chiark / gitweb /
man: document /etc/hostname
[elogind.git] / Makefile.am
index bc7ea9daed4fbf536119fec9cff0f0d7022cc11f..2e6b978b3809c93ab8798baf4fe111bede491bfe 100644 (file)
@@ -119,7 +119,8 @@ rootlibexec_PROGRAMS = \
        systemd-fsck \
        systemd-quotacheck \
        systemd-timestamp \
-       systemd-ac-power
+       systemd-ac-power \
+       systemd-sysctl
 
 if HAVE_LIBCRYPTSETUP
 rootlibexec_PROGRAMS += \
@@ -223,7 +224,6 @@ dist_systemunit_DATA = \
        units/var-run.mount \
        units/hwclock-load.service \
        units/hwclock-save.service \
-       units/sysctl.service \
        units/remount-rootfs.service \
        units/printer.target \
        units/bluetooth.target \
@@ -232,7 +232,8 @@ dist_systemunit_DATA = \
        units/systemd-tmpfiles-clean.timer \
        units/quotaon.service \
        units/systemd-ask-password-wall.path \
-       units/systemd-ask-password-plymouth.path
+       units/systemd-ask-password-plymouth.path \
+       units/systemd-ask-password-console.path
 
 nodist_systemunit_DATA = \
        units/getty@.service \
@@ -259,6 +260,8 @@ nodist_systemunit_DATA = \
        units/systemd-user-sessions.service \
        units/systemd-ask-password-wall.service \
        units/systemd-ask-password-plymouth.service \
+       units/systemd-ask-password-console.service \
+       units/systemd-sysctl.service \
        units/syslog.target \
        units/halt.service \
        units/poweroff.service \
@@ -303,6 +306,8 @@ EXTRA_DIST = \
        units/systemd-user-sessions.service.in \
        units/systemd-ask-password-wall.service.in \
        units/systemd-ask-password-plymouth.service.in \
+       units/systemd-ask-password-console.service.in \
+       units/systemd-sysctl.service.in \
        units/syslog.target.in \
        units/halt.service.in \
        units/poweroff.service.in \
@@ -500,7 +505,8 @@ MANPAGES = \
        man/shutdown.8 \
        man/pam_systemd.8 \
        man/systemd.conf.5 \
-       man/tmpfiles.d.5
+       man/tmpfiles.d.5 \
+       man/hostname.5
 
 MANPAGES_ALIAS = \
        man/reboot.8 \
@@ -710,6 +716,15 @@ systemd_tmpfiles_CFLAGS = \
 systemd_tmpfiles_LDADD = \
        libsystemd-basic.la
 
+systemd_sysctl_SOURCES = \
+       src/sysctl.c
+
+systemd_sysctl_CFLAGS = \
+       $(AM_CFLAGS)
+
+systemd_sysctl_LDADD = \
+       libsystemd-basic.la
+
 systemd_fsck_SOURCES = \
        src/fsck.c \
        src/dbus-common.c
@@ -759,10 +774,12 @@ systemd_cryptsetup_SOURCES = \
 
 systemd_cryptsetup_CFLAGS = \
        $(LIBCRYPTSETUP_CFLAGS) \
+       $(UDEV_CFLAGS) \
        $(AM_CFLAGS)
 
 systemd_cryptsetup_LDADD = \
        $(LIBCRYPTSETUP_LIBS) \
+       $(UDEV_LIBS) \
        libsystemd-basic.la
 
 systemd_cryptsetup_generator_SOURCES = \
@@ -1224,7 +1241,8 @@ install-data-hook:
                        systemd-modules-load.service \
                        systemd-random-seed-load.service \
                        systemd-tmpfiles-setup.service \
-                       sysctl.service && \
+                       systemd-sysctl.service \
+                       systemd-ask-password-console.path && \
                $(LN_S) ../dev-hugepages.automount dev-hugepages.automount && \
                $(LN_S) ../dev-mqueue.automount dev-mqueue.automount && \
                $(LN_S) ../proc-sys-fs-binfmt_misc.automount proc-sys-fs-binfmt_misc.automount && \
@@ -1234,7 +1252,8 @@ install-data-hook:
                $(LN_S) ../systemd-modules-load.service systemd-modules-load.service && \
                $(LN_S) ../systemd-random-seed-load.service systemd-random-seed-load.service && \
                $(LN_S) ../systemd-tmpfiles-setup.service systemd-tmpfiles-setup.service && \
-               $(LN_S) ../sysctl.service sysctl.service )
+               $(LN_S) ../systemd-sysctl.service systemd-sysctl.service && \
+               $(LN_S) ../systemd-ask-password-console.path systemd-ask-password-console.path )
        ( cd $(DESTDIR)$(systemunitdir)/basic.target.wants && \
                rm -f systemd-tmpfiles-clean.timer && \
                $(LN_S) ../systemd-tmpfiles-clean.timer systemd-tmpfiles-clean.timer )
@@ -1256,10 +1275,9 @@ if TARGET_FEDORA
                rm -f halt-local.service && \
                $(LN_S) $(systemunitdir)/halt-local.service halt-local.service )
        ( cd $(DESTDIR)$(systemunitdir)/sysinit.target.wants && \
-               rm -f plymouth-start.service systemd-ask-password-plymouth.path plymouth-read-write.service && \
+               rm -f plymouth-start.service plymouth-read-write.service && \
                $(LN_S) ../plymouth-start.service plymouth-start.service && \
-               $(LN_S) ../plymouth-read-write.service plymouth-read-write.service && \
-               $(LN_S) ../systemd-ask-password-plymouth.path systemd-ask-password-plymouth.path )
+               $(LN_S) ../plymouth-read-write.service plymouth-read-write.service )
        ( cd $(DESTDIR)$(systemunitdir)/multi-user.target.wants && \
                rm -f plymouth-quit.service  && \
                $(LN_S) ../plymouth-quit.service plymouth-quit.service )