Skip to content
Snippets Groups Projects
Commit 16c8deaf authored by Fons Rademakers's avatar Fons Rademakers
Browse files

add the "map" target, which calls the new rlibmap to extract all class

and library and dependent library information from the LinkDefs and the
library and libdep macros.


git-svn-id: http://root.cern.ch/svn/root/trunk@8916 27541ba8-7e3a-0410-8455-c3a389f83636
parent 2bebcf3f
No related branches found
No related tags found
No related merge requests found
......@@ -50,20 +50,24 @@ MODULES = build cint metautils utils base cont meta net zip clib matrix \
ifeq ($(ARCH),win32)
MODULES += winnt win32 gl
SYSTEML = $(WINNTL)
SYSTEMO = $(WINNTO)
SYSTEMDO = $(WINNTDO)
else
ifeq ($(ARCH),win32gdk)
MODULES += winnt win32gdk gl
SYSTEML = $(WINNTL)
SYSTEMO = $(WINNTO)
SYSTEMDO = $(WINNTDO)
else
ifeq ($(ARCH),win32gcc)
MODULES += unix x11 x11ttf x3d rootx rpdutils rootd proofd
SYSTEML = $(UNIXL)
SYSTEMO = $(UNIXO)
SYSTEMDO = $(UNIXDO)
else
MODULES += unix x11 x11ttf x3d rootx rpdutils rootd proofd
SYSTEML = $(UNIXL)
SYSTEMO = $(UNIXO)
SYSTEMDO = $(UNIXDO)
endif
......@@ -248,6 +252,8 @@ ROOTMAP = etc/system.rootmap
##### libCore #####
COREL = $(BASEL1) $(BASEL2) $(BASEL3) $(CONTL) $(METAL) $(NETL) \
$(SYSTEML) $(CLIBL) $(METAUTILSL)
COREO = $(BASEO) $(CONTO) $(METAO) $(NETO) $(SYSTEMO) $(ZIPO) $(CLIBO) \
$(METAUTILSO)
COREDO = $(BASEDO) $(CONTDO) $(METADO) $(NETDO) $(SYSTEMDO) $(CLIBDO) \
......@@ -394,6 +400,9 @@ else
"$(CORELIBEXTRA) $(CRYPTLIBS)"
endif
map:: $(RLIBMAP)
$(RLIBMAP) -r $(ROOTMAP) -l $(CORELIB) -d $(CORELIBDEP) -c $(COREL)
dist:
@$(MAKEDIST)
......@@ -451,7 +460,7 @@ endif
distclean:: clean
-@mv -f include/config.h include/config.hh
@rm -f include/*.h $(MAKEINFO) $(CORELIB)
@rm -f include/*.h $(MAKEINFO) $(ROOTMAP) $(CORELIB)
-@mv -f include/config.hh include/config.h
@rm -f bin/*.dll bin/*.exp bin/*.lib bin/*.pdb \
lib/*.def lib/*.exp lib/*.lib lib/*.dll.a \
......@@ -476,7 +485,7 @@ maintainer-clean:: distclean
-build/package/lib/makedebclean.sh
-build/package/lib/makerpmclean.sh
@rm -rf bin lib include htmldoc system.rootrc config/Makefile.config \
test/Makefile $(ROOTRC) $(ROOTMAP) etc/system.rootauthrc \
test/Makefile $(ROOTRC) etc/system.rootauthrc \
etc/system.rootdaemonrc etc/root.mimes \
build/misc/root-help.el
......
......@@ -50,6 +50,12 @@ $(ALIENDO): $(ALIENDS)
all-alien: $(ALIENLIB)
map-alien : $(RLIBMAP)
$(RLIBMAP) -r $(ROOTMAP) -l $(ALIENLIB) \
-d $(ALIENLIBDEP) -c $(ALIENL)
map:: map-alien
clean-alien:
@rm -f $(ALIENO) $(ALIENDO)
......
......@@ -97,6 +97,12 @@ $(ASIMAGEDO): $(ASIMAGEDS) $(ASTEPLIB)
all-asimage: $(ASIMAGELIB)
map-asimage: $(RLIBMAP)
$(RLIBMAP) -r $(ROOTMAP) -l $(ASIMAGELIB) \
-d $(ASIMAGELIBDEP) -c $(ASIMAGEL)
map:: map-asimage
clean-asimage:
@rm -f $(ASIMAGEO) $(ASIMAGEDO)
-@(if [ -d $(ASTEPDIRS) ]; then \
......
......@@ -49,6 +49,12 @@ $(CHIRPDO): $(CHIRPDS)
all-chirp: $(CHIRPLIB)
map-chirp: $(RLIBMAP)
$(RLIBMAP) -r $(ROOTMAP) -l $(CHIRPLIB) \
-d $(CHIRPLIBDEP) -c $(CHIRPL)
map:: map-chirp
clean-chirp:
@rm -f $(CHIRPO) $(CHIRPDO)
......
......@@ -67,9 +67,6 @@ F77 = f77
F77FLAGS = -O0 -recursive -nofor_main
F77LIBS = /usr/lib/libfor.a -lUfor -lFutil
# Extras
CORELIBDEP = $(G3DLIB) $(GRAFLIB) $(HISTLIB) $(MATRIXLIB)
# Override default in Makefile.config
INSTALL := cp -pR
INSTALLDATA := cp -pR
......
......@@ -49,6 +49,12 @@ $(DCACHEDO): $(DCACHEDS)
all-dcache: $(DCACHELIB)
map-dcache: $(RLIBMAP)
$(RLIBMAP) -r $(ROOTMAP) -l $(DCACHELIB) \
-d $(DCACHELIBDEP) -c $(DCACHEL)
map:: map-dcache
clean-dcache:
@rm -f $(DCACHEO) $(DCACHEDO)
......
......@@ -51,6 +51,12 @@ $(EGDO): $(EGDS)
all-eg: $(EGLIB)
map-eg: $(RLIBMAP)
$(RLIBMAP) -r $(ROOTMAP) -l $(EGLIB) \
-d $(EGLIBDEP) -c $(EGL)
map:: map-eg
clean-eg:
@rm -f $(EGO) $(EGDO)
......
......@@ -50,6 +50,12 @@ $(FUMILIDO): $(FUMILIDS)
all-fumili: $(FUMILILIB)
map-fumili: $(RLIBMAP)
$(RLIBMAP) -r $(ROOTMAP) -l $(FUMILILIB) \
-d $(FUMILILIBDEP) -c $(FUMILIL)
map:: map-fumili
clean-fumili:
@rm -f $(FUMILIO) $(FUMILIDO)
......
......@@ -55,6 +55,12 @@ $(G3DDO): $(G3DDS)
all-g3d: $(G3DLIB)
map-g3d: $(RLIBMAP)
$(RLIBMAP) -r $(ROOTMAP) -l $(G3DLIB) \
-d $(G3DLIBDEP) -c $(G3DL)
map:: map-g3d
clean-g3d:
@rm -f $(G3DO) $(G3DDO)
......
......@@ -50,6 +50,12 @@ $(GEDDO): $(GEDDS)
all-ged: $(GEDLIB)
map-ged: $(RLIBMAP)
$(RLIBMAP) -r $(ROOTMAP) -l $(GEDLIB) \
-d $(GEDLIBDEP) -c $(GEDL)
map:: map-ged
clean-ged:
@rm -f $(GEDO) $(GEDDO)
......
......@@ -50,6 +50,12 @@ $(GEDOLDDO): $(GEDOLDDS)
all-gedold: $(GEDOLDLIB)
map-gedold: $(RLIBMAP)
$(RLIBMAP) -r $(ROOTMAP) -l $(GEDOLDLIB) \
-d $(GEDOLDLIBDEP) -c $(GEDOLDL)
map:: map-gedold
clean-gedold:
@rm -f $(GEDOLDO) $(GEDOLDDO)
......
......@@ -75,6 +75,12 @@ $(GEOMDO2): $(GEOMDS2)
all-geom: $(GEOMLIB)
map-geom: $(RLIBMAP)
$(RLIBMAP) -r $(ROOTMAP) -l $(GEOMLIB) \
-d $(GEOMLIBDEP) -c $(GEOML1) $(GEOML2)
map:: map-geom
clean-geom:
@rm -f $(GEOMO) $(GEOMDO)
......
......@@ -51,7 +51,13 @@ $(GEOMPAINTERDS): $(GEOMPAINTERH1) $(GEOMPAINTERL) $(ROOTCINTTMP)
$(GEOMPAINTERDO): $(GEOMPAINTERDS)
$(CXX) $(NOOPT) $(CXXFLAGS) -I. -o $@ -c $<
all-geompainter: $(GEOMPAINTERLIB)
all-geompainter: $(GEOMPAINTERLIB)
map-geompainter: $(RLIBMAP)
$(RLIBMAP) -r $(ROOTMAP) -l $(GEOMPAINTERLIB) \
-d $(GEOMPAINTERLIBDEP) -c $(GEOMPAINTERL)
map:: map-geompainter
clean-geompainter:
@rm -f $(GEOMPAINTERO) $(GEOMPAINTERDO)
......
......@@ -59,6 +59,11 @@ $(GLLIB): $(GLO) $(MAINLIBS) $(GLLIBDEP)
all-gl: $(GLLIB)
map-gl: $(RLIBMAP)
$(RLIBMAP) -r $(ROOTMAP) -l $(GLLIB) -d $(GLLIBDEP) -c $(GLL)
map:: map-gl
clean-gl:
@rm -f $(GLO)
......
......@@ -50,6 +50,12 @@ $(GPADDO): $(GPADDS)
all-gpad: $(GPADLIB)
map-gpad: $(RLIBMAP)
$(RLIBMAP) -r $(ROOTMAP) -l $(GPADLIB) \
-d $(GPADLIBDEP) -c $(GPADL)
map:: map-gpad
clean-gpad:
@rm -f $(GPADO) $(GPADDO)
......
......@@ -63,6 +63,12 @@ $(GRAFDO2): $(GRAFDS2) $(FREETYPELIB)
all-graf: $(GRAFLIB)
map-graf: $(RLIBMAP)
$(RLIBMAP) -r $(ROOTMAP) -l $(GRAFLIB) \
-d $(GRAFLIBDEP) -c $(GRAFL1) $(GRAFL2)
map:: map-graf
clean-graf:
@rm -f $(GRAFO) $(GRAFDO)
......
......@@ -36,12 +36,12 @@ GUIH2 := TGObject.h TGScrollBar.h TGCanvas.h TGListBox.h TGComboBox.h \
TGToolBar.h TGListTree.h TGText.h TGView.h TGTextView.h \
TGTextEdit.h TGTextEditDialogs.h TGDoubleSlider.h TGSplitter.h \
TGFSComboBox.h TGImageMap.h TGApplication.h TGXYLayout.h \
TGResourcePool.h TGFont.h
TGResourcePool.h TGFont.h
GUIH3 := TRootGuiFactory.h TRootApplication.h TRootCanvas.h \
TRootBrowser.h TRootContextMenu.h TRootDialog.h \
TRootControlBar.h TRootHelpDialog.h TRootEmbeddedCanvas.h \
TGColorDialog.h TGColorSelect.h TGFontDialog.h
GUIH4 := HelpText.h
GUIH1 := $(patsubst %,$(MODDIRI)/%,$(GUIH1))
GUIH2 := $(patsubst %,$(MODDIRI)/%,$(GUIH2))
......@@ -90,6 +90,12 @@ $(GUIDO3): $(GUIDS3)
all-gui: $(GUILIB)
map-gui: $(RLIBMAP)
$(RLIBMAP) -r $(ROOTMAP) -l $(GUILIB) \
-d $(GUILIBDEP) -c $(GUIL1) $(GUIL2) $(GUIL3)
map:: map-gui
clean-gui:
@rm -f $(GUIO) $(GUIDO)
......
......@@ -54,6 +54,12 @@ $(HBOOKDO): $(HBOOKDS)
all-hbook: $(HBOOKLIB)
map-hbook: $(RLIBMAP)
$(RLIBMAP) -r $(ROOTMAP) -l $(HBOOKLIB) \
-d $(HBOOKLIBDEP) -c $(HBOOKL)
map:: map-hbook
clean-hbook:
@rm -f $(HBOOKO) $(HBOOKDO)
......
......@@ -50,6 +50,12 @@ $(HISTDO): $(HISTDS)
all-hist: $(HISTLIB)
map-hist: $(RLIBMAP)
$(RLIBMAP) -r $(ROOTMAP) -l $(HISTLIB) \
-d $(HISTLIBDEP) -c $(HISTL)
map:: map-hist
clean-hist:
@rm -f $(HISTO) $(HISTDO)
......
......@@ -51,7 +51,13 @@ $(HISTPAINTERDS): $(HISTPAINTERH1) $(HISTPAINTERL) $(ROOTCINTTMP)
$(HISTPAINTERDO): $(HISTPAINTERDS)
$(CXX) $(NOOPT) $(CXXFLAGS) -I. -o $@ -c $<
all-histpainter: $(HISTPAINTERLIB)
all-histpainter: $(HISTPAINTERLIB)
map-histpainter: $(RLIBMAP)
$(RLIBMAP) -r $(ROOTMAP) -l $(HISTPAINTERLIB) \
-d $(HISTPAINTERLIBDEP) -c $(HISTPAINTERL)
map:: map-histpainter
clean-histpainter:
@rm -f $(HISTPAINTERO) $(HISTPAINTERDO)
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment