X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?a=blobdiff_plain;f=Makefile.am;h=8cad1420e0f239ef17b328c808d11b558aafc70f;hb=6dde1f33e1249a8a6b354372dd95065f26b8c712;hp=fd5dede5e0420e8481c039c5009873726aecbde3;hpb=0571e0111d76cf96aa4069d9c7a6e24d97aa7e48;p=elogind.git

diff --git a/Makefile.am b/Makefile.am
index fd5dede5e..8cad1420e 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -18,15 +18,20 @@
 ACLOCAL_AMFLAGS = -I m4
 
 pkgsysconfdir=$(sysconfdir)/systemd
+dbuspolicydir=$(sysconfdir)/dbus-1/system.d
+udevrulesdir=/lib/udev/rules.d
+
+systemunitdir=$(pkgdatadir)/system
+sessionunitdir=$(pkgdatadir)/system
 
 AM_CPPFLAGS = \
         -include $(top_builddir)/config.h \
 	-DSYSTEM_CONFIG_UNIT_PATH=\"$(pkgsysconfdir)/system\" \
-	-DSYSTEM_DATA_UNIT_PATH=\"$(pkgdatadir)/system\" \
+	-DSYSTEM_DATA_UNIT_PATH=\"$(systemunitdir)\" \
 	-DSYSTEM_SYSVINIT_PATH=\"$(SYSTEM_SYSVINIT_PATH)\" \
-	-DSYSTEM_RCND_PATH=\"$(SYSTEM_SYSVRCND_PATH)\" \
+	-DSYSTEM_SYSVRCND_PATH=\"$(SYSTEM_SYSVRCND_PATH)\" \
 	-DSESSION_CONFIG_UNIT_PATH=\"$(pkgsysconfdir)/session\" \
-	-DSESSION_DATA_UNIT_PATH=\"$(pkgdatadir)/session\" \
+	-DSESSION_DATA_UNIT_PATH=\"$(sessionunitdir)\" \
 	-DCGROUP_AGENT_PATH=\"$(pkglibexecdir)/systemd-cgroups-agent\"
 
 sbin_PROGRAMS = \
@@ -45,6 +50,28 @@ noinst_PROGRAMS = \
 	test-engine \
 	test-job-type
 
+dbuspolicy_DATA = \
+	org.freedesktop.systemd1.conf
+
+udevrules_DATA = \
+	99-systemd.rules
+
+systemunit_DATA = \
+	units/emergency.service \
+	systemd-initctl.service \
+	units/systemd-initctl.socket \
+	systemd-logger.service \
+	units/systemd-logger.socket
+
+EXTRA_DIST = \
+	org.freedesktop.systemd1.conf \
+	99-systemd.rules \
+	units/emergency.service \
+	units/systemd-initctl.service.in \
+	units/systemd-initctl.socket \
+	units/systemd-logger.service.in \
+	units/systemd-logger.socket
+
 BASIC_SOURCES= \
         util.c \
         util.h \
@@ -104,7 +131,15 @@ COMMON_SOURCES= \
 	cgroup.c \
 	cgroup.h \
 	mount-setup.c \
-	mount-setup.h
+	mount-setup.h \
+	hostname-setup.c \
+	hostname-setup.h \
+	utmp-wtmp.c \
+	utmp-wtmp.h \
+	specifier.c \
+	specifier.h \
+	unit-name.c \
+	unit-name.h
 
 systemd_SOURCES = \
 	$(COMMON_SOURCES) \
@@ -177,8 +212,15 @@ systemadm_SOURCES = \
 systemadm_CPPFLAGS = $(AM_CPPFLAGS) $(DBUSGLIB_CFLAGS) $(GTK_CFLAGS)
 systemadm_LDADD = $(DBUSGLIB_LIBS) $(GTK_LIBS)
 
+systemd-initctl.service: units/systemd-initctl.service.in Makefile
+	sed -e 's,@libexecdir\@,$(libexecdir),g' < $< > $@
+
+systemd-logger.service: units/systemd-logger.service.in Makefile
+	sed -e 's,@libexecdir\@,$(libexecdir),g' < $< > $@
+
 CLEANFILES = \
 	systemd-interfaces.c \
 	systemctl.c \
 	systemadm.c \
-	systemd-cgroups-agent
+	systemd-initctl.service \
+	systemd-logger.service