X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=Makefile.am;h=bf329e5083d20d32864687200cf60f7e5ce3e859;hp=4905f2dad1b40f5604d571e20e47cb618e0b4650;hb=28695e0facfa14d54223f2805df19e44a17f3a7e;hpb=5481ab2b385855b9489debe901918b2d9b27faff

diff --git a/Makefile.am b/Makefile.am
index 4905f2dad..bf329e508 100644
--- 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 \
@@ -173,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 \
@@ -196,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 \
@@ -471,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
@@ -566,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