X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=Makefile.am;h=7df3915b753c616e1fc2cd41afe1d0d782c30864;hb=6ada823a9a0979ea145fd70add1007c21caa45c0;hp=fcc3bc6ba08f2726952bcda28666b3245fa35074;hpb=0b87a07761dcad31583142a3a454c42833e65a09;p=elogind.git

diff --git a/Makefile.am b/Makefile.am
index fcc3bc6ba..7df3915b7 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1501,12 +1501,30 @@ test_libudev_LDADD = \
 	libudev.la
 
 test_udev_SOURCES = \
-	src/test/test-udev.c
+	src/test/test-udev.c \
+	$(libudev_core_la_SOURCES) \
+	$(libudev_private_la_SOURCES)
+
+# The test-udev program needs everything compiled with relative path
+# names for /sys, /dev, /run prefixed, pointing to our test/ directory.
+test_udev_CFLAGS = \
+	-DTEST_PREFIX=\"test\" \
+	$(libudev_core_la_CFLAGS) \
+	$(libudev_private_la_CFLAGS)
+
+test_udev_CPPFLAGS =\
+	$(libudev_core_la_CPPFLAGS)
 
 test_udev_LDADD = \
-	libudev-core.la \
-	libudev-private.la \
-	libsystemd-shared.la
+	libsystemd-shared.la \
+	$(BLKID_LIBS) \
+	$(KMOD_LIBS) \
+	$(SELINUX_LIBS)
+
+if HAVE_ACL
+test_udev_LDADD += \
+	libsystemd-acl.la
+endif
 
 check_DATA += \
 	test/sys
@@ -1548,7 +1566,7 @@ udevlibexec_PROGRAMS += \
 	cdrom_id
 
 dist_udevrules_DATA += \
-	src/udev/cdrom_id/60-cdrom_id.rules
+	rules/60-cdrom_id.rules
 
 # ------------------------------------------------------------------------------
 collect_SOURCES = \
@@ -1588,7 +1606,7 @@ udevlibexec_PROGRAMS += \
 	v4l_id
 
 dist_udevrules_DATA += \
-	src/udev/v4l_id/60-persistent-v4l.rules
+	rules/60-persistent-v4l.rules
 
 # ------------------------------------------------------------------------------
 accelerometer_SOURCES = \
@@ -1602,7 +1620,7 @@ udevlibexec_PROGRAMS += \
 	accelerometer
 
 dist_udevrules_DATA += \
-	src/udev/accelerometer/61-accelerometer.rules
+	rules/61-accelerometer.rules
 
 # ------------------------------------------------------------------------------
 if ENABLE_GUDEV
@@ -1873,12 +1891,12 @@ dist_udevkeymap_DATA = \
 
 udevkeymapforcereldir = $(libexecdir)/udev/keymaps/force-release
 dist_udevkeymapforcerel_DATA = \
-	src/udev/keymap/force-release-maps/dell-touchpad \
-	src/udev/keymap/force-release-maps/dell-xps \
-	src/udev/keymap/force-release-maps/hp-other \
-	src/udev/keymap/force-release-maps/samsung-other \
-	src/udev/keymap/force-release-maps/samsung-90x3a \
-	src/udev/keymap/force-release-maps/common-volume-keys
+	keymaps-force-release/dell-touchpad \
+	keymaps-force-release/dell-xps \
+	keymaps-force-release/hp-other \
+	keymaps-force-release/samsung-other \
+	keymaps-force-release/samsung-90x3a \
+	keymaps-force-release/common-volume-keys
 
 src/udev/keymap/keys.txt: $(INCLUDE_PREFIX)/linux/input.h
 	$(AM_V_at)mkdir -p src/udev/keymap
@@ -1904,7 +1922,7 @@ mtd_probe_CPPFLAGS = \
 	$(AM_CPPFLAGS)
 
 dist_udevrules_DATA += \
-	src/udev/mtd_probe/75-probe_mtd.rules
+	rules/75-probe_mtd.rules
 
 udevlibexec_PROGRAMS += \
 	mtd_probe
@@ -2577,6 +2595,8 @@ systemd_logind_SOURCES = \
 	src/login/logind-session.h \
 	src/login/logind-user.c \
 	src/login/logind-user.h \
+	src/login/logind-inhibit.c \
+	src/login/logind-inhibit.h \
 	src/login/logind-session-dbus.c \
 	src/login/logind-seat-dbus.c \
 	src/login/logind-user-dbus.c \
@@ -2638,8 +2658,20 @@ test_login_LDADD = \
 	libsystemd-login.la \
 	libsystemd-shared.la
 
+test_inhibit_SOURCES = \
+	src/login/test-inhibit.c
+
+test_inhibit_LDADD = \
+	libsystemd-shared.la \
+	libsystemd-dbus.la
+
+test_inhibit_CFLAGS = \
+	$(AM_CFLAGS) \
+	$(DBUS_CFLAGS)
+
 noinst_PROGRAMS += \
-	test-login
+	test-login \
+	test-inhibit
 
 libsystemd_login_la_SOURCES = \
 	src/login/sd-login.c