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

diff --git a/Makefile.am b/Makefile.am
index 8720e7898..8ad1969bd 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -32,14 +32,22 @@ 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\"
+VALA_CFLAGS=-Wno-unused-variable -Wno-unused-function
 
 sbin_PROGRAMS = \
 	systemd
 
 bin_PROGRAMS = \
-	systemctl \
+	systemctl
+
+if HAVE_GTK
+bin_PROGRAMS += \
 	systemadm
+endif
 
 pkglibexec_PROGRAMS = \
 	systemd-logger \
@@ -48,7 +56,9 @@ pkglibexec_PROGRAMS = \
 
 noinst_PROGRAMS = \
 	test-engine \
-	test-job-type
+	test-job-type \
+	test-ns \
+	test-loopback
 
 dbuspolicy_DATA = \
 	org.freedesktop.systemd1.conf
@@ -70,92 +80,72 @@ EXTRA_DIST = \
 	units/systemd-initctl.service.in \
 	units/systemd-initctl.socket \
 	units/systemd-logger.service.in \
-	units/systemd-logger.socket
-
-BASIC_SOURCES= \
+	units/systemd-logger.socket \
+	LICENSE \
+	README
+
+# 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 \
+	namespace.c
+
+EXTRA_DIST += \
+	${COMMON_SOURCES:.c=.h} \
+	macro.h \
+	ioprio.h \
+	missing.h \
+	list.h \
+	securebits.h \
+	linux/auto_dev-ioctl.h \
+	initreq.h
 
 systemd_SOURCES = \
 	$(COMMON_SOURCES) \
@@ -186,6 +176,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,27 +218,31 @@ 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 \
 	systemd-interfaces.vala
 
-systemctl_CPPFLAGS = $(AM_CPPFLAGS) $(DBUSGLIB_CFLAGS)
+systemctl_CPPFLAGS = $(AM_CPPFLAGS) $(DBUSGLIB_CFLAGS) $(VALA_CFLAGS)
 systemctl_LDADD = $(DBUSGLIB_LIBS)
 
 systemadm_SOURCES = \
 	systemadm.vala \
 	systemd-interfaces.vala
 
-systemadm_CPPFLAGS = $(AM_CPPFLAGS) $(DBUSGLIB_CFLAGS) $(GTK_CFLAGS)
+systemadm_CPPFLAGS = $(AM_CPPFLAGS) $(DBUSGLIB_CFLAGS) $(GTK_CFLAGS) $(VALA_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 \
@@ -240,3 +250,12 @@ CLEANFILES = \
 	systemadm.c \
 	systemd-initctl.service \
 	systemd-logger.service
+
+install-data-hook:
+	$(MKDIR_P) -m 0755 \
+		$(DESTDIR)$(pkgsysconfdir)/system \
+		$(DESTDIR)$(pkgsysconfdir)/session \
+		$(DESTDIR)$(sysconfdir)/xdg/systemd \
+		$(DESTDIR)/cgroup/debug
+	rm -f $(DESTDIR)$(sysconfdir)/xdg/systemd/session
+	ln -sf $(DESTDIR)$(pkgsysconfdir)/session $(DESTDIR)$(sysconfdir)/xdg/systemd/session