build: do not unconditionally install ipset

build_ipset=n was not completely respected and the ipset userspace
parts were still installed. This is now fixed.

diff --git a/Makefile.am b/Makefile.am
index e6d1c7ac79900d53b469a0ffb1ea5edcb20829ca..112130e3c801fb855b833119681aad4f4a4e1811 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,7 +1,7 @@
 # -*- Makefile -*-
 
 AUTOMAKE_OPTIONS = foreign subdir-objects
-SUBDIRS          = extensions extensions/ipset
+SUBDIRS          = extensions
 
 man_MANS := xtables-addons.8
 

diff --git a/extensions/GNUmakefile.in b/extensions/GNUmakefile.in
index 44f11da2259495211f52c7e0263dd527e7068d93..8ed07b14ceef6d50a559eb1be0de55b4d5578c82 100644 (file)
--- a/extensions/GNUmakefile.in
+++ b/extensions/GNUmakefile.in
@@ -53,22 +53,30 @@ include ${srcdir}/Mbuild
 #
 #      Building blocks
 #
-targets := ${obj-m}
-targets_install := ${obj-m}
+targets := $(filter-out %/,${obj-m})
+targets_install := ${targets}
+subdirs_list := $(filter %/,${obj-m})
 
 .SECONDARY:
 
 .PHONY: all install clean distclean FORCE
 
-all: modules user matches.man targets.man
+all: subdirs modules user matches.man targets.man
+
+subdirs:
+       @for i in ${subdirs_list}; do ${MAKE} -C $$i; done;
+
+subdirs-install:
+       @for i in ${subdirs_list}; do ${MAKE} -C $$i install; done;
 
 user: ${targets}
 
-install: modules_install ${targets_install}
+install: modules_install subdirs-install ${targets_install}
        @mkdir -p "${DESTDIR}${xtlibdir}";
        install -pm0755 ${targets_install} "${DESTDIR}${xtlibdir}/";
 
 clean: clean_modules
+       @for i in ${subdirs_list}; do make -C $$i clean; done;
        rm -f *.oo *.so;
 
 distclean: clean

diff --git a/extensions/Mbuild b/extensions/Mbuild
index d19da8e97033eb6e462859cf11185af3cb052c67..6fbda26f50cb5b9cf596f51cf9161d66c128a0d9 100644 (file)
--- a/extensions/Mbuild
+++ b/extensions/Mbuild
@@ -11,5 +11,6 @@ obj-${build_condition}   += libxt_condition.so
 obj-${build_fuzzy}       += libxt_fuzzy.so
 obj-${build_geoip}       += libxt_geoip.so
 obj-${build_ipp2p}       += libxt_ipp2p.so
+obj-${build_ipset}       += ipset/
 obj-${build_portscan}    += libxt_portscan.so
 obj-${build_quota2}      += libxt_quota2.so