chiark / gitweb /
~ianmdlvl / elogind.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
nspawn: make /dev/kmsg unavailable in the container, but allow access to /proc/kmsg
[elogind.git] / Makefile.am
diff --git a/Makefile.am b/Makefile.am
index ebbee042091802e25065a54053ed3a6ff0ece5d9..22a04d4a1bafc3e1abfda0c80f6e2c54006d8d4b 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -101,6 +101,7 @@ check_PROGRAMS =
 check_DATA =
 noinst_PROGRAMS =
 TESTS =
+udevlibexec_PROGRAMS =
 
 AM_CPPFLAGS = \
        -include $(top_builddir)/config.h \
@@ -136,6 +137,7 @@ 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/udev
 
 AM_CFLAGS = $(WARNINGFLAGS)
@@ -295,8 +297,8 @@ dist_systemunit_DATA = \
        units/systemd-ask-password-wall.path \
        units/systemd-ask-password-console.path \
        units/syslog.target \
-       units/udev-control.socket \
-       units/udev-kernel.socket
+       units/systemd-udev-control.socket \
+       units/systemd-udev-kernel.socket
 
 nodist_systemunit_DATA = \
        units/getty@.service \
@@ -322,9 +324,9 @@ nodist_systemunit_DATA = \
        units/fsck-root.service \
        units/rescue.service \
        units/user@.service \
-       units/udev.service \
-       units/udev-trigger.service \
-       units/udev-settle.service
+       units/systemd-udev.service \
+       units/systemd-udev-trigger.service \
+       units/systemd-udev-settle.service
 
 dist_userunit_DATA = \
        units/user/default.target \
@@ -358,9 +360,9 @@ EXTRA_DIST += \
        units/fsck@.service.in \
        units/fsck-root.service.in \
        units/user@.service.in \
-       units/udev.service \
-       units/udev-trigger.service \
-       units/udev-settle.service \
+       units/systemd-udev.service \
+       units/systemd-udev-trigger.service \
+       units/systemd-udev-settle.service \
        introspect.awk \
        man/custom-html.xsl
 
@@ -598,7 +600,9 @@ libsystemd_label_la_SOURCES = \
        src/shared/mkdir.c \
        src/shared/mkdir.h \
        src/shared/ask-password-api.c \
-       src/shared/ask-password-api.h
+       src/shared/ask-password-api.h \
+       src/shared/dev-setup.c \
+       src/shared/dev-setup.h
 
 libsystemd_label_la_CFLAGS = \
        $(AM_CFLAGS) \
@@ -677,6 +681,8 @@ libsystemd_core_la_SOURCES = \
        src/core/job.h \
        src/core/manager.c \
        src/core/manager.h \
+       src/core/transaction.c \
+       src/core/transaction.h \
        src/core/load-fragment.c \
        src/core/load-fragment.h \
        src/core/service.c \
@@ -1274,24 +1280,26 @@ EXTRA_DIST += \
        src/libsystemd-daemon/libsystemd-daemon.sym
 
 # ------------------------------------------------------------------------------
+if ENABLE_GTK_DOC
 SUBDIRS += \
-       src/udev/docs
+       docs/libudev
+endif
 
 include_HEADERS += \
-       src/udev/libudev.h
+       src/libudev/libudev.h
 
 lib_LTLIBRARIES += \
        libudev.la
 
 libudev_la_SOURCES =\
-       src/udev/libudev-private.h \
-       src/udev/libudev.c \
-       src/udev/libudev-list.c \
-       src/udev/libudev-util.c \
-       src/udev/libudev-device.c \
-       src/udev/libudev-enumerate.c \
-       src/udev/libudev-monitor.c \
-       src/udev/libudev-queue.c
+       src/libudev/libudev-private.h \
+       src/libudev/libudev.c \
+       src/libudev/libudev-list.c \
+       src/libudev/libudev-util.c \
+       src/libudev/libudev-device.c \
+       src/libudev/libudev-enumerate.c \
+       src/libudev/libudev-monitor.c \
+       src/libudev/libudev-queue.c
 
 libudev_la_CFLAGS = \
        $(AM_CFLAGS) \
@@ -1301,14 +1309,17 @@ libudev_la_LDFLAGS = \
        $(AM_LDFLAGS) \
        -version-info $(LIBUDEV_CURRENT):$(LIBUDEV_REVISION):$(LIBUDEV_AGE)
 
+libudev_la_LIBADD = \
+       libsystemd-shared.la
+
 pkgconfiglib_DATA += \
-       src/udev/libudev.pc
+       src/libudev/libudev.pc
 
 EXTRA_DIST += \
-       src/udev/libudev.pc.in
+       src/libudev/libudev.pc.in
 
 CLEANFILES += \
-       src/udev/libudev.pc
+       src/libudev/libudev.pc
 
 # move lib from $(libdir) to $(rootlibdir) and update devel link, if needed
 libudev-install-move-hook:
@@ -1332,28 +1343,21 @@ noinst_LTLIBRARIES += \
 
 libudev_private_la_SOURCES =\
        $(libudev_la_SOURCES) \
-       src/udev/libudev-util-private.c \
-       src/udev/libudev-device-private.c \
-       src/udev/libudev-queue-private.c
-
-if HAVE_SELINUX
-libudev_private_la_SOURCES +=\
-       src/udev/libudev-selinux-private.c
-endif
+       src/libudev/libudev-device-private.c \
+       src/libudev/libudev-queue-private.c
 
 libudev_private_la_CFLAGS = \
        $(AM_CFLAGS) \
-       $(SELINUX_CFLAGS)
        -fvisibility=default
 
 libudev_private_la_LIBADD = \
-       $(SELINUX_LIBS)
+       libsystemd-shared.la
 
 # ------------------------------------------------------------------------------
 MANPAGES += \
        man/udev.7 \
        man/udevadm.8 \
-       man/udevd.8
+       man/systemd-udevd.8
 
 udev-confdirs:
        -mkdir -p $(DESTDIR)$(sysconfdir)/udev/rules.d
@@ -1393,30 +1397,30 @@ CLEANFILES += \
        src/udev/udev.pc
 
 EXTRA_DIST += \
-       units/udev.service.in \
-       units/udev-trigger.service.in \
-       units/udev-settle.service.in
+       units/systemd-udev.service.in \
+       units/systemd-udev-trigger.service.in \
+       units/systemd-udev-settle.service.in
 
 CLEANFILES += \
-       units/udev.service \
-       units/udev-trigger.service \
-       units/udev-settle.service
+       units/systemd-udev.service \
+       units/systemd-udev-trigger.service \
+       units/systemd-udev-settle.service
 
 systemd-install-hook:
        mkdir -p $(DESTDIR)$(systemunitdir)/sockets.target.wants
-       ln -sf ../udev-control.socket $(DESTDIR)$(systemunitdir)/sockets.target.wants/udev-control.socket
-       ln -sf ../udev-kernel.socket $(DESTDIR)$(systemunitdir)/sockets.target.wants/udev-kernel.socket
+       ln -sf ../systemd-udev-control.socket $(DESTDIR)$(systemunitdir)/sockets.target.wants/systemd-udev-control.socket
+       ln -sf ../systemd-udev-kernel.socket $(DESTDIR)$(systemunitdir)/sockets.target.wants/systemd-udev-kernel.socket
        mkdir -p $(DESTDIR)$(systemunitdir)/basic.target.wants
-       ln -sf ../udev.service $(DESTDIR)$(systemunitdir)/basic.target.wants/udev.service
-       ln -sf ../udev-trigger.service $(DESTDIR)$(systemunitdir)/basic.target.wants/udev-trigger.service
+       ln -sf ../systemd-udev.service $(DESTDIR)$(systemunitdir)/basic.target.wants/systemd-udev.service
+       ln -sf ../systemd-udev-trigger.service $(DESTDIR)$(systemunitdir)/basic.target.wants/systemd-udev-trigger.service
 
 INSTALL_DATA_HOOKS += systemd-install-hook
 
 bin_PROGRAMS += \
        udevadm
 
-udevlibexec_PROGRAMS = \
-       udevd
+rootlibexec_PROGRAMS += \
+       systemd-udevd
 
 noinst_LTLIBRARIES += \
        libudev-core.la
@@ -1445,6 +1449,7 @@ libudev_core_la_CFLAGS = \
 
 libudev_core_la_LIBADD = \
        libudev-private.la \
+       libsystemd-label.la \
        libsystemd-shared.la \
        $(BLKID_LIBS) \
        $(KMOD_LIBS)
@@ -1464,10 +1469,10 @@ libudev_core_la_LIBADD += \
        libsystemd-acl.la
 endif
 
-udevd_SOURCES = \
+systemd_udevd_SOURCES = \
        src/udev/udevd.c
 
-udevd_LDADD = \
+systemd_udevd_LDADD = \
        libudev-core.la
 
 udevadm_SOURCES = \
@@ -1486,43 +1491,64 @@ 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-label.la \
+       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-label.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 +1573,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 +1613,7 @@ udevlibexec_PROGRAMS += \
        v4l_id
 
 dist_udevrules_DATA += \
-       src/udev/v4l_id/60-persistent-v4l.rules
+       rules/60-persistent-v4l.rules
 
 # ------------------------------------------------------------------------------
 accelerometer_SOURCES = \
@@ -1601,54 +1627,56 @@ udevlibexec_PROGRAMS += \
        accelerometer
 
 dist_udevrules_DATA += \
-       src/udev/accelerometer/61-accelerometer.rules
+       rules/61-accelerometer.rules
 
 # ------------------------------------------------------------------------------
 if ENABLE_GUDEV
+if ENABLE_GTK_DOC
 SUBDIRS += \
-       src/udev/gudev/docs
+       docs/gudev
+endif
 
 libgudev_includedir = \
        $(includedir)/gudev-1.0/gudev
 
 libgudev_include_HEADERS = \
-       src/udev/gudev/gudev.h \
-       src/udev/gudev/gudevenums.h \
-       src/udev/gudev/gudevenumtypes.h \
-       src/udev/gudev/gudevtypes.h \
-       src/udev/gudev/gudevclient.h \
-       src/udev/gudev/gudevdevice.h \
-       src/udev/gudev/gudevenumerator.h
+       src/gudev/gudev.h \
+       src/gudev/gudevenums.h \
+       src/gudev/gudevenumtypes.h \
+       src/gudev/gudevtypes.h \
+       src/gudev/gudevclient.h \
+       src/gudev/gudevdevice.h \
+       src/gudev/gudevenumerator.h
 
 lib_LTLIBRARIES += libgudev-1.0.la
 
 pkgconfiglib_DATA += \
-       src/udev/gudev/gudev-1.0.pc
+       src/gudev/gudev-1.0.pc
 
 EXTRA_DIST += \
-       src/udev/gudev/gudev-1.0.pc.in
+       src/gudev/gudev-1.0.pc.in
 
 CLEANFILES += \
-       src/udev/gudev/gudev-1.0.pc
+       src/gudev/gudev-1.0.pc
 
 libgudev_1_0_la_SOURCES = \
-       src/udev/gudev/gudevenums.h \
-       src/udev/gudev/gudevenumtypes.h \
-       src/udev/gudev/gudevenumtypes.h\
-       src/udev/gudev/gudevtypes.h \
-       src/udev/gudev/gudevclient.h \
-       src/udev/gudev/gudevclient.c \
-       src/udev/gudev/gudevdevice.h \
-       src/udev/gudev/gudevdevice.c \
-       src/udev/gudev/gudevenumerator.h \
-       src/udev/gudev/gudevenumerator.c \
-       src/udev/gudev/gudevprivate.h
+       src/gudev/gudevenums.h \
+       src/gudev/gudevenumtypes.h \
+       src/gudev/gudevenumtypes.h\
+       src/gudev/gudevtypes.h \
+       src/gudev/gudevclient.h \
+       src/gudev/gudevclient.c \
+       src/gudev/gudevdevice.h \
+       src/gudev/gudevdevice.c \
+       src/gudev/gudevenumerator.h \
+       src/gudev/gudevenumerator.c \
+       src/gudev/gudevprivate.h
 
 nodist_libgudev_1_0_la_SOURCES = \
-       src/udev/gudev/gudevmarshal.h \
-       src/udev/gudev/gudevmarshal.c \
-       src/udev/gudev/gudevenumtypes.h \
-       src/udev/gudev/gudevenumtypes.c
+       src/gudev/gudevmarshal.h \
+       src/gudev/gudevmarshal.c \
+       src/gudev/gudevenumtypes.h \
+       src/gudev/gudevenumtypes.c
 
 BUILT_SOURCES += \
        $(nodist_libgudev_1_0_la_SOURCES)
@@ -1657,10 +1685,8 @@ libgudev_1_0_la_CPPFLAGS = \
        $(AM_CPPFLAGS) \
        -I$(top_builddir)/src\
        -I$(top_srcdir)/src\
-       -I$(top_builddir)/src/udev \
-       -I$(top_srcdir)/src/udev \
-       -I$(top_builddir)/src/udev/gudev \
-       -I$(top_srcdir)/src/udev/gudev \
+       -I$(top_builddir)/src/gudev \
+       -I$(top_srcdir)/src/gudev \
        -D_POSIX_PTHREAD_SEMANTICS -D_REENTRANT \
        -D_GUDEV_COMPILATION \
        -DG_LOG_DOMAIN=\"GUdev\"
@@ -1681,73 +1707,75 @@ libgudev_1_0_la_LDFLAGS = \
        -export-symbols-regex '^g_udev_.*'
 
 EXTRA_DIST += \
-       src/udev/gudev/gudevmarshal.list \
-       src/udev/gudev/gudevenumtypes.h.template \
-       src/udev/gudev/gudevenumtypes.c.template \
-       src/udev/gudev/gjs-example.js \
-       src/udev/gudev/seed-example-enum.js \
-       src/udev/gudev/seed-example.js
+       src/gudev/gudevmarshal.list \
+       src/gudev/gudevenumtypes.h.template \
+       src/gudev/gudevenumtypes.c.template \
+       src/gudev/gjs-example.js \
+       src/gudev/seed-example-enum.js \
+       src/gudev/seed-example.js
 
 CLEANFILES += \
        $(nodist_libgudev_1_0_la_SOURCES)
 
-src/udev/gudev/gudevmarshal.h: src/udev/gudev/gudevmarshal.list
+src/gudev/gudevmarshal.h: src/gudev/gudevmarshal.list
        $(AM_V_GEN)glib-genmarshal $< --prefix=g_udev_marshal --header > $@
 
-src/udev/gudev/gudevmarshal.c: src/udev/gudev/gudevmarshal.list
+src/gudev/gudevmarshal.c: src/gudev/gudevmarshal.list
        $(AM_V_GEN)echo "#include \"gudevmarshal.h\"" > $@ && \
        glib-genmarshal $< --prefix=g_udev_marshal --body >> $@
 
-src/udev/gudev/gudevenumtypes.h: src/udev/gudev/gudevenumtypes.h.template src/udev/gudev/gudevenums.h
+src/gudev/gudevenumtypes.h: src/gudev/gudevenumtypes.h.template src/gudev/gudevenums.h
        $(AM_V_GEN)glib-mkenums --template $^ > \
            $@.tmp && mv $@.tmp $@
 
-src/udev/gudev/gudevenumtypes.c: src/udev/gudev/gudevenumtypes.c.template src/udev/gudev/gudevenums.h
+src/gudev/gudevenumtypes.c: src/gudev/gudevenumtypes.c.template src/gudev/gudevenums.h
        $(AM_V_GEN)glib-mkenums --template $^ > \
            $@.tmp && mv $@.tmp $@
 
 if HAVE_INTROSPECTION
 -include $(INTROSPECTION_MAKEFILE)
 
-src/udev/gudev/GUdev-1.0.gir: libgudev-1.0.la
+src/gudev/GUdev-1.0.gir: libgudev-1.0.la
 
-src_udev_gudev_GUdev_1_0_gir_INCLUDES = GObject-2.0
+src_gudev_GUdev_1_0_gir_INCLUDES = GObject-2.0
 
-src_udev_gudev_GUdev_1_0_gir_CFLAGS = \
+src_gudev_GUdev_1_0_gir_CFLAGS = \
        $(INCLUDES) \
        -D_GUDEV_COMPILATION \
        -D_GUDEV_WORK_AROUND_DEV_T_BUG \
-       -I$(top_srcdir)/src/udev \
-       -I$(top_builddir)/src/udev
+       -I$(top_srcdir)/src \
+       -I$(top_builddir)/src \
+       -I$(top_srcdir)/src/gdev \
+       -I$(top_builddir)/src/gdev
 
-src_udev_gudev_GUdev_1_0_gir_LIBS = libgudev-1.0.la
+src_gudev_GUdev_1_0_gir_LIBS = libgudev-1.0.la
 
-src_udev_gudev_GUdev_1_0_gir_SCANNERFLAGS = \
+src_gudev_GUdev_1_0_gir_SCANNERFLAGS = \
        --pkg-export=gudev-1.0 \
        --warn-all
 
-src_udev_gudev_GUdev_1_0_gir_FILES = \
-       $(top_srcdir)/src/udev/gudev/gudev.h \
-       $(top_srcdir)/src/udev/gudev/gudevtypes.h \
-       $(top_srcdir)/src/udev/gudev/gudevenums.h \
-       $(or $(wildcard $(top_builddir)/src/udev/gudev/gudevenumtypes.h),$(top_srcdir)/src/udev/gudev/gudevenumtypes.h) \
-       $(top_srcdir)/src/udev/gudev/gudevclient.h \
-       $(top_srcdir)/src/udev/gudev/gudevdevice.h \
-       $(top_srcdir)/src/udev/gudev/gudevenumerator.h \
-       $(top_srcdir)/src/udev/gudev/gudevclient.c \
-       $(top_srcdir)/src/udev/gudev/gudevdevice.c \
-       $(top_srcdir)/src/udev/gudev/gudevenumerator.c
-
-INTROSPECTION_GIRS = src/udev/gudev/GUdev-1.0.gir
+src_gudev_GUdev_1_0_gir_FILES = \
+       $(top_srcdir)/src/gudev/gudev.h \
+       $(top_srcdir)/src/gudev/gudevtypes.h \
+       $(top_srcdir)/src/gudev/gudevenums.h \
+       $(or $(wildcard $(top_builddir)/src/gudev/gudevenumtypes.h),$(top_srcdir)/src/gudev/gudevenumtypes.h) \
+       $(top_srcdir)/src/gudev/gudevclient.h \
+       $(top_srcdir)/src/gudev/gudevdevice.h \
+       $(top_srcdir)/src/gudev/gudevenumerator.h \
+       $(top_srcdir)/src/gudev/gudevclient.c \
+       $(top_srcdir)/src/gudev/gudevdevice.c \
+       $(top_srcdir)/src/gudev/gudevenumerator.c
+
+INTROSPECTION_GIRS = src/gudev/GUdev-1.0.gir
 INTROSPECTION_SCANNER_ARGS = --c-include=gudev/gudev.h
 
 girdir = $(datadir)/gir-1.0
 gir_DATA = \
-       src/udev/gudev/GUdev-1.0.gir
+       src/gudev/GUdev-1.0.gir
 
 typelibsdir = $(libdir)/girepository-1.0
 typelibs_DATA = \
-       src/udev/gudev/GUdev-1.0.typelib
+       src/gudev/GUdev-1.0.typelib
 
 CLEANFILES += $(gir_DATA) $(typelibs_DATA)
 endif # HAVE_INTROSPECTION
@@ -1777,6 +1805,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,11 +1903,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/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
@@ -1902,7 +1934,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
@@ -2575,6 +2607,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 \
@@ -2636,8 +2670,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
@@ -2912,6 +2958,7 @@ CLEANFILES += \
 if HAVE_XSLTPROC
 XSLTPROC_FLAGS = \
        --nonet \
+       --stringparam man.output.quietly 1 \
        --stringparam funcsynopsis.style ansi
 
 XSLTPROC_PROCESS_MAN = \
@@ -3076,7 +3123,6 @@ systemd-install-data-hook:
                $(LN_S) ../system-services/org.freedesktop.systemd1.service org.freedesktop.systemd1.service )
 if HAVE_PLYMOUTH
        $(MKDIR_P) -m 0755 \
-               $(DESTDIR)$(SYSTEM_SYSVINIT_PATH) \
                $(DESTDIR)$(systemunitdir)/reboot.target.wants \
                $(DESTDIR)$(systemunitdir)/kexec.target.wants \
                $(DESTDIR)$(systemunitdir)/poweroff.target.wants \
@@ -3184,6 +3230,9 @@ install-data-hook: systemd-install-data-hook $(INSTALL_DATA_HOOKS)
 
 distclean-local: $(DISTCLEAN_LOCAL_HOOKS)
 
+clean-local:
+       rm -rf $(abs_srcdir)/install-tree
+
 DISTCHECK_CONFIGURE_FLAGS = \
        --with-dbuspolicydir=$$dc_install_base/$(dbuspolicydir) \
        --with-dbussessionservicedir=$$dc_install_base/$(dbussessionservicedir) \
@@ -3191,14 +3240,29 @@ DISTCHECK_CONFIGURE_FLAGS = \
        --with-dbusinterfacedir=$$dc_install_base/$(dbusinterfacedir) \
        --with-pamlibdir=$$dc_install_base/$(pamlibdir) \
        --with-rootprefix=$$dc_install_base \
-       --disable-split-usr \
+       --disable-split-usr
+
+if ENABLE_GTK_DOC
+DISTCHECK_CONFIGURE_FLAGS += \
        --enable-gtk-doc
+endif
 
 upload: all distcheck
        cp -v systemd-$(VERSION).tar.xz /home/lennart/git.fedora/systemd/
        scp systemd-$(VERSION).tar.xz fdo:/srv/www.freedesktop.org/www/software/systemd/
-       scp man/*.html fdo:/srv/www.freedesktop.org/www/software/systemd/man/
        scp man/*.html tango:public/systemd-man/
 
+doc-sync: all
+       gtkdoc-rebase --html-dir=docs/libudev/html --online
+       rsync -av --delete docs/libudev/html/ --omit-dir-times www.freedesktop.org:/srv/www.freedesktop.org/www/software/systemd/libudev/
+       gtkdoc-rebase --html-dir=docs/gudev/html --online
+       rsync -av --delete docs/gudev/html/ --omit-dir-times www.freedesktop.org:/srv/www.freedesktop.org/www/software/systemd/gudev/
+       rsync -av --delete-excluded --include="*.html" --exclude="*" --omit-dir-times man/ www.freedesktop.org:/srv/www.freedesktop.org/www/software/systemd/man/
+
 git-tag:
        git tag "v$(VERSION)" -m "systemd $(VERSION)"
+
+install-tree: all
+       rm -rf $(abs_srcdir)/install-tree
+       make install DESTDIR=$(abs_srcdir)/install-tree
+       tree $(abs_srcdir)/install-tree
Unnamed repository; edit this file 'description' to name the repository.