X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=Makefile.am;h=d08644a6f95ec3941cd5121df753fa097c656809;hp=18f27c42513c707f42cde46466d6e41c476c275a;hb=25e870b5f79f158ba6ac0b715248b0c3d3549325;hpb=5cc5d790f4593bbf7829faba502e4c00b3718a08

diff --git a/Makefile.am b/Makefile.am
index 18f27c425..d08644a6f 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -21,15 +21,22 @@ pkgsysconfdir=$(sysconfdir)/systemd
 dbuspolicydir=$(sysconfdir)/dbus-1/system.d
 udevrulesdir=/lib/udev/rules.d
 
+systemunitdir=$(pkgdatadir)/system
+sessionunitdir=$(pkgdatadir)/system
+
 AM_CPPFLAGS = \
         -include $(top_builddir)/config.h \
 	-DSYSTEM_CONFIG_UNIT_PATH=\"$(pkgsysconfdir)/system\" \
-	-DSYSTEM_DATA_UNIT_PATH=\"$(pkgdatadir)/system\" \
+	-DSYSTEM_DATA_UNIT_PATH=\"$(systemunitdir)\" \
 	-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\"
+	-DSESSION_DATA_UNIT_PATH=\"$(sessionunitdir)\" \
+	-DCGROUP_AGENT_PATH=\"$(pkglibexecdir)/systemd-cgroups-agent\" \
+	-DSYSTEMD_BINARY_PATH=\"$(sbindir)/systemd\"
+
+#	-DSYSTEMD_BINARY_PATH=\"/home/lennart/projects/systemd/systemd\"
+
 
 sbin_PROGRAMS = \
 	systemd
@@ -45,7 +52,8 @@ pkglibexec_PROGRAMS = \
 
 noinst_PROGRAMS = \
 	test-engine \
-	test-job-type
+	test-job-type \
+	test-ns
 
 dbuspolicy_DATA = \
 	org.freedesktop.systemd1.conf
@@ -53,9 +61,21 @@ dbuspolicy_DATA = \
 udevrules_DATA = \
 	99-systemd.rules
 
+systemunit_DATA = \
+	units/emergency.service \
+	systemd-initctl.service \
+	units/systemd-initctl.socket \
+	systemd-logger.service \
+	units/systemd-logger.socket
+
 EXTRA_DIST = \
-	org.freedesktop.systemd1.conf
-	99-systemd.rules
+	org.freedesktop.systemd1.conf \
+	99-systemd.rules \
+	units/emergency.service \
+	units/systemd-initctl.service.in \
+	units/systemd-initctl.socket \
+	units/systemd-logger.service.in \
+	units/systemd-logger.socket
 
 BASIC_SOURCES= \
         util.c \
@@ -113,6 +133,22 @@ COMMON_SOURCES= \
         dbus-unit.h \
         dbus-job.c \
         dbus-job.h \
+	dbus-service.c \
+	dbus-service.h \
+	dbus-socket.c \
+	dbus-socket.h \
+	dbus-target.c \
+	dbus-target.h \
+	dbus-mount.c \
+	dbus-mount.h \
+	dbus-automount.c \
+	dbus-autpmount.h \
+	dbus-snapshot.c \
+	dbus-snapshot.h \
+	dbus-device.c \
+	dbus-device.h \
+	dbus-execute.c \
+	dbus-execute.h \
 	cgroup.c \
 	cgroup.h \
 	mount-setup.c \
@@ -120,7 +156,15 @@ COMMON_SOURCES= \
 	hostname-setup.c \
 	hostname-setup.h \
 	utmp-wtmp.c \
-	utmp-wtmp.h
+	utmp-wtmp.h \
+	specifier.c \
+	specifier.h \
+	unit-name.c \
+	unit-name.h \
+	fdset.c \
+	fdset.h \
+	namespace.h \
+	namespace.c
 
 systemd_SOURCES = \
 	$(COMMON_SOURCES) \
@@ -151,6 +195,14 @@ test_job_type_SOURCES = \
 test_job_type_CPPFLAGS = $(systemd_CPPFLAGS)
 test_job_type_LDADD = $(systemd_LDADD)
 
+test_ns_SOURCES = \
+	$(BASIC_SOURCES) \
+	test-ns.c \
+	namespace.c
+
+test_ns_CPPFLAGS = $(systemd_CPPFLAGS)
+test_ns_LDADD = $(systemd_LDADD)
+
 systemd_logger_SOURCES = \
 	$(BASIC_SOURCES) \
 	logger.c
@@ -193,8 +245,19 @@ systemadm_SOURCES = \
 systemadm_CPPFLAGS = $(AM_CPPFLAGS) $(DBUSGLIB_CFLAGS) $(GTK_CFLAGS)
 systemadm_LDADD = $(DBUSGLIB_LIBS) $(GTK_LIBS)
 
+systemd-initctl.service: units/systemd-initctl.service.in Makefile
+	sed -e 's,@libexecdir\@,$(libexecdir),g' \
+		-e 's,@pkglibexecdir\@,$(pkglibexecdir),g' \
+		< $< > $@
+
+systemd-logger.service: units/systemd-logger.service.in Makefile
+	sed -e 's,@libexecdir\@,$(libexecdir),g' \
+		-e 's,@pkglibexecdir\@,$(pkglibexecdir),g' \
+		< $< > $@
+
 CLEANFILES = \
 	systemd-interfaces.c \
 	systemctl.c \
 	systemadm.c \
-	systemd-cgroups-agent
+	systemd-initctl.service \
+	systemd-logger.service