X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=Makefile.am;h=2a0d6bb358a0311c3b121474f42062b31f4ed0fb;hp=683a00bc0c02f30162db1dbe058743e2ea4a6920;hb=9f2c5942e1e10099027f0da438aafdd9f40440ba;hpb=eb10a76494542fb560efd09c16b40826fc37bc5f

diff --git a/Makefile.am b/Makefile.am
index 683a00bc0..2a0d6bb35 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -93,11 +93,15 @@ systemunit_DATA = \
 	units/systemd-logger.service \
 	units/syslog.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 \
@@ -182,21 +186,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) \
@@ -301,42 +308,34 @@ 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) units && \
 	$(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/%.html: $(builddir)/man/%.html.in Makefile
 	$(SED_PROCESS)
 
-units/syslog.target: units/syslog.target.in Makefile
+man/%.7: $(builddir)/man/%.7.in Makefile
 	$(SED_PROCESS)
 
-M4_FLAGS =
+M4_PROCESS_SYSTEM = \
+	$(AM_V_GEN)$(MKDIR_P) units && \
+	$(M4) -P $(M4_DISTRO_FLAG) -DFOR_SYSTEM=1 < $< > $@
 
-if TARGET_FEDORA
-M4_FLAGS += -DTARGET_FEDORA=1
-endif
-
-M4_PROCESS = \
-	$(MKDIR_P) units && \
-	$(M4) -P $(M4_FLAGS) < $< > $@
-
-units/basic.target: units/basic.target.m4 Makefile
-	$(M4_PROCESS)
-
-units/graphical.target: units/graphical.target.m4 Makefile
-	$(M4_PROCESS)
+M4_PROCESS_SESSION = \
+	$(AM_V_GEN)$(MKDIR_P) units/session && \
+	$(M4) -P $(M4_DISTRO_FLAG) -DFOR_SESSION=1 < $< > $@
 
-units/multi-user.target: units/multi-user.target.m4 Makefile
-	$(M4_PROCESS)
+units/%: units/%.m4 Makefile
+	$(M4_PROCESS_SYSTEM)
 
-units/getty@.service: units/getty@.service.m4 Makefile
-	$(M4_PROCESS)
+units/session/%: units/%.m4 Makefile
+	$(M4_PROCESS_SESSION)
 
 CLEANFILES = \
 	src/systemd-interfaces.c \
@@ -348,21 +347,56 @@ CLEANFILES = \
 	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_XSLTPROC
-man/%.5 man/%.7: man/%.xml
-	$(MKDIR_P) man
+#if HAVE_XSLTPROC
+XSLTPROC_PROCESS_MAN = \
+	$(AM_V_GEN)$(MKDIR_P) man && \
 	$(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) man && \
+	$(XSLTPROC) -o ${@:.in=} -nonet http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl $< && \
+	mv ${@:.in=} $@
+
+XSLTPROC_PROCESS_HTML = \
+	$(AM_V_GEN)$(MKDIR_P) man && \
 	$(XSLTPROC) -o $@ -nonet http://docbook.sourceforge.net/release/xsl/current/xhtml-1_1/docbook.xsl $<
 
+XSLTPROC_PROCESS_HTML_IN = \
+	$(AM_V_GEN)$(MKDIR_P) man && \
+	$(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)
-endif
+	man/systemd.special.7.in \
+	man/systemd.unit.html \
+	man/systemd.service.html \
+	man/systemd.special.html.in
+#endif
 
 install-data-hook:
 	$(MKDIR_P) -m 0755 \
@@ -384,9 +418,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 && \
@@ -425,6 +461,5 @@ if TARGET_FEDORA
 		$(LN_S) rc-local.service local.service )
 endif
 
-
 DISTCHECK_CONFIGURE_FLAGS = \
 	--with-udevrulesdir=$$dc_install_base/$(udevrulesdir)