mount: only add those mount points to localfs.target as Wants that are marked for us

[elogind.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 0c0e4def248378a8b8345b79e726e66788b7a1e9..361786983d9e49ab90a1233b941804af31169697 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -18,14 +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_SYSVINIT_PATH=\"$(sysconfdir)/init.d\" \
+       -DSYSTEM_DATA_UNIT_PATH=\"$(systemunitdir)\" \
+       -DSYSTEM_SYSVINIT_PATH=\"$(SYSTEM_SYSVINIT_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 = \
@@ -44,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 \
@@ -103,7 +131,11 @@ 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
 
 systemd_SOURCES = \
        $(COMMON_SOURCES) \
@@ -176,8 +208,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