From b3b5d294523044e2198f898538530270cd99f71b Mon Sep 17 00:00:00 2001
From: Philippe Teuwen <phil@teuwen.org>
Date: Wed, 27 Mar 2019 22:48:46 +0100
Subject: [PATCH] nonce2key makefile: fix race condition when using make -jN
 and add header dependency

---
 tools/nonce2key/Makefile | 33 ++++++++++++++++++---------------
 1 file changed, 18 insertions(+), 15 deletions(-)

diff --git a/tools/nonce2key/Makefile b/tools/nonce2key/Makefile
index 99f9a3598..44657419a 100644
--- a/tools/nonce2key/Makefile
+++ b/tools/nonce2key/Makefile
@@ -1,20 +1,23 @@
 CC = gcc
-LD = gcc
-CFLAGS = -std=c99 -Wall -O3 -c
-LDFLAGS =
+CFLAGS = -std=c99 -Wall -O3 -I.
+LDFLAGS = -std=c99 -Wall
+SRC := $(wildcard *.c)
+OBJ := $(SRC:.c=.o)
+DEP := $(SRC:.c=.d)
+PROG := nonce2key
 
-OBJS = crypto1.o crapto1.o
-HEADERS = crapto1.h
-EXES = nonce2key
-WINEXES = $(patsubst %, %.exe, $(EXES))
+all: $(PROG)
 
-all: $(OBJS) $(EXES)
-
-%.o : %.c
-	$(CC) $(CFLAGS) -c -o $@ $<
-
-% : %.c
-	$(LD) $(LDFLAGS) -o $@ $(OBJS) $<
+$(PROG): $(OBJ)
+	$(CC) $(LDFLAGS) $^ $(LDLIBS) -o $@
 
 clean:
-	rm -f $(OBJS) $(EXES) $(WINEXES)
+	@$(RM) $(DEP) $(OBJ) $(PROG)
+
+ifneq ($(filter clean,$(MAKECMDGOALS)),clean)
+-include $(DEP)
+endif
+
+%.d: %.c
+	$(info GEN $@)
+	@$(CC) -MM $(CFLAGS) $< | sed 's/\($*\)\.o[ :]*/\1.o $@ : /g' > $@