hostname: if no hostname is configured use localhost

[elogind.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index f187b4b9c68a1474929ea86070b562e89fb62df9..bf329e5083d20d32864687200cf60f7e5ce3e859 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -73,13 +73,15 @@ rootlibexec_PROGRAMS = \
        systemd-update-utmp \
        systemd-random-seed \
        systemd-shutdownd \
-       systemd-auto-console-getty
+       systemd-auto-console-getty \
+       systemd-modules-load
 
 noinst_PROGRAMS = \
        test-engine \
        test-job-type \
        test-ns \
        test-loopback \
+       test-hostname \
        test-daemon \
        test-cgroup \
        test-env-replace
@@ -140,7 +142,6 @@ dist_systemunit_DATA = \
        units/systemd-initctl.socket \
        units/systemd-logger.socket \
        units/systemd-shutdownd.socket \
-       units/systemd-auto-console-getty.service \
        units/dev-hugepages.automount \
        units/dev-hugepages.mount \
        units/dev-mqueue.automount \
@@ -151,10 +152,14 @@ dist_systemunit_DATA = \
        units/sys-kernel-debug.mount \
        units/sys-kernel-security.automount \
        units/sys-kernel-security.mount \
+       units/tmp.mount \
        units/var-lock.mount \
        units/var-lock.service \
        units/var-run.mount \
        units/var-run.service \
+       units/hwclock-load.service \
+       units/hwclock-save.service \
+       units/sysctl.service \
        units/printer.target \
        units/bluetooth.target \
        units/smartcard.target
@@ -169,6 +174,7 @@ nodist_systemunit_DATA = \
        units/systemd-logger.service \
        units/systemd-shutdownd.service \
        units/systemd-auto-console-getty.service \
+       units/systemd-modules-load.service \
        units/systemd-update-utmp-runlevel.service \
        units/systemd-update-utmp-shutdown.service \
        units/systemd-random-seed-save.service \
@@ -192,6 +198,7 @@ EXTRA_DIST = \
        units/systemd-logger.service.in \
        units/systemd-shutdownd.service.in \
        units/systemd-auto-console-getty.service.in \
+       units/systemd-modules-load.service.in \
        units/systemd-update-utmp-runlevel.service.in \
        units/systemd-update-utmp-shutdown.service.in \
        units/systemd-random-seed-save.service.in \
@@ -312,7 +319,6 @@ libsystemd_core_la_SOURCES = \
        src/hostname-setup.c \
        src/loopback-setup.c \
        src/kmod-setup.c \
-       src/modprobe-setup.c \
        src/specifier.c \
        src/unit-name.c \
        src/fdset.c \
@@ -468,6 +474,13 @@ test_loopback_SOURCES = \
 test_loopback_LDADD = \
        libsystemd-basic.la
 
+test_hostname_SOURCES = \
+       src/test-hostname.c \
+       src/hostname-setup.c
+
+test_hostname_LDADD = \
+       libsystemd-basic.la
+
 test_daemon_SOURCES = \
        src/test-daemon.c \
        src/sd-daemon.c
@@ -563,6 +576,15 @@ systemd_auto_console_getty_LDADD = \
        libsystemd-basic.la \
        $(DBUS_LIBS)
 
+systemd_modules_load_SOURCES = \
+       src/modules-load.c
+
+systemd_modules_load_CFLAGS = \
+       $(AM_CFLAGS)
+
+systemd_modules_load_LDADD = \
+       libsystemd-basic.la
+
 systemd_cgroups_agent_SOURCES = \
        src/cgroups-agent.c \
        src/dbus-common.c