Date: Wednesday, March 8, 2006 @ 16:37:19
  Author: marc
    Path: /cvsroot/carob/odbsequoia/src

Modified: GNUmakefile (1.6 -> 1.7)

Added -lgmpxx and -lgmp. Clarified linker flags.


-------------+
 GNUmakefile |   16 ++++++++++------
 1 files changed, 10 insertions(+), 6 deletions(-)


Index: odbsequoia/src/GNUmakefile
diff -u odbsequoia/src/GNUmakefile:1.6 odbsequoia/src/GNUmakefile:1.7
--- odbsequoia/src/GNUmakefile:1.6      Fri Feb 24 16:12:43 2006
+++ odbsequoia/src/GNUmakefile  Wed Mar  8 16:37:19 2006
@@ -23,8 +23,10 @@
 
 LIBSHORT=lib${ROOTNAME}.so
 LIB=${LIBSHORT}.1
-
-LDFLAGS=-lodbc
+LINKODBC=-lodbc
+# we need BOTH -lgmpxx AND -lgmp only when statically linking
+# (else libgmpxx.so pulls libgmp.so automatically)
+LDFLAGS=-lpthread  -lgmpxx -lgmp -lodbcinst
 
 CAROB=carob
 
@@ -35,7 +37,7 @@
 all: a.out
 
 a.out: simpletest.c ${LIBSHORT}
-       c++ -Wall -g3 simpletest.c ${LDFLAGS} -Wl,-rpath -Wl,. -o $@
+       c++ -Wall -g3 simpletest.c ${LINKODBC} -Wl,-rpath -Wl,. -o $@
 
 # libodbsequoia targets
 ${LIBSHORT}: ${LIB}
@@ -43,14 +45,16 @@
 
 # libcarob.a needs -lpthread
 ${LIB}:        ${OBJS} ${CAROB_PATH}/lib${CAROB}.a
-       ${CXX} ${CXXFLAGS} -shared $^ -lpthread -lodbcinst -o $@
+       ${CXX} ${CXXFLAGS} -shared $^ ${LDFLAGS} -shared -o $@
 
 clean:
        rm -f ${LIB} ${LIBSHORT} a.out ${OBJS}
 
-# useful to detect linking issues *before* the driver manager gets them
+# Link a empty executable to our driver + the driver manager.
+# Useful to detect unresolved symbols in our driver 
+# *before* the driver manager stumbles on them
 linktest: ${LIBSHORT}
-       ${CXX} dummymain.cpp ${LIBSHORT} -lodbc -lodbcinst -o $@
+       ${CXX} dummymain.cpp ${LIBSHORT} ${LINKODBC} -o $@
 
 # compile each .hpp, isolated
 checkheaders:

_______________________________________________
Carob-commits mailing list
[email protected]
https://forge.continuent.org/mailman/listinfo/carob-commits

Reply via email to