X-Git-Url: http://git.ipfire.org/?p=people%2Fms%2Fsystemd.git;a=blobdiff_plain;f=Makefile.am;h=7396dddd87e30ead9680f1e85dfc97bf2a5cdf49;hp=7afa2f1576c5df099b868442e545c755ee783194;hb=75db651adba49238a02fe031842155d30e7a8219;hpb=15ae422b7471cf6f41ccf450243d8afd8ea0a054

diff --git a/Makefile.am b/Makefile.am
index 7afa2f1..7396ddd 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -53,7 +53,8 @@ pkglibexec_PROGRAMS = \
 noinst_PROGRAMS = \
 	test-engine \
 	test-job-type \
-	test-ns
+	test-ns \
+	test-loopback
 
 dbuspolicy_DATA = \
 	org.freedesktop.systemd1.conf
@@ -77,93 +78,57 @@ EXTRA_DIST = \
 	units/systemd-logger.service.in \
 	units/systemd-logger.socket
 
-BASIC_SOURCES= \
+# This is needed because automake is buggy in how it generates the
+# rules for C programs, but not Vala programs.  We therefore can't
+# list the .h files as dependencies if we want make dist to work.
+BASIC_SOURCES = \
         util.c \
-        util.h \
         hashmap.c \
-        hashmap.h \
         set.c \
-        set.h \
         strv.c \
-        strv.h \
         conf-parser.c \
-        conf-parser.h \
         socket-util.c \
-        socket-util.h \
         log.c \
-        log.h \
-        ratelimit.c \
-        ratelimit.h
+        ratelimit.c
 
-COMMON_SOURCES= \
+COMMON_SOURCES = \
 	$(BASIC_SOURCES) \
 	unit.c \
-	unit.h \
         job.c \
-	job.h \
         manager.c \
-        manager.h \
         load-fragment.c \
-        load-fragment.h \
         service.c \
-        service.h \
         automount.c \
-        automount.h \
         mount.c \
-        mount.h \
+        swap.c \
         device.c \
-        device.h \
         target.c \
-        target.h \
         snapshot.c \
-        snapshot.h \
         socket.c \
-        socket.h \
         timer.c \
-        timer.h \
         load-dropin.c \
-        load-dropin.h \
         execute.c \
-        execute.h \
         dbus.c \
-        dbus.h \
         dbus-manager.c \
-        dbus-manager.h \
         dbus-unit.c \
-        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-swap.c \
 	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 \
-	mount-setup.h \
 	hostname-setup.c \
-	hostname-setup.h \
+	loopback-setup.c \
 	utmp-wtmp.c \
-	utmp-wtmp.h \
 	specifier.c \
-	specifier.h \
 	unit-name.c \
-	unit-name.h \
 	fdset.c \
-	fdset.h \
-	namespace.h \
 	namespace.c
 
 systemd_SOURCES = \
@@ -203,6 +168,14 @@ test_ns_SOURCES = \
 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
@@ -229,7 +202,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 \
@@ -246,10 +219,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 \