[Guile-commits] 01/01: Snarfing .x depends on built headers

[Andy Wingo]

wingo pushed a commit to branch stable-2.0
in repository guile.

commit edd6d6e2805894e21afe51276d1af65d5395180d
Author: Andy Wingo <address@hidden>
Date:   Sun Aug 7 12:23:50 2016 +0200

    Snarfing .x depends on built headers
    
    * libguile/Makefile.am (BUILT_INCLUDES): New variable.
      (BUILT_SOURCES): Put .i and other generated .h to BUILT_INCLUDES.
      (.c.x, .c.doc): Depend on BUILT_INCLUDES.  Fixes
      https://bugs.gentoo.org/show_bug.cgi?id=590528.
---
 libguile/Makefile.am |   10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/libguile/Makefile.am b/libguile/Makefile.am
index cd85604..4c54744 100644
--- a/libguile/Makefile.am
+++ b/libguile/Makefile.am
@@ -430,9 +430,9 @@ DOT_I_FILES = vm-i-system.i vm-i-scheme.i vm-i-loader.i
 .c.i:
        $(AM_V_GEN)$(GREP) '^VM_DEFINE' $< > $@
 
-BUILT_SOURCES = cpp-E.c cpp-SIG.c libpath.h \
-    scmconfig.h \
-    $(DOT_I_FILES) $(DOT_X_FILES) $(EXTRA_DOT_X_FILES)
+BUILT_INCLUDES = $(DOT_I_FILES) 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.
@@ -730,9 +730,9 @@ snarfcppopts = $(DEFS) $(AM_CPPFLAGS) $(CPPFLAGS) $(CFLAGS)
 
 SUFFIXES = .x .doc
 
-.c.x:
+.c.x: $(BUILT_INCLUDES)
        $(AM_V_SNARF)$(GUILE_SNARF) -o $@ $< $(snarfcppopts)
-.c.doc:
+.c.doc: $(BUILT_INCLUDES)
        $(AM_V_SNARF)./guile-snarf-docs -o $@ $< -- $(snarfcppopts)
 
 $(DOT_X_FILES) $(EXTRA_DOT_X_FILES): scmconfig.h snarf.h guile-snarf.in 
version.h