From: Diego Elio 'Flameeyes' Pettenò <flameeyes@gmail.com>
Date: Fri, 7 Aug 2009 17:44:30 +0000 (+0200)
Subject: Merge in Makefile.am.inc into Makefile.am
X-Git-Tag: 174~839
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=commitdiff_plain;h=51668e2c8b7ffba73ec420f9896ea837d58f7c15;p=elogind.git

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 41d45a012..7d97af51e 100644
--- 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
index 59d21aa22..000000000
--- 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
-