X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=Makefile.am;h=c676712e969d4a907ba1677fcbfa23875a7e4deb;hp=3fc221c7f0549941c657212851048d2e3c10ac2c;hb=e9da3678fcfc774b325dc1eaa054d0e00028a1fc;hpb=036643a247c659db8e1b3df1778d51553a816ec9

diff --git a/Makefile.am b/Makefile.am
index 3fc221c7f..c676712e9 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -17,29 +17,75 @@
 
 ACLOCAL_AMFLAGS = -I m4
 
+dbuspolicydir=$(sysconfdir)/dbus-1/system.d
+udevrulesdir=@udevrulesdir@
+
 pkgsysconfdir=$(sysconfdir)/systemd
+systemunitdir=$(pkgdatadir)/system
+sessionunitdir=$(pkgdatadir)/session
 
 AM_CPPFLAGS = \
         -include $(top_builddir)/config.h \
 	-DSYSTEM_CONFIG_UNIT_PATH=\"$(pkgsysconfdir)/system\" \
-	-DSYSTEM_DATA_UNIT_PATH=\"$(pkgdatadir)/system\" \
-	-DSYSTEM_SYSVINIT_PATH=\"$(sysconfdir)/init.d\" \
+	-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\"
+	-DSESSION_DATA_UNIT_PATH=\"$(sessionunitdir)\" \
+	-DCGROUP_AGENT_PATH=\"$(pkglibexecdir)/systemd-cgroups-agent\" \
+	-DSYSTEMD_BINARY_PATH=\"$(sbindir)/systemd\"
+
+VALA_CFLAGS = \
+	-Wno-unused-variable \
+	-Wno-unused-function
 
 sbin_PROGRAMS = \
 	systemd
 
 bin_PROGRAMS = \
-	systemctl \
-	systemadm \
-	systemd-logger
+	systemctl
+
+if HAVE_GTK
+bin_PROGRAMS += \
+	systemadm
+endif
+
+pkglibexec_PROGRAMS = \
+	systemd-logger \
+	systemd-cgroups-agent \
+	systemd-initctl
 
 noinst_PROGRAMS = \
 	test-engine \
-	test-job-type
+	test-job-type \
+	test-ns \
+	test-loopback
+
+dist_dbuspolicy_DATA = \
+	org.freedesktop.systemd1.conf
 
-BASIC_SOURCES= \
+dist_udevrules_DATA = \
+	99-systemd.rules
+
+dist_systemunit_DATA = \
+	units/emergency.service \
+	units/systemd-initctl.socket \
+	units/systemd-logger.socket
+
+systemunit_DATA = \
+	systemd-initctl.service \
+	systemd-logger.service
+
+EXTRA_DIST = \
+	units/systemd-initctl.service.in \
+	units/systemd-logger.service.in \
+	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 \
         hashmap.c \
         set.c \
@@ -49,7 +95,7 @@ BASIC_SOURCES= \
         log.c \
         ratelimit.c
 
-COMMON_SOURCES= \
+COMMON_SOURCES = \
 	$(BASIC_SOURCES) \
 	unit.c \
         job.c \
@@ -58,6 +104,7 @@ COMMON_SOURCES= \
         service.c \
         automount.c \
         mount.c \
+        swap.c \
         device.c \
         target.c \
         snapshot.c \
@@ -68,7 +115,51 @@ COMMON_SOURCES= \
         dbus.c \
         dbus-manager.c \
         dbus-unit.c \
-        dbus-job.c
+        dbus-job.c \
+	dbus-service.c \
+	dbus-socket.c \
+	dbus-target.c \
+	dbus-mount.c \
+	dbus-automount.c \
+	dbus-swap.c \
+	dbus-snapshot.c \
+	dbus-device.c \
+	dbus-execute.c \
+	cgroup.c \
+	mount-setup.c \
+	hostname-setup.c \
+	loopback-setup.c \
+	utmp-wtmp.c \
+	specifier.c \
+	unit-name.c \
+	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 \
+	sd-daemon.h
+
+dist_man_MANS = \
+	systemd.unit.5 \
+	systemd.service.5
+
+HTMLMANS = \
+	systemd.unit.html \
+	systemd.service.html
+
+dist_noinst_DATA = \
+	$(HTMLMANS)
+
+EXTRA_DIST += \
+	man/systemd.unit.xml \
+	man/systemd.service.xml
 
 systemd_SOURCES = \
 	$(COMMON_SOURCES) \
@@ -77,11 +168,13 @@ systemd_SOURCES = \
 systemd_CPPFLAGS = \
 	$(AM_CPPFLAGS) \
 	$(DBUS_CFLAGS) \
-	$(UDEV_CFLAGS)
+	$(UDEV_CFLAGS) \
+	$(CGROUP_CFLAGS)
 
 systemd_LDADD = \
 	$(DBUS_LIBS) \
-	$(UDEV_LIBS)
+	$(UDEV_LIBS) \
+	$(CGROUP_LIBS)
 
 test_engine_SOURCES = \
 	$(COMMON_SOURCES) \
@@ -97,27 +190,106 @@ 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
+	logger.c \
+	sd-daemon.c
+
+systemd_initctl_SOURCES = \
+	$(BASIC_SOURCES) \
+	initctl.c \
+	sd-daemon.c
+
+systemd_initctl_CPPFLAGS = \
+	$(AM_CPPFLAGS) \
+	$(DBUS_CFLAGS)
+
+systemd_initctl_LDADD = \
+	$(DBUS_LIBS)
+
+systemd_cgroups_agent_SOURCES = \
+	$(BASIC_SOURCES) \
+	cgroups-agent.c
+
+systemd_cgroups_agent_CPPFLAGS = \
+	$(AM_CPPFLAGS) \
+	$(DBUS_CFLAGS)
+
+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' \
+		-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
+	systemadm.c \
+	systemd-initctl.service \
+	systemd-logger.service
+
+if HAVE_XSLTPROC
+%.5: man/%.xml
+	$(XSLTPROC) -o $@ -nonet http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl $<
+
+%.html: man/%.xml
+	$(XSLTPROC) -o $@ -nonet http://docbook.sourceforge.net/release/xsl/current/xhtml-1_1/docbook.xsl $<
+
+CLEANFILES += \
+	$(dist_man_MANS) \
+	$(HTMLMANS)
+endif
+
+install-data-hook:
+	$(MKDIR_P) -m 0755 \
+		$(DESTDIR)$(systemunitdir) \
+		$(DESTDIR)$(sessionunitdir) \
+		$(DESTDIR)$(pkgsysconfdir)/system \
+		$(DESTDIR)$(pkgsysconfdir)/session \
+		$(DESTDIR)$(sysconfdir)/xdg/systemd \
+		$(DESTDIR)/cgroup/debug
+	( cd $(DESTDIR)$(sysconfdir)/xdg/systemd/ && \
+		rm -f session && \
+		$(LN_S) $(DESTDIR)$(pkgsysconfdir)/session session )
+
+DISTCHECK_CONFIGURE_FLAGS = \
+	--with-udevrulesdir=$$dc_install_base/$(udevrulesdir)