[PATCH 4/6] Merge tools/Makefile.am into Makefile.am

[David Herrmann]

no-subdir-objects is deprecated and future automake releases will enable
subdir-objects automatically. So try merging sub-makefiles into the
main-makefile.

Signed-off-by: David Herrmann <dh.herrmann at gmail.com>
---
 Makefile.am       | 14 ++++++++++++--
 configure.ac      |  1 -
 tools/Makefile.am |  8 --------
 3 files changed, 12 insertions(+), 11 deletions(-)
 delete mode 100644 tools/Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 8544de2..f549076 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -7,9 +7,10 @@ PRINT_DIRECTORY_FLAGS_1=
 PRINT_DIRECTORY_FLAGS_0=--no-print-directory
 PRINT_DIRECTORY_FLAGS_=$(PRINT_DIRECTORY_FLAGS_$(AM_DEFAULT_VERBOSITY))
 AM_MAKEFLAGS = $(PRINT_DIRECTORY_FLAGS_$(V))
-AM_CPPFLAGS = $(GCC_CFLAGS) $(GCOV_CFLAGS) -I$(top_srcdir)
-SUBDIRS = doc tools test
+AM_CPPFLAGS = $(GCC_CFLAGS) $(GCOV_CFLAGS) -I$(top_srcdir) -I$(top_srcdir)/libevdev
+SUBDIRS = doc test
 lib_LTLIBRARIES =
+noinst_PROGRAMS =
 
 pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA = libevdev.pc
@@ -57,3 +58,12 @@ BUILT_SOURCES += event-names.h
 # gcov leaves it's mess in this directory too
 clean-local:
 	@rm -f libevdev/*.gcno
+
+#
+# tools/ build rules
+#
+
+noinst_PROGRAMS += libevdev-events
+
+libevdev_events_SOURCES = tools/libevdev-events.c
+libevdev_events_LDADD = libevdev.la $(GCOV_LDFLAGS)
diff --git a/configure.ac b/configure.ac
index 2d03514..f3d867c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -75,7 +75,6 @@ AC_MSG_RESULT([$enable_gcov])
 AC_CONFIG_FILES([Makefile
 		 doc/Makefile
 		 doc/libevdev.doxygen
-		 tools/Makefile
 		 test/Makefile
 		 libevdev.pc])
 AC_OUTPUT
diff --git a/tools/Makefile.am b/tools/Makefile.am
deleted file mode 100644
index 931a7d2..0000000
--- a/tools/Makefile.am
+++ /dev/null
@@ -1,8 +0,0 @@
-noinst_PROGRAMS = libevdev-events
-
-AM_CPPFLAGS = -I$(top_srcdir)/libevdev
-libevdev_ldadd = $(top_builddir)/libevdev/libevdev.la
-
-libevdev_events_SOURCES = libevdev-events.c
-libevdev_events_LDADD = $(libevdev_ldadd)
-
-- 
1.8.4