6 files changed, 36 insertions, 42 deletions

diff --git a/lib/Makefile b/lib/Makefile
index ff4ddd5..10a06a1 100644
--- a/lib/Makefile
+++ b/lib/Makefile
@@ -1,21 +1,20 @@
 CC ?= gcc
 
-CFLAGS = -Wall
 DEBUG ?= 0
 TEST ?= 0
 FAST ?= 0
 ifeq ($(DEBUG), 1)
-    CFLAGS += -DDEBUG -g -Og -Werror -pedantic
+    ECGEN_CFLAGS = -DDEBUG -g -Og -Werror -pedantic
 else ifeq ($(TEST), 1)
-	CFLAGS += -DNDEBUG --coverage -g -O0
+	ECGEN_CFLAGS = -DNDEBUG --coverage -g -O0
 else ifeq ($(FAST), 1)
     ifeq ($(CC), gcc)
-        CFLAGS += -DNDEBUG -O3 -march=native -pipe
+        ECGEN_CFLAGS = -DNDEBUG -O3 -march=native -pipe
     else
-        CFLAGS += -DNDEBUG -O3
+        ECGEN_CFLAGS = -DNDEBUG -O3
     endif
 else
-    CFLAGS += -DNDEBUG -O2
+    ECGEN_CFLAGS = -DNDEBUG -O2
 endif
 export
 
@@ -25,4 +24,4 @@ all:
 
 clean:
 	$(MAKE) -C parson clean
-	$(MAKE) -C sha1 clean
\ No newline at end of file
+	$(MAKE) -C sha1 clean
diff --git a/lib/parson/Makefile b/lib/parson/Makefile
index 08e41dd..c94f2c8 100644
--- a/lib/parson/Makefile
+++ b/lib/parson/Makefile
@@ -1,6 +1,4 @@
 CC ?= gcc
-CCFLAGS ?= -Wall
-LDFLAGS =
 
 SOURCES = $(wildcard *.c)
 OBJECTS = $(SOURCES:.c=.o)
@@ -11,13 +9,13 @@ A = libparson.a
 all: $(TARGET)
 
 $(TARGET): $(OBJECTS)
-	$(CC) $(CFLAGS) -o $@ $^ $(LDFLAGS)
+	$(CC) $(strip $(CPPFLAGS) $(CFLAGS) -o) $@ $^ $(LDFLAGS) $(LIBS)
 
 $(A): $(OBJECTS)
 	ar rcs $(A) $(OBJECTS)
 
 %.o: %.c
-	$(CC) $(CFLAGS) -c $<
+	$(CC) $(strip $(CPPFLAGS) $(CFLAGS) -c) $<
 
 clean:
 	rm -f *.o *.a $(TARGET)
diff --git a/lib/sha1/Makefile b/lib/sha1/Makefile
index 7c7a1ed..71fbe9e 100644
--- a/lib/sha1/Makefile
+++ b/lib/sha1/Makefile
@@ -1,6 +1,4 @@
 CC ?= gcc
-CFLAGS ?= -Wall
-LDFLAGS =
 
 SOURCES = $(wildcard *.c)
 OBJECTS = $(SOURCES:.c=.o)
@@ -11,13 +9,13 @@ A = libsha1.a
 all: $(TARGET)
 
 $(TARGET): $(OBJECTS)
-	$(CC) $(CFLAGS) -o $@ $^ $(LDFLAGS)
+	$(CC) $(strip $(CPPFLAGS) $(CFLAGS) -o) $@ $^ $(LDFLAGS) $(LIBS)
 
 $(A): $(OBJECTS)
 	ar rcs $(A) $(OBJECTS)
 
 %.o: %.c
-	$(CC) $(CFLAGS) -c $<
+	$(CC) $(strip $(CPPFLAGS) $(CFLAGS) -c) $<
 
 clean:
 	rm -f *.o *.a $(TARGET)
diff --git a/src/Makefile b/src/Makefile
index 6641022..6d5140b 100644
--- a/src/Makefile
+++ b/src/Makefile
@@ -1,7 +1,7 @@
 ####
 #
 # ecgen, tool for generating Elliptic curve domain parameters
-# Copyright (C) 2017-2018 J08nY
+# Copyright (C) 2017-2021 J08nY
 #
 ####
 
@@ -14,32 +14,32 @@ FAST ?= 0
 STATIC ?= 0
 
 ifeq ($(DEBUG), 1)
-    CFLAGS += -DDEBUG -g -Og -Werror -pedantic
+    ECGEN_CFLAGS = -DDEBUG -g -Og -Werror -pedantic
 else ifeq ($(TEST), 1)
-	CFLAGS += -DNDEBUG --coverage -g -O0
+	ECGEN_CFLAGS = -DNDEBUG --coverage -g -O0
 else ifeq ($(FAST), 1)
     ifeq ($(CC), gcc)
-        CFLAGS += -DNDEBUG -O3 -march=native -mtune=native -pipe -flto
+        ECGEN_CFLAGS = -DNDEBUG -O3 -march=native -mtune=native -pipe -flto
     else
-        CFLAGS += -DNDEBUG -O3
+        ECGEN_CFLAGS = -DNDEBUG -O3
     endif
 else
-    CFLAGS += -DNDEBUG -O2
+    ECGEN_CFLAGS = -DNDEBUG -O2
 endif
 
-LDFLAGS = -L../lib/parson -L../lib/sha1 -L../lib/pari
+ECGEN_LDFLAGS = -L../lib/parson -L../lib/sha1 -L../lib/pari
 ifeq ($(STATIC), 1)
-	LIBS = -lrt -Wl,-Bstatic -lpari -Wl,-Bdynamic -lpthread -lparson -lsha1 -lm -lgmp -ldl
+	ECGEN_LIBS = -lrt -Wl,-Bstatic -lpari -Wl,-Bdynamic -lpthread -lparson -lsha1 -lm -lgmp -ldl
 else
-	LIBS = -lrt -lpari -lpthread -lparson -lsha1
+	ECGEN_LIBS = -lrt -lpari -lpthread -lparson -lsha1
 endif
 
-INCLUDES = -I. -I../lib
+ECGEN_INCLUDES = -I. -I../lib
 
 
-GIT_COMMIT = $(shell git rev-parse --short HEAD)
+GIT_COMMIT = $(shell git rev-parse --short HEAD 2>/dev/null)
 ifneq ($(GIT_COMMIT),)
-	CFLAGS += -DGIT_COMMIT=\"$(GIT_COMMIT)\"
+	ECGEN_CFLAGS += -DGIT_COMMIT=\"$(GIT_COMMIT)\"
 endif
 
 ####
@@ -55,11 +55,11 @@ HDR = $(wildcard */*.h)
 all: ecgen
 
 ecgen: ecgen.o $(ECGEN_OBJ)
-	$(CC) $(CFLAGS) $(INCLUDES) -o $@ $^ $(LDFLAGS) $(LIBS)
+	$(CC) $(strip $(CPPFLAGS) $(ECGEN_INCLUDES) $(ECGEN_CFLAGS) $(CFLAGS) -o) $@ $^ $(ECGEN_LDFLAGS) $(LDFLAGS) $(ECGEN_LIBS) $(LIBS)
 	mv ecgen ..
 
 %.o: %.c
-	$(CC) $(CFLAGS) $(INCLUDES) -c -o $@ $<
+	$(CC) $(strip $(CPPFLAGS) $(ECGEN_INCLUDES) $(ECGEN_CFLAGS) $(CFLAGS) -c -o) $@ $<
 
 ####
 
diff --git a/test/Makefile b/test/Makefile
index 502f9cf..4f495d9 100644
--- a/test/Makefile
+++ b/test/Makefile
@@ -1,7 +1,7 @@
 ####
 #
 # ecgen, tool for generating Elliptic curve domain parameters
-# Copyright (C) 2017 J08nY
+# Copyright (C) 2017,2021 J08nY
 #
 ####
 
@@ -27,4 +27,4 @@ clean-cov:
 	+$(MAKE) -C src clean-cov
 
 format:
-	+$(MAKE) -C src format
\ No newline at end of file
+	+$(MAKE) -C src format
diff --git a/test/src/Makefile b/test/src/Makefile
index 86e2598..c8badc3 100644
--- a/test/src/Makefile
+++ b/test/src/Makefile
@@ -1,20 +1,19 @@
 ####
 #
 # ecgen, tool for generating Elliptic curve domain parameters
-# Copyright (C) 2017-2018 J08nY
+# Copyright (C) 2017-2018,2021 J08nY
 #
 ####
 
 
 CC ?= gcc
-CFLAGS = -Wall
 TEST ?= 0
 ifeq ($(TEST), 1)
-    CFLAGS += --coverage -g -O0
+    ECGEN_CFLAGS = --coverage -g -O0
 endif
-LDFLAGS = -L../../lib/parson -L../../lib/sha1 -L../../lib/pari -L../lib/criterion/build
-INCLUDES = -I. -I../../src -I../../lib -I../lib/criterion/include
-LIBS = -lrt -lpari -lpthread -lparson -lsha1 -lcriterion
+ECGEN_LDFLAGS = -L../../lib/parson -L../../lib/sha1 -L../../lib/pari -L../lib/criterion/build
+ECGEN_INCLUDES = -I. -I../../src -I../../lib -I../lib/criterion/include
+ECGEN_LIBS = -lrt -lpari -lpthread -lparson -lsha1 -lcriterion
 
 TEST_SRC = $(wildcard *.c) $(wildcard */*.c)
 TEST_HDR = $(wildcard */*.h)
@@ -27,16 +26,16 @@ ECGEN_OBJ = $(patsubst %.c,%.o, $(ECGEN_SRC))
 all: unittest
 
 unittest: test_ecgen
-	LD_LIBRARY_PATH=../lib/criterion/build ./test_ecgen --verbose=1 --filter \!\(brainpool_rfc/test_brainpool_rfc_params\)
+	LD_LIBRARY_PATH=../lib/criterion/build DYLD_LIBRARY_PATH=../lib/criterion/build ./test_ecgen --verbose=1 --filter \!\(brainpool_rfc/test_brainpool_rfc_params\)
 
 fulltest: test_ecgen
-	LD_LIBRARY_PATH=../lib/criterion/build ./test_ecgen --verbose=1
+	LD_LIBRARY_PATH=../lib/criterion/build DYLD_LIBRARY_PATH=../lib/criterion/build ./test_ecgen --verbose=1
 
 test_ecgen: $(TEST_OBJ) $(ECGEN_OBJ)
-	$(CC) $(CFLAGS) $(INCLUDES) -o $@ $^ $(LDFLAGS) $(LIBS)
+	$(CC) $(strip $(CPPFLAGS) $(ECGEN_INCLUDES) $(ECGEN_CFLAGS) $(CFLAGS) -o) $@ $^ $(ECGEN_LDFLAGS) $(LDFLAGS) $(ECGEN_LIBS) $(LIBS)
 
 %.o: %.c
-	$(CC) $(CFLAGS) $(INCLUDES) -c -o $@ $<
+	$(CC) $(strip $(CPPFLAGS) $(ECGEN_INCLUDES) $(ECGEN_CFLAGS) $(CFLAGS) -c -o) $@ $<
 
 clean-all: clean
 	rm -f ./test_ecgen
@@ -53,4 +52,4 @@ format:
 	clang-format -i $(TEST_SRC)
 	clang-format -i $(TEST_HDR)
 
-.PHONY: all clean-all clean clean-cov format
\ No newline at end of file
+.PHONY: all clean-all clean clean-cov format