[systemd-commits] Makefile.am

[Daniel Mack]

 Makefile.am |    4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

New commits:
commit 0689798a9009f1be25d162a533e0d14094e9b5bd
Author: Daniel Mack <daniel at zonque.org>
Date:   Sat May 30 00:59:22 2015 +0200

    Revert "Makefile: make custom-entities.ent depend on Makefile.am"
    
    This reverts commit 6096d9cc. As discussed on the mailing list, we
    should accept some formal incorrectness in the dependency here, and
    not rebuild the man pages every time Makefile.am changes - xsltproc
    is simply too expensive.
    
    Instead, let's move man/custom-entities.ent from DISTCLEANFILES to
    CLEANFILES, so a 'make clean' is sufficient to actually make changes
    in Makefile.am efficient for the contents of the man pages.

diff --git a/Makefile.am b/Makefile.am
index 06512ae..38e5d74 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -6597,13 +6597,13 @@ EXTRA_DIST += \
 
 # ------------------------------------------------------------------------------
 if ENABLE_MANPAGES
-man/custom-entities.ent: Makefile.am configure.ac
+man/custom-entities.ent: configure.ac
 	$(AM_V_GEN)$(MKDIR_P) $(dir $@)
 	$(AM_V_GEN)(echo '<?xml version="1.0" encoding="utf-8" ?>' && \
 	 printf '$(subst '|,<!ENTITY ,$(subst =, ",$(subst |',">\n,$(substitutions))))') \
 	 > $@ # '
 
-DISTCLEANFILES += \
+CLEANFILES += \
 	man/custom-entities.ent
 
 XSLTPROC_FLAGS = \