fsck: don't fsck against basic.target in order to properly allow automount /home

[elogind.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index db28572dc26615f8803c2e47f57f4994b136f595..26412ab304f5a3c4f440786315f672f2de83e74d 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -144,7 +144,8 @@ rootlibexec_PROGRAMS = \
        systemd-ac-power \
        systemd-detect-virt \
        systemd-sysctl \
-       systemd-binfmt
+       systemd-binfmt \
+        systemd-hostnamed
 
 systemgenerator_PROGRAMS = \
        systemd-getty-generator
@@ -177,10 +178,12 @@ dist_pkgsysconf_DATA = \
        src/system.conf
 
 dist_dbuspolicy_DATA = \
-       src/org.freedesktop.systemd1.conf
+       src/org.freedesktop.systemd1.conf \
+        src/org.freedesktop.hostname1.conf
 
 dist_dbussystemservice_DATA = \
-       src/org.freedesktop.systemd1.service
+       src/org.freedesktop.systemd1.service \
+        src/org.freedesktop.hostname1.service
 
 dist_udevrules_DATA = \
        src/99-systemd.rules
@@ -282,6 +285,7 @@ nodist_systemunit_DATA = \
        units/systemd-initctl.service \
        units/systemd-logger.service \
        units/systemd-shutdownd.service \
+       units/systemd-hostnamed.service \
        units/systemd-kmsg-syslogd.service \
        units/systemd-modules-load.service \
        units/systemd-vconsole-setup.service \
@@ -326,6 +330,7 @@ EXTRA_DIST = \
        units/systemd-initctl.service.in \
        units/systemd-logger.service.in \
        units/systemd-shutdownd.service.in \
+       units/systemd-hostnamed.service.in \
        units/systemd-kmsg-syslogd.service.in \
        units/systemd-modules-load.service.in \
        units/systemd-vconsole-setup.service.in \
@@ -406,9 +411,12 @@ dist_doc_DATA = \
 pkgconfigdata_DATA = \
        systemd.pc
 
-polkitpolicy_DATA = \
+nodist_polkitpolicy_DATA = \
        src/org.freedesktop.systemd1.policy
 
+dist_polkitpolicy_DATA = \
+        src/org.freedesktop.hostname1.policy
+
 noinst_LTLIBRARIES = \
        libsystemd-basic.la \
        libsystemd-core.la \
@@ -571,6 +579,7 @@ MANPAGES = \
        man/vconsole.conf.5 \
        man/locale.conf.5 \
        man/os-release.5 \
+        man/machine-info.5 \
        man/modules-load.d.5 \
        man/binfmt.d.5 \
        man/sysctl.d.5 \
@@ -754,6 +763,19 @@ systemd_shutdownd_LDADD = \
        libsystemd-basic.la \
        libsystemd-daemon.la
 
+systemd_hostnamed_SOURCES = \
+       src/hostnamed.c \
+        src/dbus-common.c
+
+systemd_hostnamed_CFLAGS = \
+       $(AM_CFLAGS) \
+       $(DBUS_CFLAGS)
+
+systemd_hostnamed_LDADD = \
+       libsystemd-basic.la \
+       libsystemd-daemon.la \
+       $(DBUS_LIBS)
+
 systemd_shutdown_SOURCES = \
        src/mount-setup.c \
        src/umount.c \
@@ -1346,9 +1368,10 @@ install-data-hook:
                $(LN_S) graphical.target runlevel5.target && \
                $(LN_S) reboot.target runlevel6.target )
        ( cd $(DESTDIR)$(systemunitdir) && \
-               rm -f default.target ctrl-alt-del.target && \
+               rm -f default.target ctrl-alt-del.target dbus-org.freedesktop.hostname1.service && \
                $(LN_S) graphical.target default.target && \
-               $(LN_S) reboot.target ctrl-alt-del.target )
+               $(LN_S) reboot.target ctrl-alt-del.target && \
+                $(LN_S) systemd-hostnamed.service dbus-org.freedesktop.hostname1.service )
        ( cd $(DESTDIR)$(systemunitdir)/multi-user.target.wants && \
                rm -f getty.target systemd-user-sessions.service systemd-ask-password-wall.path && \
                $(LN_S) ../getty.target getty.target && \