Change the way libguile and boot-9.scm are timestamped, to try to

get rid of these spurious mismatch warnings.  Now both
libguile/versiondat.h and ice-9/version.scm are generated directly
by the configuration process, rather than having version.scm
generated directly, and libguile/versiondat.h generated by the
Makefile, which is generated by configure.  It seems that
sometimes the Makefile would change, but versiondat.h depends on
Makefile.in, not Makefile, so it wouldn't get rebuilt.
* Makefile.am (versiondat.h): Target removed; this is generated
directly by the configure script now.
(BUILT_SOURCES): Remove versiondat.h.
* versiondat.h.in: New file, transformed by the configure script
into versiondat.h.
* Makefile.in: Regenerated.

diff --git a/libguile/Makefile.am b/libguile/Makefile.am
index c780e0f..7d93c33 100644 (file)
--- a/libguile/Makefile.am
+++ b/libguile/Makefile.am
@@ -30,7 +30,7 @@ libguile_la_SOURCES = \
     backtrace.c stacks.c debug.c srcprop.c
 
 BUILT_SOURCES = \
-    cpp_err_symbols.c cpp_sig_symbols.c libpath.h versiondat.h \
+    cpp_err_symbols.c cpp_sig_symbols.c libpath.h \
     alist.x arbiters.x async.x boolean.x chars.x \
     continuations.x dynl.x dynwind.x eq.x error.x eval.x feature.x \
     filesys.x fports.x gc.x gdbint.x genio.x gh_data.x gh_eval.x \
@@ -136,19 +136,6 @@ libpath.h: $(srcdir)/Makefile.in  $(top_builddir)/config.status
        @echo '}' >> libpath.tmp
        @mv libpath.tmp libpath.h
 
-## FIXME: Consider using timestamp file, to avoid unnecessary rebuilds.
-versiondat.h: $(srcdir)/Makefile.in  $(top_builddir)/config.status
-       @echo "Generating versiondat.h..."
-       @rm -f versiondat.tmp
-       @echo '/* generated by Makefile */' > versiondat.tmp
-       @echo '#define GUILE_VERSION "$(GUILE_VERSION)"' >> versiondat.tmp
-       @echo '#define GUILE_MAJOR_VERSION "$(GUILE_MAJOR_VERSION)"' \
-               >> versiondat.tmp
-       @echo '#define GUILE_MINOR_VERSION "$(GUILE_MINOR_VERSION)"' \
-               >> versiondat.tmp
-       @echo '#define GUILE_STAMP   "$(GUILE_STAMP)"' >> versiondat.tmp
-       @mv versiondat.tmp versiondat.h
-
 SUFFIXES = .x
 .c.x:
        ./guile-snarf $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) $< > $@

diff --git a/libguile/Makefile.in b/libguile/Makefile.in
index 919e98b..9653677 100644 (file)
--- a/libguile/Makefile.in
+++ b/libguile/Makefile.in
@@ -114,7 +114,7 @@ libguile_la_SOURCES = \
     backtrace.c stacks.c debug.c srcprop.c
 
 BUILT_SOURCES = \
-    cpp_err_symbols.c cpp_sig_symbols.c libpath.h versiondat.h \
+    cpp_err_symbols.c cpp_sig_symbols.c libpath.h \
     alist.x arbiters.x async.x boolean.x chars.x \
     continuations.x dynl.x dynwind.x eq.x error.x eval.x feature.x \
     filesys.x fports.x gc.x gdbint.x genio.x gh_data.x gh_eval.x \
@@ -190,7 +190,7 @@ CLEANFILES = versiondat.h libpath.h
 DISTCLEANFILES = *.x
 mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
 CONFIG_HEADER = scmconfig.h
-CONFIG_CLEAN_FILES =  guile-snarf
+CONFIG_CLEAN_FILES =  guile-snarf versiondat.h
 LTLIBRARIES =  $(lib_LTLIBRARIES)
 
 
@@ -233,7 +233,7 @@ HEADERS =  $(include_HEADERS) $(modinclude_HEADERS) $(noinst_HEADERS) \
 $(pkginclude_HEADERS)
 
 DIST_COMMON =  COPYING ChangeLog Makefile.am Makefile.in guile-snarf.in \
-scmconfig.h.in stamp-h.in
+scmconfig.h.in stamp-h.in versiondat.h.in
 
 
 DISTFILES = $(DIST_COMMON) $(SOURCES) $(HEADERS) $(TEXINFOS) $(EXTRA_DIST)
@@ -298,6 +298,8 @@ distclean-hdr:
 maintainer-clean-hdr:
 guile-snarf: $(top_builddir)/config.status guile-snarf.in
        cd $(top_builddir) && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= ./config.status
+versiondat.h: $(top_builddir)/config.status versiondat.h.in
+       cd $(top_builddir) && CONFIG_FILES=$(subdir)/$@ CONFIG_HEADERS= ./config.status
 
 mostlyclean-libLTLIBRARIES:
 
@@ -674,18 +676,6 @@ libpath.h: $(srcdir)/Makefile.in  $(top_builddir)/config.status
        @echo ' { "LIBS",          "@GUILE_LIBS@" }, \' >> libpath.tmp
        @echo '}' >> libpath.tmp
        @mv libpath.tmp libpath.h
-
-versiondat.h: $(srcdir)/Makefile.in  $(top_builddir)/config.status
-       @echo "Generating versiondat.h..."
-       @rm -f versiondat.tmp
-       @echo '/* generated by Makefile */' > versiondat.tmp
-       @echo '#define GUILE_VERSION "$(GUILE_VERSION)"' >> versiondat.tmp
-       @echo '#define GUILE_MAJOR_VERSION "$(GUILE_MAJOR_VERSION)"' \
-               >> versiondat.tmp
-       @echo '#define GUILE_MINOR_VERSION "$(GUILE_MINOR_VERSION)"' \
-               >> versiondat.tmp
-       @echo '#define GUILE_STAMP   "$(GUILE_STAMP)"' >> versiondat.tmp
-       @mv versiondat.tmp versiondat.h
 .c.x:
        ./guile-snarf $(DEFS) $(INCLUDES) $(CPPFLAGS) $(CFLAGS) $< > $@
 

diff --git a/libguile/versiondat.h.in b/libguile/versiondat.h.in
new file mode 100644 (file)
index 0000000..250fbc1
--- /dev/null
+++ b/libguile/versiondat.h.in
@@ -0,0 +1,4 @@
+#define GUILE_VERSION "@GUILE_VERSION@"
+#define GUILE_MAJOR_VERSION "@GUILE_MAJOR_VERSION@"
+#define GUILE_MINOR_VERSION "@GUILE_MINOR_VERSION@"
+#define GUILE_STAMP   "@GUILE_STAMP@"