build: no recursive make for "files/**/Makefile.am"

Merge the Makefile.am under "files/" into the toplevel Makefile.am. This
is a step in the effort of dropping recursive make.

Signed-off-by: Thomas Haller <thaller@redhat.com>
Signed-off-by: Florian Westphal <fw@strlen.de>

diff --git a/Makefile.am b/Makefile.am
index 8b8de7bd141a20a89d11f489a7095b8f90367d4e..83f25dd8574beca9dc5742af3a9d1cf0255bb4fd 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -2,6 +2,8 @@ ACLOCAL_AMFLAGS = -I m4
 
 EXTRA_DIST =
 
+###############################################################################
+
 pkginclude_HEADERS = \
        include/nftables/libnftables.h \
        $(NULL)
@@ -72,11 +74,48 @@ noinst_HEADERS = \
        \
        $(NULL)
 
+###############################################################################
+
 SUBDIRS =      src     \
-               files   \
                doc     \
                examples
 
+###############################################################################
+
+dist_pkgdata_DATA = \
+       files/nftables/all-in-one.nft \
+       files/nftables/arp-filter.nft \
+       files/nftables/bridge-filter.nft \
+       files/nftables/inet-filter.nft \
+       files/nftables/inet-nat.nft \
+       files/nftables/ipv4-filter.nft \
+       files/nftables/ipv4-mangle.nft \
+       files/nftables/ipv4-nat.nft \
+       files/nftables/ipv4-raw.nft \
+       files/nftables/ipv6-filter.nft \
+       files/nftables/ipv6-mangle.nft \
+       files/nftables/ipv6-nat.nft \
+       files/nftables/ipv6-raw.nft \
+       files/nftables/netdev-ingress.nft \
+       $(NULL)
+
+pkgdocdir = ${docdir}/examples
+
+dist_pkgdoc_SCRIPTS = \
+       files/examples/ct_helpers.nft \
+       files/examples/load_balancing.nft \
+       files/examples/secmark.nft \
+       files/examples/sets_and_maps.nft \
+       $(NULL)
+
+pkgsysconfdir = ${sysconfdir}/nftables/osf
+
+dist_pkgsysconf_DATA = \
+       files/osf/pf.os \
+       $(NULL)
+
+###############################################################################
+
 EXTRA_DIST += \
        py/pyproject.toml \
        py/setup.cfg \
@@ -86,6 +125,8 @@ EXTRA_DIST += \
        py/src/schema.json \
        $(NULL)
 
+###############################################################################
+
 EXTRA_DIST += \
        files \
        tests \

diff --git a/configure.ac b/configure.ac
index 389efbe9f730218ed54bb95d203d9809e20c6abe..23581f91341d9c7d2dfd16d25a97751683703354 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -118,10 +118,6 @@ AC_CONFIG_FILES([                                  \
                Makefile                                \
                libnftables.pc                          \
                src/Makefile                            \
-               files/Makefile                          \
-               files/examples/Makefile                 \
-               files/nftables/Makefile                 \
-               files/osf/Makefile                      \
                doc/Makefile                            \
                examples/Makefile                       \
                ])

diff --git a/files/Makefile.am b/files/Makefile.am
deleted file mode 100644 (file)
index 7deec15..0000000
--- a/files/Makefile.am
+++ /dev/null
@@ -1,3 +0,0 @@
-SUBDIRS =      nftables \
-               examples \
-               osf

diff --git a/files/examples/Makefile.am b/files/examples/Makefile.am
deleted file mode 100644 (file)
index b29e9f6..0000000
--- a/files/examples/Makefile.am
+++ /dev/null
@@ -1,5 +0,0 @@
-pkgdocdir = ${docdir}/examples
-dist_pkgdoc_SCRIPTS = ct_helpers.nft \
-               load_balancing.nft \
-               secmark.nft \
-               sets_and_maps.nft

diff --git a/files/nftables/Makefile.am b/files/nftables/Makefile.am
deleted file mode 100644 (file)
index ee88dd8..0000000
--- a/files/nftables/Makefile.am
+++ /dev/null
@@ -1,14 +0,0 @@
-dist_pkgdata_DATA =    all-in-one.nft          \
-                       arp-filter.nft          \
-                       bridge-filter.nft       \
-                       inet-filter.nft         \
-                       inet-nat.nft            \
-                       ipv4-filter.nft         \
-                       ipv4-mangle.nft         \
-                       ipv4-nat.nft            \
-                       ipv4-raw.nft            \
-                       ipv6-filter.nft         \
-                       ipv6-mangle.nft         \
-                       ipv6-nat.nft            \
-                       ipv6-raw.nft            \
-                       netdev-ingress.nft

diff --git a/files/osf/Makefile.am b/files/osf/Makefile.am
deleted file mode 100644 (file)
index d80196d..0000000
--- a/files/osf/Makefile.am
+++ /dev/null
@@ -1,2 +0,0 @@
-pkgsysconfdir = ${sysconfdir}/nftables/osf
-dist_pkgsysconf_DATA = pf.os