From 195e38da469eb46c5051eda94b3347e4d0b80665 Mon Sep 17 00:00:00 2001
From: Fons Rademakers <Fons.Rademakers@cern.ch>
Date: Fri, 8 Dec 2000 17:50:35 +0000
Subject: [PATCH] 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
---
main/Module.mk | 4 ++--
mysql/Module.mk | 2 +-
rfio/Module.mk | 2 +-
thread/Module.mk | 2 +-
venus/Module.mk | 2 +-
x11ttf/Module.mk | 2 +-
6 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/main/Module.mk b/main/Module.mk
index 7ea4c812254..9c9e1dc38df 100644
--- a/main/Module.mk
+++ b/main/Module.mk
@@ -72,11 +72,11 @@ $(H2ROOT): $(H2ROOTO) $(NEWLIB) $(CORELIB) $(CINTLIB) $(HISTLIB) \
$(GRAFLIB) $(G3DLIB) $(TREELIB) $(MATRIXLIB)
$(LD) $(LDFLAGS) -o $@ $(H2ROOTO) \
$(RPATH) $(ROOTLIBS) \
- $(CERNPATH) $(CERNLIBS) $(F77LIBS) $(SYSLIBS)
+ $(CERNLIBDIR) $(CERNLIBS) $(F77LIBS) $(SYSLIBS)
$(G2ROOT): $(G2ROOTO)
$(F77LD) $(F77LDFLAGS) -o $@ $(G2ROOTO) \
- $(CERNPATH) $(CERNLIBS) $(F77LIBS) $(SYSLIBS)
+ $(CERNLIBDIR) $(CERNLIBS) $(F77LIBS) $(SYSLIBS)
ifneq ($(CERNLIBDIR),)
all-main: $(ROOTEXE) $(PROOFSERV) $(H2ROOT) $(G2ROOT)
diff --git a/mysql/Module.mk b/mysql/Module.mk
index d0f7d02ae8f..b7de3ebfcdf 100644
--- a/mysql/Module.mk
+++ b/mysql/Module.mk
@@ -39,7 +39,7 @@ include/%.h: $(MYSQLDIRI)/%.h
$(MYSQLLIB): $(MYSQLO) $(MYSQLDO) $(MAINLIBS)
@$(MAKELIB) $(PLATFORM) $(LD) "$(LDFLAGS)" \
"$(SOFLAGS)" libMySQL.$(SOEXT) $@ "$(MYSQLO) $(MYSQLDO)" \
- "$(MYSQLLIBEXTRA) $(MYSQLLIBDIR)/libmysqlclient.a"
+ "$(MYSQLLIBEXTRA) $(MYSQLLIBDIR) $(MYSQLCLILIB)"
$(MYSQLDS): $(MYSQLH) $(MYSQLL) $(ROOTCINTTMP)
@echo "Generating dictionary $@..."
diff --git a/rfio/Module.mk b/rfio/Module.mk
index b2ae3eddf01..3bf5610e6f6 100644
--- a/rfio/Module.mk
+++ b/rfio/Module.mk
@@ -39,7 +39,7 @@ include/%.h: $(RFIODIRI)/%.h
$(RFIOLIB): $(RFIOO) $(RFIODO) $(MAINLIBS)
@$(MAKELIB) $(PLATFORM) $(LD) "$(LDFLAGS)" \
"$(SOFLAGS)" libRFIO.$(SOEXT) $@ "$(RFIOO) $(RFIODO)" \
- "$(RFIOLIBEXTRA) $(RFIO)"
+ "$(RFIOLIBEXTRA) $(SHIFTLIBDIR) $(SHIFTLIB)"
$(RFIODS): $(RFIOH) $(RFIOL) $(ROOTCINTTMP)
@echo "Generating dictionary $@..."
diff --git a/thread/Module.mk b/thread/Module.mk
index a9bd74a96f9..f10b878a393 100644
--- a/thread/Module.mk
+++ b/thread/Module.mk
@@ -41,7 +41,7 @@ include/%.h: $(THREADDIRI)/%.h
$(THREADLIB): $(THREADO) $(THREADDO) $(MAINLIBS)
@$(MAKELIB) $(PLATFORM) $(LD) "$(LDFLAGS)" \
"$(SOFLAGS)" libThread.$(SOEXT) $@ "$(THREADO) $(THREADDO)" \
- "$(THREADLIBEXTRA) $(THREAD)"
+ "$(THREADLIBEXTRA) $(OSTHREADLIBDIR) $(OSTHREADLIB)"
$(THREADDS): $(THREADH) $(THREADL) $(ROOTCINTTMP)
@echo "Generating dictionary $@..."
diff --git a/venus/Module.mk b/venus/Module.mk
index 36e7e7a2053..6c8cba3112c 100644
--- a/venus/Module.mk
+++ b/venus/Module.mk
@@ -40,7 +40,7 @@ include/%.h: $(VENUSDIRI)/%.h
$(VENUSLIB): $(VENUSO) $(VENUSDO) $(MAINLIBS) $(VENUSLIBDEP)
@$(MAKELIB) $(PLATFORM) $(LD) "$(LDFLAGS)" \
"$(SOFLAGS)" libEGVenus.$(SOEXT) $@ "$(VENUSO) $(VENUSDO)" \
- "$(VENUSLIBEXTRA) $(VENUS)"
+ "$(VENUSLIBEXTRA) $(FVENUSLIBDIR) $(FVENUSLIB)"
$(VENUSDS): $(VENUSH1) $(VENUSL) $(ROOTCINTTMP)
@echo "Generating dictionary $@..."
diff --git a/x11ttf/Module.mk b/x11ttf/Module.mk
index 34ca1f8da82..4b8a1a77a23 100644
--- a/x11ttf/Module.mk
+++ b/x11ttf/Module.mk
@@ -40,7 +40,7 @@ $(X11TTFLIB): $(X11TTFO) $(X11TTFDO) $(MAINLIBS) $(X11TTFLIBDEP)
@$(MAKELIB) $(PLATFORM) $(LD) "$(LDFLAGS)" \
"$(SOFLAGS)" libGX11TTF.$(SOEXT) $@ \
"$(X11TTFO) $(X11TTFDO)" \
- "$(X11TTFLIBEXTRA) $(TTFLIBDIR)/libttf.a"
+ "$(X11TTFLIBEXTRA) $(TTFLIBDIR) $(TTFLIB)"
$(X11TTFDS): $(X11TTFH) $(X11TTFL) $(ROOTCINTTMP)
@echo "Generating dictionary $@..."
--
GitLab