units: introduce umount.target for unmounting all file systems

[elogind.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index fd02db3d096be804ec8c6596cdeae32591deb5b7..57b8aa525c881957cfedf162c901135a039b2b93 100644 (file)
--- 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\" \
@@ -56,7 +58,8 @@ rootbin_PROGRAMS = \
        systemd-notify
 
 bin_PROGRAMS = \
-       systemd-install
+       systemd-install \
+       systemd-cgls
 
 if HAVE_GTK
 bin_PROGRAMS += \
@@ -81,6 +84,9 @@ pamlib_LTLIBRARIES = \
        pam_systemd.la
 endif
 
+dist_pkgsysconf_DATA = \
+       src/system.conf
+
 dist_dbuspolicy_DATA = \
        src/org.freedesktop.systemd1.conf
 
@@ -120,9 +126,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 \
@@ -146,8 +154,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
@@ -165,7 +172,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
 
@@ -306,13 +312,16 @@ EXTRA_DIST += \
        src/initreq.h \
        src/sd-daemon.h \
        src/special.h \
-       src/dbus-common.h
+       src/dbus-common.h \
+       src/bus-errors.h \
+       src/cgroup-show.h
 
 MANPAGES = \
        man/systemd.1 \
        man/systemctl.1 \
        man/systemadm.1 \
        man/systemd-install.1 \
+       man/systemd-cgls.1 \
        man/systemd-notify.1 \
        man/sd_notify.3 \
        man/sd_booted.3 \
@@ -336,7 +345,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 \
@@ -447,7 +457,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) \
@@ -471,7 +482,8 @@ systemd_cgroups_agent_LDADD = \
 systemctl_SOURCES = \
        src/systemctl.c \
        src/utmp-wtmp.c \
-       src/dbus-common.c
+       src/dbus-common.c \
+       src/cgroup-show.c
 
 systemctl_CFLAGS = \
        $(AM_CFLAGS) \
@@ -491,7 +503,8 @@ systemd_notify_LDADD = \
 systemd_install_SOURCES = \
        src/install.c \
        src/path-lookup.c \
-       src/dbus-common.c
+       src/dbus-common.c \
+       src/sd-daemon.c
 
 systemd_install_LDADD = \
        libsystemd-basic.la \
@@ -501,6 +514,16 @@ systemd_install_CFLAGS = \
        $(AM_CFLAGS) \
        $(DBUS_CFLAGS)
 
+systemd_cgls_SOURCES = \
+       src/systemd-cgls.c \
+       src/cgroup-show.c
+
+systemd_cgls_LDADD = \
+       libsystemd-basic.la
+
+systemd_cgls_CFLAGS = \
+       $(AM_CFLAGS)
+
 systemadm_SOURCES = \
        src/systemadm.vala \
        src/systemd-interfaces.vala
@@ -550,7 +573,6 @@ 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' \
@@ -663,7 +685,7 @@ CLEANFILES += \
 endif
 
 org.freedesktop.systemd1.%.xml: systemd
-       $(AM_V_GEN)./systemd --introspect=${@:.xml=} > $@
+       $(AM_V_GEN)SYSTEMD_SKIP_API_MOUNTS=1 ./systemd --introspect=${@:.xml=} > $@
 
 CLEANFILES += \
        $(dbusinterface_DATA)
@@ -744,7 +766,7 @@ if TARGET_FEDORA
                $(LN_S) $(systemunitdir)/prefdm.service display-manager.service )
        ( cd $(DESTDIR)$(pkgsysconfdir)/system/graphical.target.wants && \
                rm -f prefdm.service && \
-               $(LN_S) ../prefdm.service prefdm.service )
+               $(LN_S) $(systemunitdir)/prefdm.service prefdm.service )
        ( cd $(DESTDIR)$(pkgsysconfdir)/system/multi-user.target.wants && \
                rm -f rc-local.service && \
                $(LN_S) $(systemunitdir)/rc-local.service rc-local.service )
@@ -759,8 +781,8 @@ if TARGET_GENTOO
                rm -f display-manager.service && \
                $(LN_S) $(systemunitdir)/xdm.service display-manager.service )
        ( cd $(DESTDIR)$(pkgsysconfdir)/system/graphical.target.wants && \
-               rm -f prefdm.service && \
-               $(LN_S) ../prefdm.service prefdm.service )
+               rm -f xdm.service && \
+               $(LN_S) $(systemunitdir)/xdm.service xdm.service )
 endif
 
 DISTCHECK_CONFIGURE_FLAGS = \
@@ -771,3 +793,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)"