From Axel:

Without --enable-cint7, put (deprecated) copies of the headers in
include/cint/ into include/ to allow a transition period to the new
CINT include dir. They will be removed by configure --enable-cint
cint7: set G__CFG_COREVERSION.


git-svn-id: http://root.cern.ch/svn/root/trunk@24430 27541ba8-7e3a-0410-8455-c3a389f83636

cint/ROOT/configcint.mk

@@ -43,7 +43,7 @@ $(G__CFG_CONF): config/Makefile.$(ARCH) config/Makefile.comp $(G__CFG_CONFMK)
 	    echo '#define G__CFG_PLATFORMO ""' >> $@__ && \
 	    echo '#define G__CFG_AR "ar qcs"' >> $@__ ;; \
 	esac && \
-	echo '#define G__CFG_COREVERSION "cint"' >> $@__ && \
+	echo '#define G__CFG_COREVERSION "$(patsubst cint/%/inc/,%,$(dir $@))"' >> $@__ && \
 	echo '#define G__CFG_CC "$(CC)"' >> $@__ && \
 	echo '#define G__CFG_CFLAGS "$(G__CFG_CFLAGS)"' >> $@__ && \
 	echo '#define G__CFG_CMACROS "$(filter -D%,$(G__CFG_CFLAGS))"' >> $@__ && \

cint/cint/Module.mk

@@ -26,6 +26,7 @@ CINTDIRT     := $(MODDIRBASE)/tool
 CINTCONF     := $(CINTDIRI)/configcint.h
 CINTH        := $(wildcard $(CINTDIRI)/*.h)
 CINTHT       := $(sort $(patsubst $(CINTDIRI)/%.h,include/cint/%.h,$(CINTH) $(CINTCONF)))
+CINTBWHT     := $(patsubst include/cint/%,include/%,$(CINTHT))
 CINTS1       := $(wildcard $(MODDIRS)/*.c)
 CINTS2       := $(wildcard $(MODDIRS)/*.cxx) \
 	$(MODDIRSD)/longif.cxx $(MODDIRSD)/Apiif.cxx $(MODDIRSD)/stdstrct.cxx
@@ -216,6 +217,11 @@ endif
 # used in the main Makefile
 ALLHDRS     += $(CINTHT)
 
+ifeq ($(BUILDCINT7),)
+ALLHDRS     += $(CINTBWHT)
+endif
+
+
 CINTCXXFLAGS += -DG__HAVE_CONFIG -DG__NOMAKEINFO -DG__CINTBODY -I$(CINTDIRI) -I$(CINTDIRS) -I$(CINTDIRSD)
 CINTCFLAGS += -DG__HAVE_CONFIG -DG__NOMAKEINFO -DG__CINTBODY -I$(CINTDIRI) -I$(CINTDIRS) -I$(CINTDIRSD)
 
@@ -240,12 +246,17 @@ INCLUDEFILES += $(CINTDEP) $(CINTEXEDEP)
 ##### local rules #####
 .PHONY:         all-$(MODNAME) clean-$(MODNAME) distclean-$(MODNAME)
 
-include/cint/%.h:    $(CINTDIRI)/%.h
+include/cint/%.h: $(CINTDIRI)/%.h
 		@(if [ ! -d "include/cint" ]; then    \
 		   mkdir -p include/cint;             \
 		fi)
 		cp $< $@
 
+ifeq ($(BUILDCINT7),)
+$(CINTBWHT): include/%.h: $(CINTDIRI)/%.h
+		cp $< $@
+endif
+
 $(CINTLIB):     $(CINTO)
 		@$(MAKELIB) $(PLATFORM) $(LD) "$(LDFLAGS)" \
 		   "$(SOFLAGS)" libCint.$(SOEXT) $@ "$^" "$(CINTLIBEXTRA)"
@@ -277,7 +288,7 @@ all-$(MODNAME): $(CINTLIB) $(CINT) $(CINTTMP) $(MAKECINT) $(IOSENUM)
 
 clean-$(MODNAME):
 		@rm -f $(CINTTMPO) $(CINTALLO) $(CINTEXEO) $(MAKECINTO) \
-		   $(CINTHT:include/cint/%=include/%)
+		   $(CINTBWHT)
 
 clean::         clean-$(MODNAME)
 

configure

@@ -4111,6 +4111,14 @@ if test ! "x$enable_cint7" = "xno"; then
     enable_cint7="yes"
     enable_reflex="yes"
     result "yes"
+    # remove CINT5's include/G__ci.h etc
+    if test -d include/cint; then
+        for f in `cd include/cint/; ls`; do
+            if test -f include/$f; then
+                rm include/$f
+            fi
+        done
+    fi
 else
     enable_cint7=""
     result "no"