changed from legacy rootcint to the new rootcling ROOT dictionary generator.

acinclude.m4

@@ -18,7 +18,7 @@ dnl The macro defines the following substitution variables
 dnl
 dnl    ROOTCONF           full path to root-config
 dnl    ROOTEXEC           full path to root
-dnl    ROOTCINT           full path to rootcint
+dnl    ROOTCLING          full path to rootcling
 dnl    ROOTLIBDIR         Where the ROOT libraries are 
 dnl    ROOTINCDIR         Where the ROOT headers are 
 dnl    ROOTETCDIR         Where the ROOT configuration is
@@ -29,7 +29,7 @@ dnl    ROOTAUXLIBS        Auxilary libraries and linker flags for ROOT
 dnl    ROOTAUXCFLAGS      Auxilary compiler flags 
 dnl    ROOTRPATH          Same as ROOTLIBDIR
 dnl
-dnl The macro will fail if root-config and rootcint isn't found.
+dnl The macro will fail if root-config and rootcling isn't found.
 dnl
 dnl Christian Holm Christensen <cholm@nbi.dk>
 dnl
@@ -49,10 +49,10 @@ AC_DEFUN([ROOT_PATH],
   fi
   AC_PATH_PROG(ROOTCONF, root-config , no, $rootbin)
   AC_PATH_PROG(ROOTEXEC, root , no, $rootbin)
-  AC_PATH_PROG(ROOTCINT, rootcint , no, $rootbin)
+  AC_PATH_PROG(ROOTCLING, rootcling , no, $rootbin)
 	
   if test ! x"$ROOTCONF" = "xno" && \
-     test ! x"$ROOTCINT" = "xno" ; then 
+     test ! x"$ROOTCLING" = "xno" ; then 
 
     # define some variables 
     ROOTLIBDIR=`$ROOTCONF --libdir`

doc/examples/UserFcn/Makefile.PUserFcn

@@ -46,11 +46,11 @@ clean:; 	@rm -f $(OBJS) *Dict* core*
 $(OBJS): %.o: %.cpp
 	$(CXX) $(INCLUDES) $(CXXFLAGS) -c $<
 
-# Generate the ROOT CINT dictionary
+# Generate the ROOT CLING dictionary
 
 PUserFcnDict.cpp: PUserFcn.h PUserFcnLinkDef.h
 	@echo "Generating dictionary $@..."
-	rootcint -f $@ -c -p -I$(ROOTINCLUDE) $^
+	rootcling -f $@ -c -p -I$(ROOTINCLUDE) $^
 
 install: all
 	@echo "Installing shared lib: libTApproximation.so"

src/classes/Makefile.PMusr

@@ -202,27 +202,27 @@ $(EXTOBJS): ../external/MuSR_software/Class_MuSR_PSI/MuSR_td_PSI_bin.cpp
 
 TLemRunHeaderDict.cxx: ../external/TLemRunHeader/TLemRunHeader.h ../external/TLemRunHeader/TLemRunHeaderLinkDef.h
 	@echo "Generating dictionary $@..."
-	rootcint -f $@ -c -p $^
+	rootcling -f $@ -c -p $^
 
 TLemStatsDict.cxx: ../external/TLemRunHeader/TLemStats.h ../external/TLemRunHeader/TLemStatsLinkDef.h
 	@echo "Generating dictionary $@..."
-	rootcint -f $@ -c -p $^
+	rootcling -f $@ -c -p $^
 
 PStartupHandlerDict.cpp: ../include/PStartupHandler.h ../include/PStartupHandlerLinkDef.h
 	@echo "Generating dictionary $@..."
-	rootcint -f $@ -c -p $^
+	rootcling -f $@ -c -p $^
 
 PMusrCanvasDict.cpp: ../include/PMusrCanvas.h ../include/PMusrCanvasLinkDef.h
 	@echo "Generating dictionary $@..."
-	rootcint -v -f $@ -c -p $^
+	rootcling -v -f $@ -c -p $^
 
 PMusrT0Dict.cpp: ../include/PMusrT0.h ../include/PMusrT0LinkDef.h
 	@echo "Generating dictionary $@..."
-	rootcint -v -f $@ -c -p $^
+	rootcling -v -f $@ -c -p $^
 
 PUserFcnBaseDict.cpp: ../include/PUserFcnBase.h ../include/PUserFcnBaseLinkDef.h
 	@echo "Generating dictionary $@..."
-	rootcint -v -f $@ -c -p $^
+	rootcling -v -f $@ -c -p $^
 
 install: leminstall musrinstall
 

src/classes/Makefile.PUserFcn

@@ -89,7 +89,7 @@ $(OBJS): %.o: %.cpp
 
 PUserFcnDict.cpp: ../include/PUserFcn.h ../include/PUserFcnLinkDef.h
 	@echo "Generating dictionary $@..."
-	rootcint -f $@ -c -p $^
+	rootcling -f $@ -c -p $^
 
 install: all
 	@echo "Installing shared lib: libPUserFcn.so ( you must be root ;-) )"

src/classes/Makefile.am

@@ -103,7 +103,7 @@ AM_LDFLAGS = $(LOCAL_LIB_LDFLAGS) -L@ROOTLIBDIR@
 CLEANFILES = *Dict.cpp *Dict.h *Dict* *~ core
 
 %Dict.cpp %Dict.h: ../include/%.h ../include/%LinkDef.h
-	@ROOTCINT@ -v -f $*Dict.cpp -c -p $(AM_CPPFLAGS) $^
+	@ROOTCLING@ -v -f $*Dict.cpp -c -p $(AM_CPPFLAGS) $^
 
 lib_LTLIBRARIES = libPUserFcnBase.la libPMusr.la
 

src/external/BMWtools/Makefile.am

@@ -33,7 +33,7 @@ AM_LDFLAGS = $(LOCAL_LIB_LDFLAGS) -L@ROOTLIBDIR@
 CLEANFILES = *Dict.cpp *Dict.h *Dict* *~ core
 
 %Dict.cpp %Dict.h: %.h %LinkDef.h
-	@ROOTCINT@ -v -f $*Dict.cpp -c -p $(INCLUDES) $^
+	@ROOTCLING@ -v -f $*Dict.cpp -c -p $(INCLUDES) $^
 
 lib_LTLIBRARIES = libBMWtools.la
 

src/external/MagProximity/Makefile.am

@@ -39,7 +39,7 @@ AM_LDFLAGS = $(LOCAL_LIB_LDFLAGS) -L@ROOTLIBDIR@
 CLEANFILES = *Dict.cpp *Dict.h *Dict* *~ core
 
 %Dict.cpp %Dict.h: %.h %LinkDef.h
-	@ROOTCINT@ -v -f $*Dict.cpp -c -p $(AM_CPPFLAGS) $^
+	@ROOTCLING@ -v -f $*Dict.cpp -c -p $(AM_CPPFLAGS) $^
 
 lib_LTLIBRARIES = libPMagProximityFitter.la
 

src/external/MusrRoot/Makefile.am

@@ -29,7 +29,7 @@ AM_LDFLAGS = $(LOCAL_LIB_LDFLAGS) -L@ROOTLIBDIR@
 CLEANFILES = *Dict.cpp *Dict.h *Dict* *~ core
 
 %Dict.cpp %Dict.h: %.h %LinkDef.h
-	@ROOTCINT@ -v -f $*Dict.cpp -c -p $(INCLUDES) $^
+	@ROOTCLING@ -v -f $*Dict.cpp -c -p $(INCLUDES) $^
 
 lib_LTLIBRARIES = libTMusrRunHeader.la
 

src/external/Nonlocal/Makefile.am

@@ -39,7 +39,7 @@ AM_LDFLAGS = $(LOCAL_LIB_LDFLAGS) -L@ROOTLIBDIR@
 CLEANFILES = *Dict.cpp *Dict.h *Dict* *~ core
 
 %Dict.cpp %Dict.h: %.h %LinkDef.h
-	@ROOTCINT@ -v -f $*Dict.cpp -c -p $(AM_CPPFLAGS) $^
+	@ROOTCLING@ -v -f $*Dict.cpp -c -p $(AM_CPPFLAGS) $^
 
 lib_LTLIBRARIES = libPNL_PippardFitter.la
 

src/external/TLemRunHeader/Makefile.am

@@ -36,7 +36,7 @@ AM_LDFLAGS = $(LOCAL_LIB_LDFLAGS) -L@ROOTLIBDIR@
 CLEANFILES = *Dict.cxx *Dict.h *Dict* *~ core
 
 %Dict.cxx %Dict.h: %.h %LinkDef.h
-	@ROOTCINT@ -v -f $*Dict.cxx -c -p $(INCLUDES) $^
+	@ROOTCLING@ -v -f $*Dict.cxx -c -p $(INCLUDES) $^
 
 lib_LTLIBRARIES = libTLemRunHeader.la
 

src/external/libBNMR/Makefile.am

@@ -26,7 +26,7 @@ AM_LDFLAGS = $(LOCAL_LIB_LDFLAGS) -L@ROOTLIBDIR@
 CLEANFILES = *Dict.cpp *Dict.h *~ core
 
 %Dict.cpp %Dict.h: %.h %LinkDef.h
-	@ROOTCINT@ -v -f $*Dict.cpp -c -p $(AM_CPPFLAGS) $^
+	@ROOTCLING@ -v -f $*Dict.cpp -c -p $(AM_CPPFLAGS) $^
 
 lib_LTLIBRARIES = libBNMR.la
 

src/external/libBNMR/Makefile.libBNMR

@@ -46,11 +46,11 @@ clean:; 	@rm -f $(OBJS) *Dict* core*
 $(OBJS): %.o: %.cpp
 	$(CXX) $(INCLUDES) $(CXXFLAGS) -c $<
 
-# Generate the ROOT CINT dictionary
+# Generate the ROOT CLING dictionary
 
 TlibBNMRDict.cpp: TBNMR.h TBNMRLinkDef.h
 	@echo "Generating dictionary $@..."
-	rootcint -f $@ -c -p -I$(ROOTINCLUDE) $^
+	rootcling -f $@ -c -p -I$(ROOTINCLUDE) $^
 
 install: all
 	@echo "Installing shared lib: libTApproximation.so"

src/external/libCalcMeanFieldsLEM/Makefile.am

@@ -29,7 +29,7 @@ AM_LDFLAGS = $(LOCAL_LIB_LDFLAGS) -L@ROOTLIBDIR@
 CLEANFILES = *Dict.cpp *Dict.h *Dict* *~ core
 
 %Dict.cpp %Dict.h: %.h %LinkDef.h
-	@ROOTCINT@ -v -f $*Dict.cpp -c -p $(AM_CPPFLAGS) $^
+	@ROOTCLING@ -v -f $*Dict.cpp -c -p $(AM_CPPFLAGS) $^
 
 lib_LTLIBRARIES = libCalcMeanFieldsLEM.la
 

src/external/libFitPofB/classes/Makefile.am

@@ -50,7 +50,7 @@ AM_LDFLAGS = $(LOCAL_LIB_LDFLAGS) -L@ROOTLIBDIR@
 CLEANFILES = *Dict.cpp *Dict.h *Dict* *~ ../include/*~ core
 
 %Dict.cpp %Dict.h: ../include/%.h ../include/%LinkDef.h
-	@ROOTCINT@ -v -f $*Dict.cpp -c -p $(AM_CPPFLAGS) $^
+	@ROOTCLING@ -v -f $*Dict.cpp -c -p $(AM_CPPFLAGS) $^
 
 lib_LTLIBRARIES = libFitPofB.la
 

src/external/libGapIntegrals/Makefile.am

@@ -29,7 +29,7 @@ AM_LDFLAGS = $(LOCAL_LIB_LDFLAGS) -L@ROOTLIBDIR@
 CLEANFILES = *Dict.cpp *Dict.h *Dict* *~ core
 
 %Dict.cpp %Dict.h: %.h %LinkDef.h
-	@ROOTCINT@ -v -f $*Dict.cpp -c -p $(AM_CPPFLAGS) $^
+	@ROOTCLING@ -v -f $*Dict.cpp -c -p $(AM_CPPFLAGS) $^
 
 lib_LTLIBRARIES = libGapIntegrals.la
 

src/external/libGbGLF/Makefile.am

@@ -26,7 +26,7 @@ AM_LDFLAGS = $(LOCAL_LIB_LDFLAGS) -L@ROOTLIBDIR@
 CLEANFILES = *Dict.cpp *Dict.h *~ core
 
 %Dict.cpp %Dict.h: %.h %LinkDef.h
-	@ROOTCINT@ -v -f $*Dict.cpp -c -p $(AM_CPPFLAGS) $^
+	@ROOTCLING@ -v -f $*Dict.cpp -c -p $(AM_CPPFLAGS) $^
 
 lib_LTLIBRARIES = libGbGLF.la
 

src/external/libLFRelaxation/Makefile.am

@@ -29,7 +29,7 @@ AM_LDFLAGS = $(LOCAL_LIB_LDFLAGS) -L@ROOTLIBDIR@
 CLEANFILES = *Dict.cpp *Dict.h *Dict* *~ core
 
 %Dict.cpp %Dict.h: %.h %LinkDef.h
-	@ROOTCINT@ -v -f $*Dict.cpp -c -p $(AM_CPPFLAGS) $^
+	@ROOTCLING@ -v -f $*Dict.cpp -c -p $(AM_CPPFLAGS) $^
 
 lib_LTLIBRARIES = libLFRelaxation.la
 

src/external/libPhotoMeissner/classes/Makefile.am

@@ -36,7 +36,7 @@ AM_LDFLAGS = $(LOCAL_LIB_LDFLAGS) -L@ROOTLIBDIR@
 CLEANFILES = ../classes/*Dict* ../include/*Dict.* *~ core
 
 %Dict.cpp %Dict.h: ../include/%.h ../include/%LinkDef.h
-	@ROOTCINT@ -v -f $*Dict.cpp -c -p $(AM_CPPFLAGS) $^
+	@ROOTCLING@ -v -f $*Dict.cpp -c -p $(AM_CPPFLAGS) $^
 
 lib_LTLIBRARIES = libPPhotoMeissner.la
 

src/external/libSpinValve/classes/Makefile.am

@@ -36,7 +36,7 @@ AM_LDFLAGS = $(LOCAL_LIB_LDFLAGS) -L@ROOTLIBDIR@
 CLEANFILES = ../classes/*Dict.* ../include/*Dict.* *~ core
 
 %Dict.cpp %Dict.h: ../include/%.h ../include/%LinkDef.h
-	@ROOTCINT@ -v -f $*Dict.cpp -c -p $(AM_CPPFLAGS) $^
+	@ROOTCLING@ -v -f $*Dict.cpp -c -p $(AM_CPPFLAGS) $^
 
 lib_LTLIBRARIES = libPSpinValve.la
 

src/external/libZFRelaxation/Makefile.am

@@ -29,7 +29,7 @@ AM_LDFLAGS = $(LOCAL_LIB_LDFLAGS) -L@ROOTLIBDIR@
 CLEANFILES = *Dict.cpp *Dict.h *Dict* *~ core
 
 %Dict.cpp %Dict.h: %.h %LinkDef.h
-	@ROOTCINT@ -v -f $*Dict.cpp -c -p $(AM_CPPFLAGS) $^
+	@ROOTCLING@ -v -f $*Dict.cpp -c -p $(AM_CPPFLAGS) $^
 
 lib_LTLIBRARIES = libZFRelaxation.la
 

src/include/PMusrCanvas.h

@@ -45,10 +45,10 @@
 #include <TLatex.h>
 
 #include "PMusr.h"
-#ifndef __MAKECINT__
+#ifndef __MAKECLING__
 #include "PMsrHandler.h"
 #include "PRunListCollection.h"
-#endif // __MAKECINT__
+#endif // __MAKECLING__
 
 #define YINFO  0.1
 #define YTITLE 0.95
@@ -197,7 +197,7 @@ typedef vector<PMusrCanvasAsciiDump> PMusrCanvasAsciiDumpVector;
 
 //--------------------------------------------------------------------------
 /**
- * <p>The preprocessor tag __MAKECINT__ is used to hide away from rootcint
+ * <p>The preprocessor tag __MAKECLING__ is used to hide away from rootcling
  * the overly complex spirit header files. 
  */
 class PMusrCanvas : public TObject, public TQObject
@@ -216,10 +216,10 @@ class PMusrCanvas : public TObject, public TQObject
 
     virtual Bool_t IsValid() { return fValid; }
 
-#ifndef __MAKECINT__
+#ifndef __MAKECLING__
     virtual void SetMsrHandler(PMsrHandler *msrHandler);
     virtual void SetRunListCollection(PRunListCollection *runList) { fRunList = runList; }
-#endif // __MAKECINT__
+#endif // __MAKECLING__
 
     virtual void SetTimeout(Int_t ival);
     virtual void UpdateParamTheoryPad();
@@ -277,10 +277,10 @@ class PMusrCanvas : public TObject, public TQObject
 
     TH1F *fHistoFrame; ///< fHistoFrame is a 'global' frame needed in order to plot histograms with (potentially) different x-frames
 
-#ifndef __MAKECINT__
+#ifndef __MAKECLING__
     PMsrHandler        *fMsrHandler; ///< msr-file handler
     PRunListCollection *fRunList;    ///< data handler
-#endif // __MAKECINT__
+#endif // __MAKECLING__
 
     PMusrCanvasDataSet fDataAvg; ///< set of all averaged data to be plotted (asymmetry/single histogram)
 

src/include/PMusrT0.h

@@ -42,9 +42,9 @@
 #include <TTimer.h>
 
 #include "PMusr.h"
-#ifndef __MAKECINT__
+#ifndef __MAKECLING__
 #include "PMsrHandler.h"
-#endif // __MAKECINT__
+#endif // __MAKECLING__
 
 #define PMUSRT0_FORWARD  0
 #define PMUSRT0_BACKWARD 1
@@ -113,7 +113,7 @@ class PMusrT0Data {
 //--------------------------------------------------------------------------
 /**
  * <p>Handles the musrt0 graphical user interface.
- * <p>The preprocessor tag __MAKECINT__ is used to hide away from rootcint
+ * <p>The preprocessor tag __MAKECLING__ is used to hide away from rootcling
  * the overly complex spirit header files.
  */
 class PMusrT0 : public TObject, public TQObject
@@ -131,18 +131,18 @@ class PMusrT0 : public TObject, public TQObject
     virtual void Quit(); // SLOT
     virtual void SetTimeout(Int_t timeout);
 
-#ifndef __MAKECINT__
+#ifndef __MAKECLING__
     virtual void SetMsrHandler(PMsrHandler *msrHandler);
-#endif // __MAKECINT__
+#endif // __MAKECLING__
 
     virtual void InitT0();
     virtual void InitDataAndBkg();
     virtual Int_t GetStatus() { return fStatus; }
 
   private:
-#ifndef __MAKECINT__
+#ifndef __MAKECLING__
     PMsrHandler *fMsrHandler; ///< msr-file handler
-#endif // __MAKECINT__
+#endif // __MAKECLING__
     Int_t  fTimeout;          ///< timeout after which the Done signal should be emited. If timeout <= 0, no timeout is taking place
 
     Bool_t fValid; ///< true if raw data set are available, otherwise false

src/musrt0.cpp

@@ -111,7 +111,7 @@ Bool_t musrt0_item(TApplication &app, PMsrHandler *msrHandler, PMusrT0Data &data
   // set timeout
   musrT0->SetTimeout(timeout);
 
-  // set the msr-file handler. The handler cannot be transfered at construction time since rootcint is not able to handle the PMsrHandler class
+  // set the msr-file handler. The handler cannot be transfered at construction time since rootcling is not able to handle the PMsrHandler class
   musrT0->SetMsrHandler(msrHandler);
 
   // check if only t0, data-, and bkg-range is wished, if not, only initialize t0 at this point

src/musrview.cpp

@@ -330,7 +330,7 @@ int main(int argc, char *argv[])
 
       musrCanvas->SetTimeout(timeout);
 
-      // ugly but rootcint cannot handle the spirit-parser framework
+      // ugly but rootcling cannot handle the spirit-parser framework
       musrCanvas->SetMsrHandler(msrHandler);
       musrCanvas->SetRunListCollection(runListCollection);