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

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@redhat.com>
Signed-off-by: Florian Westphal <fw@strlen.de>

diff --git a/Makefile.am b/Makefile.am
index b89d60e32d8c8971328762b7ce775e4df91b0c28..af82f021203a2edd07d294d954290b1c59fd84a0 100644 (file)
--- 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 79024e49ab28f93ccb63d8712d1b231e9456dc1a..c5e4113898a0d742a3511aa4811dbf7ab417d11c 100644 (file)
--- 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 (file)
index 3b8b0b6..0000000
--- 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