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

diff --git a/Makefile.am b/Makefile.am
index 3fc221c7f..57a2dd98d 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -25,15 +25,19 @@ AM_CPPFLAGS = \
 	-DSYSTEM_DATA_UNIT_PATH=\"$(pkgdatadir)/system\" \
 	-DSYSTEM_SYSVINIT_PATH=\"$(sysconfdir)/init.d\" \
 	-DSESSION_CONFIG_UNIT_PATH=\"$(pkgsysconfdir)/session\" \
-	-DSESSION_DATA_UNIT_PATH=\"$(pkgdatadir)/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
 
 noinst_PROGRAMS = \
 	test-engine \
@@ -41,34 +45,64 @@ noinst_PROGRAMS = \
 
 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
 
 systemd_SOURCES = \
 	$(COMMON_SOURCES) \
@@ -77,11 +111,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) \
@@ -101,6 +137,17 @@ systemd_logger_SOURCES = \
 	$(BASIC_SOURCES) \
 	logger.c
 
+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 = \
@@ -120,4 +167,5 @@ systemadm_LDADD = $(DBUSGLIB_LIBS) $(GTK_LIBS)
 CLEANFILES = \
 	systemd-interfaces.c \
 	systemctl.c \
-	systemadm.c
+	systemadm.c \
+	systemd-cgroups-agent