updated vxworks makefile for 3.6.14 release (CVS 6611)

FossilOrigin-Name: 5d4bffaabbf6a809938f115de266b382183a0a96

diff --git a/Makefile.vxworks b/Makefile.vxworks
index 8dde391df82b19ed8babd7cb76dc043c0d8e9a6d..6ca6303a132f9f267f7a4d7c4908edcefc00be82 100644 (file)
--- a/Makefile.vxworks
+++ b/Makefile.vxworks
@@ -188,19 +188,24 @@ NAWK = awk
 
 # This is how we compile
 #
-TCCX = $(TCC) $(OPTS) -I. -I$(TOP)/src -I$(TOP) -I$(TOP)/ext/rtree
-TCCX_SHARED = $(TCC_SHARED) $(OPTS) -I. -I$(TOP)/src -I$(TOP) -I$(TOP)/ext/rtree
+TCCX = $(TCC) $(OPTS) -I. -I$(TOP)/src -I$(TOP)
+TCCX_SHARED = $(TCC_SHARED) $(OPTS) -I. -I$(TOP)/src -I$(TOP) \
+       -I$(TOP)/ext/rtree -I$(TOP)/ext/icu -I$(TOP)/ext/fts3 \
+       -I$(TOP)/ext/async
 
 # Object files for the SQLite library.
 #
 LIBOBJ+= alter.o analyze.o attach.o auth.o \
          backup.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_expr.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 mem0.o mem1.o mem2.o mem3.o mem5.o memjournal.o \
-         mutex.o mutex_os2.o mutex_unix.o mutex_w32.o mutex_noop.o \
-         opcodes.o os.o os_os2.o os_unix.o os_win.o \
+         main.o malloc.o mem0.o mem1.o mem2.o mem3.o mem5.o \
+         memjournal.o \
+         mutex.o mutex_noop.o mutex_os2.o mutex_unix.o mutex_w32.o \
+         notify.o opcodes.o os.o os_os2.o os_unix.o os_win.o \
          pager.o parse.o pcache.o pcache1.o pragma.o prepare.o printf.o \
          random.o resolve.o rowset.o rtree.o select.o status.o \
          table.o tokenize.o trigger.o \
@@ -209,6 +214,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 = \
@@ -248,10 +254,11 @@ SRC = \
   $(TOP)/src/memjournal.c \
   $(TOP)/src/mutex.c \
   $(TOP)/src/mutex.h \
+  $(TOP)/src/mutex_noop.c \
   $(TOP)/src/mutex_os2.c \
   $(TOP)/src/mutex_unix.c \
   $(TOP)/src/mutex_w32.c \
-  $(TOP)/src/mutex_noop.c \
+  $(TOP)/src/notify.c \
   $(TOP)/src/os.c \
   $(TOP)/src/os.h \
   $(TOP)/src/os_common.h \
@@ -262,8 +269,8 @@ SRC = \
   $(TOP)/src/pager.h \
   $(TOP)/src/parse.y \
   $(TOP)/src/pcache.c \
-  $(TOP)/src/pcache1.c \
   $(TOP)/src/pcache.h \
+  $(TOP)/src/pcache1.c \
   $(TOP)/src/pragma.c \
   $(TOP)/src/prepare.c \
   $(TOP)/src/printf.c \
@@ -329,8 +336,8 @@ SRC += \
   $(TOP)/ext/fts3/fts3_tokenizer.c \
   $(TOP)/ext/fts3/fts3_tokenizer1.c
 SRC += \
-  $(TOP)/ext/icu/icu.c \
-  $(TOP)/ext/icu/sqliteicu.h
+  $(TOP)/ext/icu/sqliteicu.h \
+  $(TOP)/ext/icu/icu.c 
 SRC += \
   $(TOP)/ext/rtree/rtree.h \
   $(TOP)/ext/rtree/rtree.c
@@ -361,33 +368,41 @@ TESTSRC = \
   $(TOP)/src/test9.c \
   $(TOP)/src/test_autoext.c \
   $(TOP)/src/test_async.c \
+  $(TOP)/src/test_backup.c \
   $(TOP)/src/test_btree.c \
   $(TOP)/src/test_config.c \
   $(TOP)/src/test_devsym.c \
   $(TOP)/src/test_func.c \
   $(TOP)/src/test_hexio.c \
+  $(TOP)/src/test_journal.c \
   $(TOP)/src/test_malloc.c \
   $(TOP)/src/test_md5.c \
   $(TOP)/src/test_mutex.c \
   $(TOP)/src/test_onefile.c \
   $(TOP)/src/test_osinst.c \
+  $(TOP)/src/test_pcache.c \
   $(TOP)/src/test_schema.c \
   $(TOP)/src/test_server.c \
   $(TOP)/src/test_tclvar.c \
   $(TOP)/src/test_thread.c \
+  $(TOP)/src/test_wsd.c \
 
 #TESTSRC += $(TOP)/ext/fts2/fts2_tokenizer.c
 #TESTSRC += $(TOP)/ext/fts3/fts3_tokenizer.c
 
 TESTSRC2 = \
-  $(TOP)/src/attach.c $(TOP)/src/btree.c $(TOP)/src/build.c $(TOP)/src/date.c  \
+  $(TOP)/src/attach.c $(TOP)/src/backup.c $(TOP)/src/btree.c                   \
+  $(TOP)/src/build.c $(TOP)/src/date.c                                         \
   $(TOP)/src/expr.c $(TOP)/src/func.c $(TOP)/src/insert.c $(TOP)/src/os.c      \
   $(TOP)/src/os_os2.c $(TOP)/src/os_unix.c $(TOP)/src/os_win.c                 \
   $(TOP)/src/pager.c $(TOP)/src/pragma.c $(TOP)/src/prepare.c                  \
   $(TOP)/src/printf.c $(TOP)/src/random.c $(TOP)/src/pcache.c                  \
-  $(TOP)/src/select.c $(TOP)/src/tokenize.c                                    \
+  $(TOP)/src/pcache1.c $(TOP)/src/select.c $(TOP)/src/tokenize.c               \
   $(TOP)/src/utf.c $(TOP)/src/util.c $(TOP)/src/vdbeapi.c $(TOP)/src/vdbeaux.c \
-  $(TOP)/src/vdbe.c $(TOP)/src/vdbemem.c $(TOP)/src/where.c parse.c
+  $(TOP)/src/vdbe.c $(TOP)/src/vdbemem.c $(TOP)/src/where.c parse.c            \
+  $(TOP)/ext/fts3/fts3.c $(TOP)/ext/fts3/fts3_expr.c                           \
+  $(TOP)/ext/fts3/fts3_tokenizer.c                                             \
+  $(TOP)/ext/async/sqlite3async.c
 
 # Header files used by all library source files.
 #
@@ -423,10 +438,13 @@ EXTHDR += \
   $(TOP)/ext/fts2/fts2_tokenizer.h
 EXTHDR += \
   $(TOP)/ext/fts3/fts3.h \
+  $(TOP)/ext/fts3/fts3_expr.h \
   $(TOP)/ext/fts3/fts3_hash.h \
   $(TOP)/ext/fts3/fts3_tokenizer.h
 EXTHDR += \
   $(TOP)/ext/rtree/rtree.h
+EXTHDR += \
+  $(TOP)/ext/icu/sqliteicu.h
 
 # This is the default Makefile target.  The objects listed here
 # are what get build when you type just "make" with no arguments.
@@ -551,6 +569,9 @@ fts2_tokenizer1.o:  $(TOP)/ext/fts2/fts2_tokenizer1.c $(HDR) $(EXTHDR)
 fts3.o:        $(TOP)/ext/fts3/fts3.c $(HDR) $(EXTHDR)
        $(TCCX_SHARED) -DSQLITE_CORE -c $(TOP)/ext/fts3/fts3.c
 
+fts3_expr.o:   $(TOP)/ext/fts3/fts3_expr.c $(HDR) $(EXTHDR)
+       $(TCCX_SHARED) -DSQLITE_CORE -c $(TOP)/ext/fts3/fts3_expr.c
+
 fts3_hash.o:   $(TOP)/ext/fts3/fts3_hash.c $(HDR) $(EXTHDR)
        $(TCCX_SHARED) -DSQLITE_CORE -c $(TOP)/ext/fts3/fts3_hash.c
 

diff --git a/manifest b/manifest
index 2fdf8a2c4bdd1ebb52702c006e53bc34a4c69527..3ed9a475b59f0b48990b1267bd71d7e0c328dc22 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,9 +1,9 @@
-C Add\sa\sshort\spause\sto\sforce\sa\scontext\sswap\swhile\swaiting\sfor\sa\sseparate\sprocess\nto\sclear\sits\slock\sin\sthe\slock4.test\sscript.\s(CVS\s6610)
-D 2009-05-06T00:52:41
+C updated\svxworks\smakefile\sfor\s3.6.14\srelease\s(CVS\s6611)
+D 2009-05-06T15:24:04
 F Makefile.arm-wince-mingw32ce-gcc fcd5e9cd67fe88836360bb4f9ef4cb7f8e2fb5a0
 F Makefile.in 583e87706abc3026960ed759aff6371faf84c211
 F Makefile.linux-gcc d53183f4aa6a9192d249731c90dbdffbd2c68654
-F Makefile.vxworks 40c707b2589f61436b89788003b1ccf5679ec3e6
+F Makefile.vxworks 51698ac39a2d114c1586b7694838f2f321c43f64
 F README b974cdc3f9f12b87e851b04e75996d720ebf81ac
 F VERSION 768db26884d4fad3631e6d435475edd072d4379c
 F aclocal.m4 a5c22d164aff7ed549d53a90fa56d56955281f50
@@ -728,7 +728,7 @@ F tool/speedtest16.c c8a9c793df96db7e4933f0852abb7a03d48f2e81
 F tool/speedtest2.tcl ee2149167303ba8e95af97873c575c3e0fab58ff
 F tool/speedtest8.c 2902c46588c40b55661e471d7a86e4dd71a18224
 F tool/speedtest8inst1.c 293327bc76823f473684d589a8160bde1f52c14e
-P c1e739e39b1df205f3beb4088ce7760a0d56359f
-R 2672359e21ab734b97c78750b0209c2d
-U drh
-Z 59fab89a94744c99e14b75dd09367216
+P 4357e76d53f692cb7495fbde61b4b7580560f816
+R 7f6d232abc0e2ee18f7e13e4cb8b2a02
+U chw
+Z 380772f02108e949a1e4532819450406

diff --git a/manifest.uuid b/manifest.uuid
index dd7525c862f7e2a7dbaa1b629a6967761a615d31..8ca66726ecd710156a48e261d5f73db4693fff5c 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-4357e76d53f692cb7495fbde61b4b7580560f816
\ No newline at end of file
+5d4bffaabbf6a809938f115de266b382183a0a96
\ No newline at end of file