fstab-generator: avoid mangling of mount source string

[elogind.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index b62b9be9952db9f9c051aa2e6c665715f670814f..85953c7853287de5d3606afc5bfca274526de1cf 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -129,6 +129,7 @@ AM_CPPFLAGS = \
        -DSYSTEM_GENERATOR_PATH=\"$(systemgeneratordir)\" \
        -DUSER_GENERATOR_PATH=\"$(usergeneratordir)\" \
        -DSYSTEM_SHUTDOWN_PATH=\"$(systemshutdowndir)\" \
+       -DSYSTEM_SLEEP_PATH=\"$(systemsleepdir)\" \
        -DSYSTEMD_KBD_MODEL_MAP=\"$(pkgdatadir)/kbd-model-map\" \
        -DX_SERVER=\"$(bindir)/X\" \
        -DUDEVLIBEXECDIR=\""$(libexecdir)/udev"\" \
@@ -490,23 +491,32 @@ MANPAGES = \
        man/os-release.5 \
        man/machine-info.5 \
        man/modules-load.d.5 \
+       man/systemd-modules-load.service.8 \
        man/sysctl.d.5 \
+       man/systemd-sysctl.service.8 \
        man/systemd-ask-password.1 \
        man/systemd-cat.1 \
        man/systemd-machine-id-setup.1 \
        man/systemd-detect-virt.1 \
        man/journald.conf.5 \
+       man/systemd-journald.service.8 \
        man/journalctl.1 \
        man/systemd-inhibit.1
 
 MANPAGES_ALIAS = \
        man/reboot.8 \
        man/poweroff.8 \
-       man/init.1
+       man/init.1 \
+       man/systemd-modules-load.8 \
+       man/systemd-sysctl.8 \
+       man/systemd-journald.8
 
 man/reboot.8: man/halt.8
 man/poweroff.8: man/halt.8
 man/init.1: man/systemd.1
+man/systemd-modules-load.8: man/systemd-modules-load.service.8
+man/systemd-sysctl.8: man/systemd-sysctl.service.8
+man/systemd-journald.8: man/systemd-journald.service.8
 
 XML_FILES = \
        ${patsubst %.1,%.xml,${patsubst %.3,%.xml,${patsubst %.5,%.xml,${patsubst %.7,%.xml,${patsubst %.8,%.xml,$(MANPAGES)}}}}}
@@ -606,13 +616,23 @@ libsystemd_dbus_la_LIBADD = \
 
 # ------------------------------------------------------------------------------
 noinst_LTLIBRARIES += \
-       libsystemd-label.la
+       libsystemd-units.la
 
-libsystemd_label_la_SOURCES = \
+libsystemd_units_la_SOURCES = \
        src/shared/install.c \
        src/shared/install.h \
        src/shared/path-lookup.c \
-       src/shared/path-lookup.h \
+       src/shared/path-lookup.h
+
+libsystemd_units_la_CFLAGS = \
+       $(AM_CFLAGS) \
+       $(DBUS_CFLAGS)
+
+# ------------------------------------------------------------------------------
+noinst_LTLIBRARIES += \
+       libsystemd-label.la
+
+libsystemd_label_la_SOURCES = \
        src/shared/cgroup-label.c \
        src/shared/socket-label.c \
        src/shared/label.c \
@@ -626,7 +646,6 @@ libsystemd_label_la_SOURCES = \
 
 libsystemd_label_la_CFLAGS = \
        $(AM_CFLAGS) \
-       $(DBUS_CFLAGS) \
        $(SELINUX_CFLAGS)
 
 libsystemd_label_la_LIBADD = \
@@ -810,6 +829,7 @@ libsystemd_core_la_CFLAGS = \
 
 libsystemd_core_la_LIBADD = \
        libsystemd-capability.la \
+       libsystemd-units.la \
        libsystemd-label.la \
        libsystemd-shared.la \
        libsystemd-dbus.la \
@@ -980,6 +1000,7 @@ test_install_CFLAGS = \
        $(DBUS_CFLAGS)
 
 test_install_LDADD = \
+       libsystemd-units.la \
        libsystemd-label.la \
        libsystemd-shared.la
 
@@ -1191,6 +1212,7 @@ systemctl_CFLAGS = \
        $(DBUS_CFLAGS)
 
 systemctl_LDADD = \
+       libsystemd-units.la \
        libsystemd-label.la \
        libsystemd-shared.la \
        libsystemd-daemon.la \
@@ -1889,12 +1911,14 @@ TESTS += \
        src/udev/keymap/check-keymaps.sh
 
 EXTRA_DIST += \
-       src/udev/keymap/check-keymaps.sh
+       src/udev/keymap/check-keymaps.sh \
+       src/udev/keymap/keyboard-force-release.sh.in
 
 CLEANFILES += \
        $(nodist_keymap_SOURCES) \
        src/udev/keymap/keys.txt \
-       src/udev/keymap/keys-from-name.gperf
+       src/udev/keymap/keys-from-name.gperf \
+       src/udev/keymap/keyboard-force-release.sh
 
 udevkeymapdir = $(libexecdir)/udev/keymaps
 dist_udevkeymap_DATA = \
@@ -2321,7 +2345,13 @@ INSTALL_DATA_HOOKS += \
        binfmt-install-data-hook
 
 MANPAGES += \
-       man/binfmt.d.5
+       man/binfmt.d.5 \
+       man/systemd-binfmt.service.8
+
+MANPAGES_ALIAS +=  \
+       man/systemd-binfmt.8
+
+man/systemd-binfmt.8: man/systemd-binfmt.service.8
 
 EXTRA_DIST += \
        units/systemd-binfmt.service.in
@@ -2890,6 +2920,7 @@ nodist_udevrules_DATA += \
        src/login/73-seat-late.rules
 
 MANPAGES += \
+       man/systemd-logind.service.8 \
        man/logind.conf.5 \
        man/sd-login.7 \
        man/loginctl.1 \
@@ -2901,6 +2932,7 @@ MANPAGES += \
        man/sd_get_seats.3
 
 MANPAGES_ALIAS += \
+       man/systemd-logind.8 \
        man/sd_login_monitor_unref.3 \
        man/sd_login_monitor_flush.3 \
        man/sd_login_monitor_get_fd.3 \
@@ -2920,6 +2952,7 @@ MANPAGES_ALIAS += \
        man/sd_get_sessions.3 \
        man/sd_get_uids.3
 
+man/systemd-logind.8: man/systemd-logind.service.8
 man/sd_login_monitor_unref.3: man/sd_login_monitor_new.3
 man/sd_login_monitor_flush.3: man/sd_login_monitor_new.3
 man/sd_login_monitor_get_fd.3: man/sd_login_monitor_new.3