Merge in Makefile.am.inc into Makefile.am

This removes another file from the distribution, since we're not using it
anywhere else but the top-level Makefile.am file.

diff --git a/Makefile.am b/Makefile.am
index 41d45a0127571c4f3d7af30307b0fe3b8e7cb226..7d97af51e55d634a756d9b0ebde597e70aefbc8f 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,5 +1,3 @@
-include $(top_srcdir)/Makefile.am.inc
-
 SUBDIRS = . libudev/docs
 
 udevconfdir = $(sysconfdir)/udev
@@ -22,6 +20,20 @@ ACLOCAL_AMFLAGS = -I m4
 
 AM_MAKEFLAGS = --no-print-directory
 
+AM_CPPFLAGS = \
+       -include $(top_builddir)/config.h \
+       -I$(top_srcdir)/libudev \
+       -DSYSCONFDIR=\""$(sysconfdir)"\" \
+       -DLIBEXECDIR=\""$(libexecdir)"\"
+
+AM_CFLAGS =
+
+AM_LDFLAGS = \
+       -Wl,--as-needed
+
+udevrulesdir = \
+       $(libexecdir)/rules.d
+
 DISTCHECK_CONFIGURE_FLAGS = \
        --enable-gtk-doc \
        --enable-extras

diff --git a/Makefile.am.inc b/Makefile.am.inc
deleted file mode 100644 (file)
index 59d21aa..0000000
--- a/Makefile.am.inc
+++ /dev/null
@@ -1,14 +0,0 @@
-AM_CPPFLAGS = \
-       -include $(top_builddir)/config.h \
-       -I$(top_srcdir)/libudev \
-       -DSYSCONFDIR=\""$(sysconfdir)"\" \
-       -DLIBEXECDIR=\""$(libexecdir)"\"
-
-AM_CFLAGS =
-
-AM_LDFLAGS = \
-       -Wl,--as-needed
-
-udevrulesdir = \
-       $(libexecdir)/rules.d
-