move geom, geombuilder, geompainter and gdml to geom meta directory.

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

Makefile

@@ -63,10 +63,10 @@ MODULES       = build cint/cint metautils pcre utils base cont meta io \
                 hist/hist tree/tree freetype graf gpad g3d gui math/minuit \
                 hist/histpainter tree/treeplayer ged tree/treeviewer \
                 math/physics \
-                postscript rint thread html eg geom geompainter vmc \
+                postscript rint thread html eg geom/geom geom/geompainter vmc \
                 math/fumili math/mlp math/quadp auth guibuilder xml \
                 math/foam math/splot math/smatrix sql tmva \
-                geombuilder hist/spectrum hist/spectrumpainter \
+                geom/geombuilder hist/spectrum hist/spectrumpainter \
                 fitpanel proof/proof proof/proofplayer sessionviewer guihtml
 
 ifeq ($(ARCH),win32)
@@ -183,7 +183,7 @@ ifeq ($(BUILDROOFIT),yes)
 MODULES      += roofitcore roofit
 endif
 ifeq ($(BUILDGDML),yes)
-MODULES      += gdml
+MODULES      += geom/gdml
 endif
 ifeq ($(BUILDTABLE),yes)
 MODULES      += table
@@ -244,7 +244,7 @@ MODULES      += unix winnt x11 x11ttf win32gdk gl ftgl rfio castor \
                 oracle xmlparser math/mathmore cint/reflex cintex \
                 roofitcore roofit \
                 math/minuit2 monalisa math/fftw odbc math/unuran \
-                gdml eve g4root glite
+                geom/gdml eve g4root glite
 MODULES      := $(sort $(MODULES))   # removes duplicates
 endif
 

gdml/Module.mk → geom/gdml/Module.mk

@@ -3,7 +3,8 @@
 #
 # Author: Ben Lloyd 09/11/06
 
-MODDIR       := gdml
+MODNAME      := gdml
+MODDIR       := geom/$(MODNAME)
 MODDIRS      := $(MODDIR)/src
 MODDIRI      := $(MODDIR)/inc
 
@@ -35,6 +36,8 @@ ALLMAPS      += $(GDMLMAP)
 INCLUDEFILES += $(GDMLDEP)
 
 ##### local rules #####
+.PHONY:         all-$(MODNAME) clean-$(MODNAME) distclean-$(MODNAME)
+
 include/%.h:    $(GDMLDIRI)/%.h
 		cp $< $@
 
@@ -51,14 +54,14 @@ $(GDMLMAP):     $(RLIBMAP) $(MAKEFILEDEP) $(GDMLL)
 		$(RLIBMAP) -o $(GDMLMAP) -l $(GDMLLIB) \
 		   -d $(GDMLLIBDEPM) -c $(GDMLL)
 
-all-gdml:       $(GDMLLIB) $(GDMLMAP)
+all-$(MODNAME): $(GDMLLIB) $(GDMLMAP)
 
-clean-gdml:
+clean-$(MODNAME):
 		@rm -f $(GDMLO) $(GDMLDO)
 
-clean::         clean-gdml
+clean::         clean-$(MODNAME)
 
-distclean-gdml: clean-gdml
+distclean-$(MODNAME): clean-$(MODNAME)
 		@rm -f $(GDMLDEP) $(GDMLDS) $(GDMLDH) $(GDMLLIB) $(GDMLMAP)
 
-distclean::     distclean-gdml
+distclean::     distclean-$(MODNAME)

geom/Module.mk → geom/geom/Module.mk

@@ -3,7 +3,8 @@
 #
 # Author: Fons Rademakers, 29/2/2000
 
-MODDIR       := geom
+MODNAME      := geom
+MODDIR       := geom/$(MODNAME)
 MODDIRS      := $(MODDIR)/src
 MODDIRI      := $(MODDIR)/inc
 
@@ -55,6 +56,8 @@ ALLMAPS     += $(GEOMMAP)
 INCLUDEFILES += $(GEOMDEP)
 
 ##### local rules #####
+.PHONY:         all-$(MODNAME) clean-$(MODNAME) distclean-$(MODNAME)
+
 include/%.h:    $(GEOMDIRI)/%.h
 		cp $< $@
 
@@ -75,14 +78,14 @@ $(GEOMMAP):     $(RLIBMAP) $(MAKEFILEDEP) $(GEOML1) $(GEOML2)
 		$(RLIBMAP) -o $(GEOMMAP) -l $(GEOMLIB) \
 		   -d $(GEOMLIBDEPM) -c $(GEOML1) $(GEOML2)
 
-all-geom:       $(GEOMLIB) $(GEOMMAP)
+all-$(MODNAME): $(GEOMLIB) $(GEOMMAP)
 
-clean-geom:
+clean-$(MODNAME):
 		@rm -f $(GEOMO) $(GEOMDO)
 
-clean::         clean-geom
+clean::         clean-$(MODNAME)
 
-distclean-geom: clean-geom
+distclean-$(MODNAME): clean-$(MODNAME)
 		@rm -f $(GEOMDEP) $(GEOMDS) $(GEOMDH) $(GEOMLIB) $(GEOMMAP)
 
-distclean::     distclean-geom
+distclean::     distclean-$(MODNAME)