[Guile-commits] 04/04: build: .x and .doc files depend on generated includes.

[Andy Wingo]

wingo pushed a commit to branch master
in repository guile.

commit 8f7ed8abf22daf3c82b26e292b28eaf0a275e29a
Author: Mark H Weaver <address@hidden>
Date:   Thu Aug 11 03:59:40 2016 -0400

    build: .x and .doc files depend on generated includes.
    
    Fixes <https://bugs.gentoo.org/show_bug.cgi?id=590528>.
    
    * libguile/Makefile.am (BUILT_INCLUDES): New variable.
    (BUILT_SOURCES): Put generated .h to BUILT_INCLUDES.
    (DOT_X_FILES, EXTRA_DOT_X_FILES, DOT_DOC_FILES, EXTRA_DOT_DOC_FILES):
    Depend on $(BUILT_INCLUDES), in place of scmconfig.h which is included
    in $(BUILT_INCLUDES).
---
 libguile/Makefile.am | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/libguile/Makefile.am b/libguile/Makefile.am
index c36a7e5..fa60220 100644
--- a/libguile/Makefile.am
+++ b/libguile/Makefile.am
@@ -443,9 +443,9 @@ vm-operations.h: vm-engine.c
        | sed -e 's,VM_DEFINE_OP (\(.*\)).*,  M (\1) \\,' >> $@
        @echo '' >> $@
 
-BUILT_SOURCES = cpp-E.c cpp-SIG.c libpath.h \
-    scmconfig.h \
-    vm-operations.h $(DOT_X_FILES) $(EXTRA_DOT_X_FILES)
+BUILT_INCLUDES = vm-operations.h scmconfig.h
+BUILT_SOURCES = cpp-E.c cpp-SIG.c libpath.h $(BUILT_INCLUDES) \
+    $(DOT_X_FILES) $(EXTRA_DOT_X_FILES)
 
 # Force the generation of `guile-procedures.texi' because the top-level
 # Makefile expects it to be built.
@@ -754,9 +754,9 @@ SUFFIXES = .x .doc
 .c.doc:
        $(AM_V_SNARF)./guile-snarf-docs -o $@ $< -- $(snarfcppopts)
 
-$(DOT_X_FILES) $(EXTRA_DOT_X_FILES): scmconfig.h snarf.h guile-snarf.in 
version.h
+$(DOT_X_FILES) $(EXTRA_DOT_X_FILES): $(BUILT_INCLUDES) snarf.h guile-snarf.in 
version.h
 
-$(DOT_DOC_FILES) $(EXTRA_DOT_DOC_FILES): scmconfig.h snarf.h 
guile-snarf-docs.in guile_filter_doc_snarfage$(EXEEXT)
+$(DOT_DOC_FILES) $(EXTRA_DOT_DOC_FILES): $(BUILT_INCLUDES) snarf.h 
guile-snarf-docs.in guile_filter_doc_snarfage$(EXEEXT)
 
 error.x: cpp-E.c
 posix.x: cpp-SIG.c