chiark / gitweb /
service: when start is repeated too often, consider that failure
[elogind.git] / Makefile.am
index 973c08e4cee4a4a6fa08e7d056c3ac8946a059c4..8313e57ff7b40060eedc261ffcb0ca6b58ee313e 100644 (file)
@@ -82,7 +82,16 @@ dist_systemunit_DATA = \
        units/sockets.target \
        units/swap.target \
        units/systemd-initctl.socket \
-       units/systemd-logger.socket
+       units/systemd-logger.socket \
+       units/dev-hugepages.automount \
+       units/dev-hugepages.mount \
+       units/dev-mqueue.automount \
+       units/dev-mqueue.mount \
+       units/proc-sys-fs-binfmt_misc.automount \
+       units/proc-sys-fs-binfmt_misc.mount \
+       units/sys-kernel-debug.automount \
+       units/sys-kernel-debug.mount \
+       units/var-run.mount
 
 systemunit_DATA = \
        units/basic.target \
@@ -93,16 +102,24 @@ systemunit_DATA = \
        units/systemd-logger.service \
        units/syslog.target
 
+dist_sessionunit_DATA = \
+       units/session/default.target
+
+sessionunit_DATA = \
+       units/session/remote-fs.target
+
 EXTRA_DIST = \
        units/basic.target.m4 \
        units/getty@.service.m4 \
        units/graphical.target.m4 \
        units/multi-user.target.m4 \
+       units/remote-fs.target.m4 \
        units/systemd-initctl.service.in \
        units/systemd-logger.service.in \
        units/syslog.target.in \
        LICENSE \
-       README
+       README \
+       DISTRO_PORTING
 
 if TARGET_FEDORA
 dist_systemunit_DATA += \
@@ -115,6 +132,15 @@ dist_systemunit_DATA += \
        units/fedora/sysinit.service
 endif
 
+if TARGET_GENTOO
+dist_systemunit_DATA += \
+       units/gentoo/halt.service \
+       units/gentoo/killall.service \
+       units/gentoo/poweroff.service \
+       units/gentoo/reboot.service \
+       units/gentoo/xdm.service
+endif
+
 # This is needed because automake is buggy in how it generates the
 # rules for C programs, but not Vala programs.  We therefore can't
 # list the .h files as dependencies if we want make dist to work.
@@ -181,21 +207,24 @@ EXTRA_DIST += \
 
 dist_man_MANS = \
        man/systemd.unit.5 \
-       man/systemd.service.5 \
+       man/systemd.service.5
+
+nodist_man_MANS = \
        man/systemd.special.7
 
-HTMLMANS = \
+dist_noinst_DATA = \
        man/systemd.unit.html \
-       man/systemd.service.html \
-       man/systemd.special.html
+       man/systemd.service.html
 
-dist_noinst_DATA = \
-       $(HTMLMANS)
+nodist_noinst_DATA = \
+       man/systemd.special.html
 
 EXTRA_DIST += \
        man/systemd.unit.xml \
        man/systemd.service.xml \
-       man/systemd.special.xml
+       man/systemd.special.xml.in \
+       man/systemd.special.7.in \
+       man/systemd.special.html.in
 
 systemd_SOURCES = \
        $(COMMON_SOURCES) \
@@ -300,67 +329,95 @@ systemadm_CPPFLAGS = $(AM_CPPFLAGS) $(DBUSGLIB_CFLAGS) $(GTK_CFLAGS) $(VALA_CFLA
 systemadm_LDADD = $(DBUSGLIB_LIBS) $(GTK_LIBS)
 
 SED_PROCESS = \
-       $(MKDIR_P) units && \
+       $(AM_V_GEN)$(MKDIR_P) $(dir $@) && \
        $(SED)  -e 's,@libexecdir\@,$(libexecdir),g' \
                -e 's,@pkglibexecdir\@,$(pkglibexecdir),g' \
                -e 's,@SPECIAL_SYSLOG_SERVICE\@,$(SPECIAL_SYSLOG_SERVICE),g' \
                < $< > $@
 
-units/systemd-initctl.service: units/systemd-initctl.service.in Makefile
+units/%: units/%.in Makefile
        $(SED_PROCESS)
 
-units/systemd-logger.service: units/systemd-logger.service.in Makefile
+man/%: man/%.in Makefile
        $(SED_PROCESS)
 
-units/syslog.target: units/syslog.target.in Makefile
-       $(SED_PROCESS)
-
-M4_FLAGS =
-
-if TARGET_FEDORA
-M4_FLAGS += -DTARGET_FEDORA=1
-endif
+M4_PROCESS_SYSTEM = \
+       $(AM_V_GEN)$(MKDIR_P) $(dir $@) && \
+       $(M4) -P $(M4_DISTRO_FLAG) -DFOR_SYSTEM=1 < $< > $@
 
-M4_PROCESS = \
-       $(MKDIR_P) units && \
-       $(M4) -P $(M4_FLAGS) < $< > $@
+M4_PROCESS_SESSION = \
+       $(AM_V_GEN)$(MKDIR_P) $(dir $@) && \
+       $(M4) -P $(M4_DISTRO_FLAG) -DFOR_SESSION=1 < $< > $@
 
-units/basic.target: units/basic.target.m4 Makefile
-       $(M4_PROCESS)
+units/%: units/%.m4 Makefile
+       $(M4_PROCESS_SYSTEM)
 
-units/graphical.target: units/graphical.target.m4 Makefile
-       $(M4_PROCESS)
-
-units/multi-user.target: units/multi-user.target.m4 Makefile
-       $(M4_PROCESS)
-
-units/getty@.service: units/getty@.service.m4 Makefile
-       $(M4_PROCESS)
+units/session/%: units/%.m4 Makefile
+       $(M4_PROCESS_SESSION)
 
 CLEANFILES = \
-       src/systemd-interfaces.c \
-       src/systemctl.c \
-       src/systemadm.c \
        units/systemd-initctl.service \
        units/systemd-logger.service \
        units/syslog.target \
        units/basic.target \
        units/getty@.service \
        units/graphical.target \
-       units/multi-user.target
+       units/multi-user.target \
+       units/remote-fs.target \
+       units/session/remote-fs.target \
+       man/systemd.special.7 \
+       man/systemd.special.html
+
+if HAVE_VALAC
+CLEANFILES += \
+       src/systemd-interfaces.c \
+       src/systemctl.c \
+       src/systemadm.c
+endif
 
 if HAVE_XSLTPROC
-man/%.5 man/%.7: man/%.xml
-       $(MKDIR_P) man
+XSLTPROC_PROCESS_MAN = \
+       $(AM_V_GEN)$(MKDIR_P) $(dir $@) && \
        $(XSLTPROC) -o $@ -nonet http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl $<
 
-man/%.html: man/%.xml
-       $(MKDIR_P) man
+XSLTPROC_PROCESS_MAN_IN = \
+       $(AM_V_GEN)$(MKDIR_P) $(dir $@) && \
+       $(XSLTPROC) -o ${@:.in=} -nonet http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl $< && \
+       mv ${@:.in=} $@
+
+XSLTPROC_PROCESS_HTML = \
+       $(AM_V_GEN)$(MKDIR_P) $(dir $@) && \
        $(XSLTPROC) -o $@ -nonet http://docbook.sourceforge.net/release/xsl/current/xhtml-1_1/docbook.xsl $<
 
+XSLTPROC_PROCESS_HTML_IN = \
+       $(AM_V_GEN)$(MKDIR_P) $(dir $@) && \
+       $(XSLTPROC) -o ${@:.in=} -nonet http://docbook.sourceforge.net/release/xsl/current/xhtml-1_1/docbook.xsl $< && \
+       mv ${@:.in=} $@
+
+man/%.5: man/%.xml
+       $(XSLTPROC_PROCESS_MAN)
+
+man/%.5.in: man/%.xml.in
+       $(XSLTPROC_PROCESS_MAN)
+
+man/%.7: man/%.xml
+       $(XSLTPROC_PROCESS_MAN)
+
+man/%.7.in: man/%.xml.in
+       $(XSLTPROC_PROCESS_MAN_IN)
+
+man/%.html: man/%.xml
+       $(XSLTPROC_PROCESS_HTML)
+
+man/%.html.in: man/%.xml.in
+       $(XSLTPROC_PROCESS_HTML_IN)
+
 CLEANFILES += \
        $(dist_man_MANS) \
-       $(HTMLMANS)
+       man/systemd.special.7.in \
+       man/systemd.unit.html \
+       man/systemd.service.html \
+       man/systemd.special.html.in
 endif
 
 install-data-hook:
@@ -368,13 +425,15 @@ install-data-hook:
                $(DESTDIR)$(systemunitdir) \
                $(DESTDIR)$(sessionunitdir) \
                $(DESTDIR)$(systemunitdir)/sockets.target.wants \
+               $(DESTDIR)$(systemunitdir)/basic.target.wants \
                $(DESTDIR)$(pkgsysconfdir)/system \
                $(DESTDIR)$(pkgsysconfdir)/system/getty.target.wants \
                $(DESTDIR)$(pkgsysconfdir)/system/multi-user.target.wants \
                $(DESTDIR)$(pkgsysconfdir)/system/graphical.target.wants \
                $(DESTDIR)$(pkgsysconfdir)/session \
-               $(DESTDIR)$(sysconfdir)/xdg/systemd \
-               $(DESTDIR)/cgroup/debug
+               $(DESTDIR)$(sysconfdir)/xdg/systemd
+       $(MKDIR_P) -m 0755 $(DESTDIR)/cgroup/systemd || \
+               echo "Don't forget to create /cgroup/systemd! Couldn't create it for you, continuing anyway."
        ( cd $(DESTDIR)$(sysconfdir)/xdg/systemd/ && \
                rm -f session && \
                $(LN_S) $(pkgsysconfdir)/session session )
@@ -383,9 +442,11 @@ install-data-hook:
                $(LN_S) ../systemd-logger.socket systemd-logger.socket && \
                $(LN_S) ../systemd-initctl.socket systemd-initctl.socket )
        ( cd $(DESTDIR)$(sessionunitdir) && \
-               rm -f shutdown.target sockets.target && \
+               rm -f shutdown.target sockets.target local-fs.target swap.target && \
                $(LN_S) ../system/shutdown.target shutdown.target && \
-               $(LN_S) ../system/sockets.target sockets.target )
+               $(LN_S) ../system/sockets.target sockets.target && \
+               $(LN_S) ../system/local-fs.target local-fs.target && \
+               $(LN_S) ../system/swap.target swap.target )
        ( cd $(DESTDIR)$(systemunitdir) && \
                rm -f runlevel0.target runlevel1.target runlevel6.target && \
                $(LN_S) poweroff.target runlevel0.target && \
@@ -412,6 +473,12 @@ install-data-hook:
        ( cd $(DESTDIR)$(pkgsysconfdir)/system/multi-user.target.wants && \
                rm -f getty.target && \
                $(LN_S) $(systemunitdir)/getty.target getty.target )
+       ( cd $(DESTDIR)$(systemunitdir)/basic.target.wants && \
+               rm -f dev-hugepages.automount dev-mqueue.automount proc-sys-fs-binfmt_misc.automount sys-kernel-debug.automount && \
+               $(LN_S) ../dev-hugepages.automount dev-hugepages.automount && \
+               $(LN_S) ../dev-mqueue.automount dev-mqueue.automount && \
+               $(LN_S) ../proc-sys-fs-binfmt_misc.automount proc-sys-fs-binfmt_misc.automount && \
+               $(LN_S) ../sys-kernel-debug.automount sys-kernel-debug.automount )
 if TARGET_FEDORA
        ( cd $(DESTDIR)$(pkgsysconfdir)/system/graphical.target.wants && \
                rm -f prefdm.service && \
@@ -422,8 +489,9 @@ if TARGET_FEDORA
        ( cd $(DESTDIR)$(systemunitdir) && \
                rm -f local.service && \
                $(LN_S) rc-local.service local.service )
+       ( cd $(DESTDIR)/etc/init.d && \
+               $(LN_S) halt reboot > /dev/null 2>&1 || true )
 endif
 
-
 DISTCHECK_CONFIGURE_FLAGS = \
        --with-udevrulesdir=$$dc_install_base/$(udevrulesdir)