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.
This commit is contained in:
Diego Elio 'Flameeyes' Pettenò 2009-08-07 19:44:30 +02:00
parent f5fcc00997
commit 51668e2c8b
2 changed files with 14 additions and 16 deletions

View file

@ -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

View file

@ -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