From 7ad55ad6210d450521664f64453f854b3ba13d8d Mon Sep 17 00:00:00 2001 From: Jan Engelhardt Date: Tue, 16 Aug 2022 10:44:56 +0200 Subject: [PATCH] build: eliminate geoip/ make recursion --- Makefile.am | 14 ++++++++++---- configure.ac | 2 +- geoip/Makefile.am | 9 --------- 3 files changed, 11 insertions(+), 14 deletions(-) delete mode 100644 geoip/Makefile.am diff --git a/Makefile.am b/Makefile.am index c051d53..0518bb6 100644 --- 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 2920d41..727c45f 100644 --- 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 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 -- 2.47.3