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

diff --git a/udev/Makefile.am b/udev/Makefile.am
index 4a7c7855c..f1d4d2d43 100644
--- a/udev/Makefile.am
+++ b/udev/Makefile.am
@@ -1,5 +1,4 @@
-SUBDIRS = \
-	lib
+include $(top_srcdir)/Makefile.am.inc
 
 sbin_PROGRAMS = \
 	udevd \
@@ -8,59 +7,36 @@ sbin_PROGRAMS = \
 noinst_PROGRAMS = \
 	test-udev
 
-AM_CPPFLAGS = \
-	-DSYSCONFDIR=\""$(sysconfdir)"\" \
-	-DUDEV_PREFIX=\""$(udev_prefix)"\"
-
-common_ldadd =
-
-common_files = \
-	list.h \
-	logging.h \
+common_files =\
 	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
-
-
-if USE_SELINUX
-common_files += \
-	udev_selinux.c
-
+	udev-event.c \
+	udev-watch.c \
+	udev-node.c \
+	udev-rules.c
+
+common_ldadd = \
+	$(top_builddir)/libudev/libudev-private.la
+if WITH_SELINUX
 common_ldadd += \
 	$(SELINUX_LIBS)
 endif
 
 udevd_SOURCES = \
 	$(common_files) \
-	udevd.h \
 	udevd.c
 
 udevd_LDADD = \
 	$(common_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)
@@ -79,7 +55,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
@@ -87,6 +67,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)