[PATCH 3/6] Merge libevdev/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          | 50 +++++++++++++++++++++++++++++++++++++++++++++++++-
 configure.ac         |  1 -
 libevdev/Makefile.am | 35 -----------------------------------
 3 files changed, 49 insertions(+), 37 deletions(-)
 delete mode 100644 libevdev/Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 95a16ea..8544de2 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,11 +1,59 @@
+#
+# Global setup
+#
+
 ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS}
 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))
-SUBDIRS = doc libevdev tools test
+AM_CPPFLAGS = $(GCC_CFLAGS) $(GCOV_CFLAGS) -I$(top_srcdir)
+SUBDIRS = doc tools test
+lib_LTLIBRARIES =
 
 pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA = libevdev.pc
 
 EXTRA_DIST = libevdev.pc.in
+CLEANFILES =
+BUILT_SOURCES =
+
+#
+# libevdev/ build rules
+#
+
+lib_LTLIBRARIES += libevdev.la
+
+libevdev_la_SOURCES = \
+	libevdev/libevdev.h \
+	libevdev/libevdev-int.h \
+	libevdev/libevdev-util.h \
+	libevdev/libevdev-uinput.c \
+	libevdev/libevdev-uinput.h \
+	libevdev/libevdev-uinput-int.h \
+	libevdev/libevdev.c
+
+libevdev_la_LDFLAGS = \
+	-version-info $(LIBEVDEV_LT_VERSION) \
+	-export-symbols-regex '^libevdev_' \
+	$(GCOV_LDFLAGS) \
+	-Wl,--as-needed \
+	-Wl,--gc-sections \
+	-Wl,-z,relro \
+	-Wl,-z,now
+
+libevdevincludedir = $(includedir)/libevdev-1.0/libevdev
+libevdevinclude_HEADERS = \
+	libevdev/libevdev.h \
+	libevdev/libevdev-uinput.h
+
+event-names.h: Makefile libevdev/make-event-names.py
+	$(top_srcdir)/libevdev/make-event-names.py --output=c > $@
+
+EXTRA_DIST += libevdev/make-event-names.py
+CLEANFILES += event-names.h
+BUILT_SOURCES += event-names.h
+
+# gcov leaves it's mess in this directory too
+clean-local:
+	@rm -f libevdev/*.gcno
diff --git a/configure.ac b/configure.ac
index 9b56500..2d03514 100644
--- a/configure.ac
+++ b/configure.ac
@@ -73,7 +73,6 @@ AC_SUBST([GCOV_LDFLAGS])
 AC_MSG_RESULT([$enable_gcov])
 
 AC_CONFIG_FILES([Makefile
-		 libevdev/Makefile
 		 doc/Makefile
 		 doc/libevdev.doxygen
 		 tools/Makefile
diff --git a/libevdev/Makefile.am b/libevdev/Makefile.am
deleted file mode 100644
index 64adf58..0000000
--- a/libevdev/Makefile.am
+++ /dev/null
@@ -1,35 +0,0 @@
-lib_LTLIBRARIES=libevdev.la
-
-AM_CPPFLAGS = $(GCC_CFLAGS) $(GCOV_CFLAGS) -I$(top_srcdir)
-
-libevdev_la_SOURCES = \
-                   libevdev.h \
-                   libevdev-int.h \
-                   libevdev-util.h \
-                   libevdev-uinput.c \
-                   libevdev-uinput.h \
-                   libevdev-uinput-int.h \
-                   libevdev.c
-
-libevdev_la_LDFLAGS = \
-	-version-info $(LIBEVDEV_LT_VERSION) \
-	-export-symbols-regex '^libevdev_' \
-	$(GCOV_LDFLAGS) \
-	-Wl,--as-needed \
-	-Wl,--gc-sections \
-	-Wl,-z,relro \
-	-Wl,-z,now
-
-libevdevincludedir = $(includedir)/libevdev-1.0/libevdev
-libevdevinclude_HEADERS = libevdev.h libevdev-uinput.h
-
-event-names.h: Makefile make-event-names.py
-	        $(srcdir)/make-event-names.py --output=c > $@
-
-EXTRA_DIST = make-event-names.py
-CLEANFILES = event-names.h
-BUILT_SOURCES = event-names.h
-
-# gcov leaves it's mess in this directory too
-clean-local:
-	@rm -f *.gcno
-- 
1.8.4