Date: Monday, December 19, 2005 @ 09:06:58
Author: csaba
Path: /cvsroot/carob/libmysequoia
Modified: .cdtproject (1.6 -> 1.7) .cvsignore (1.7 -> 1.8) .project (1.2
-> 1.3) src/Makefile.am (1.1 -> 1.2) test/Makefile.am (1.1 ->
1.2)
Removed the link to the carob library from the testprogram and linked to carob
our libmysequoia library.
------------------+
.cdtproject | 6 +++---
.cvsignore | 1 +
.project | 20 ++++++++++----------
src/Makefile.am | 3 ++-
test/Makefile.am | 2 +-
5 files changed, 17 insertions(+), 15 deletions(-)
Index: libmysequoia/.cdtproject
diff -u libmysequoia/.cdtproject:1.6 libmysequoia/.cdtproject:1.7
--- libmysequoia/.cdtproject:1.6 Sat Dec 17 15:18:14 2005
+++ libmysequoia/.cdtproject Mon Dec 19 09:06:58 2005
@@ -2,8 +2,8 @@
<?eclipse-cdt version="2.0"?>
<cdtproject id="org.eclipse.cdt.make.core.make">
-<extension id="org.eclipse.cdt.core.ELF"
point="org.eclipse.cdt.core.BinaryParser"/>
-<extension id="org.eclipse.cdt.core.domsourceindexer"
point="org.eclipse.cdt.core.CIndexer"/>
+<extension point="org.eclipse.cdt.core.BinaryParser"
id="org.eclipse.cdt.core.ELF"/>
+<extension point="org.eclipse.cdt.core.CIndexer"
id="org.eclipse.cdt.core.domsourceindexer"/>
<data>
<item id="scannerConfiguration">
<autodiscovery enabled="true" problemReportingEnabled="true"
selectedProfileId="org.eclipse.cdt.make.core.GCCStandardMakePerProjectProfile"/>
@@ -52,7 +52,7 @@
<pathentry kind="src" path=""/>
<pathentry kind="out" path=""/>
<pathentry kind="con"
path="org.eclipse.cdt.make.core.DISCOVERED_SCANNER_INFO"/>
-<pathentry include="include" kind="inc" path="" system="true"/>
+<pathentry kind="inc" path="" include="include" system="true"/>
</item>
<item id="org.eclipse.cdt.make.core.buildtargets">
<buildTargets>
Index: libmysequoia/.cvsignore
diff -u libmysequoia/.cvsignore:1.7 libmysequoia/.cvsignore:1.8
--- libmysequoia/.cvsignore:1.7 Sun Dec 18 20:14:49 2005
+++ libmysequoia/.cvsignore Mon Dec 19 09:06:58 2005
@@ -12,3 +12,4 @@
libtool
missing
coverage
+mkinstalldirs
Index: libmysequoia/.project
diff -u libmysequoia/.project:1.2 libmysequoia/.project:1.3
--- libmysequoia/.project:1.2 Thu Dec 8 12:53:13 2005
+++ libmysequoia/.project Mon Dec 19 09:06:58 2005
@@ -18,22 +18,22 @@
<value>org.eclipse.cdt.core.MakeErrorParser;org.eclipse.cdt.core.GCCErrorParser;org.eclipse.cdt.core.GASErrorParser;org.eclipse.cdt.core.GLDErrorParser;org.eclipse.cdt.core.VCErrorParser;</value>
</dictionary>
<dictionary>
-
<key>org.eclipse.cdt.make.core.environment</key>
- <value></value>
- </dictionary>
- <dictionary>
<key>org.eclipse.cdt.make.core.enableAutoBuild</key>
<value>false</value>
</dictionary>
<dictionary>
-
<key>org.eclipse.cdt.make.core.build.target.inc</key>
- <value>all</value>
+
<key>org.eclipse.cdt.make.core.environment</key>
+
<value>LD_LIBRARY_PATH=${project_loc}/../carob|</value>
</dictionary>
<dictionary>
<key>org.eclipse.cdt.make.core.enableFullBuild</key>
<value>true</value>
</dictionary>
<dictionary>
+
<key>org.eclipse.cdt.make.core.build.target.inc</key>
+ <value>all</value>
+ </dictionary>
+ <dictionary>
<key>org.eclipse.cdt.make.core.enabledIncrementalBuild</key>
<value>true</value>
</dictionary>
@@ -42,14 +42,14 @@
<value></value>
</dictionary>
<dictionary>
-
<key>org.eclipse.cdt.make.core.build.command</key>
- <value>make</value>
- </dictionary>
- <dictionary>
<key>org.eclipse.cdt.make.core.build.target.clean</key>
<value>clean</value>
</dictionary>
<dictionary>
+
<key>org.eclipse.cdt.make.core.build.command</key>
+ <value>make</value>
+ </dictionary>
+ <dictionary>
<key>org.eclipse.cdt.make.core.enableCleanBuild</key>
<value>true</value>
</dictionary>
Index: libmysequoia/src/Makefile.am
diff -u libmysequoia/src/Makefile.am:1.1 libmysequoia/src/Makefile.am:1.2
--- libmysequoia/src/Makefile.am:1.1 Sat Dec 17 15:03:46 2005
+++ libmysequoia/src/Makefile.am Mon Dec 19 09:06:58 2005
@@ -25,8 +25,9 @@
libmysequoia_la_SOURCES = CarobMySQL.cpp \
MySQLAPI.cpp \
Utils.cpp
+# remove the relative paths to carob when carob will be installable
libmysequoia_la_CXXFLAGS = -I$(top_builddir)/../carob/include @MYSQL_CFLAGS@
@GCOV_CFLAGS@
-libmysequoia_la_LDFLAGS = -version-info 0:0:0 @GCOV_LDADD@ @LOG4CXX_LDADD@
+libmysequoia_la_LDFLAGS = -version-info 0:0:0 -L$(top_builddir)/../carob
-lcarob @GCOV_LDADD@ @LOG4CXX_LDADD@
clean-local:
rm -f *.gcno *.gcda
Index: libmysequoia/test/Makefile.am
diff -u libmysequoia/test/Makefile.am:1.1 libmysequoia/test/Makefile.am:1.2
--- libmysequoia/test/Makefile.am:1.1 Sat Dec 17 15:03:46 2005
+++ libmysequoia/test/Makefile.am Mon Dec 19 09:06:58 2005
@@ -27,7 +27,7 @@
TestMySQLAPI.cpp
# FIXME the relative PATH
runTests_CXXFLAGS = -I$(top_builddir)/../carob/include @CPPUNIT_CFLAGS@
@MYSQL_CFLAGS@ @GCOV_CFLAGS@
-runTests_LDADD = $(top_builddir)/src/libmysequoia.la
$(top_builddir)/../carob/libcarob.a @CPPUNIT_LDADD@ @GCOV_LDADD@ -lpthread
+runTests_LDADD = $(top_builddir)/src/libmysequoia.la @CPPUNIT_LDADD@
@GCOV_LDADD@ -lpthread
TESTS = $(check_PROGRAMS)
_______________________________________________
Carob-commits mailing list
[email protected]
https://forge.continuent.org/mailman/listinfo/carob-commits
