-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)
# ------------------------------------------------------------------------------
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 = \
libudev.la
test_udev_SOURCES = \
- src/udev/test-udev.c
+ src/test/test-udev.c
test_udev_LDADD = \
libudev-core.la \
libsystemd-shared.la
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 = \
cdrom_id
dist_udevrules_DATA += \
- src/udev/cdrom_id/60-cdrom_id.rules
+ rules/60-cdrom_id.rules
# ------------------------------------------------------------------------------
collect_SOURCES = \
v4l_id
dist_udevrules_DATA += \
- src/udev/v4l_id/60-persistent-v4l.rules
+ rules/60-persistent-v4l.rules
# ------------------------------------------------------------------------------
accelerometer_SOURCES = \
accelerometer
dist_udevrules_DATA += \
- src/udev/accelerometer/61-accelerometer.rules
+ rules/61-accelerometer.rules
# ------------------------------------------------------------------------------
if ENABLE_GUDEV
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
$(AM_CPPFLAGS)
dist_udevrules_DATA += \
- src/udev/mtd_probe/75-probe_mtd.rules
+ rules/75-probe_mtd.rules
udevlibexec_PROGRAMS += \
mtd_probe
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 \
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