X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;ds=sidebyside;f=Makefile.am;h=ec90ebad56fec2c97cdb4aaf8eab027f8413b431;hb=e537352b9bfffe6f6286483bff2c7601c78407e3;hp=57a2dd98dd9be7aa76ea8b4f3f0f756c61df14d0;hpb=8e27452380193a5f81bfd08a59aab8b07008ba0b;p=elogind.git

diff --git a/Makefile.am b/Makefile.am
index 57a2dd98d..ec90ebad5 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -23,7 +23,8 @@ AM_CPPFLAGS = \
         -include $(top_builddir)/config.h \
 	-DSYSTEM_CONFIG_UNIT_PATH=\"$(pkgsysconfdir)/system\" \
 	-DSYSTEM_DATA_UNIT_PATH=\"$(pkgdatadir)/system\" \
-	-DSYSTEM_SYSVINIT_PATH=\"$(sysconfdir)/init.d\" \
+	-DSYSTEM_SYSVINIT_PATH=\"$(SYSTEM_SYSVINIT_PATH)\" \
+	-DSYSTEM_SYSVRCND_PATH=\"$(SYSTEM_SYSVRCND_PATH)\" \
 	-DSESSION_CONFIG_UNIT_PATH=\"$(pkgsysconfdir)/session\" \
 	-DSESSION_DATA_UNIT_PATH=\"$(pkgdatadir)/session\" \
 	-DCGROUP_AGENT_PATH=\"$(pkglibexecdir)/systemd-cgroups-agent\"
@@ -37,7 +38,8 @@ bin_PROGRAMS = \
 
 pkglibexec_PROGRAMS = \
 	systemd-logger \
-	systemd-cgroups-agent
+	systemd-cgroups-agent \
+	systemd-initctl
 
 noinst_PROGRAMS = \
 	test-engine \
@@ -102,7 +104,11 @@ COMMON_SOURCES= \
 	cgroup.c \
 	cgroup.h \
 	mount-setup.c \
-	mount-setup.h
+	mount-setup.h \
+	hostname-setup.c \
+	hostname-setup.h \
+	utmp-wtmp.c \
+	utmp-wtmp.h
 
 systemd_SOURCES = \
 	$(COMMON_SOURCES) \
@@ -137,6 +143,17 @@ systemd_logger_SOURCES = \
 	$(BASIC_SOURCES) \
 	logger.c
 
+systemd_initctl_SOURCES = \
+	$(BASIC_SOURCES) \
+	initctl.c
+
+systemd_initctl_CPPFLAGS = \
+	$(AM_CPPFLAGS) \
+	$(DBUS_CFLAGS)
+
+systemd_initctl_LDADD = \
+	$(DBUS_LIBS)
+
 systemd_cgroups_agent_SOURCES = \
 	$(BASIC_SOURCES) \
 	cgroups-agent.c