units: add missing units

[elogind.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index c89f519438522cc7d81ff8b68731a4a1de1eef5f..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 \
@@ -126,9 +127,11 @@ dist_systemunit_DATA = \
        units/rpcbind.target \
        units/rtc-set.target \
        units/shutdown.target \
+       units/umount.target \
        units/sigpwr.target \
        units/sockets.target \
        units/swap.target \
+       units/dbus.target \
        units/systemd-initctl.socket \
        units/systemd-logger.socket \
        units/dev-hugepages.automount \
@@ -152,8 +155,7 @@ nodist_systemunit_DATA = \
        units/multi-user.target \
        units/systemd-initctl.service \
        units/systemd-logger.service \
-       units/syslog.target \
-       units/dbus.target
+       units/syslog.target
 
 dist_sessionunit_DATA = \
        units/session/default.target
@@ -171,7 +173,6 @@ EXTRA_DIST = \
        units/systemd-initctl.service.in \
        units/systemd-logger.service.in \
        units/syslog.target.in \
-       units/dbus.target.in \
        units/session/exit.service.in \
        systemd.pc.in
 
@@ -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 \
@@ -483,7 +480,8 @@ systemctl_SOURCES = \
        src/systemctl.c \
        src/utmp-wtmp.c \
        src/dbus-common.c \
-       src/cgroup-show.c
+       src/cgroup-show.c \
+       src/cgroup-util.c
 
 systemctl_CFLAGS = \
        $(AM_CFLAGS) \
@@ -516,14 +514,15 @@ systemd_install_CFLAGS = \
 
 systemd_cgls_SOURCES = \
        src/systemd-cgls.c \
-       src/cgroup-show.c
-
-systemd_cgls_LDADD = \
-       libsystemd-basic.la
+       src/cgroup-show.c \
+       src/cgroup-util.c
 
 systemd_cgls_CFLAGS = \
        $(AM_CFLAGS)
 
+systemd_cgls_LDADD = \
+       libsystemd-basic.la
+
 systemadm_SOURCES = \
        src/systemadm.vala \
        src/systemd-interfaces.vala
@@ -553,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 = \
@@ -566,14 +564,12 @@ 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 $@) && \
        $(SED)  -e 's,@rootlibexecdir\@,$(rootlibexecdir),g' \
                -e 's,@SPECIAL_SYSLOG_SERVICE\@,$(SPECIAL_SYSLOG_SERVICE),g' \
-               -e 's,@SPECIAL_DBUS_SERVICE\@,$(SPECIAL_DBUS_SERVICE),g' \
                -e 's,@SYSTEMCTL\@,$(rootbindir)/systemctl,g' \
                -e 's,@pkgsysconfdir\@,$(pkgsysconfdir),g' \
                -e 's,@pkgdatadir\@,$(pkgdatadir),g' \
@@ -761,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 )
@@ -771,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 )
@@ -794,3 +794,11 @@ DISTCHECK_CONFIGURE_FLAGS = \
        --with-udevrulesdir=$$dc_install_base/$(udevrulesdir) \
        --with-pamlibdir=$$dc_install_base/$(pamlibdir) \
        --with-rootdir=$$dc_install_base/$(rootdir)
+
+upload: all distcheck
+       cp -v systemd-$(VERSION).tar.bz2 /home/lennart/cvs.fedora/systemd/devel/
+       scp systemd-$(VERSION).tar.bz2 fdo:/srv/www.freedesktop.org/www/software/systemd/
+       scp man/*.html tango:public/systemd-man/
+
+git-tag:
+       git tag "v$(VERSION)" -m "systemd $(VERSION)"