Build system change, bugfix ...

* Workaround for a bug where getrandom() call block within mbedtls
* Remove use of undocumented autoconf feature: pkg-config
* Remove proone-arch-test

1 files changed, 14 insertions, 24 deletions

diff --git a/src/Makefile.am b/src/Makefile.am
index 1bb594d..cbd1fd1 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,16 +1,11 @@
-TARGET_FLAGS =
-DEV_FLAGS =
+# TODO: Use -D_POSIX_C_SOURCE=200112L or -D_POSIX_C_SOURCE=2
+AM_CFLAGS = -std=c11 -pedantic -Wall -Wextra -Wno-switch -D_GNU_SOURCE -Wno-unused-parameter
 if DEBUG
-TARGET_FLAGS += -g -O0
-DEV_FLAGS += -g -O0 -DPRNE_DEBUG
+AM_CFLAGS += -g -O0 -DPRNE_DEBUG
 else
-TARGET_FLAGS += -Os -g
-DEV_FLAGS += -Os -g
+AM_CFLAGS += -g -Os
 endif
 
-# TODO: Use -D_POSIX_C_SOURCE=200112L or -D_POSIX_C_SOURCE=2
-AM_CFLAGS = -std=c11 -pedantic -Wall -Wextra -Wno-switch -D_GNU_SOURCE -Wno-unused-parameter  $(DEV_FLAGS)
-
 noinst_LIBRARIES = libproone.a
 bin_PROGRAMS =\
 	proone\
@@ -20,7 +15,6 @@ bin_PROGRAMS =\
 	proone-mask\
 	proone-print-all-data\
 	proone-resolv\
-	proone-arch-test\
 	proone-stress
 
 libproone_a_SOURCES =\
@@ -38,39 +32,35 @@ libproone_a_SOURCES =\
 	resolv_worker.c
 
 proone_LDFLAGS = -static
-proone_LDADD = libproone.a $(LIBS) $(DEP_PKGCFG_LIBS) -lrt -lpthread
+proone_LDADD = libproone.a
 proone_SOURCES =\
 	proone.c
 
 proone_pack_LDADD = libproone.a
-proone_pack_LDFLAGS = $(LIBS) $(DEP_PKGCFG_LIBS)
+proone_pack_LDFLAGS =
 proone_pack_SOURCES = proone-pack.c
 
 proone_unpack_LDADD = libproone.a
-proone_unpack_LDFLAGS = $(LIBS) $(DEP_PKGCFG_LIBS)
+proone_unpack_LDFLAGS =
 proone_unpack_SOURCES = proone-unpack.c
 
 proone_list_arch_LDADD = libproone.a
-proone_list_arch_LDFLAGS = $(LIBS) $(DEP_PKGCFG_LIBS)
+proone_list_arch_LDFLAGS =
 proone_list_arch_SOURCES = proone-list-arch.c
 
 proone_mask_LDADD = libproone.a
-proone_mask_LDFLAGS = $(LIBS) $(DEP_PKGCFG_LIBS)
+proone_mask_LDFLAGS =
 proone_mask_SOURCES = proone-mask.c
 
 proone_print_all_data_LDADD = libproone.a
-proone_print_all_data_LDFLAGS = $(LIBS) $(DEP_PKGCFG_LIBS)
+proone_print_all_data_LDFLAGS =
 proone_print_all_data_SOURCES = proone-print-all-data.c
 
 proone_resolv_LDADD = libproone.a
-proone_resolv_LDFLAGS = $(LIBS) $(DEP_PKGCFG_LIBS)
+proone_resolv_LDFLAGS =
 proone_resolv_SOURCES = proone-resolv.c
 
-proone_arch_test_LDADD = libproone.a -lrt -lpthread $(LIBS) $(DEP_PKGCFG_LIBS)
-proone_arch_test_SOURCES = proone-arch-test.c
-proone_arch_test_LDFLAGS = -static
-
-proone_stress_LDADD = libproone.a -lrt -lpthread $(LIBS) $(DEP_PKGCFG_LIBS)
+proone_stress_LDADD = libproone.a
 proone_stress_LDFLAGS = -static
 proone_stress_SOURCES = proone-stress.c
 
@@ -78,10 +68,10 @@ if TESTS
 bin_PROGRAMS += proone-test_proto proone-test_util
 
 proone_test_proto_LDADD = libproone.a
-proone_test_proto_LDFLAGS = $(LIBS) $(DEP_PKGCFG_LIBS)
+proone_test_proto_LDFLAGS =
 proone_test_proto_SOURCES = proone-test_proto.c
 
 proone_test_util_LDADD = libproone.a
-proone_test_util_LDFLAGS = $(LIBS) $(DEP_PKGCFG_LIBS)
+proone_test_util_LDFLAGS =
 proone_test_util_SOURCES = proone-test_util.c
 endif