build: eliminate geoip/ make recursion

diff --git a/Makefile.am b/Makefile.am
index c051d5391dc6c0ac5899eeb75fe1f12af349b6f1..0518bb677fd1a353621073f5a3e685a25e801b1c 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,10 +1,16 @@
 # -*- Makefile -*-
 
 ACLOCAL_AMFLAGS  = -I m4
-SUBDIRS          = extensions extensions/ACCOUNT extensions/pknock geoip
-
-pkglibexec_SCRIPTS = asn/xt_asn_build asn/xt_asn_dl asn/xt_asn_fetch
-man_MANS = xtables-addons.8 asn/xt_asn_build.1 asn/xt_asn_dl.1
+SUBDIRS          = extensions extensions/ACCOUNT extensions/pknock
+
+bin_SCRIPTS = geoip/xt_geoip_query
+pkglibexec_SCRIPTS = asn/xt_asn_build asn/xt_asn_dl asn/xt_asn_fetch \
+       geoip/xt_geoip_build geoip/xt_geoip_build_maxmind \
+       geoip/xt_geoip_dl geoip/xt_geoip_dl_maxmind
+man_MANS = xtables-addons.8 asn/xt_asn_build.1 asn/xt_asn_dl.1 \
+       geoip/xt_geoip_build.1 geoip/xt_geoip_dl.1 \
+       geoip/xt_geoip_build_maxmind.1 geoip/xt_geoip_dl_maxmind.1 \
+       geoip/xt_geoip_query.1
 
 .PHONY: FORCE
 FORCE:

diff --git a/configure.ac b/configure.ac
index 2920d41ebd87c6c42f4e83259b01de7f791cc70a..727c45f456408ff68583c3cd94ff2e95423313e8 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -79,7 +79,7 @@ AC_SUBST([regular_CPPFLAGS])
 AC_SUBST([regular_CFLAGS])
 AC_SUBST([kbuilddir])
 AC_SUBST([xtlibdir])
-AC_CONFIG_FILES([Makefile Makefile.iptrules Makefile.mans geoip/Makefile
+AC_CONFIG_FILES([Makefile Makefile.iptrules Makefile.mans
        extensions/Makefile extensions/ACCOUNT/Makefile
        extensions/pknock/Makefile])
 AC_OUTPUT

diff --git a/geoip/Makefile.am b/geoip/Makefile.am
deleted file mode 100644 (file)
index f8840fb..0000000
--- a/geoip/Makefile.am
+++ /dev/null
@@ -1,9 +0,0 @@
-# -*- Makefile -*-
-
-bin_SCRIPTS = xt_geoip_query
-
-pkglibexec_SCRIPTS = xt_geoip_build xt_geoip_build_maxmind xt_geoip_dl xt_geoip_dl_maxmind
-
-man1_MANS = xt_geoip_build.1 xt_geoip_dl.1 \
-           xt_geoip_build_maxmind.1 xt_geoip_dl_maxmind.1 \
-           xt_geoip_query.1