build: no recursive make for "py/Makefile.am"

Merge the Makefile.am under "py/" 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 bfc64ebbed710c7955ccfdb6f26c10357c362d8f..8b8de7bd141a20a89d11f489a7095b8f90367d4e 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,5 +1,7 @@
 ACLOCAL_AMFLAGS = -I m4
 
+EXTRA_DIST =
+
 pkginclude_HEADERS = \
        include/nftables/libnftables.h \
        $(NULL)
@@ -73,11 +75,21 @@ noinst_HEADERS = \
 SUBDIRS =      src     \
                files   \
                doc     \
-               examples\
-               py
+               examples
+
+EXTRA_DIST += \
+       py/pyproject.toml \
+       py/setup.cfg \
+       py/setup.py \
+       py/src/__init__.py \
+       py/src/nftables.py \
+       py/src/schema.json \
+       $(NULL)
 
-EXTRA_DIST =   tests   \
-               files
+EXTRA_DIST += \
+       files \
+       tests \
+       $(NULL)
 
 pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA = libnftables.pc

diff --git a/configure.ac b/configure.ac
index 67ca50fddf67a5ecfb025bf24e2d376b6d0b4c6c..389efbe9f730218ed54bb95d203d9809e20c6abe 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -123,7 +123,6 @@ AC_CONFIG_FILES([                                   \
                files/nftables/Makefile                 \
                files/osf/Makefile                      \
                doc/Makefile                            \
-               py/Makefile                             \
                examples/Makefile                       \
                ])
 AC_OUTPUT

diff --git a/py/Makefile.am b/py/Makefile.am
deleted file mode 100644 (file)
index 76aa082..0000000
--- a/py/Makefile.am
+++ /dev/null
@@ -1 +0,0 @@
-EXTRA_DIST = pyproject.toml setup.cfg setup.py src