X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=Makefile.am;h=b444c02f3026e6ce37ed464866675e07b530d7c2;hb=b3eaa6288107210a84d6d121036fb4b2f7283ee2;hp=d1ce02c849c7a9ab3e7b0b553e6ce4fe2ab1f099;hpb=af65a09126e216d468592f069aee50dfe0382d3a;p=elogind.git

diff --git a/Makefile.am b/Makefile.am
index d1ce02c84..b444c02f3 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\" \
@@ -81,6 +83,9 @@ pamlib_LTLIBRARIES = \
 	pam_systemd.la
 endif
 
+dist_pkgsysconf_DATA = \
+	src/system.conf
+
 dist_dbuspolicy_DATA = \
 	src/org.freedesktop.systemd1.conf
 
@@ -219,10 +224,6 @@ noinst_LTLIBRARIES = \
 	libsystemd-basic.la \
 	libsystemd-core.la
 
-# 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.
-
 libsystemd_basic_la_SOURCES = \
         src/util.c \
         src/hashmap.c \
@@ -271,6 +272,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 \
@@ -293,6 +295,10 @@ libsystemd_core_la_LIBADD = \
 	$(LIBWRAP_LIBS) \
 	$(PAM_LIBS)
 
+# 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.
+
 EXTRA_DIST += \
 	${libsystemd_basic_la_SOURCES:.c=.h} \
 	${libsystemd_core_la_SOURCES:.c=.h} \
@@ -304,8 +310,8 @@ EXTRA_DIST += \
 	src/linux/auto_dev-ioctl.h \
 	src/initreq.h \
 	src/sd-daemon.h \
-	src/special.h
-
+	src/special.h \
+	src/dbus-common.h
 
 MANPAGES = \
 	man/systemd.1 \
@@ -335,7 +341,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 +453,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) \
@@ -469,7 +477,8 @@ systemd_cgroups_agent_LDADD = \
 
 systemctl_SOURCES = \
 	src/systemctl.c \
-	src/utmp-wtmp.c
+	src/utmp-wtmp.c \
+	src/dbus-common.c
 
 systemctl_CFLAGS = \
 	$(AM_CFLAGS) \
@@ -488,12 +497,13 @@ systemd_notify_LDADD = \
 
 systemd_install_SOURCES = \
 	src/install.c \
-	src/path-lookup.c
+	src/path-lookup.c \
+	src/dbus-common.c
 
 systemd_install_LDADD = \
-	libsystemd-basic.la
+	libsystemd-basic.la \
+	$(DBUS_LIBS)
 
-# We don't really link here against D-Bus, however we indirectly include D-Bus header files
 systemd_install_CFLAGS = \
 	$(AM_CFLAGS) \
 	$(DBUS_CFLAGS)