Fix everything that broke for macOS in the makefiles

asn.1/Makefile

@@ -16,9 +16,8 @@ libasn1.a: $(ALL_OBJECTS)
 generate: Sync-Protocols.c
 	rm -f converter-sample.c
 
-# '-Wno-cpp' is required to suppress the warning "_BSD_SOURCE and _SVID_SOURCE are deprecated, use _DEFAULT_SOURCE" otherwise printed during the compilation of every asn1c-generated C file.
 %.o: %.c %.h
-	$(CC) $(CFLAGS) -Wno-cpp -I. $(ASN1C_INC) -c $< -o $@
+	$(CC) $(CFLAGS) $(CFLAGS_GENERATED) -I. $(ASN1C_INC) -c $< -o $@
 
 Sync-Protocols.c: pEp.asn1 devicegroup.asn1 protocols.asn1
 	$(ASN1C) -gen-PER -fincludes-quoted -fcompound-names -pdu=PEP.Message $^

build-config/Darwin.conf

@@ -7,10 +7,11 @@
 TARGET=libpEpEngine.dylib
 
 ######### C #########
-CC=clang -std=c99 -pthread
-CFLAGS=-fPIC -fstrict-aliasing -fcolor-diagnostics
+# clang issues a warning when "-cflags" is used for linking. So, include it in CFLAGS, and not in CC
+CC=clang -std=c99
+CFLAGS=-pthread -fPIC -fstrict-aliasing -fcolor-diagnostics
 ifdef WARN
-    CFLAGS+= -Wall -pedantic -Wstrict-aliasing=3
+    CFLAGS+= -Wall -pedantic
 else
     CFLAGS+= -w
 endif
@@ -19,9 +20,10 @@ ifdef DEBUG
 else
     CFLAGS+= -O3 -DNDEBUG
 endif
+CFLAGS_GENERATED=
 
 ######### C++ #########
-CXX=clang -std=c++11
+CXX=clang -std=c++11 -pthread
 CXXFLAGS=-fcolor-diagnostics -I../src -I../asn.1 $(ETPAN_INC)
 ifdef WARN
     CXXFLAGS+=
@@ -44,6 +46,8 @@ endif
 
 ######### OpenPGP #########
 LIBGPGME=libgpgme.dylib
+GPGME_LIB=-L/opt/local/lib
+GPGME_INC=-I/opt/local/include
 
 ######### Engine internals #########
 

build-config/Linux.conf

@@ -7,7 +7,7 @@
 TARGET=libpEpEngine.so
 
 ######### C #########
-CC=gcc -std=c99
+CC=gcc -std=c99 -pthread
 CFLAGS=-fPIC -fstrict-aliasing -fdiagnostics-color=always
 ifdef WARN
     CFLAGS+= -Wall -pedantic -Wstrict-aliasing=3
@@ -19,6 +19,8 @@ ifdef DEBUG
 else
     CFLAGS+= -O3 -DNDEBUG
 endif
+# '-Wno-cpp' is required to suppress the warning "_BSD_SOURCE and _SVID_SOURCE are deprecated, use _DEFAULT_SOURCE" otherwise printed during the compilation of every asn1c-generated C file.
+CFLAGS_GENERATED=-Wno-cpp
 
 ######### C++ #########
 CXX=g++ -std=gnu++11 -pthread
@@ -44,6 +46,8 @@ endif
 
 ######### OpenPGP #########
 LIBGPGME=libgpgme.so.11
+GPGME_LIB=
+GPGME_INC=
 
 ######### Engine internals #########
 

build-config/common.conf

@@ -23,6 +23,8 @@ WARN=placeholder
 #CC This option is platform-specific
 CPPFLAGS=
 #CFLAGS This option is platform-specific
+# Additional CFLAGS used for compiling ASN1C-generated code
+#CFLAGS_GENERATED This option is platform-specific
 
 ######### C++ #########
 #CXX This option is platform-specific
@@ -63,11 +65,9 @@ OPENPGP=GPG
 # Path of libGPGME binary
 #LIBGPGME This option is platform-specific
 # libGPGME library search flag
-GPGME_LIB=
-#GPGME_LIB=-L$(PREFIX)/lib
+#GPGME_LIB= This option is platform-specific
 # libGPGME include search flag
-GPGME_INC=
-#GPGME_INC=-I$(PREFIX)/include
+#GPGME_INC= This option is platform-specific
 # NETPGP library search flag
 NETPGP_LIB=
 #NETPGP_LIB=-L$(PREFIX)/lib