X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=udev%2FMakefile.am;h=6c0b94e2cf7de54d117c3f73c399c020daab347b;hp=3d285462a9e12bd34aca5ac4bf14251973c52105;hb=3ab2be88bde4c0baa1b3cad5d473bc07a8b5c1fb;hpb=a3b55b1c4744ab0e7f78057db04f6832688a5a3f

diff --git a/udev/Makefile.am b/udev/Makefile.am
index 3d285462a..6c0b94e2c 100644
--- a/udev/Makefile.am
+++ b/udev/Makefile.am
@@ -1,3 +1,5 @@
+include $(top_srcdir)/Makefile.am.inc
+
 sbin_PROGRAMS = \
 	udevd \
 	udevadm
@@ -5,43 +7,37 @@ 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_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
-
-
-if USE_SELINUX
+	udev-event.c \
+	udev-watch.c \
+	udev-node.c \
+	udev-rules.c \
+	../libudev/libudev.h \
+	../libudev/libudev-private.h \
+	../libudev/libudev.c \
+	../libudev/libudev-list.c \
+	../libudev/libudev-util.c \
+	../libudev/libudev-util-private.c \
+	../libudev/libudev-device.c \
+	../libudev/libudev-device-private.c \
+	../libudev/libudev-monitor.c \
+	../libudev/libudev-enumerate.c \
+	../libudev/libudev-queue.c \
+	../libudev/libudev-queue-private.c \
+	../libudev/libudev-ctrl.c
+
+if WITH_SELINUX
 common_files += \
-	udev_selinux.c
-
+	../libudev/libudev-selinux-private.c
 common_ldadd += \
 	$(SELINUX_LIBS)
 endif
 
 udevd_SOURCES = \
 	$(common_files) \
-	udevd.h \
 	udevd.c
 
 udevd_LDADD = \
@@ -51,12 +47,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)
@@ -75,7 +71,11 @@ dist_man_MANS = \
 	udevadm.8 \
 	udevd.8
 
+pkgconfigdir = $(datadir)/pkgconfig
+pkgconfig_DATA = udev.pc
+
 EXTRA_DIST = \
+	udev.pc.in \
 	udev.xml \
 	udevadm.xml \
 	udevd.xml
@@ -83,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)