X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=Makefile.am;h=421d27c88659f7b73db180e7b3fafe80b1888459;hp=33b51d8e30d3c2c38403f4fbdb1a5cb42688e1f5;hb=33502ffe2eb7b56cdd018a4fb6830d7828519fad;hpb=7c1d34c5d460a6c1acb39a0ab96338fcb1386ed4

diff --git a/Makefile.am b/Makefile.am
index 33b51d8e3..421d27c88 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -136,7 +136,8 @@ AM_CPPFLAGS = \
 	-I $(top_srcdir)/src/journal \
 	-I $(top_srcdir)/src/systemd \
 	-I $(top_srcdir)/src/core \
-	-I $(top_srcdir)/src/libudev
+	-I $(top_srcdir)/src/libudev \
+	-I $(top_srcdir)/src/udev
 
 AM_CFLAGS = $(WARNINGFLAGS)
 AM_LDFLAGS = $(GCLDFLAGS)
@@ -1301,6 +1302,9 @@ libudev_la_LDFLAGS = \
 	$(AM_LDFLAGS) \
 	-version-info $(LIBUDEV_CURRENT):$(LIBUDEV_REVISION):$(LIBUDEV_AGE)
 
+libudev_la_LIBADD = \
+	libsystemd-shared.la
+
 pkgconfiglib_DATA += \
 	src/libudev/libudev.pc
 
@@ -1347,6 +1351,7 @@ libudev_private_la_CFLAGS = \
 	-fvisibility=default
 
 libudev_private_la_LIBADD = \
+	libsystemd-shared.la \
 	$(SELINUX_LIBS)
 
 # ------------------------------------------------------------------------------
@@ -1486,43 +1491,62 @@ udevadm_LDADD = \
 
 # ------------------------------------------------------------------------------
 TESTS += \
-	src/udev/test/udev-test.pl \
-	src/udev/test/rules-test.sh
+	test/udev-test.pl \
+	test/rules-test.sh
 
 noinst_PROGRAMS += \
 	test-libudev \
 	test-udev
 
 test_libudev_SOURCES = \
-	src/udev/test-libudev.c
+	src/test/test-libudev.c
 
 test_libudev_LDADD = \
+	libsystemd-shared.la \
 	libudev.la
 
 test_udev_SOURCES = \
-	src/udev/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 += \
-	src/udev/test/sys
+	test/sys
 
 # packed sysfs test tree
-src/udev/test/sys:
-	$(AM_V_GEN)mkdir -p src/udev/test && tar -C src/udev/test/ -xJf $(top_srcdir)/src/udev/test/sys.tar.xz
+test/sys:
+	$(AM_V_GEN)mkdir -p test && tar -C test/ -xJf $(top_srcdir)/test/sys.tar.xz
 
 test-sys-distclean:
-	-rm -rf src/udev/test/sys
+	-rm -rf test/sys
 DISTCLEAN_LOCAL_HOOKS += test-sys-distclean
 
 EXTRA_DIST += \
-	src/udev/test/sys.tar.xz \
-	src/udev/test/udev-test.pl \
-	src/udev/test/rules-test.sh \
-	src/udev/test/rule-syntax-check.py
+	test/sys.tar.xz \
+	test/udev-test.pl \
+	test/rules-test.sh \
+	test/rule-syntax-check.py
 
 # ------------------------------------------------------------------------------
 ata_id_SOURCES = \
@@ -1547,7 +1571,7 @@ udevlibexec_PROGRAMS += \
 	cdrom_id
 
 dist_udevrules_DATA += \
-	src/udev/cdrom_id/60-cdrom_id.rules
+	rules/60-cdrom_id.rules
 
 # ------------------------------------------------------------------------------
 collect_SOURCES = \
@@ -1587,7 +1611,7 @@ udevlibexec_PROGRAMS += \
 	v4l_id
 
 dist_udevrules_DATA += \
-	src/udev/v4l_id/60-persistent-v4l.rules
+	rules/60-persistent-v4l.rules
 
 # ------------------------------------------------------------------------------
 accelerometer_SOURCES = \
@@ -1601,7 +1625,7 @@ udevlibexec_PROGRAMS += \
 	accelerometer
 
 dist_udevrules_DATA += \
-	src/udev/accelerometer/61-accelerometer.rules
+	rules/61-accelerometer.rules
 
 # ------------------------------------------------------------------------------
 if ENABLE_GUDEV
@@ -1777,6 +1801,9 @@ keymap_SOURCES = \
 keymap_CPPFLAGS = \
 	$(AM_CPPFLAGS) -I src/udev/keymap
 
+keymap_LDADD = \
+	libsystemd-shared.la
+
 nodist_keymap_SOURCES = \
 	src/udev/keymap/keys-from-name.h \
 	src/udev/keymap/keys-to-name.h
@@ -1872,12 +1899,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
@@ -1903,7 +1930,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
@@ -2576,6 +2603,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 \
@@ -2637,8 +2666,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