From 76d4d6b2bafada7b790e817b7324d53f3d3a0c7f Mon Sep 17 00:00:00 2001
From: David Timber <mieabby@gmail.com>
Date: Thu, 20 Aug 2020 12:23:35 +0930
Subject: Progress ...

* Move DVault out of executable. Dynamically load it on startup
* Improved testing scheme
* Tidy up prne_*assert* macro series
* Protocol: store host credentials in base64 string. No mask
* Use the lock shm as a shared_global so the stats can persist
* mmap() the executable read-only for later use
---
 src/Makefile.am | 52 ++++++++++++++++++++++++++++++++--------------------
 1 file changed, 32 insertions(+), 20 deletions(-)

(limited to 'src/Makefile.am')

diff --git a/src/Makefile.am b/src/Makefile.am
index 2c320a2..590157f 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,5 +1,7 @@
+BIN_ALIGNMENT = 8
+
 # 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
+AM_CFLAGS = -std=c11 -pedantic -Wall -Wextra -Wno-switch -D_GNU_SOURCE -Wno-unused-parameter -DPRNE_BIN_ALIGNMENT=$(BIN_ALIGNMENT)
 if DEBUG
 AM_CFLAGS += -g -O0 -DPRNE_DEBUG
 else
@@ -7,23 +9,28 @@ AM_CFLAGS += -g -Os
 endif
 
 noinst_LIBRARIES = libproone.a
+my_DATA = proone testlist
+mydir = $(bindir)
 bin_PROGRAMS =\
-	proone\
+	proone.bin\
+	proone-mkdvault\
 	proone-pack\
 	proone-unpack\
 	proone-list-arch\
-	proone-mask\
-	proone-print-all-data\
 	proone-resolv\
 	proone-stress\
 	proone-ipaddr-arr
 
+proone_tests =\
+	proone-test_proto\
+	proone-test_util
+bin_PROGRAMS += $(proone_tests)
+
 libproone_a_SOURCES =\
 	config.c\
 	protocol.c\
 	pack.c\
 	dvault.c\
-	data.c\
 	util_rt.c\
 	llist.c\
 	iset.c\
@@ -32,11 +39,25 @@ libproone_a_SOURCES =\
 	pth.c\
 	resolv.c
 
-proone_LDFLAGS = -static
-proone_LDADD = libproone.a
-proone_SOURCES =\
+proone: proone.bin dvault.bin
+	cp -fa proone.bin proone
+	./build-utils.sh align-file $(BIN_ALIGNMENT) proone
+	./build-utils.sh append-uint16 `stat -c "%s" dvault.bin` proone
+	./build-utils.sh append-uint16 0 proone
+	./build-utils.sh append-uint32 0 proone
+	cat dvault.bin >> proone
+
+proone_bin_LDFLAGS = -static
+proone_bin_LDADD = libproone.a
+proone_bin_SOURCES =\
 	proone.c
 
+dvault.bin: proone-mkdvault
+	./proone-mkdvault > dvault.bin
+
+proone_mkdvault_LDADD = libproone.a
+proone_mkdvault_SOURCES = proone-mkdvault.c
+
 proone_pack_LDADD = libproone.a
 proone_pack_LDFLAGS =
 proone_pack_SOURCES = proone-pack.c
@@ -49,14 +70,6 @@ proone_list_arch_LDADD = libproone.a
 proone_list_arch_LDFLAGS =
 proone_list_arch_SOURCES = proone-list-arch.c
 
-proone_mask_LDADD = libproone.a
-proone_mask_LDFLAGS =
-proone_mask_SOURCES = proone-mask.c
-
-proone_print_all_data_LDADD = libproone.a
-proone_print_all_data_LDFLAGS =
-proone_print_all_data_SOURCES = proone-print-all-data.c
-
 proone_resolv_LDADD = libproone.a
 proone_resolv_LDFLAGS =
 proone_resolv_SOURCES = proone-resolv.c
@@ -67,9 +80,6 @@ proone_stress_LDADD = libproone.a
 proone_stress_LDFLAGS = -static
 proone_stress_SOURCES = proone-stress.c
 
-if TESTS
-bin_PROGRAMS += proone-test_proto proone-test_util
-
 proone_test_proto_LDADD = libproone.a
 proone_test_proto_LDFLAGS =
 proone_test_proto_SOURCES = proone-test_proto.c
@@ -77,4 +87,6 @@ proone_test_proto_SOURCES = proone-test_proto.c
 proone_test_util_LDADD = libproone.a
 proone_test_util_LDFLAGS =
 proone_test_util_SOURCES = proone-test_util.c
-endif
+
+testlist: $(proone_tests)
+	echo $(proone_tests) > testlist
-- 
cgit