Makefile: support building multiple files with one config option

diff --git a/extensions/GNUmakefile.in b/extensions/GNUmakefile.in
index 2c926984aa0b63b3f4f56838800392d8d26658aa..8c98cf9042ba44aa8a9bb26563ee484f1365509d 100644 (file)
--- a/extensions/GNUmakefile.in
+++ b/extensions/GNUmakefile.in
@@ -45,16 +45,14 @@ endif
 #
 include ${top_srcdir}/mconfig
 -include ${top_srcdir}/mconfig.*
-pfx_all_mod   := $(patsubst ${srcdir}/libxt_%.c,%,$(wildcard ${srcdir}/libxt_*.c))
-pfx_build_mod := $(foreach i,${pfx_all_mod},$(if ${build_${i}},${i},))
-pfx_solibs    := $(patsubst %,libxt_%.so,${pfx_build_mod})
+include ${srcdir}/Mbuild
 
 
 #
 #      Building blocks
 #
-targets := ${pfx_solibs}
-targets_install := ${pfx_solibs}
+targets := ${obj-m}
+targets_install := ${obj-m}
 
 .SECONDARY:
 

diff --git a/extensions/Mbuild b/extensions/Mbuild
new file mode 100644 (file)
index 0000000..336c3f2
--- /dev/null
+++ b/extensions/Mbuild
@@ -0,0 +1,8 @@
+obj-${build_CHAOS}    += libxt_CHAOS.so
+obj-${build_DELUDE}   += libxt_DELUDE.so
+obj-${build_ECHO}     += libxt_ECHO.so
+obj-${build_LOGMARK}  += libxt_LOGMARK.so
+obj-${build_TARPIT}   += libxt_TARPIT.so
+obj-${build_TEE}      += libxt_TEE.so
+obj-${build_geoip}    += libxt_geoip.so
+obj-${build_portscan} += libxt_portscan.so

diff --git a/mconfig b/mconfig
index 83e67984a56b79f3c274f7ef05153f328f3efa2f..dd2e0d5f3a399f6f8fcca1803bfdcfd5a6ead8cc 100644 (file)
--- a/mconfig
+++ b/mconfig
@@ -1,8 +1,5 @@
 # -*- Makefile -*-
 #
-# Only "build_${name}=m" (build extensions) or "build_${name}="
-# (do not build) are valid!
-#
 build_CHAOS=m
 build_DELUDE=m
 build_ECHO=