Skip to content
Snippets Groups Projects
Commit ac07191f authored by Rene Brun's avatar Rene Brun
Browse files

-Define BOOTLIBS to be libCore, libCint only

-root.exe is created with BOOTLIBS instead of ROOTLIBS


git-svn-id: http://root.cern.ch/svn/root/trunk@17975 27541ba8-7e3a-0410-8455-c3a389f83636
parent 3a954eaf
No related branches found
No related tags found
No related merge requests found
...@@ -240,6 +240,8 @@ CINT7LIBS := -lCint7 -lReflex ...@@ -240,6 +240,8 @@ CINT7LIBS := -lCint7 -lReflex
NEWLIBS := -lNew NEWLIBS := -lNew
ROOTLIBS := -lCore -lCint -lRIO -lNet -lHist -lGraf -lGraf3d -lGpad \ ROOTLIBS := -lCore -lCint -lRIO -lNet -lHist -lGraf -lGraf3d -lGpad \
-lTree -lMatrix -lTree -lMatrix
BOOTLIBS := -lCore -lCint
ifneq ($(ROOTDICTTYPE),cint) ifneq ($(ROOTDICTTYPE),cint)
ROOTLIBS += -lCintex -lReflex ROOTLIBS += -lCintex -lReflex
endif endif
...@@ -253,8 +255,10 @@ ROOTLIBS := $(LPATH)/libCore.lib $(LPATH)/libCint.lib \ ...@@ -253,8 +255,10 @@ ROOTLIBS := $(LPATH)/libCore.lib $(LPATH)/libCint.lib \
$(LPATH)/libHist.lib $(LPATH)/libGraf.lib \ $(LPATH)/libHist.lib $(LPATH)/libGraf.lib \
$(LPATH)/libGraf3d.lib $(LPATH)/libGpad.lib \ $(LPATH)/libGraf3d.lib $(LPATH)/libGpad.lib \
$(LPATH)/libTree.lib $(LPATH)/libMatrix.lib $(LPATH)/libTree.lib $(LPATH)/libMatrix.lib
BOOTLIBS := $(LPATH)/libCore.lib $(LPATH)/libCint.lib
ifneq ($(ROOTDICTTYPE),cint) ifneq ($(ROOTDICTTYPE),cint)
ROOTLIBS += $(LPATH)/libCintex.lib $(LPATH)/libReflex.lib ROOTLIBS += $(LPATH)/libCintex.lib $(LPATH)/libReflex.lib
BOOTLIBS += $(LPATH)/libCintex.lib $(LPATH)/libReflex.lib
endif endif
RINTLIBS := $(LPATH)/libRint.lib RINTLIBS := $(LPATH)/libRint.lib
endif endif
...@@ -270,6 +274,7 @@ endif ...@@ -270,6 +274,7 @@ endif
ifeq ($(FORCELINK),yes) ifeq ($(FORCELINK),yes)
ifeq ($(PLATFORM),aix5) ifeq ($(PLATFORM),aix5)
ROOTULIBS := -Wl,-u,.G__cpp_setupG__Net \ ROOTULIBS := -Wl,-u,.G__cpp_setupG__Net \
-Wl,-u,.G__cpp_setupG__IO \
-Wl,-u,.G__cpp_setupG__Hist \ -Wl,-u,.G__cpp_setupG__Hist \
-Wl,-u,.G__cpp_setupG__Graf1 \ -Wl,-u,.G__cpp_setupG__Graf1 \
-Wl,-u,.G__cpp_setupG__G3D \ -Wl,-u,.G__cpp_setupG__G3D \
...@@ -278,6 +283,7 @@ ROOTULIBS := -Wl,-u,.G__cpp_setupG__Net \ ...@@ -278,6 +283,7 @@ ROOTULIBS := -Wl,-u,.G__cpp_setupG__Net \
-Wl,-u,.G__cpp_setupG__Matrix -Wl,-u,.G__cpp_setupG__Matrix
else else
ROOTULIBS := -Wl,-u,_G__cpp_setupG__Net \ ROOTULIBS := -Wl,-u,_G__cpp_setupG__Net \
-Wl,-u,_G__cpp_setupG__IO \
-Wl,-u,_G__cpp_setupG__Hist \ -Wl,-u,_G__cpp_setupG__Hist \
-Wl,-u,_G__cpp_setupG__Graf1 \ -Wl,-u,_G__cpp_setupG__Graf1 \
-Wl,-u,_G__cpp_setupG__G3D \ -Wl,-u,_G__cpp_setupG__G3D \
...@@ -288,6 +294,7 @@ endif ...@@ -288,6 +294,7 @@ endif
endif endif
ifeq ($(PLATFORM),win32) ifeq ($(PLATFORM),win32)
ROOTULIBS := -include:_G__cpp_setupG__Net \ ROOTULIBS := -include:_G__cpp_setupG__Net \
-include:_G__cpp_setupG__IO \
-include:_G__cpp_setupG__Hist \ -include:_G__cpp_setupG__Hist \
-include:_G__cpp_setupG__Graf1 \ -include:_G__cpp_setupG__Graf1 \
-include:_G__cpp_setupG__G3D \ -include:_G__cpp_setupG__G3D \
......
...@@ -110,7 +110,7 @@ INCLUDEFILES += $(ROOTEXEDEP) $(PROOFSERVDEP) $(HADDDEP) $(H2ROOTDEP) \ ...@@ -110,7 +110,7 @@ INCLUDEFILES += $(ROOTEXEDEP) $(PROOFSERVDEP) $(HADDDEP) $(H2ROOTDEP) \
##### local rules ##### ##### local rules #####
$(ROOTEXE): $(ROOTEXEO) $(ROOTLIBSDEP) $(RINTLIB) $(ROOTEXE): $(ROOTEXEO) $(ROOTLIBSDEP) $(RINTLIB)
$(LD) $(LDFLAGS) -o $@ $(ROOTEXEO) $(ROOTICON) $(ROOTULIBS) \ $(LD) $(LDFLAGS) -o $@ $(ROOTEXEO) $(ROOTICON) $(ROOTULIBS) \
$(RPATH) $(ROOTLIBS) $(RINTLIBS) $(SYSLIBS) $(RPATH) $(BOOTLIBS) $(RINTLIBS) $(SYSLIBS)
$(ROOTNEXE): $(ROOTEXEO) $(NEWLIB) $(ROOTLIBSDEP) $(RINTLIB) $(ROOTNEXE): $(ROOTEXEO) $(NEWLIB) $(ROOTLIBSDEP) $(RINTLIB)
$(LD) $(LDFLAGS) -o $@ $(ROOTEXEO) $(ROOTICON) $(ROOTULIBS) \ $(LD) $(LDFLAGS) -o $@ $(ROOTEXEO) $(ROOTICON) $(ROOTULIBS) \
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment