Date: Wednesday, September 20, 2006 @ 17:09:13
Author: gilles
Path: /cvsroot/carob/carob
Modified: contrib/CPP/Makefile (1.1 -> 1.2) test/GNUmakefile (1.21 ->
1.22)
Minor change for mingw compilation
Added static target to be able to compile with mingw
Improvement for CAROB-87
----------------------+
contrib/CPP/Makefile | 6 ++++--
test/GNUmakefile | 11 ++++++++---
2 files changed, 12 insertions(+), 5 deletions(-)
Index: carob/contrib/CPP/Makefile
diff -u carob/contrib/CPP/Makefile:1.1 carob/contrib/CPP/Makefile:1.2
--- carob/contrib/CPP/Makefile:1.1 Tue Dec 13 14:57:34 2005
+++ carob/contrib/CPP/Makefile Wed Sep 20 17:09:13 2006
@@ -36,7 +36,9 @@
OBJS = read_example.o
${EXE}: ${OBJS}
- ${CXX} ${LDFLAGS} -o $@ $^
-
+ ${CXX} $^ ${LDFLAGS} -o $@
+# use this when compiling with mingw
+static: ${OBJS} lib${LIB_CAROB}.a
+ ${CXX} $^ ${LDFLAGS} -o $@
clean:
${RM} ${TESTOBJS} ${EXE}
Index: carob/test/GNUmakefile
diff -u carob/test/GNUmakefile:1.21 carob/test/GNUmakefile:1.22
--- carob/test/GNUmakefile:1.21 Mon Feb 27 17:13:35 2006
+++ carob/test/GNUmakefile Wed Sep 20 17:09:13 2006
@@ -26,7 +26,8 @@
CAROB_ROOT = ..
LIB_CAROB = carob
-LIB_CAROB_FILE = ${CAROB_ROOT}/lib${LIB_CAROB}.so
+LIB_CAROB_SO = ${CAROB_ROOT}/lib${LIB_CAROB}.so
+LIB_CAROB_A = ${CAROB_ROOT}/lib${LIB_CAROB}.a
INCDIR = ${CAROB_ROOT}/include
@@ -53,12 +54,16 @@
#LDFLAGS += -llog4cxx
-${EXE}: ${TESTOBJS} CarobTestLauncher.o ${LIB_CAROB_FILE}
- ${CXX} ${LDFLAGS} -o $@ $^
+${EXE}: ${TESTOBJS} CarobTestLauncher.o ${LIB_CAROB_SO}
+ ${CXX} $^ ${LDFLAGS} -o $@
${LIB_CAROB_FILE}:
${MAKE} -C ${CAROB_ROOT}
+# use this when compiling with mingw
+static: ${TESTOBJS} CarobTestLauncher.o ${LIB_CAROB_A}
+ ${CXX} $^ ${LDFLAGS} -o $@
+
clean:
${RM} ${TESTOBJS} CarobTestLauncher.o ${EXE}
_______________________________________________
Carob-commits mailing list
[email protected]
https://forge.continuent.org/mailman/listinfo/carob-commits
