X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=Makefile.am;h=18f27c42513c707f42cde46466d6e41c476c275a;hp=8ac2c2da4cb154b8f4d853eefa007591b0aa3390;hb=4112df163517478207526e0d3e7278ab1acf1f9f;hpb=47be870bd83fb3719dffc3ee9348a409ab762a14

diff --git a/Makefile.am b/Makefile.am
index 8ac2c2da4..18f27c425 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -17,52 +17,110 @@
 
 ACLOCAL_AMFLAGS = -I m4
 
+pkgsysconfdir=$(sysconfdir)/systemd
+dbuspolicydir=$(sysconfdir)/dbus-1/system.d
+udevrulesdir=/lib/udev/rules.d
+
 AM_CPPFLAGS = \
         -include $(top_builddir)/config.h \
-	-DUNIT_PATH=\"/tmp/does/not/exist\"
+	-DSYSTEM_CONFIG_UNIT_PATH=\"$(pkgsysconfdir)/system\" \
+	-DSYSTEM_DATA_UNIT_PATH=\"$(pkgdatadir)/system\" \
+	-DSYSTEM_SYSVINIT_PATH=\"$(SYSTEM_SYSVINIT_PATH)\" \
+	-DSYSTEM_SYSVRCND_PATH=\"$(SYSTEM_SYSVRCND_PATH)\" \
+	-DSESSION_CONFIG_UNIT_PATH=\"$(pkgsysconfdir)/session\" \
+	-DSESSION_DATA_UNIT_PATH=\"$(pkgdatadir)/session\" \
+	-DCGROUP_AGENT_PATH=\"$(pkglibexecdir)/systemd-cgroups-agent\"
 
 sbin_PROGRAMS = \
 	systemd
 
 bin_PROGRAMS = \
 	systemctl \
-	systemadm \
-	systemd-logger
+	systemadm
+
+pkglibexec_PROGRAMS = \
+	systemd-logger \
+	systemd-cgroups-agent \
+	systemd-initctl
 
 noinst_PROGRAMS = \
 	test-engine \
 	test-job-type
 
+dbuspolicy_DATA = \
+	org.freedesktop.systemd1.conf
+
+udevrules_DATA = \
+	99-systemd.rules
+
+EXTRA_DIST = \
+	org.freedesktop.systemd1.conf
+	99-systemd.rules
+
 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 \
-        ratelimit.c
+        log.h \
+        ratelimit.c \
+        ratelimit.h
 
 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 \
         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-job.c
+        dbus-unit.h \
+        dbus-job.c \
+        dbus-job.h \
+	cgroup.c \
+	cgroup.h \
+	mount-setup.c \
+	mount-setup.h \
+	hostname-setup.c \
+	hostname-setup.h \
+	utmp-wtmp.c \
+	utmp-wtmp.h
 
 systemd_SOURCES = \
 	$(COMMON_SOURCES) \
@@ -71,11 +129,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) \
@@ -95,6 +155,28 @@ systemd_logger_SOURCES = \
 	$(BASIC_SOURCES) \
 	logger.c
 
+systemd_initctl_SOURCES = \
+	$(BASIC_SOURCES) \
+	initctl.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
 
 systemctl_SOURCES = \
@@ -110,3 +192,9 @@ systemadm_SOURCES = \
 
 systemadm_CPPFLAGS = $(AM_CPPFLAGS) $(DBUSGLIB_CFLAGS) $(GTK_CFLAGS)
 systemadm_LDADD = $(DBUSGLIB_LIBS) $(GTK_LIBS)
+
+CLEANFILES = \
+	systemd-interfaces.c \
+	systemctl.c \
+	systemadm.c \
+	systemd-cgroups-agent