units: add missing units

[elogind.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 422d37ee68843014c73ab3dfaa2ce74a27ce3b6e..51fe5a946139c47d7e6461f131de357c0339fdb6 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -113,6 +113,7 @@ dbusinterface_DATA = \
 
 dist_systemunit_DATA = \
        units/emergency.service \
+       units/emergency.target \
        units/basic.target \
        units/getty.target \
        units/halt.target \
@@ -183,7 +184,8 @@ dist_systemunit_DATA += \
        units/fedora/prefdm.service \
        units/fedora/rc-local.service \
        units/fedora/reboot.service \
-       units/fedora/sysinit.service
+       units/fedora/sysinit.service \
+       units/fedora/single.service
 endif
 
 if TARGET_SUSE
@@ -285,14 +287,12 @@ libsystemd_core_la_SOURCES = \
 libsystemd_core_la_CFLAGS = \
        $(AM_CFLAGS) \
        $(DBUS_CFLAGS) \
-       $(UDEV_CFLAGS) \
-       $(CGROUP_CFLAGS)
+       $(UDEV_CFLAGS)
 
 libsystemd_core_la_LIBADD = \
        libsystemd-basic.la \
        $(DBUS_LIBS) \
        $(UDEV_LIBS) \
-       $(CGROUP_LIBS) \
        $(LIBWRAP_LIBS) \
        $(PAM_LIBS)
 
@@ -396,8 +396,7 @@ systemd_SOURCES = \
 systemd_CFLAGS = \
        $(AM_CFLAGS) \
        $(DBUS_CFLAGS) \
-       $(UDEV_CFLAGS) \
-       $(CGROUP_CFLAGS)
+       $(UDEV_CFLAGS)
 
 systemd_LDADD = \
        libsystemd-core.la
@@ -439,12 +438,10 @@ test_cgroup_SOURCES = \
        src/cgroup-util.c
 
 test_cgroup_CFLAGS = \
-       $(AM_CFLAGS) \
-       $(CGROUP_CFLAGS)
+       $(AM_CFLAGS)
 
 test_cgroup_LDADD = \
-       libsystemd-basic.la \
-       $(CGROUP_LIBS)
+       libsystemd-basic.la
 
 systemd_logger_SOURCES = \
        src/logger.c \
@@ -488,13 +485,11 @@ systemctl_SOURCES = \
 
 systemctl_CFLAGS = \
        $(AM_CFLAGS) \
-       $(DBUS_CFLAGS) \
-       $(CGROUP_CLAGS)
+       $(DBUS_CFLAGS)
 
 systemctl_LDADD = \
        libsystemd-basic.la \
-       $(DBUS_LIBS) \
-       $(CGROUP_LIBS)
+       $(DBUS_LIBS)
 
 systemd_notify_SOURCES = \
        src/notify.c \
@@ -523,12 +518,10 @@ systemd_cgls_SOURCES = \
        src/cgroup-util.c
 
 systemd_cgls_CFLAGS = \
-       $(AM_CFLAGS) \
-       $(CGROUP_CLAGS)
+       $(AM_CFLAGS)
 
 systemd_cgls_LDADD = \
-       libsystemd-basic.la \
-       $(CGROUP_LIBS)
+       libsystemd-basic.la
 
 systemadm_SOURCES = \
        src/systemadm.vala \
@@ -559,8 +552,7 @@ pam_systemd_la_SOURCES = \
        src/sd-daemon.c
 
 pam_systemd_la_CFLAGS = \
-       $(AM_CFLAGS) \
-       $(CGROUP_CFLAGS) \
+       $(AM_CFLAGS)
        -fvisibility=hidden
 
 pam_systemd_la_LDFLAGS = \
@@ -572,8 +564,7 @@ pam_systemd_la_LDFLAGS = \
 
 pam_systemd_la_LIBADD = \
        libsystemd-basic.la \
-       $(PAM_LIBS) \
-       $(CGROUP_LIBS)
+       $(PAM_LIBS)
 
 SED_PROCESS = \
        $(AM_V_GEN)$(MKDIR_P) $(dir $@) && \
@@ -766,7 +757,8 @@ install-data-hook:
                $(LN_S) ../system-services/org.freedesktop.systemd1.service org.freedesktop.systemd1.service )
 if TARGET_FEDORA
        $(MKDIR_P) -m 0755 \
-               $(DESTDIR)$(SYSTEM_SYSVINIT_PATH)
+               $(DESTDIR)$(SYSTEM_SYSVINIT_PATH) \
+               $(DESTDIR)$(systemunitdir)/rescue.target.wants
        ( cd $(DESTDIR)$(pkgsysconfdir)/system && \
                rm -f display-manager.service && \
                $(LN_S) $(systemunitdir)/prefdm.service display-manager.service )
@@ -776,6 +768,9 @@ if TARGET_FEDORA
        ( cd $(DESTDIR)$(pkgsysconfdir)/system/multi-user.target.wants && \
                rm -f rc-local.service && \
                $(LN_S) $(systemunitdir)/rc-local.service rc-local.service )
+       ( cd $(DESTDIR)$(systemunitdir)/rescue.target.wants && \
+               rm -f single.service && \
+               $(LN_S) $(systemunitdir)/single.service single.service )
        ( cd $(DESTDIR)$(systemunitdir) && \
                rm -f local.service && \
                $(LN_S) rc-local.service local.service )