build-sys: make xsltproc/sed invocations silent

[elogind.git] / Makefile.am

diff --git a/Makefile.am b/Makefile.am
index 683a00bc0c02f30162db1dbe058743e2ea4a6920..77274891da86cda5d98d61f8992bc7c2a17085f7 100644 (file)
--- 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 \
@@ -301,7 +305,7 @@ 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' \
@@ -316,27 +320,31 @@ units/systemd-logger.service: units/systemd-logger.service.in Makefile
 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) units && \
+       $(M4) -P $(M4_DISTRO_FLAG) -DFOR_SYSTEM < $< > $@
 
-M4_PROCESS = \
-       $(MKDIR_P) units && \
-       $(M4) -P $(M4_FLAGS) < $< > $@
+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)
+       $(M4_PROCESS_SYSTEM)
 
 units/graphical.target: units/graphical.target.m4 Makefile
-       $(M4_PROCESS)
+       $(M4_PROCESS_SYSTEM)
 
 units/multi-user.target: units/multi-user.target.m4 Makefile
-       $(M4_PROCESS)
+       $(M4_PROCESS_SYSTEM)
 
 units/getty@.service: units/getty@.service.m4 Makefile
-       $(M4_PROCESS)
+       $(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
+       $(M4_PROCESS_SESSION)
 
 CLEANFILES = \
        src/systemd-interfaces.c \
@@ -348,15 +356,17 @@ 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
 
 if HAVE_XSLTPROC
 man/%.5 man/%.7: man/%.xml
-       $(MKDIR_P) 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
+       $(AM_V_GEN)$(MKDIR_P) man && \
        $(XSLTPROC) -o $@ -nonet http://docbook.sourceforge.net/release/xsl/current/xhtml-1_1/docbook.xsl $<
 
 CLEANFILES += \
@@ -384,9 +394,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 && \