X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=blobdiff_plain;f=Makefile.am;h=3589b735b0a6cb55d917e0f7624b13b227e6b589;hp=61b18b327364e2bcc89448cae3feeabcd566d7de;hb=1b5601907efffd364b660bb75156b2aed49c46a4;hpb=12e84679cc81cdf5f042540e54131a0ce37147ad diff --git a/Makefile.am b/Makefile.am index 61b18b327..3589b735b 100644 --- a/Makefile.am +++ b/Makefile.am @@ -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 \ @@ -186,21 +195,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) \ @@ -305,51 +317,33 @@ 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 - $(SED_PROCESS) - -units/systemd-logger.service: units/systemd-logger.service.in Makefile +units/%: units/%.in Makefile $(SED_PROCESS) -units/syslog.target: units/syslog.target.in Makefile +man/%: man/%.in Makefile $(SED_PROCESS) M4_PROCESS_SYSTEM = \ - $(AM_V_GEN)$(MKDIR_P) units && \ - $(M4) -P $(M4_DISTRO_FLAG) -DFOR_SYSTEM < $< > $@ + $(AM_V_GEN)$(MKDIR_P) $(dir $@) && \ + $(M4) -P $(M4_DISTRO_FLAG) -DFOR_SYSTEM=1 < $< > $@ M4_PROCESS_SESSION = \ - $(AM_V_GEN)$(MKDIR_P) units/session && \ - $(M4) -P $(M4_DISTRO_FLAG) -DFOR_SESSION < $< > $@ - -units/basic.target: units/basic.target.m4 Makefile - $(M4_PROCESS_SYSTEM) + $(AM_V_GEN)$(MKDIR_P) $(dir $@) && \ + $(M4) -P $(M4_DISTRO_FLAG) -DFOR_SESSION=1 < $< > $@ -units/graphical.target: units/graphical.target.m4 Makefile +units/%: units/%.m4 Makefile $(M4_PROCESS_SYSTEM) -units/multi-user.target: units/multi-user.target.m4 Makefile - $(M4_PROCESS_SYSTEM) - -units/getty@.service: units/getty@.service.m4 Makefile - $(M4_PROCESS_SYSTEM) - -units/remote-fs.target: units/remote-fs.target.m4 Makefile - $(M4_PROCESS_SYSTEM) - -units/session/remote-fs.target: units/remote-fs.target.m4 Makefile +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 \ @@ -358,20 +352,60 @@ CLEANFILES = \ units/graphical.target \ units/multi-user.target \ units/remote-fs.target \ - units/session/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: @@ -379,13 +413,16 @@ 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/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) $(pkgsysconfdir)/session session ) @@ -425,6 +462,15 @@ install-data-hook: ( 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 && \ @@ -437,6 +483,5 @@ if TARGET_FEDORA $(LN_S) rc-local.service local.service ) endif - DISTCHECK_CONFIGURE_FLAGS = \ --with-udevrulesdir=$$dc_install_base/$(udevrulesdir)