From: danielk1977 <danielk1977@noemail.net>
Date: Tue, 14 Oct 2008 14:28:35 +0000 (+0000)
Subject: Modifications to main.mk so that -DSQLITE_ENABLE_FTS3 works. (CVS 5818)
X-Git-Tag: version-3.6.10~359
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=376687518e050dc795dcb8945fffea78b860814a;p=thirdparty%2Fsqlite.git

Modifications to main.mk so that -DSQLITE_ENABLE_FTS3 works. (CVS 5818)

FossilOrigin-Name: a06d226dee0df0df1aedb9c17353332c6a6e712f
---

diff --git a/main.mk b/main.mk
index 50d9962e5b..469c9b6da8 100644
--- a/main.mk
+++ b/main.mk
@@ -44,14 +44,17 @@
 
 # This is how we compile
 #
-TCCX = $(TCC) $(OPTS) -I. -I$(TOP)/src -I$(TOP) -I$(TOP)/ext/rtree -I$(TOP)/ext/icu
+TCCX =  $(TCC) $(OPTS) -I. -I$(TOP)/src -I$(TOP) 
+TCCX += -I$(TOP)/ext/rtree -I$(TOP)/ext/icu -I$(TOP)/ext/fts3
 
 # Object files for the SQLite library.
 #
 LIBOBJ+= alter.o analyze.o attach.o auth.o \
          bitvec.o btmutex.o btree.o build.o \
-         callback.o complete.o date.o delete.o \
-         expr.o fault.o func.o global.o hash.o \
+         callback.o complete.o date.o delete.o expr.o fault.o \
+         fts3.o fts3_hash.o fts3_icu.o fts3_porter.o \
+         fts3_tokenizer.o fts3_tokenizer1.o \
+         func.o global.o hash.o \
          icu.o insert.o journal.o legacy.o loadext.o \
          main.o malloc.o mem1.o mem2.o mem3.o mem4.o mem5.o mem6.o \
          mutex.o mutex_noop.o mutex_os2.o mutex_unix.o mutex_w32.o \
@@ -64,6 +67,7 @@ LIBOBJ+= alter.o analyze.o attach.o auth.o \
          walker.o where.o utf.o vtab.o
 
 
+
 # All of the source code files.
 #
 SRC = \
diff --git a/manifest b/manifest
index 189d7eea9d..aeb2b54780 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C fix\sa\sfew\sreturn\scodes\sin\sthe\sOS/2\sVFS\s(CVS\s5817)
-D 2008-10-13T21:46:47
+C Modifications\sto\smain.mk\sso\sthat\s-DSQLITE_ENABLE_FTS3\sworks.\s(CVS\s5818)
+D 2008-10-14T14:28:36
 F Makefile.arm-wince-mingw32ce-gcc fcd5e9cd67fe88836360bb4f9ef4cb7f8e2fb5a0
 F Makefile.in 2014e5a4010ad5ebbcaedff98240b3d14ee83838
 F Makefile.linux-gcc d53183f4aa6a9192d249731c90dbdffbd2c68654
@@ -79,7 +79,7 @@ F ext/rtree/tkt3363.test 6662237ea75bb431cd5d262dfc9535e1023315fc
 F ext/rtree/viewrtree.tcl 09526398dae87a5a87c5aac2b3854dbaf8376869
 F install-sh 9d4de14ab9fb0facae2f48780b874848cbf2f895
 F ltmain.sh 09fe5815427dc7d0abb188bbcdf0e34896577210
-F main.mk 5fc368ed5b618cc1713b7480a03346998719def4
+F main.mk e8870c902f6412118dbebe90fbe12776e3b4a05f
 F mkdll.sh 7d09b23c05d56532e9d44a50868eb4b12ff4f74a
 F mkextu.sh 416f9b7089d80e5590a29692c9d9280a10dbad9f
 F mkextw.sh 4123480947681d9b434a5e7b1ee08135abe409ac
@@ -648,7 +648,7 @@ F tool/speedtest16.c c8a9c793df96db7e4933f0852abb7a03d48f2e81
 F tool/speedtest2.tcl ee2149167303ba8e95af97873c575c3e0fab58ff
 F tool/speedtest8.c 2902c46588c40b55661e471d7a86e4dd71a18224
 F tool/speedtest8inst1.c 293327bc76823f473684d589a8160bde1f52c14e
-P 119b69fba0c27c4c479749360176b6eb69d2e70f
-R 8572cc15f5ebd64ab3df6bc802843d95
-U pweilbacher
-Z d399e9a2a7b4d7e67abfaf5fa03ff952
+P 4e978a40f7ee93b09093e82173edc74a992aadeb
+R 05d9c088f4622418f1cd7e2b66527270
+U danielk1977
+Z 85a3e3157ff6f762851644b800aa41e4
diff --git a/manifest.uuid b/manifest.uuid
index bd3f407ebb..1233320648 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-4e978a40f7ee93b09093e82173edc74a992aadeb
\ No newline at end of file
+a06d226dee0df0df1aedb9c17353332c6a6e712f
\ No newline at end of file