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

diff --git a/udev/Makefile.am b/udev/Makefile.am
index 4a30bf9e3..cbab15d34 100644
--- a/udev/Makefile.am
+++ b/udev/Makefile.am
@@ -1,3 +1,5 @@
+include $(top_srcdir)/Makefile.am.inc
+
 SUBDIRS = \
 	lib
 
@@ -8,48 +10,40 @@ 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-rules.h \
+	udev-sysdeps.h \
+	udev-event.c \
+	udev-node.c \
+	udev-rules.c \
+	udev-rules-parse.c \
+	udev-util.c \
+	udev-util-file.c \
+	list.h \
 	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-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 +52,6 @@ udevd_LDADD = \
 
 udevadm_SOURCES = \
 	$(common_files) \
-	udev-control.c \
 	udevadm.c \
 	udevadm-info.c \
 	udevadm-control.c \