X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;ds=sidebyside;f=Makefile.am;h=4611a66209bfea8a8bbd671f8383b914e1f9b821;hb=b9cd233f49f384ea4b8a91c5d1734aae3172bcae;hp=8cad1420e0f239ef17b328c808d11b558aafc70f;hpb=9e2f7c11fb6ba35ffec2274da3e2d08b10d23965;p=elogind.git

diff --git a/Makefile.am b/Makefile.am
index 8cad1420e..4611a6620 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -32,7 +32,11 @@ AM_CPPFLAGS = \
 	-DSYSTEM_SYSVRCND_PATH=\"$(SYSTEM_SYSVRCND_PATH)\" \
 	-DSESSION_CONFIG_UNIT_PATH=\"$(pkgsysconfdir)/session\" \
 	-DSESSION_DATA_UNIT_PATH=\"$(sessionunitdir)\" \
-	-DCGROUP_AGENT_PATH=\"$(pkglibexecdir)/systemd-cgroups-agent\"
+	-DCGROUP_AGENT_PATH=\"$(pkglibexecdir)/systemd-cgroups-agent\" \
+	-DSYSTEMD_BINARY_PATH=\"$(sbindir)/systemd\"
+
+#	-DSYSTEMD_BINARY_PATH=\"/home/lennart/projects/systemd/systemd\"
+
 
 sbin_PROGRAMS = \
 	systemd
@@ -48,7 +52,8 @@ pkglibexec_PROGRAMS = \
 
 noinst_PROGRAMS = \
 	test-engine \
-	test-job-type
+	test-job-type \
+	test-ns
 
 dbuspolicy_DATA = \
 	org.freedesktop.systemd1.conf
@@ -128,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 \
@@ -139,7 +160,11 @@ COMMON_SOURCES= \
 	specifier.c \
 	specifier.h \
 	unit-name.c \
-	unit-name.h
+	unit-name.h \
+	fdset.c \
+	fdset.h \
+	namespace.h \
+	namespace.c
 
 systemd_SOURCES = \
 	$(COMMON_SOURCES) \
@@ -170,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
@@ -196,7 +229,7 @@ systemd_cgroups_agent_CPPFLAGS = \
 systemd_cgroups_agent_LDADD = \
 	$(DBUS_LIBS)
 
-VALAFLAGS = -g --save-temps --pkg=dbus-glib-1 --pkg=posix --pkg gee-1.0 --pkg gtk+-2.0
+VALAFLAGS = -g --save-temps --pkg=dbus-glib-1 --pkg=posix --pkg gtk+-2.0
 
 systemctl_SOURCES = \
 	systemctl.vala \
@@ -213,10 +246,14 @@ 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' < $< > $@
+	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' < $< > $@
+	sed -e 's,@libexecdir\@,$(libexecdir),g' \
+		-e 's,@pkglibexecdir\@,$(pkglibexecdir),g' \
+		< $< > $@
 
 CLEANFILES = \
 	systemd-interfaces.c \