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@xxxxxxxxxx> --- Makefile.am | 20 ++++++++++++++++---- configure.ac | 1 - py/Makefile.am | 1 - 3 files changed, 16 insertions(+), 6 deletions(-) delete mode 100644 py/Makefile.am diff --git a/Makefile.am b/Makefile.am index bfc64ebbed71..8b8de7bd141a 100644 --- 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 67ca50fddf67..389efbe9f730 100644 --- 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 index 76aa082f8709..000000000000 --- a/py/Makefile.am +++ /dev/null @@ -1 +0,0 @@ -EXTRA_DIST = pyproject.toml setup.cfg setup.py src -- 2.41.0
