Revert from failed experiment.

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

config/Makefile.depend

@@ -97,7 +97,7 @@ X11TTFLIBDEPM          = $(X11LIB) $(GRAFLIB)
 X3DLIBDEPM             = $(G3DLIB) $(GUILIB)
 MONALISALIBDEPM        = $(NETLIB) $(IOLIB)
 THREADLIBDEPM          = $(IOLIB)
-EVELIBDEPM             = $(GEOMLIB) $(G3DLIB) $(GUILIB) \
+EVELIBDEPM             = $(GEOMLIB) $(GEOMPAINTERLIB) $(G3DLIB) $(GUILIB) \
                          $(GPADLIB) $(GRAFLIB) $(HISTLIB) $(PHYSICSLIB) \
                          $(GEDLIB) $(EGLIB) $(TREELIB) $(TREEPLAYERLIB) \
                          $(GLLIB) $(FTGLLIB) $(IOLIB) $(RINTLIB) $(MATHCORELIB)
@@ -306,7 +306,7 @@ GDMLLIBEXTRA            = lib/libGeom.lib lib/libXMLIO.lib lib/libHist.lib \
 UNURANLIBEXTRA          = lib/libHist.lib lib/libMathCore.lib
 MONALISALIBEXTRA        = lib/libNet.lib lib/libRIO.lib
 THREADLIBEXTRA          = lib/libRIO.lib
-EVELIBEXTRA             = lib/libGeom.lib \
+EVELIBEXTRA             = lib/libGeom.lib lib/libGeomPainter.lib \
                           lib/libGpad.lib lib/libGraf3d.lib lib/libGui.lib \
                           lib/libGraf.lib lib/libHist.lib lib/libPhysics.lib \
                           lib/libGed.lib lib/libEG.lib lib/libTree.lib \
@@ -398,7 +398,7 @@ GDMLLIBEXTRA            = -Llib -lGeom -lXMLIO -lHist -lRIO
 UNURANLIBEXTRA          = -Llib -lHist -lMathCore
 MONALISALIBEXTRA        = -Llib -lNet -lRIO
 THREADLIBEXTRA          = -Llib -lRIO
-EVELIBEXTRA             = -Llib -lGeom -lGraf3d -lGui -lGpad \
+EVELIBEXTRA             = -Llib -lGeom -lGeomPainter -lGraf3d -lGui -lGpad \
                           -lGraf -lHist -lPhysics -lGed -lEG -lTree \
                           -lTreePlayer -lRGL -lRIO -lRint -lMathCore
 

geom/geom/Module.mk

@@ -34,7 +34,7 @@ GEOMH1       := TGeoAtt.h TGeoBoolNode.h \
                 TGeoScaledShape.h TVirtualGeoPainter.h TVirtualGeoTrack.h \
 		TGeoPolygon.h TGeoXtru.h TGeoPhysicalNode.h \
                 TGeoHelix.h TGeoParaboloid.h TGeoElement.h TGeoHalfSpace.h \
-                TGeoBuilder.h TGeoNavigator.h TGeoOverlap.h
+                TGeoBuilder.h TGeoNavigator.h
 GEOMH2       := TGeoPatternFinder.h TGeoCache.h
 GEOMH1       := $(patsubst %,$(MODDIRI)/%,$(GEOMH1))
 GEOMH2       := $(patsubst %,$(MODDIRI)/%,$(GEOMH2))

geom/geom/inc/LinkDef1.h

@@ -81,6 +81,5 @@
 #pragma link C++ class TGeoIterator;
 #pragma link C++ class TGeoBuilder;
 #pragma link C++ class TGeoNavigator+;
-#pragma link C++ class TGeoOverlap+;
 
 #endif

geom/geompainter/inc/LinkDef.h

@@ -16,5 +16,6 @@
 #pragma link C++ class TGeoPainter+;
 #pragma link C++ class TGeoChecker+;
 #pragma link C++ class TGeoTrack+;
+#pragma link C++ class TGeoOverlap+;
 
 #endif

io/io/inc/LinkDef.h

@@ -40,6 +40,5 @@
 #pragma link C++ class TCollectionStreamer-;
 #pragma link C++ class TCollectionClassStreamer-;
 #pragma link C++ class TCollectionMemberStreamer-;
-#pragma link C++ class TFileMerger+;
 
 #endif

proof/proofplayer/inc/LinkDef.h

@@ -40,6 +40,7 @@
 #pragma link C++ class TProofLimitsFinder;
 #pragma link C++ class TDrawFeedback+;
 #pragma link C++ class TStatus+;
+#pragma link C++ class TFileMerger+;
 #pragma link C++ class TProofOutputFile+;
 
 #endif