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

modifications releated to the new configure script. By Christian Holm.

git-svn-id: http://root.cern.ch/svn/root/trunk@1138 27541ba8-7e3a-0410-8455-c3a389f83636
parent e2fc3dde
No related branches found
No related tags found
No related merge requests found
...@@ -72,11 +72,11 @@ $(H2ROOT): $(H2ROOTO) $(NEWLIB) $(CORELIB) $(CINTLIB) $(HISTLIB) \ ...@@ -72,11 +72,11 @@ $(H2ROOT): $(H2ROOTO) $(NEWLIB) $(CORELIB) $(CINTLIB) $(HISTLIB) \
$(GRAFLIB) $(G3DLIB) $(TREELIB) $(MATRIXLIB) $(GRAFLIB) $(G3DLIB) $(TREELIB) $(MATRIXLIB)
$(LD) $(LDFLAGS) -o $@ $(H2ROOTO) \ $(LD) $(LDFLAGS) -o $@ $(H2ROOTO) \
$(RPATH) $(ROOTLIBS) \ $(RPATH) $(ROOTLIBS) \
$(CERNPATH) $(CERNLIBS) $(F77LIBS) $(SYSLIBS) $(CERNLIBDIR) $(CERNLIBS) $(F77LIBS) $(SYSLIBS)
$(G2ROOT): $(G2ROOTO) $(G2ROOT): $(G2ROOTO)
$(F77LD) $(F77LDFLAGS) -o $@ $(G2ROOTO) \ $(F77LD) $(F77LDFLAGS) -o $@ $(G2ROOTO) \
$(CERNPATH) $(CERNLIBS) $(F77LIBS) $(SYSLIBS) $(CERNLIBDIR) $(CERNLIBS) $(F77LIBS) $(SYSLIBS)
ifneq ($(CERNLIBDIR),) ifneq ($(CERNLIBDIR),)
all-main: $(ROOTEXE) $(PROOFSERV) $(H2ROOT) $(G2ROOT) all-main: $(ROOTEXE) $(PROOFSERV) $(H2ROOT) $(G2ROOT)
......
...@@ -39,7 +39,7 @@ include/%.h: $(MYSQLDIRI)/%.h ...@@ -39,7 +39,7 @@ include/%.h: $(MYSQLDIRI)/%.h
$(MYSQLLIB): $(MYSQLO) $(MYSQLDO) $(MAINLIBS) $(MYSQLLIB): $(MYSQLO) $(MYSQLDO) $(MAINLIBS)
@$(MAKELIB) $(PLATFORM) $(LD) "$(LDFLAGS)" \ @$(MAKELIB) $(PLATFORM) $(LD) "$(LDFLAGS)" \
"$(SOFLAGS)" libMySQL.$(SOEXT) $@ "$(MYSQLO) $(MYSQLDO)" \ "$(SOFLAGS)" libMySQL.$(SOEXT) $@ "$(MYSQLO) $(MYSQLDO)" \
"$(MYSQLLIBEXTRA) $(MYSQLLIBDIR)/libmysqlclient.a" "$(MYSQLLIBEXTRA) $(MYSQLLIBDIR) $(MYSQLCLILIB)"
$(MYSQLDS): $(MYSQLH) $(MYSQLL) $(ROOTCINTTMP) $(MYSQLDS): $(MYSQLH) $(MYSQLL) $(ROOTCINTTMP)
@echo "Generating dictionary $@..." @echo "Generating dictionary $@..."
......
...@@ -39,7 +39,7 @@ include/%.h: $(RFIODIRI)/%.h ...@@ -39,7 +39,7 @@ include/%.h: $(RFIODIRI)/%.h
$(RFIOLIB): $(RFIOO) $(RFIODO) $(MAINLIBS) $(RFIOLIB): $(RFIOO) $(RFIODO) $(MAINLIBS)
@$(MAKELIB) $(PLATFORM) $(LD) "$(LDFLAGS)" \ @$(MAKELIB) $(PLATFORM) $(LD) "$(LDFLAGS)" \
"$(SOFLAGS)" libRFIO.$(SOEXT) $@ "$(RFIOO) $(RFIODO)" \ "$(SOFLAGS)" libRFIO.$(SOEXT) $@ "$(RFIOO) $(RFIODO)" \
"$(RFIOLIBEXTRA) $(RFIO)" "$(RFIOLIBEXTRA) $(SHIFTLIBDIR) $(SHIFTLIB)"
$(RFIODS): $(RFIOH) $(RFIOL) $(ROOTCINTTMP) $(RFIODS): $(RFIOH) $(RFIOL) $(ROOTCINTTMP)
@echo "Generating dictionary $@..." @echo "Generating dictionary $@..."
......
...@@ -41,7 +41,7 @@ include/%.h: $(THREADDIRI)/%.h ...@@ -41,7 +41,7 @@ include/%.h: $(THREADDIRI)/%.h
$(THREADLIB): $(THREADO) $(THREADDO) $(MAINLIBS) $(THREADLIB): $(THREADO) $(THREADDO) $(MAINLIBS)
@$(MAKELIB) $(PLATFORM) $(LD) "$(LDFLAGS)" \ @$(MAKELIB) $(PLATFORM) $(LD) "$(LDFLAGS)" \
"$(SOFLAGS)" libThread.$(SOEXT) $@ "$(THREADO) $(THREADDO)" \ "$(SOFLAGS)" libThread.$(SOEXT) $@ "$(THREADO) $(THREADDO)" \
"$(THREADLIBEXTRA) $(THREAD)" "$(THREADLIBEXTRA) $(OSTHREADLIBDIR) $(OSTHREADLIB)"
$(THREADDS): $(THREADH) $(THREADL) $(ROOTCINTTMP) $(THREADDS): $(THREADH) $(THREADL) $(ROOTCINTTMP)
@echo "Generating dictionary $@..." @echo "Generating dictionary $@..."
......
...@@ -40,7 +40,7 @@ include/%.h: $(VENUSDIRI)/%.h ...@@ -40,7 +40,7 @@ include/%.h: $(VENUSDIRI)/%.h
$(VENUSLIB): $(VENUSO) $(VENUSDO) $(MAINLIBS) $(VENUSLIBDEP) $(VENUSLIB): $(VENUSO) $(VENUSDO) $(MAINLIBS) $(VENUSLIBDEP)
@$(MAKELIB) $(PLATFORM) $(LD) "$(LDFLAGS)" \ @$(MAKELIB) $(PLATFORM) $(LD) "$(LDFLAGS)" \
"$(SOFLAGS)" libEGVenus.$(SOEXT) $@ "$(VENUSO) $(VENUSDO)" \ "$(SOFLAGS)" libEGVenus.$(SOEXT) $@ "$(VENUSO) $(VENUSDO)" \
"$(VENUSLIBEXTRA) $(VENUS)" "$(VENUSLIBEXTRA) $(FVENUSLIBDIR) $(FVENUSLIB)"
$(VENUSDS): $(VENUSH1) $(VENUSL) $(ROOTCINTTMP) $(VENUSDS): $(VENUSH1) $(VENUSL) $(ROOTCINTTMP)
@echo "Generating dictionary $@..." @echo "Generating dictionary $@..."
......
...@@ -40,7 +40,7 @@ $(X11TTFLIB): $(X11TTFO) $(X11TTFDO) $(MAINLIBS) $(X11TTFLIBDEP) ...@@ -40,7 +40,7 @@ $(X11TTFLIB): $(X11TTFO) $(X11TTFDO) $(MAINLIBS) $(X11TTFLIBDEP)
@$(MAKELIB) $(PLATFORM) $(LD) "$(LDFLAGS)" \ @$(MAKELIB) $(PLATFORM) $(LD) "$(LDFLAGS)" \
"$(SOFLAGS)" libGX11TTF.$(SOEXT) $@ \ "$(SOFLAGS)" libGX11TTF.$(SOEXT) $@ \
"$(X11TTFO) $(X11TTFDO)" \ "$(X11TTFO) $(X11TTFDO)" \
"$(X11TTFLIBEXTRA) $(TTFLIBDIR)/libttf.a" "$(X11TTFLIBEXTRA) $(TTFLIBDIR) $(TTFLIB)"
$(X11TTFDS): $(X11TTFH) $(X11TTFL) $(ROOTCINTTMP) $(X11TTFDS): $(X11TTFH) $(X11TTFL) $(ROOTCINTTMP)
@echo "Generating dictionary $@..." @echo "Generating dictionary $@..."
......
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