X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=udev%2FMakefile.am;h=6cd2f23dc3b88d3b079343dd0cd2b293a6308e26;hb=e91ac78ffc62a7a4f10fc66ed492e5b67a11448a;hp=4a30bf9e319477b33b4f65950aeeb3a0983ba2e2;hpb=7d563a17f3967890331daf08d43f2f005418139b;p=elogind.git

diff --git a/udev/Makefile.am b/udev/Makefile.am
index 4a30bf9e3..6cd2f23dc 100644
--- a/udev/Makefile.am
+++ b/udev/Makefile.am
@@ -1,3 +1,5 @@
+include $(top_srcdir)/Makefile.am.inc
+
 SUBDIRS = \
 	lib
 
@@ -8,48 +10,38 @@ sbin_PROGRAMS = \
 noinst_PROGRAMS = \
 	test-udev
 
-AM_CPPFLAGS = \
-	-DSYSCONFDIR=\""$(sysconfdir)"\" \
-	-DUDEV_PREFIX=\""$(udev_prefix)"\" \
-	-D_LIBUDEV_COMPILATION
-
 common_ldadd =
 
 common_files = \
-	list.h \
-	logging.h \
 	udev.h \
-	udev_rules.h \
-	udev_selinux.h \
-	udev_sysdeps.h \
-	udev_db.c \
-	udev_device.c \
-	udev_device_event.c \
-	udev_node.c \
-	udev_rules.c \
-	udev_rules_parse.c \
-	udev_sysdeps.c \
-	udev_sysfs.c \
-	udev_utils.c \
-	udev_utils_file.c \
-	udev_utils_string.c \
+	udev-sysdeps.h \
+	udev-event.c \
+	udev-watch.c \
+	udev-node.c \
+	udev-rules.c \
+	udev-util.c \
 	lib/libudev.h \
 	lib/libudev-private.h \
 	lib/libudev.c \
-	lib/libudev-utils.c
-
+	lib/libudev-list.c \
+	lib/libudev-util.c \
+	lib/libudev-device.c \
+	lib/libudev-device-db-write.c \
+	lib/libudev-monitor.c \
+	lib/libudev-enumerate.c \
+	lib/libudev-queue.c \
+	lib/libudev-queue-export.c \
+	lib/libudev-ctrl.c
 
 if USE_SELINUX
 common_files += \
-	udev_selinux.c
-
+	udev-selinux.c
 common_ldadd += \
 	$(SELINUX_LIBS)
 endif
 
 udevd_SOURCES = \
 	$(common_files) \
-	udevd.h \
 	udevd.c
 
 udevd_LDADD = \
@@ -58,7 +50,6 @@ udevd_LDADD = \
 
 udevadm_SOURCES = \
 	$(common_files) \
-	udev-control.c \
 	udevadm.c \
 	udevadm-info.c \
 	udevadm-control.c \
@@ -92,6 +83,8 @@ EXTRA_DIST = \
 %.7 %.8 : %.xml
 	$(XSLTPROC) -nonet http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl $<
 
-distclean-local:
+MAINTAINERCLEANFILES = \
+	$(dist_man_MANS)
+
+git-clean:
 	rm -f Makefile.in
-	rm -f $(dist_man_MANS)