WIP: rename back version.h -> gap_version.h

Makefile.rules

@@ -48,7 +48,7 @@ SOURCES += src/finfield.c
 SOURCES += src/funcs.c
 SOURCES += src/gap.c
 SOURCES += src/gaptime.c
-SOURCES += build/version.c	# generated source file
+SOURCES += build/gap_version.c	# generated source file
 SOURCES += src/gvars.c
 SOURCES += src/hookintrprtr.c
 SOURCES += src/info.c
@@ -347,13 +347,13 @@ DEPFLAGS = -MQ $(OBJFILE) -MMD -MP -MF $(DEPFILE)
 # careful to not put these into GAP_CXXFLAGS, as kernel extensions may want to
 # use GAP_CXXFLAGS but also may need to interface with C++ code in
 # libraries that use exceptions.
-build/obj/%.cc.lo: %.cc cnf/GAP-CXXFLAGS cnf/GAP-CPPFLAGS libtool build/config.h build/version.h
+build/obj/%.cc.lo: %.cc cnf/GAP-CXXFLAGS cnf/GAP-CPPFLAGS libtool build/config.h build/gap_version.h
 	@$(MKDIR_P) build/obj/$(*D) build/deps/$(*D)
 	$(QUIET_CXX)$(LIBTOOL) --mode=compile --tag CXX $(CXX) $(DEPFLAGS) $(GAP_CXXFLAGS) -fno-exceptions -fno-rtti $(WARN_CXXFLAGS) $(GAP_CPPFLAGS) -c $< -o $(OBJFILE)
 	@echo "$<:" >> $(DEPFILE)
 
 # Build rule for C source files
-build/obj/%.c.lo: %.c cnf/GAP-CFLAGS cnf/GAP-CPPFLAGS libtool build/config.h build/version.h
+build/obj/%.c.lo: %.c cnf/GAP-CFLAGS cnf/GAP-CPPFLAGS libtool build/config.h build/gap_version.h
 	@$(MKDIR_P) build/obj/$(*D) build/deps/$(*D)
 	$(QUIET_CC)$(LIBTOOL) --mode=compile --tag CC $(CC) $(DEPFLAGS) $(GAP_CFLAGS) $(WARN_CFLAGS) $(GAP_CPPFLAGS) -c $< -o $(OBJFILE)
 	@echo "$<:" >> $(DEPFILE)
@@ -1297,8 +1297,8 @@ $(GVF): FORCE
 	@$(SHELL) $(srcdir)/cnf/gap-version-gen.sh $(GAP_VERSION)
 -include $(GVF)
 
-# (re)generate build/version.c
-build/version.c: $(srcdir)/src/version.c.in $(srcdir)/Makefile.rules $(GVF)
+# (re)generate build/gap_version.c
+build/gap_version.c: $(srcdir)/src/gap_version.c.in $(srcdir)/Makefile.rules $(GVF)
 	@$(MKDIR_P) $(@D)
 	$(QUIET_SED)sed \
 		-e "s/@GAP_VERSION@/$(GAP_VERSION)/" \
@@ -1307,9 +1307,9 @@ build/version.c: $(srcdir)/src/version.c.in $(srcdir)/Makefile.rules $(GVF)
 		-e "s/@GAP_BUILD_DATETIME@/$(GAP_BUILD_DATETIME)/" \
 		< $< > $@
 
-# (re)generate build/version.h ; only regenerate if the content actually
+# (re)generate build/gap_version.h ; only regenerate if the content actually
 # changed, to avoid unnecessary recompilation
-build/version.h: $(srcdir)/src/version.h.in $(srcdir)/Makefile.rules
+build/gap_version.h: $(srcdir)/src/gap_version.h.in $(srcdir)/Makefile.rules
 	@$(MKDIR_P) $(@D)
 	$(QUIET)sed \
 		-e "s/@GAP_KERNEL_MAJOR_VERSION@/$(GAP_KERNEL_MAJOR_VERSION)/" \

src/gap.c

@@ -18,6 +18,7 @@
 #include "compiler.h"
 #include "error.h"
 #include "funcs.h"
+#include "gap_version.h"
 #include "gapstate.h"
 #ifdef USE_GASMAN
 #include "gasman_intern.h"
@@ -42,7 +43,6 @@
 #include "sysstr.h"
 #include "trycatch.h"
 #include "vars.h"
-#include "version.h"
 
 #ifdef HPCGAP
 #include "hpc/misc.h"

src/gap_all.h

@@ -37,6 +37,7 @@ extern "C" {
 #include "gap.h"
 #include "gapstate.h"
 #include "gaptime.h"
+#include "gap_version.h"
 #include "gasman.h"
 #include "gvars.h"
 #include "info.h"
@@ -75,7 +76,6 @@ extern "C" {
 #include "trycatch.h"
 #include "vars.h"
 #include "vector.h"
-#include "version.h"
 #include "weakptr.h"
 
 #ifdef HPCGAP

src/version.c.in → src/gap_version.c.in

@@ -10,7 +10,7 @@
 **  This file contains the GAP build version
 */
 
-#include "version.h"
+#include "gap_version.h"
 
 
 /****************************************************************************

src/modules.h

@@ -16,7 +16,7 @@
 #define GAP_MODULES_H
 
 #include "common.h"
-#include "version.h"
+#include "gap_version.h"
 
 enum {
     /** builtin module */

src/saveload.c

@@ -18,6 +18,7 @@
 #include "calls.h"
 #include "error.h"
 #include "finfield.h"
+#include "gap_version.h"
 #ifdef USE_GASMAN
 #include "gasman_intern.h"
 #endif
@@ -30,7 +31,6 @@
 #include "sysfiles.h"
 #include "sysopt.h"
 #include "sysstr.h"
-#include "version.h"
 
 #include <stdio.h>
 #include <unistd.h>

src/system.c

@@ -15,6 +15,7 @@
 
 #include "system.h"
 
+#include "gap_version.h"
 #include "gaputils.h"
 #ifdef GAP_MEM_CHECK
 #include "gasman_intern.h"
@@ -24,7 +25,6 @@
 #include "sysopt.h"
 #include "sysroots.h"
 #include "sysstr.h"
-#include "version.h"
 
 #ifdef HPCGAP
 #include "hpc/misc.h"