X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=Makefile.am;h=115cd0530f2933e9d6970b489e2d6d45c5918d10;hb=6e620becc8543e9ea8381fcd779dd932c2464749;hp=8720e7898fae37f85bd078b2f59666e61c6180aa;hpb=4139c1b2729f88991159b9affa2ebf3e4eb904a0;p=elogind.git

diff --git a/Makefile.am b/Makefile.am
index 8720e7898..115cd0530 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,9 @@ pkglibexec_PROGRAMS = \
 
 noinst_PROGRAMS = \
 	test-engine \
-	test-job-type
+	test-job-type \
+	test-ns \
+	test-loopback
 
 dbuspolicy_DATA = \
 	org.freedesktop.systemd1.conf
@@ -72,7 +78,7 @@ EXTRA_DIST = \
 	units/systemd-logger.service.in \
 	units/systemd-logger.socket
 
-BASIC_SOURCES= \
+BASIC_SOURCES = \
         util.c \
         util.h \
         hashmap.c \
@@ -90,7 +96,7 @@ BASIC_SOURCES= \
         ratelimit.c \
         ratelimit.h
 
-COMMON_SOURCES= \
+COMMON_SOURCES = \
 	$(BASIC_SOURCES) \
 	unit.c \
 	unit.h \
@@ -106,6 +112,8 @@ COMMON_SOURCES= \
         automount.h \
         mount.c \
         mount.h \
+        swap.c \
+        swap.h \
         device.c \
         device.h \
         target.c \
@@ -138,6 +146,8 @@ COMMON_SOURCES= \
 	dbus-mount.h \
 	dbus-automount.c \
 	dbus-autpmount.h \
+	dbus-swap.c \
+	dbus-swap.h \
 	dbus-snapshot.c \
 	dbus-snapshot.h \
 	dbus-device.c \
@@ -150,12 +160,18 @@ COMMON_SOURCES= \
 	mount-setup.h \
 	hostname-setup.c \
 	hostname-setup.h \
+	loopback-setup.c \
+	loopback-setup.h \
 	utmp-wtmp.c \
 	utmp-wtmp.h \
 	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) \
@@ -186,6 +202,22 @@ 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)
+
+test_loopback_SOURCES = \
+	$(BASIC_SOURCES) \
+	test-loopback.c \
+	loopback-setup.c
+
+test_loopback_CPPFLAGS = $(systemd_CPPFLAGS)
+test_loopback_LDADD = $(systemd_LDADD)
+
 systemd_logger_SOURCES = \
 	$(BASIC_SOURCES) \
 	logger.c
@@ -212,7 +244,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 \
@@ -229,10 +261,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 \