From 10c5b1116ecaebd0a7e17ad91902170dfc11788a Mon Sep 17 00:00:00 2001
From: Rene Brun <Rene.Brun@cern.ch>
Date: Wed, 14 Dec 2005 11:48:34 +0000
Subject: [PATCH] From Axel: * Fixed libCintex's libdeps (if dicttype!=cint), *
lib order on unix/win link line, don't link libCore against cintex/reflex,
link libCintex against libCore
git-svn-id: http://root.cern.ch/svn/root/trunk@13705 27541ba8-7e3a-0410-8455-c3a389f83636
---
build/unix/makelib.sh | 4 ++--
build/win/makelib.sh | 15 ++++++---------
cintex/Module.mk | 3 ++-
3 files changed, 10 insertions(+), 12 deletions(-)
diff --git a/build/unix/makelib.sh b/build/unix/makelib.sh
index bbc095b0bd5..2ec4080ac7c 100755
--- a/build/unix/makelib.sh
+++ b/build/unix/makelib.sh
@@ -51,9 +51,9 @@ if [ "x$EXPLICIT" = "xyes" ]; then
fi
fi
if [ $LIB != "lib/libCore.$soext" ]; then
- EXPLLNKCORE="-Llib -lCore -lCint $NEEDREFLEX"
+ EXPLLNKCORE="-Llib $NEEDREFLEX -lCore -lCint"
else
- EXPLLNKCORE="-Llib -lCint $NEEDREFLEX"
+ EXPLLNKCORE="-Llib -lCint"
fi
fi
fi
diff --git a/build/win/makelib.sh b/build/win/makelib.sh
index 6bae496a69c..de135662f84 100755
--- a/build/win/makelib.sh
+++ b/build/win/makelib.sh
@@ -60,22 +60,19 @@ if [ "$R__PLATFORM" = "win32" ]; then
lib/${name}.exp $R__EXTRA $syslibs"
elif [ "$R__LIB" = "lib/libCintex.dll" ]; then
cmd="$R__LD $R__SOFLAGS $R__LDFLAGS -o bin/${name}.dll $R__OBJS \
- lib/${name}.exp lib/libReflex.lib $R__EXTRA $syslibs"
+ lib/${name}.exp lib/libCore.lib lib/libReflex.lib \
+ lib/libCint.lib $R__EXTRA $syslibs"
elif [ "$R__LIB" = "lib/libCore.dll" ]; then
- if [ "$(bin/root-config --dicttype)" != "cint" ]; then
- needReflex="lib/libCintex.lib lib/libReflex.lib"
- fi
cmd="$R__LD $R__SOFLAGS $R__LDFLAGS -o bin/${name}.dll $R__OBJS \
- lib/${name}.exp lib/libCint.lib $needReflex\
- $R__EXTRA $syslibs WSock32.lib \
- Oleaut32.lib Iphlpapi.lib"
+ lib/${name}.exp lib/libCint.lib \
+ $R__EXTRA $syslibs WSock32.lib Oleaut32.lib Iphlpapi.lib"
else
if [ "$(bin/root-config --dicttype)" != "cint" ]; then
needReflex="lib/libCintex.lib lib/libReflex.lib"
fi
cmd="$R__LD $R__SOFLAGS $R__LDFLAGS -o bin/${name}.dll $R__OBJS \
- lib/${name}.exp $R__EXTRA lib/libCore.lib \
- lib/libCint.lib $needReflex \
+ lib/${name}.exp $R__EXTRA \
+ $needReflex lib/libCore.lib lib/libCint.lib \
$syslibs"
fi
echo $cmd
diff --git a/cintex/Module.mk b/cintex/Module.mk
index 6bb8c0ec94f..b346f1dc7bf 100644
--- a/cintex/Module.mk
+++ b/cintex/Module.mk
@@ -63,7 +63,8 @@ include/Cintex/%.h: $(CINTEXDIRI)/Cintex/%.h
%.pyc: %.py; python -c 'import py_compile; py_compile.compile( "$<" )'
%.pyo: %.py; python -O -c 'import py_compile; py_compile.compile( "$<" )'
-$(CINTEXLIB): $(CINTEXO) $(CINTEXPY) $(CINTEXPYC) $(CINTEXPYO) $(ORDER_) $(MAINLIBS) $(CINTEXLIBDEP)
+$(CINTEXLIB): $(CINTEXO) $(CINTEXPY) $(CINTEXPYC) $(CINTEXPYO) \
+ $(ORDER_) $(subst $(CINTEXLIB),,$(MAINLIBS)) $(CINTEXLIBDEP)
@$(MAKELIB) $(PLATFORM) $(LD) "$(LDFLAGS)" \
"$(SOFLAGS)" libCintex.$(SOEXT) $@ "$(CINTEXO)" \
"$(CINTEXLIBEXTRA)"
--
GitLab