Merge the Makefile.am under "examples/" 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 | 19 ++++++++++++++++--- configure.ac | 1 - examples/Makefile.am | 6 ------ 3 files changed, 16 insertions(+), 10 deletions(-) delete mode 100644 examples/Makefile.am diff --git a/Makefile.am b/Makefile.am index b89d60e32d8c..af82f021203a 100644 --- a/Makefile.am +++ b/Makefile.am @@ -26,9 +26,11 @@ ACLOCAL_AMFLAGS = -I m4 EXTRA_DIST = BUILT_SOURCES = +LDADD = lib_LTLIBRARIES = noinst_LTLIBRARIES = sbin_PROGRAMS = +check_PROGRAMS = ############################################################################### @@ -288,9 +290,20 @@ src_nft_LDADD = src/libnftables.la ############################################################################### -SUBDIRS = \ - doc \ - examples +SUBDIRS = doc + +############################################################################### + + +check_PROGRAMS += examples/nft-buffer + +examples_nft_buffer_AM_CPPFLAGS = -I$(srcdir)/include +examples_nft_buffer_LDADD = src/libnftables.la + +check_PROGRAMS += examples/nft-json-file + +examples_nft_json_file_AM_CPPFLAGS = -I$(srcdir)/include +examples_nft_json_file_LDADD = src/libnftables.la ############################################################################### diff --git a/configure.ac b/configure.ac index 79024e49ab28..c5e4113898a0 100644 --- a/configure.ac +++ b/configure.ac @@ -118,7 +118,6 @@ AC_CONFIG_FILES([ \ Makefile \ libnftables.pc \ doc/Makefile \ - examples/Makefile \ ]) AC_OUTPUT diff --git a/examples/Makefile.am b/examples/Makefile.am deleted file mode 100644 index 3b8b0b6708dc..000000000000 --- a/examples/Makefile.am +++ /dev/null @@ -1,6 +0,0 @@ -check_PROGRAMS = nft-buffer \ - nft-json-file - -AM_CPPFLAGS = -I$(top_srcdir)/include - -LDADD = $(top_builddir)/src/libnftables.la -- 2.41.0
