X-Git-Url: https://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=Makefile.am;h=3589b735b0a6cb55d917e0f7624b13b227e6b589;hp=780ded62fa95655168dd5a847e519e2b6ec63ed5;hb=a4312405f209ff19fa071b15bda843f4e68ffbbc;hpb=a7b6f8e578724c3b4f0cfc8777d9b4a8e29207b0

diff --git a/Makefile.am b/Makefile.am
index 780ded62f..3589b735b 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -66,29 +66,68 @@ dist_udevrules_DATA = \
 
 dist_systemunit_DATA = \
 	units/emergency.service \
+	units/getty.target \
+	units/halt.target \
 	units/local-fs.target \
 	units/network.target \
 	units/nss-lookup.target \
+	units/poweroff.target \
+	units/reboot.target \
 	units/remote-fs.target \
+	units/rescue.target \
+	units/rpcbind.target \
 	units/rtc-set.target \
 	units/shutdown.target \
 	units/sigpwr.target \
 	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 \
+	units/getty@.service \
+	units/graphical.target \
+	units/multi-user.target \
 	units/systemd-initctl.service \
 	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 \
 	LICENSE \
-	README
+	README \
+	DISTRO_PORTING
+
+if TARGET_FEDORA
+dist_systemunit_DATA += \
+	units/fedora/halt.service \
+	units/fedora/killall.service \
+	units/fedora/poweroff.service \
+	units/fedora/prefdm.service \
+	units/fedora/rc-local.service \
+	units/fedora/reboot.service \
+	units/fedora/sysinit.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
@@ -158,16 +197,22 @@ dist_man_MANS = \
 	man/systemd.unit.5 \
 	man/systemd.service.5
 
-HTMLMANS = \
+nodist_man_MANS = \
+	man/systemd.special.7
+
+dist_noinst_DATA = \
 	man/systemd.unit.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.service.xml \
+	man/systemd.special.xml.in \
+	man/systemd.special.7.in \
+	man/systemd.special.html.in
 
 systemd_SOURCES = \
 	$(COMMON_SOURCES) \
@@ -271,65 +316,172 @@ systemadm_SOURCES = \
 systemadm_CPPFLAGS = $(AM_CPPFLAGS) $(DBUSGLIB_CFLAGS) $(GTK_CFLAGS) $(VALA_CFLAGS)
 systemadm_LDADD = $(DBUSGLIB_LIBS) $(GTK_LIBS)
 
-units/systemd-initctl.service: units/systemd-initctl.service.in Makefile
-	$(MKDIR_P) units
-	$(SED) -e 's,@libexecdir\@,$(libexecdir),g' \
+SED_PROCESS = \
+	$(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-logger.service: units/systemd-logger.service.in Makefile
-	$(MKDIR_P) units
-	$(SED) -e 's,@libexecdir\@,$(libexecdir),g' \
-		-e 's,@pkglibexecdir\@,$(pkglibexecdir),g' \
-		< $< > $@
+units/%: units/%.in Makefile
+	$(SED_PROCESS)
 
-units/syslog.target: units/syslog.target.in Makefile
-	$(MKDIR_P) units
-	$(SED) -e 's,@SPECIAL_SYSLOG_SERVICE\@,$(SPECIAL_SYSLOG_SERVICE),g' \
-		< $< > $@
+man/%: man/%.in Makefile
+	$(SED_PROCESS)
+
+M4_PROCESS_SYSTEM = \
+	$(AM_V_GEN)$(MKDIR_P) $(dir $@) && \
+	$(M4) -P $(M4_DISTRO_FLAG) -DFOR_SYSTEM=1 < $< > $@
+
+M4_PROCESS_SESSION = \
+	$(AM_V_GEN)$(MKDIR_P) $(dir $@) && \
+	$(M4) -P $(M4_DISTRO_FLAG) -DFOR_SESSION=1 < $< > $@
+
+units/%: units/%.m4 Makefile
+	$(M4_PROCESS_SYSTEM)
+
+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/syslog.target \
+	units/basic.target \
+	units/getty@.service \
+	units/graphical.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/%.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:
 	$(MKDIR_P) -m 0755 \
 		$(DESTDIR)$(systemunitdir) \
 		$(DESTDIR)$(sessionunitdir) \
+		$(DESTDIR)$(systemunitdir)/sockets.target.wants \
+		$(DESTDIR)$(systemunitdir)/basic.target.wants \
 		$(DESTDIR)$(pkgsysconfdir)/system \
-		$(DESTDIR)$(pkgsysconfdir)/system/sockets.target.wants \
+		$(DESTDIR)$(pkgsysconfdir)/system/getty.target.wants \
+		$(DESTDIR)$(pkgsysconfdir)/system/local-fs.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) $(DESTDIR)$(pkgsysconfdir)/session session )
-	( cd $(DESTDIR)$(pkgsysconfdir)/system/sockets.target.wants && \
+		$(LN_S) $(pkgsysconfdir)/session session )
+	( cd $(DESTDIR)$(systemunitdir)/sockets.target.wants && \
 		rm -f systemd-initctl.socket systemd-logger.socket && \
-		$(LN_S) $(DESTDIR)$(systemunitdir)/systemd-logger.socket systemd-logger.socket && \
-		$(LN_S) $(DESTDIR)$(systemunitdir)/systemd-initctl.socket systemd-initctl.socket )
+		$(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 && \
+		$(LN_S) rescue.target runlevel1.target && \
+		$(LN_S) reboot.target runlevel6.target )
+	( cd $(DESTDIR)$(pkgsysconfdir)/system && \
+		rm -f default.target ctrl-alt-del.target kbrequest.target && \
+		$(LN_S) $(systemunitdir)/graphical.target default.target && \
+		$(LN_S) $(systemunitdir)/reboot.target ctrl-alt-del.target && \
+		$(LN_S) $(systemunitdir)/rescue.target kbrequest.target && \
+		rm -f runlevel2.target runlevel3.target runlevel4.target runlevel5.target && \
+		$(LN_S) $(systemunitdir)/multi-user.target runlevel2.target && \
+		$(LN_S) $(systemunitdir)/multi-user.target runlevel3.target && \
+		$(LN_S) $(systemunitdir)/multi-user.target runlevel4.target && \
+		$(LN_S) $(systemunitdir)/graphical.target runlevel5.target )
+	( cd $(DESTDIR)$(pkgsysconfdir)/system/getty.target.wants && \
+		rm -f getty@tty1.service getty@tty2.service getty@tty3.service getty@tty4.service getty@tty5.service getty@tty6.service && \
+		$(LN_S) $(systemunitdir)/getty@.service getty@tty1.service && \
+		$(LN_S) $(systemunitdir)/getty@.service getty@tty2.service && \
+		$(LN_S) $(systemunitdir)/getty@.service getty@tty3.service && \
+		$(LN_S) $(systemunitdir)/getty@.service getty@tty4.service && \
+		$(LN_S) $(systemunitdir)/getty@.service getty@tty5.service && \
+		$(LN_S) $(systemunitdir)/getty@.service getty@tty6.service )
+	( cd $(DESTDIR)$(pkgsysconfdir)/system/multi-user.target.wants && \
+		rm -f getty.target && \
+		$(LN_S) $(systemunitdir)/getty.target getty.target )
+	( cd $(DESTDIR)$(pkgsysconfdir)/system/local-fs.target.wants && \
+		rm -f var-run.mount && \
+		$(LN_S) $(systemunitdir)/var-run.mount var-run.mount )
+	( 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 && \
+		$(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 )
+	( cd $(DESTDIR)$(systemunitdir) && \
+		rm -f local.service && \
+		$(LN_S) rc-local.service local.service )
+endif
 
 DISTCHECK_CONFIGURE_FLAGS = \
 	--with-udevrulesdir=$$dc_install_base/$(udevrulesdir)