X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=udev%2FMakefile.am;h=6f9acce5a966a4a666f6417b38c21219bf5a06d6;hb=b03e89cfbaa1fdd0c32bbd54f2b450e17014b522;hp=4a7c7855ce042536d54c73706140fbfd29f37fe8;hpb=d46f37fdee02ab5f906518b3c08886cd0eb0a6c8;p=elogind.git

diff --git a/udev/Makefile.am b/udev/Makefile.am
index 4a7c7855c..6f9acce5a 100644
--- a/udev/Makefile.am
+++ b/udev/Makefile.am
@@ -1,3 +1,5 @@
+include $(top_srcdir)/Makefile.am.inc
+
 SUBDIRS = \
 	lib
 
@@ -8,44 +10,39 @@ sbin_PROGRAMS = \
 noinst_PROGRAMS = \
 	test-udev
 
-AM_CPPFLAGS = \
-	-DSYSCONFDIR=\""$(sysconfdir)"\" \
-	-DUDEV_PREFIX=\""$(udev_prefix)"\"
-
 common_ldadd =
 
 common_files = \
-	list.h \
-	logging.h \
 	udev.h \
 	udev_rules.h \
-	udev_selinux.h \
 	udev_sysdeps.h \
-	udev_config.c \
 	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
-
+	list.h \
+	lib/libudev.h \
+	lib/libudev-private.h \
+	lib/libudev.c \
+	lib/libudev-list.c \
+	lib/libudev-util.c \
+	lib/libudev-device.c \
+	lib/libudev-monitor.c \
+	lib/libudev-enumerate.c \
+	lib/libudev-ctrl.c
 
 if USE_SELINUX
-common_files += \
-	udev_selinux.c
-
 common_ldadd += \
 	$(SELINUX_LIBS)
 endif
 
 udevd_SOURCES = \
 	$(common_files) \
-	udevd.h \
 	udevd.c
 
 udevd_LDADD = \
@@ -55,12 +52,12 @@ udevd_LDADD = \
 udevadm_SOURCES = \
 	$(common_files) \
 	udevadm.c \
-	udevinfo.c \
-	udevcontrol.c \
-	udevtest.c \
-	udevmonitor.c \
-	udevsettle.c \
-	udevtrigger.c
+	udevadm-info.c \
+	udevadm-control.c \
+	udevadm-test.c \
+	udevadm-monitor.c \
+	udevadm-settle.c \
+	udevadm-trigger.c
 
 udevadm_LDADD = \
 	$(common_ldadd)