From 818cd3b47e4974a53ad8fe2ddcda336fc52bb27a Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Wed, 26 Mar 2008 08:11:04 +0100 Subject: [PATCH] Makefile: support building multiple files with one config option --- extensions/GNUmakefile.in | 8 +++----- extensions/Mbuild | 8 ++++++++ mconfig | 3 --- 3 files changed, 11 insertions(+), 8 deletions(-) create mode 100644 extensions/Mbuild diff --git a/extensions/GNUmakefile.in b/extensions/GNUmakefile.in index 2c92698..8c98cf9 100644 --- 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 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 83e6798..dd2e0d5 100644 --- 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=