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

after some tests it turns out only libCore needs to be linked with -g, it is

not needed (anymore) to compile and link graf/src/G* with -g. The "redo"
script had as side effect to relink also libCore with -g which was the
real solution.


git-svn-id: http://root.cern.ch/svn/root/trunk@7182 27541ba8-7e3a-0410-8455-c3a389f83636
parent 5cd3285c
No related branches found
No related tags found
No related merge requests found
...@@ -349,9 +349,15 @@ build/dummy.d: config $(ROOTRC) $(RMKDEP) $(BINDEXP) $(ALLHDRS) ...@@ -349,9 +349,15 @@ build/dummy.d: config $(ROOTRC) $(RMKDEP) $(BINDEXP) $(ALLHDRS)
$(MAKEDEP) $@ "$(CXXFLAGS)" $*.cxx > $@ $(MAKEDEP) $@ "$(CXXFLAGS)" $*.cxx > $@
$(CORELIB): $(COREO) $(COREDO) $(CINTLIB) $(CORELIBDEP) $(CORELIB): $(COREO) $(COREDO) $(CINTLIB) $(CORELIBDEP)
ifneq ($(ARCH),alphacxx6)
@$(MAKELIB) $(PLATFORM) $(LD) "$(LDFLAGS)" \ @$(MAKELIB) $(PLATFORM) $(LD) "$(LDFLAGS)" \
"$(SOFLAGS)" libCore.$(SOEXT) $@ "$(COREO) $(COREDO)" \ "$(SOFLAGS)" libCore.$(SOEXT) $@ "$(COREO) $(COREDO)" \
"$(CORELIBEXTRA) $(CRYPTLIBS)" "$(CORELIBEXTRA) $(CRYPTLIBS)"
else
@$(MAKELIB) $(PLATFORM) $(LD) "$(CORELDFLAGS)" \
"$(SOFLAGS)" libCore.$(SOEXT) $@ "$(COREO) $(COREDO)" \
"$(CORELIBEXTRA) $(CRYPTLIBS)"
endif
dist: dist:
@$(MAKEDIST) @$(MAKEDIST)
......
...@@ -42,7 +42,7 @@ CILIBS = -lm -ltermcap ...@@ -42,7 +42,7 @@ CILIBS = -lm -ltermcap
F77LIBS = /usr/shlib/libFutil.so /usr/shlib/libfor.so /usr/shlib/libots.so F77LIBS = /usr/shlib/libFutil.so /usr/shlib/libfor.so /usr/shlib/libots.so
# Extras # Extras
CORELIBDEP = $(G3DLIB) $(GRAFLIB) $(HISTLIB) $(MATRIXLIB) CORELDFLAGS = $(DEBUGFLAGS) $(EXTRA_LDFLAGS)
# Override default in Makefile.config # Override default in Makefile.config
INSTALL := cp -pR INSTALL := cp -pR
......
...@@ -56,17 +56,10 @@ $(GRAFDS2): $(GRAFH) $(GRAFL2) $(ROOTCINTTMP) ...@@ -56,17 +56,10 @@ $(GRAFDS2): $(GRAFH) $(GRAFL2) $(ROOTCINTTMP)
@echo "Generating dictionary $@..." @echo "Generating dictionary $@..."
$(ROOTCINTTMP) -f $@ -c $(GRAFH) $(GRAFL2) $(ROOTCINTTMP) -f $@ -c $(GRAFH) $(GRAFL2)
ifneq ($(ARCH),alphacxx6)
$(GRAFDO1): $(GRAFDS1) $(GRAFDO1): $(GRAFDS1)
$(CXX) $(NOOPT) $(CXXFLAGS) -I. -o $@ -c $< $(CXX) $(NOOPT) $(CXXFLAGS) -I. -o $@ -c $<
$(GRAFDO2): $(GRAFDS2) $(FREETYPELIB) $(GRAFDO2): $(GRAFDS2) $(FREETYPELIB)
$(CXX) $(NOOPT) -I$(FREETYPEDIRI) $(CXXFLAGS) -I. -o $@ -c $< $(CXX) $(NOOPT) -I$(FREETYPEDIRI) $(CXXFLAGS) -I. -o $@ -c $<
else
$(GRAFDO1): $(GRAFDS1)
$(CXX) $(DEBUGFLAGS) $(CXXFLAGS) -I. -o $@ -c $<
$(GRAFDO2): $(GRAFDS2) $(FREETYPELIB)
$(CXX) $(DEBUGFLAGS) -I$(FREETYPEDIRI) $(CXXFLAGS) -I. -o $@ -c $<
endif
all-graf: $(GRAFLIB) all-graf: $(GRAFLIB)
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment