X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=Makefile.am;h=c89f519438522cc7d81ff8b68731a4a1de1eef5f;hp=e76eee43e9c1ffd29e627152eacff4269038ab8e;hb=39280feb5723861ec52dfe889d4e09096f063dff;hpb=83698d60db0edeff364717c48b93b74036a17449

diff --git a/Makefile.am b/Makefile.am
index e76eee43e..c89f51943 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -58,7 +58,8 @@ rootbin_PROGRAMS = \
 	systemd-notify
 
 bin_PROGRAMS = \
-	systemd-install
+	systemd-install \
+	systemd-cgls
 
 if HAVE_GTK
 bin_PROGRAMS += \
@@ -312,13 +313,15 @@ EXTRA_DIST += \
 	src/sd-daemon.h \
 	src/special.h \
 	src/dbus-common.h \
-	src/bus-errors.h
+	src/bus-errors.h \
+	src/cgroup-show.h
 
 MANPAGES = \
 	man/systemd.1 \
 	man/systemctl.1 \
 	man/systemadm.1 \
 	man/systemd-install.1 \
+	man/systemd-cgls.1 \
 	man/systemd-notify.1 \
 	man/sd_notify.3 \
 	man/sd_booted.3 \
@@ -479,7 +482,8 @@ systemd_cgroups_agent_LDADD = \
 systemctl_SOURCES = \
 	src/systemctl.c \
 	src/utmp-wtmp.c \
-	src/dbus-common.c
+	src/dbus-common.c \
+	src/cgroup-show.c
 
 systemctl_CFLAGS = \
 	$(AM_CFLAGS) \
@@ -499,7 +503,8 @@ systemd_notify_LDADD = \
 systemd_install_SOURCES = \
 	src/install.c \
 	src/path-lookup.c \
-	src/dbus-common.c
+	src/dbus-common.c \
+	src/sd-daemon.c
 
 systemd_install_LDADD = \
 	libsystemd-basic.la \
@@ -509,6 +514,16 @@ systemd_install_CFLAGS = \
 	$(AM_CFLAGS) \
 	$(DBUS_CFLAGS)
 
+systemd_cgls_SOURCES = \
+	src/systemd-cgls.c \
+	src/cgroup-show.c
+
+systemd_cgls_LDADD = \
+	libsystemd-basic.la
+
+systemd_cgls_CFLAGS = \
+	$(AM_CFLAGS)
+
 systemadm_SOURCES = \
 	src/systemadm.vala \
 	src/systemd-interfaces.vala
@@ -671,7 +686,7 @@ CLEANFILES += \
 endif
 
 org.freedesktop.systemd1.%.xml: systemd
-	$(AM_V_GEN)./systemd --introspect=${@:.xml=} > $@
+	$(AM_V_GEN)SYSTEMD_SKIP_API_MOUNTS=1 ./systemd --introspect=${@:.xml=} > $@
 
 CLEANFILES += \
 	$(dbusinterface_DATA)