2009-09-17 Ivan Maidanski <ivmai@mail.ru>

	* Makefile: Replace "version.h" with "include/gc_version.h".
	* include/gc_version.h: Ditto.

diff --git a/ChangeLog b/ChangeLog
index 37d717d..19cb164 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
 2009-09-17  Ivan Maidanski <ivmai@mail.ru>
 
+       * Makefile: Replace "version.h" with "include/gc_version.h".
+       * include/gc_version.h: Ditto.
+
+2009-09-17  Ivan Maidanski <ivmai@mail.ru>
+
        * alloc.c (GC_collect_or_expand): Output heap size in WARN()
        (before returning FALSE) for convenience.
 

diff --git a/Makefile b/Makefile
index e4ad43b..6bb39fe 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -143,8 +143,8 @@ OTHER_FILES= Makefile setjmp_t.c callprocs \
            MacProjects.sit.hqx MacOS.c \
            Mac_files/datastart.c Mac_files/dataend.c \
            Mac_files/MacOS_config.h Mac_files/MacOS_Test_config.h \
-           add_gc_prefix.c gc_cpp.cpp \
-           version.h AmigaOS.c msvc_dbg.c include/private/msvc_dbg.h \
+           add_gc_prefix.c gc_cpp.cpp include/gc_version.h \
+           AmigaOS.c msvc_dbg.c include/private/msvc_dbg.h \
           $(TESTS) $(GNU_BUILD_FILES) $(OTHER_MAKEFILES)
 
 CORD_INCLUDE_FILES= $(srcdir)/include/gc.h $(srcdir)/include/cord.h \
@@ -336,7 +336,7 @@ mark_rts.o: $(srcdir)/mark_rts.c $(UTILS)
 #      Work-around for DEC optimizer tail recursion elimination bug.
 #  The ALPHA-specific line should be removed if gcc is used.
 
-alloc.o: version.h
+alloc.o: include/gc_version.h
 
 cord:
        mkdir cord
@@ -409,10 +409,10 @@ KandRtest: setjmp_test gctest
        ./setjmp_test
        ./gctest
 
-add_gc_prefix: $(srcdir)/add_gc_prefix.c $(srcdir)/version.h
+add_gc_prefix: $(srcdir)/add_gc_prefix.c $(srcdir)/include/gc_version.h
        $(CC) -o add_gc_prefix $(srcdir)/add_gc_prefix.c
 
-gcname: $(srcdir)/gcname.c $(srcdir)/version.h
+gcname: $(srcdir)/gcname.c $(srcdir)/include/gc_version.h
        $(CC) -o gcname $(srcdir)/gcname.c
 
 #We assume this is being done from source directory.

diff --git a/include/gc_version.h b/include/gc_version.h
index 40a1a4c..14bda4b 100644 (file)
--- a/include/gc_version.h
+++ b/include/gc_version.h
@@ -31,7 +31,7 @@
      GC_TMP_VERSION_MINOR != GC_VERSION_MINOR || \
      defined(GC_ALPHA_VERSION) != (GC_TMP_ALPHA_VERSION != GC_NOT_ALPHA) || \
      defined(GC_ALPHA_VERSION) && GC_TMP_ALPHA_VERSION != GC_ALPHA_VERSION
-#   error Inconsistent version info.  Check README, version.h, and configure.ac.
+#   error Inconsistent version info.  Check doc/README, include/gc_version.h, and configure.ac.
 # endif
 #else
 # define GC_VERSION_MAJOR GC_TMP_VERSION_MAJOR