X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=Makefile.am;h=52339718a1d0fcd3ba0ddd11b9352963797cc63e;hp=435f00d663de5cdb08386e2d8b3fd7b064c97fc9;hb=58c16a1a3c49471e77393ab7dd92b10603c744b4;hpb=9a1ac7b9ae2fb218170d1bd106d5351a76d03a95

diff --git a/Makefile.am b/Makefile.am
index 435f00d66..52339718a 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -38,10 +38,12 @@ systemunitdir=$(rootdir)/lib/systemd/system
 
 AM_CPPFLAGS = \
         -include $(top_builddir)/config.h \
+	-DSYSTEM_CONFIG_FILE=\"$(pkgsysconfdir)/system.conf\" \
 	-DSYSTEM_CONFIG_UNIT_PATH=\"$(pkgsysconfdir)/system\" \
 	-DSYSTEM_DATA_UNIT_PATH=\"$(systemunitdir)\" \
 	-DSYSTEM_SYSVINIT_PATH=\"$(SYSTEM_SYSVINIT_PATH)\" \
 	-DSYSTEM_SYSVRCND_PATH=\"$(SYSTEM_SYSVRCND_PATH)\" \
+	-DSESSION_CONFIG_FILE=\"$(pkgsysconfdir)/session.conf\" \
 	-DSESSION_CONFIG_UNIT_PATH=\"$(pkgsysconfdir)/session\" \
 	-DSESSION_DATA_UNIT_PATH=\"$(sessionunitdir)\" \
 	-DCGROUP_AGENT_PATH=\"$(rootlibexecdir)/systemd-cgroups-agent\" \
@@ -56,7 +58,8 @@ rootbin_PROGRAMS = \
 	systemd-notify
 
 bin_PROGRAMS = \
-	systemd-install
+	systemd-install \
+	systemd-cgls
 
 if HAVE_GTK
 bin_PROGRAMS += \
@@ -81,6 +84,9 @@ pamlib_LTLIBRARIES = \
 	pam_systemd.la
 endif
 
+dist_pkgsysconf_DATA = \
+	src/system.conf
+
 dist_dbuspolicy_DATA = \
 	src/org.freedesktop.systemd1.conf
 
@@ -267,6 +273,7 @@ libsystemd_core_la_SOURCES = \
 	src/hostname-setup.c \
 	src/loopback-setup.c \
 	src/kmod-setup.c \
+	src/modprobe-setup.c \
 	src/utmp-wtmp.c \
 	src/specifier.c \
 	src/unit-name.c \
@@ -305,13 +312,16 @@ EXTRA_DIST += \
 	src/initreq.h \
 	src/sd-daemon.h \
 	src/special.h \
-	src/dbus.common.h
+	src/dbus-common.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 \
@@ -335,7 +345,8 @@ MANPAGES = \
 	man/telinit.8 \
 	man/halt.8 \
 	man/shutdown.8 \
-	man/pam_systemd.8
+	man/pam_systemd.8 \
+	man/systemd.conf.5
 
 MANPAGES_ALIAS = \
 	man/reboot.8 \
@@ -446,7 +457,8 @@ systemd_logger_LDADD = \
 
 systemd_initctl_SOURCES = \
 	src/initctl.c \
-	src/sd-daemon.c
+	src/sd-daemon.c \
+	src/dbus-common.c
 
 systemd_initctl_CFLAGS = \
 	$(AM_CFLAGS) \
@@ -470,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) \
@@ -490,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 \
@@ -500,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
@@ -743,7 +767,7 @@ if TARGET_FEDORA
 		$(LN_S) $(systemunitdir)/prefdm.service display-manager.service )
 	( cd $(DESTDIR)$(pkgsysconfdir)/system/graphical.target.wants && \
 		rm -f prefdm.service && \
-		$(LN_S) ../prefdm.service prefdm.service )
+		$(LN_S) $(systemunitdir)/prefdm.service prefdm.service )
 	( cd $(DESTDIR)$(pkgsysconfdir)/system/multi-user.target.wants && \
 		rm -f rc-local.service && \
 		$(LN_S) $(systemunitdir)/rc-local.service rc-local.service )
@@ -758,8 +782,8 @@ if TARGET_GENTOO
 		rm -f display-manager.service && \
 		$(LN_S) $(systemunitdir)/xdm.service display-manager.service )
 	( cd $(DESTDIR)$(pkgsysconfdir)/system/graphical.target.wants && \
-		rm -f prefdm.service && \
-		$(LN_S) ../prefdm.service prefdm.service )
+		rm -f xdm.service && \
+		$(LN_S) $(systemunitdir)/xdm.service xdm.service )
 endif
 
 DISTCHECK_CONFIGURE_FLAGS = \