Import SQLite 3.10.2.

third_party/sqlite/src/Makefile.in

 #!/usr/make
 #
 # Makefile for SQLITE
 #
 # This makefile is suppose to be configured automatically using the
 # autoconf.  But if that does not work for you, you can configure
 # the makefile manually.  Just set the parameters below to values that
 # work well for your system.
 #
 # If the configure script does not work out-of-the-box, you might
 # be able to get it to work by giving it some hints.  See the comment
 # at the beginning of configure.in for additional information.
 #
 
 # The toplevel directory of the source tree.  This is the directory
 # that contains this "Makefile.in" and the "configure.in" script.
 #
-TOP = @srcdir@
+TOP = @abs_srcdir@
 
 # C Compiler and options for use in building executables that
 # will run on the platform that is doing the build.
 #
 BCC = @BUILD_CC@ @BUILD_CFLAGS@
 
-# C Compile and options for use in building executables that 
+# TCC is the C Compile and options for use in building executables that 
 # will run on the target platform.  (BCC and TCC are usually the
-# same unless your are cross-compiling.)
+# same unless your are cross-compiling.)  Separate CC and CFLAGS macros
+# are provide so that these aspects of the build process can be changed
+# on the "make" command-line.  Ex:  "make CC=clang CFLAGS=-fsanitize=undefined"
 #
-TCC = @CC@ @CPPFLAGS@ @CFLAGS@ -I. -I${TOP}/src -I${TOP}/ext/rtree
+CC = @CC@
+CFLAGS = @CPPFLAGS@ @CFLAGS@
+TCC = $(CC) $(CFLAGS) -I. -I${TOP}/src -I${TOP}/ext/rtree -I${TOP}/ext/fts3
 
 # Define this for the autoconf-based build, so that the code knows it can
 # include the generated config.h
 # 
 TCC += -D_HAVE_SQLITE_CONFIG_H -DBUILD_sqlite
 
 # Define -DNDEBUG to compile without debugging (i.e., for production usage)
 # Omitting the define will cause extra debugging code to be inserted and
 # includes extra comments when "EXPLAIN stmt" is used.
 #
-TCC += @TARGET_DEBUG@ @XTHREADCONNECT@
+TCC += @TARGET_DEBUG@
 
 # Compiler options needed for programs that use the TCL library.
 #
 TCC += @TCL_INCLUDE_SPEC@
 
 # The library that programs using TCL must link against.
 #
 LIBTCL = @TCL_LIB_SPEC@
 
 # Compiler options needed for programs that use the readline() library.
 #
 READLINE_FLAGS = -DHAVE_READLINE=@TARGET_HAVE_READLINE@ @TARGET_READLINE_INC@
+READLINE_FLAGS += -DHAVE_EDITLINE=@TARGET_HAVE_EDITLINE@
 
 # The library that programs using readline() must link against.
 #
 LIBREADLINE = @TARGET_READLINE_LIBS@
 
 # Should the database engine be compiled threadsafe
 #
 TCC += -DSQLITE_THREADSAFE=@SQLITE_THREADSAFE@
 
 # Any target libraries which libsqlite must be linked against
 # 
-TLIBS = @LIBS@
+TLIBS = @LIBS@ $(LIBS)
 
 # Flags controlling use of the in memory btree implementation
 #
 # SQLITE_TEMP_STORE is 0 to force temporary tables to be in a file, 1 to
 # default to file, 2 to default to memory, and 3 to force temporary
 # tables to always be in memory.
 #
 TEMP_STORE = -DSQLITE_TEMP_STORE=@TEMP_STORE@
 
 # Enable/disable loadable extensions, and other optional features
@@ skipping 69 matching lines @@
 includedir = @includedir@
 INSTALL = @INSTALL@
 LIBTOOL = ./libtool
 ALLOWRELEASE = @ALLOWRELEASE@
 
 # libtool compile/link/install
 LTCOMPILE = $(LIBTOOL) --mode=compile --tag=CC $(TCC) $(LTCOMPILE_EXTRAS)
 LTLINK = $(LIBTOOL) --mode=link $(TCC) $(LTCOMPILE_EXTRAS) @LDFLAGS@ $(LTLINK_EXTRAS)
 LTINSTALL = $(LIBTOOL) --mode=install $(INSTALL)
 
-# nawk compatible awk.
-NAWK = @AWK@
-
 # You should not have to change anything below this line
 ###############################################################################
 
 USE_AMALGAMATION = @USE_AMALGAMATION@
 
 # Object files for the SQLite library (non-amalgamation).
 #
 LIBOBJS0 = alter.lo analyze.lo attach.lo auth.lo \
          backup.lo bitvec.lo btmutex.lo btree.lo build.lo \
-         callback.lo complete.lo ctime.lo date.lo delete.lo \
+         callback.lo complete.lo ctime.lo date.lo dbstat.lo delete.lo \
          expr.lo fault.lo fkey.lo \
          fts3.lo fts3_aux.lo fts3_expr.lo fts3_hash.lo fts3_icu.lo \
          fts3_porter.lo fts3_snippet.lo fts3_tokenizer.lo fts3_tokenizer1.lo \
          fts3_tokenize_vtab.lo \
          fts3_unicode.lo fts3_unicode2.lo fts3_write.lo \
+         fts5.lo \
          func.lo global.lo hash.lo \
-         icu.lo insert.lo journal.lo legacy.lo loadext.lo \
+         icu.lo insert.lo journal.lo json1.lo legacy.lo loadext.lo \
          main.lo malloc.lo mem0.lo mem1.lo mem2.lo mem3.lo mem5.lo \
          memjournal.lo \
          mutex.lo mutex_noop.lo mutex_unix.lo mutex_w32.lo \
          notify.lo opcodes.lo os.lo os_unix.lo os_win.lo \
          pager.lo parse.lo pcache.lo pcache1.lo pragma.lo prepare.lo printf.lo \
          random.lo resolve.lo rowset.lo rtree.lo select.lo status.lo \
-         table.lo threads.lo tokenize.lo trigger.lo \
+         table.lo threads.lo tokenize.lo treeview.lo trigger.lo \
          update.lo util.lo vacuum.lo \
          vdbe.lo vdbeapi.lo vdbeaux.lo vdbeblob.lo vdbemem.lo vdbesort.lo \
-         vdbetrace.lo wal.lo walker.lo where.lo utf.lo vtab.lo
+         vdbetrace.lo wal.lo walker.lo where.lo wherecode.lo whereexpr.lo \
+         utf.lo vtab.lo
 
 # Object files for the amalgamation.
 #
 LIBOBJS1 = sqlite3.lo
 
 # Determine the real value of LIBOBJ based on the 'configure' script
 #
 LIBOBJ = $(LIBOBJS$(USE_AMALGAMATION))
 
 
 # All of the source code files.
 #
 SRC = \
   $(TOP)/src/alter.c \
   $(TOP)/src/analyze.c \
   $(TOP)/src/attach.c \
   $(TOP)/src/auth.c \
   $(TOP)/src/backup.c \
   $(TOP)/src/bitvec.c \
   $(TOP)/src/btmutex.c \
   $(TOP)/src/btree.c \
   $(TOP)/src/btree.h \
   $(TOP)/src/btreeInt.h \
   $(TOP)/src/build.c \
   $(TOP)/src/callback.c \
   $(TOP)/src/complete.c \
   $(TOP)/src/ctime.c \
   $(TOP)/src/date.c \
+  $(TOP)/src/dbstat.c \
   $(TOP)/src/delete.c \
   $(TOP)/src/expr.c \
   $(TOP)/src/fault.c \
   $(TOP)/src/fkey.c \
   $(TOP)/src/func.c \
   $(TOP)/src/global.c \
   $(TOP)/src/hash.c \
   $(TOP)/src/hash.h \
   $(TOP)/src/hwtime.h \
   $(TOP)/src/insert.c \
   $(TOP)/src/journal.c \
   $(TOP)/src/legacy.c \
   $(TOP)/src/loadext.c \
   $(TOP)/src/main.c \
   $(TOP)/src/malloc.c \
   $(TOP)/src/mem0.c \
   $(TOP)/src/mem1.c \
   $(TOP)/src/mem2.c \
   $(TOP)/src/mem3.c \
   $(TOP)/src/mem5.c \
   $(TOP)/src/memjournal.c \
+  $(TOP)/src/msvc.h \
   $(TOP)/src/mutex.c \
   $(TOP)/src/mutex.h \
   $(TOP)/src/mutex_noop.c \
   $(TOP)/src/mutex_unix.c \
   $(TOP)/src/mutex_w32.c \
   $(TOP)/src/notify.c \
   $(TOP)/src/os.c \
   $(TOP)/src/os.h \
   $(TOP)/src/os_common.h \
   $(TOP)/src/os_setup.h \
   $(TOP)/src/os_unix.c \
   $(TOP)/src/os_win.c \
   $(TOP)/src/os_win.h \
   $(TOP)/src/pager.c \
   $(TOP)/src/pager.h \
   $(TOP)/src/parse.y \
   $(TOP)/src/pcache.c \
   $(TOP)/src/pcache.h \
   $(TOP)/src/pcache1.c \
   $(TOP)/src/pragma.c \
+  $(TOP)/src/pragma.h \
   $(TOP)/src/prepare.c \
   $(TOP)/src/printf.c \
   $(TOP)/src/random.c \
   $(TOP)/src/recover.c \
   $(TOP)/src/resolve.c \
   $(TOP)/src/rowset.c \
   $(TOP)/src/select.c \
   $(TOP)/src/status.c \
   $(TOP)/src/shell.c \
   $(TOP)/src/sqlite.h.in \
   $(TOP)/src/sqlite3ext.h \
   $(TOP)/src/sqliteInt.h \
   $(TOP)/src/sqliteLimit.h \
   $(TOP)/src/table.c \
+  $(TOP)/src/tclsqlite.c \
   $(TOP)/src/threads.c \
-  $(TOP)/src/tclsqlite.c \
   $(TOP)/src/tokenize.c \
+  $(TOP)/src/treeview.c \
   $(TOP)/src/trigger.c \
   $(TOP)/src/utf.c \
   $(TOP)/src/update.c \
   $(TOP)/src/util.c \
   $(TOP)/src/vacuum.c \
   $(TOP)/src/vdbe.c \
   $(TOP)/src/vdbe.h \
   $(TOP)/src/vdbeapi.c \
   $(TOP)/src/vdbeaux.c \
   $(TOP)/src/vdbeblob.c \
   $(TOP)/src/vdbemem.c \
   $(TOP)/src/vdbesort.c \
   $(TOP)/src/vdbetrace.c \
   $(TOP)/src/vdbeInt.h \
   $(TOP)/src/vtab.c \
+  $(TOP)/src/vxworks.h \
   $(TOP)/src/wal.c \
   $(TOP)/src/wal.h \
   $(TOP)/src/walker.c \
   $(TOP)/src/where.c \
+  $(TOP)/src/wherecode.c \
+  $(TOP)/src/whereexpr.c \
   $(TOP)/src/whereInt.h
 
 # Source code for extensions
 #
 SRC += \
   $(TOP)/ext/fts1/fts1.c \
   $(TOP)/ext/fts1/fts1.h \
   $(TOP)/ext/fts1/fts1_hash.c \
   $(TOP)/ext/fts1/fts1_hash.h \
   $(TOP)/ext/fts1/fts1_porter.c \
@@ skipping 26 matching lines @@
   $(TOP)/ext/fts3/fts3_tokenize_vtab.c \
   $(TOP)/ext/fts3/fts3_unicode.c \
   $(TOP)/ext/fts3/fts3_unicode2.c \
   $(TOP)/ext/fts3/fts3_write.c
 SRC += \
   $(TOP)/ext/icu/sqliteicu.h \
   $(TOP)/ext/icu/icu.c
 SRC += \
   $(TOP)/ext/rtree/rtree.h \
   $(TOP)/ext/rtree/rtree.c
+SRC += \
+  $(TOP)/ext/rbu/sqlite3rbu.h \
+  $(TOP)/ext/rbu/sqlite3rbu.c
+SRC += \
+  $(TOP)/ext/misc/json1.c
+
 
 
 # Generated source code files
 #
 SRC += \
   keywordhash.h \
   opcodes.c \
   opcodes.h \
   parse.c \
   parse.h \
   config.h \
   sqlite3.h
 
 # Source code to the test files.
 #
 TESTSRC = \
   $(TOP)/src/test1.c \
   $(TOP)/src/test2.c \
   $(TOP)/src/test3.c \
   $(TOP)/src/test4.c \
   $(TOP)/src/test5.c \
   $(TOP)/src/test6.c \
   $(TOP)/src/test7.c \
   $(TOP)/src/test8.c \
   $(TOP)/src/test9.c \
   $(TOP)/src/test_autoext.c \
   $(TOP)/src/test_async.c \
   $(TOP)/src/test_backup.c \
+  $(TOP)/src/test_blob.c \
   $(TOP)/src/test_btree.c \
   $(TOP)/src/test_config.c \
   $(TOP)/src/test_demovfs.c \
   $(TOP)/src/test_devsym.c \
   $(TOP)/src/test_fs.c \
   $(TOP)/src/test_func.c \
   $(TOP)/src/test_hexio.c \
   $(TOP)/src/test_init.c \
   $(TOP)/src/test_intarray.c \
   $(TOP)/src/test_journal.c \
   $(TOP)/src/test_malloc.c \
   $(TOP)/src/test_multiplex.c \
   $(TOP)/src/test_mutex.c \
   $(TOP)/src/test_onefile.c \
   $(TOP)/src/test_osinst.c \
   $(TOP)/src/test_pcache.c \
   $(TOP)/src/test_quota.c \
   $(TOP)/src/test_rtree.c \
   $(TOP)/src/test_schema.c \
   $(TOP)/src/test_server.c \
   $(TOP)/src/test_superlock.c \
   $(TOP)/src/test_syscall.c \
-  $(TOP)/src/test_stat.c \
   $(TOP)/src/test_tclvar.c \
   $(TOP)/src/test_thread.c \
   $(TOP)/src/test_vfs.c \
+  $(TOP)/src/test_windirent.c \
   $(TOP)/src/test_wsd.c       \
   $(TOP)/ext/fts3/fts3_term.c \
-  $(TOP)/ext/fts3/fts3_test.c 
+  $(TOP)/ext/fts3/fts3_test.c \
+  $(TOP)/ext/rbu/test_rbu.c 
 
 # Statically linked extensions
 #
 TESTSRC += \
   $(TOP)/ext/misc/amatch.c \
   $(TOP)/ext/misc/closure.c \
+  $(TOP)/ext/misc/eval.c \
   $(TOP)/ext/misc/fileio.c \
   $(TOP)/ext/misc/fuzzer.c \
+  $(TOP)/ext/fts5/fts5_tcl.c \
+  $(TOP)/ext/fts5/fts5_test_mi.c \
   $(TOP)/ext/misc/ieee754.c \
   $(TOP)/ext/misc/nextchar.c \
   $(TOP)/ext/misc/percentile.c \
   $(TOP)/ext/misc/regexp.c \
+  $(TOP)/ext/misc/series.c \
   $(TOP)/ext/misc/spellfix.c \
   $(TOP)/ext/misc/totype.c \
   $(TOP)/ext/misc/wholenumber.c
 
 # Source code to the library files needed by the test fixture
 #
 TESTSRC2 = \
   $(TOP)/src/attach.c \
   $(TOP)/src/backup.c \
   $(TOP)/src/bitvec.c \
   $(TOP)/src/btree.c \
   $(TOP)/src/build.c \
   $(TOP)/src/ctime.c \
   $(TOP)/src/date.c \
+  $(TOP)/src/dbstat.c \
   $(TOP)/src/expr.c \
   $(TOP)/src/func.c \
   $(TOP)/src/insert.c \
   $(TOP)/src/wal.c \
   $(TOP)/src/main.c \
   $(TOP)/src/mem5.c \
   $(TOP)/src/os.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/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/vdbetrace.c \
   $(TOP)/src/where.c \
+  $(TOP)/src/wherecode.c \
+  $(TOP)/src/whereexpr.c \
   parse.c \
   $(TOP)/ext/fts3/fts3.c \
   $(TOP)/ext/fts3/fts3_aux.c \
   $(TOP)/ext/fts3/fts3_expr.c \
   $(TOP)/ext/fts3/fts3_term.c \
   $(TOP)/ext/fts3/fts3_tokenizer.c \
   $(TOP)/ext/fts3/fts3_write.c \
   $(TOP)/ext/async/sqlite3async.c
 
 # Header files used by all library source files.
 #
 HDR = \
    $(TOP)/src/btree.h \
    $(TOP)/src/btreeInt.h \
    $(TOP)/src/hash.h \
    $(TOP)/src/hwtime.h \
    keywordhash.h \
+   $(TOP)/src/msvc.h \
    $(TOP)/src/mutex.h \
    opcodes.h \
    $(TOP)/src/os.h \
    $(TOP)/src/os_common.h \
    $(TOP)/src/os_setup.h \
    $(TOP)/src/os_win.h \
    $(TOP)/src/pager.h \
    $(TOP)/src/pcache.h \
    parse.h  \
+   $(TOP)/src/pragma.h \
    sqlite3.h  \
    $(TOP)/src/sqlite3ext.h \
    $(TOP)/src/sqliteInt.h  \
    $(TOP)/src/sqliteLimit.h \
    $(TOP)/src/vdbe.h \
    $(TOP)/src/vdbeInt.h \
+   $(TOP)/src/vxworks.h \
    $(TOP)/src/whereInt.h \
    config.h
 
 # Header files used by extensions
 #
 EXTHDR += \
   $(TOP)/ext/fts1/fts1.h \
   $(TOP)/ext/fts1/fts1_hash.h \
   $(TOP)/ext/fts1/fts1_tokenizer.h
 EXTHDR += \
   $(TOP)/ext/fts2/fts2.h \
   $(TOP)/ext/fts2/fts2_hash.h \
   $(TOP)/ext/fts2/fts2_tokenizer.h
 EXTHDR += \
   $(TOP)/ext/fts3/fts3.h \
   $(TOP)/ext/fts3/fts3Int.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
 EXTHDR += \
   $(TOP)/ext/rtree/sqlite3rtree.h
 
+# executables needed for testing
+#
+TESTPROGS = \
+  testfixture$(TEXE) \
+  sqlite3$(TEXE) \
+  sqlite3_analyzer$(TEXE) \
+  sqldiff$(TEXE)
+
+# Databases containing fuzzer test cases
+#
+FUZZDATA = \
+  $(TOP)/test/fuzzdata1.db \
+  $(TOP)/test/fuzzdata2.db \
+  $(TOP)/test/fuzzdata3.db \
+  $(TOP)/test/fuzzdata4.db
+
+# Standard options to testfixture
+#
+TESTOPTS = --verbose=file --output=test-out.txt
+
+# Extra compiler options for various shell tools
+#
+SHELL_OPT = -DSQLITE_ENABLE_JSON1 -DSQLITE_ENABLE_FTS4 -DSQLITE_ENABLE_FTS5
+FUZZERSHELL_OPT = -DSQLITE_ENABLE_JSON1
+FUZZCHECK_OPT = -DSQLITE_ENABLE_JSON1 -DSQLITE_ENABLE_MEMSYS5
+
 # This is the default Makefile target.  The objects listed here
 # are what get build when you type just "make" with no arguments.
 #
 all:    sqlite3.h libsqlite3.la sqlite3$(TEXE) $(HAVE_TCL:1=libtclsqlite3.la)
 
 Makefile: $(TOP)/Makefile.in
         ./config.status
 
 sqlite3.pc: $(TOP)/sqlite3.pc.in
         ./config.status
 
 libsqlite3.la:  $(LIBOBJ)
         $(LTLINK) -no-undefined -o $@ $(LIBOBJ) $(TLIBS) \
                 ${ALLOWRELEASE} -rpath "$(libdir)" -version-info "8:6:8"
 
 libtclsqlite3.la:       tclsqlite.lo libsqlite3.la
         $(LTLINK) -no-undefined -o $@ tclsqlite.lo \
                 libsqlite3.la @TCL_STUB_LIB_SPEC@ $(TLIBS) \
                 -rpath "$(TCLLIBDIR)" \
                 -version-info "8:6:8" \
                 -avoid-version
 
 sqlite3$(TEXE): $(TOP)/src/shell.c libsqlite3.la sqlite3.h
-        $(LTLINK) $(READLINE_FLAGS) \
-                -o $@ $(TOP)/src/shell.c libsqlite3.la \
+        $(LTLINK) $(READLINE_FLAGS) $(SHELL_OPT) -o $@ \
+                $(TOP)/src/shell.c libsqlite3.la \
                 $(LIBREADLINE) $(TLIBS) -rpath "$(libdir)"
 
-mptester$(EXE): sqlite3.c $(TOP)/mptest/mptest.c
+sqldiff$(TEXE): $(TOP)/tool/sqldiff.c sqlite3.c sqlite3.h
+        $(LTLINK) -o $@ $(TOP)/tool/sqldiff.c sqlite3.c $(TLIBS)
+
+fuzzershell$(TEXE):     $(TOP)/tool/fuzzershell.c sqlite3.c sqlite3.h
+        $(LTLINK) -o $@ $(FUZZERSHELL_OPT) \
+          $(TOP)/tool/fuzzershell.c sqlite3.c $(TLIBS)
+
+fuzzcheck$(TEXE):       $(TOP)/test/fuzzcheck.c sqlite3.c sqlite3.h
+        $(LTLINK) -o $@ $(FUZZCHECK_OPT) $(TOP)/test/fuzzcheck.c sqlite3.c $(TLIBS)
+
+mptester$(TEXE):        sqlite3.c $(TOP)/mptest/mptest.c
         $(LTLINK) -o $@ -I. $(TOP)/mptest/mptest.c sqlite3.c \
                 $(TLIBS) -rpath "$(libdir)"
 
+MPTEST1=./mptester$(TEXE) mptest.db $(TOP)/mptest/crash01.test --repeat 20
+MPTEST2=./mptester$(TEXE) mptest.db $(TOP)/mptest/multiwrite01.test --repeat 20
+mptest: mptester$(TEXE)
+        rm -f mptest.db
+        $(MPTEST1) --journalmode DELETE
+        $(MPTEST2) --journalmode WAL
+        $(MPTEST1) --journalmode WAL
+        $(MPTEST2) --journalmode PERSIST
+        $(MPTEST1) --journalmode PERSIST
+        $(MPTEST2) --journalmode TRUNCATE
+        $(MPTEST1) --journalmode TRUNCATE
+        $(MPTEST2) --journalmode DELETE
+
 
 # This target creates a directory named "tsrc" and fills it with
 # copies of all of the C source code and header files needed to
 # build on the target system.  Some of the C source code and header
 # files are automatically generated.  This target takes care of
 # all that automatic generation.
 #
-.target_source: $(SRC) $(TOP)/tool/vdbe-compress.tcl
+.target_source: $(SRC) $(TOP)/tool/vdbe-compress.tcl fts5.c
         rm -rf tsrc
         mkdir tsrc
         cp -f $(SRC) tsrc
         rm tsrc/sqlite.h.in tsrc/parse.y
         $(TCLSH_CMD) $(TOP)/tool/vdbe-compress.tcl $(OPTS) <tsrc/vdbe.c >vdbe.new
         mv vdbe.new tsrc/vdbe.c
+        cp fts5.c fts5.h tsrc
         touch .target_source
 
 sqlite3.c:      .target_source $(TOP)/tool/mksqlite3c.tcl
         $(TCLSH_CMD) $(TOP)/tool/mksqlite3c.tcl
         cp tsrc/shell.c tsrc/sqlite3ext.h .
 
+sqlite3ext.h:   .target_source
+        cp tsrc/sqlite3ext.h .
+
 tclsqlite3.c:   sqlite3.c
         echo '#ifndef USE_SYSTEM_SQLITE' >tclsqlite3.c
         cat sqlite3.c >>tclsqlite3.c
         echo '#endif /* USE_SYSTEM_SQLITE */' >>tclsqlite3.c
         cat $(TOP)/src/tclsqlite.c >>tclsqlite3.c
 
 sqlite3-all.c:  sqlite3.c $(TOP)/tool/split-sqlite3c.tcl
         $(TCLSH_CMD) $(TOP)/tool/split-sqlite3c.tcl
 
 # Rule to build the amalgamation
 #
 sqlite3.lo:     sqlite3.c
         $(LTCOMPILE) $(TEMP_STORE) -c sqlite3.c
 
 # Rules to build the LEMON compiler generator
 #
-lemon$(BEXE):   $(TOP)/tool/lemon.c $(TOP)/src/lempar.c
+lemon$(BEXE):   $(TOP)/tool/lemon.c $(TOP)/tool/lempar.c
         $(BCC) -o $@ $(TOP)/tool/lemon.c
-        cp $(TOP)/src/lempar.c .
+        cp $(TOP)/tool/lempar.c .
 
 # Rules to build individual *.o files from generated *.c files. This
 # applies to:
 #
 #     parse.o
 #     opcodes.o
 #
 parse.lo:       parse.c $(HDR)
         $(LTCOMPILE) $(TEMP_STORE) -c parse.c
 
@@ skipping 34 matching lines @@
 
 complete.lo:    $(TOP)/src/complete.c $(HDR)
         $(LTCOMPILE) $(TEMP_STORE) -c $(TOP)/src/complete.c
 
 ctime.lo:       $(TOP)/src/ctime.c $(HDR)
         $(LTCOMPILE) $(TEMP_STORE) -c $(TOP)/src/ctime.c
 
 date.lo:        $(TOP)/src/date.c $(HDR)
         $(LTCOMPILE) $(TEMP_STORE) -c $(TOP)/src/date.c
 
+dbstat.lo:      $(TOP)/src/dbstat.c $(HDR)
+        $(LTCOMPILE) $(TEMP_STORE) -c $(TOP)/src/dbstat.c
+
 delete.lo:      $(TOP)/src/delete.c $(HDR)
         $(LTCOMPILE) $(TEMP_STORE) -c $(TOP)/src/delete.c
 
 expr.lo:        $(TOP)/src/expr.c $(HDR)
         $(LTCOMPILE) $(TEMP_STORE) -c $(TOP)/src/expr.c
 
 fault.lo:       $(TOP)/src/fault.c $(HDR)
         $(LTCOMPILE) $(TEMP_STORE) -c $(TOP)/src/fault.c
 
 fkey.lo:        $(TOP)/src/fkey.c $(HDR)
@@ skipping 103 matching lines @@
 
 table.lo:       $(TOP)/src/table.c $(HDR)
         $(LTCOMPILE) $(TEMP_STORE) -c $(TOP)/src/table.c
 
 threads.lo:     $(TOP)/src/threads.c $(HDR)
         $(LTCOMPILE) $(TEMP_STORE) -c $(TOP)/src/threads.c
 
 tokenize.lo:    $(TOP)/src/tokenize.c keywordhash.h $(HDR)
         $(LTCOMPILE) $(TEMP_STORE) -c $(TOP)/src/tokenize.c
 
+treeview.lo:    $(TOP)/src/treeview.c $(HDR)
+        $(LTCOMPILE) $(TEMP_STORE) -c $(TOP)/src/treeview.c
+
 trigger.lo:     $(TOP)/src/trigger.c $(HDR)
         $(LTCOMPILE) $(TEMP_STORE) -c $(TOP)/src/trigger.c
 
 update.lo:      $(TOP)/src/update.c $(HDR)
         $(LTCOMPILE) $(TEMP_STORE) -c $(TOP)/src/update.c
 
 utf.lo: $(TOP)/src/utf.c $(HDR)
         $(LTCOMPILE) $(TEMP_STORE) -c $(TOP)/src/utf.c
 
 util.lo:        $(TOP)/src/util.c $(HDR)
@@ skipping 28 matching lines @@
 
 wal.lo: $(TOP)/src/wal.c $(HDR)
         $(LTCOMPILE) $(TEMP_STORE) -c $(TOP)/src/wal.c
 
 walker.lo:      $(TOP)/src/walker.c $(HDR)
         $(LTCOMPILE) $(TEMP_STORE) -c $(TOP)/src/walker.c
 
 where.lo:       $(TOP)/src/where.c $(HDR)
         $(LTCOMPILE) $(TEMP_STORE) -c $(TOP)/src/where.c
 
+wherecode.lo:   $(TOP)/src/wherecode.c $(HDR)
+        $(LTCOMPILE) $(TEMP_STORE) -c $(TOP)/src/wherecode.c
+
+whereexpr.lo:   $(TOP)/src/whereexpr.c $(HDR)
+        $(LTCOMPILE) $(TEMP_STORE) -c $(TOP)/src/whereexpr.c
+
 tclsqlite.lo:   $(TOP)/src/tclsqlite.c $(HDR)
         $(LTCOMPILE) -DUSE_TCL_STUBS=1 -c $(TOP)/src/tclsqlite.c
 
 tclsqlite-shell.lo:     $(TOP)/src/tclsqlite.c $(HDR)
         $(LTCOMPILE) -DTCLSH=1 -o $@ -c $(TOP)/src/tclsqlite.c
 
 tclsqlite-stubs.lo:     $(TOP)/src/tclsqlite.c $(HDR)
         $(LTCOMPILE) -DUSE_TCL_STUBS=1 -o $@ -c $(TOP)/src/tclsqlite.c
 
 tclsqlite3$(TEXE):      tclsqlite-shell.lo libsqlite3.la
         $(LTLINK) -o $@ tclsqlite-shell.lo \
                  libsqlite3.la $(LIBTCL)
 
 # Rules to build opcodes.c and opcodes.h
 #
-opcodes.c:      opcodes.h $(TOP)/mkopcodec.awk
-        $(NAWK) -f $(TOP)/mkopcodec.awk opcodes.h >opcodes.c
+opcodes.c:      opcodes.h $(TOP)/tool/mkopcodec.tcl
+        $(TCLSH_CMD) $(TOP)/tool/mkopcodec.tcl opcodes.h >opcodes.c
 
-opcodes.h:      parse.h $(TOP)/src/vdbe.c $(TOP)/mkopcodeh.awk
-        cat parse.h $(TOP)/src/vdbe.c | $(NAWK) -f $(TOP)/mkopcodeh.awk >opcodes.h
+opcodes.h:      parse.h $(TOP)/src/vdbe.c $(TOP)/tool/mkopcodeh.tcl
+        cat parse.h $(TOP)/src/vdbe.c | $(TCLSH_CMD) $(TOP)/tool/mkopcodeh.tcl >opcodes.h
 
 # Rules to build parse.c and parse.h - the outputs of lemon.
 #
 parse.h:        parse.c
 
-parse.c:        $(TOP)/src/parse.y lemon$(BEXE) $(TOP)/addopcodes.awk
+parse.c:        $(TOP)/src/parse.y lemon$(BEXE) $(TOP)/tool/addopcodes.tcl
         cp $(TOP)/src/parse.y .
         rm -f parse.h
         ./lemon$(BEXE) $(OPT_FEATURE_FLAGS) $(OPTS) parse.y
         mv parse.h parse.h.temp
-        $(NAWK) -f $(TOP)/addopcodes.awk parse.h.temp >parse.h
+        $(TCLSH_CMD) $(TOP)/tool/addopcodes.tcl parse.h.temp >parse.h
 
 sqlite3.h:      $(TOP)/src/sqlite.h.in $(TOP)/manifest.uuid $(TOP)/VERSION
         $(TCLSH_CMD) $(TOP)/tool/mksqlite3h.tcl $(TOP) >sqlite3.h
 
 keywordhash.h:  $(TOP)/tool/mkkeywordhash.c
         $(BCC) -o mkkeywordhash$(BEXE) $(OPT_FEATURE_FLAGS) $(OPTS) $(TOP)/tool/mkkeywordhash.c
         ./mkkeywordhash$(BEXE) >keywordhash.h
 
 
 
@@ skipping 55 matching lines @@
 
 fts3_unicode2.lo:       $(TOP)/ext/fts3/fts3_unicode2.c $(HDR) $(EXTHDR)
         $(LTCOMPILE) -DSQLITE_CORE -c $(TOP)/ext/fts3/fts3_unicode2.c
 
 fts3_write.lo:  $(TOP)/ext/fts3/fts3_write.c $(HDR) $(EXTHDR)
         $(LTCOMPILE) -DSQLITE_CORE -c $(TOP)/ext/fts3/fts3_write.c
 
 rtree.lo:       $(TOP)/ext/rtree/rtree.c $(HDR) $(EXTHDR)
         $(LTCOMPILE) -DSQLITE_CORE -c $(TOP)/ext/rtree/rtree.c
 
+json1.lo:       $(TOP)/ext/misc/json1.c
+        $(LTCOMPILE) -DSQLITE_CORE -c $(TOP)/ext/misc/json1.c
+
+# FTS5 things
+#
+FTS5_SRC = \
+   $(TOP)/ext/fts5/fts5.h \
+   $(TOP)/ext/fts5/fts5Int.h \
+   $(TOP)/ext/fts5/fts5_aux.c \
+   $(TOP)/ext/fts5/fts5_buffer.c \
+   $(TOP)/ext/fts5/fts5_main.c \
+   $(TOP)/ext/fts5/fts5_config.c \
+   $(TOP)/ext/fts5/fts5_expr.c \
+   $(TOP)/ext/fts5/fts5_hash.c \
+   $(TOP)/ext/fts5/fts5_index.c \
+   fts5parse.c fts5parse.h \
+   $(TOP)/ext/fts5/fts5_storage.c \
+   $(TOP)/ext/fts5/fts5_tokenize.c \
+   $(TOP)/ext/fts5/fts5_unicode2.c \
+   $(TOP)/ext/fts5/fts5_varint.c \
+   $(TOP)/ext/fts5/fts5_vocab.c  \
+
+fts5parse.c:    $(TOP)/ext/fts5/fts5parse.y lemon 
+        cp $(TOP)/ext/fts5/fts5parse.y .
+        rm -f fts5parse.h
+        ./lemon $(OPTS) fts5parse.y
+
+fts5parse.h: fts5parse.c
+
+fts5.c: $(FTS5_SRC)
+        $(TCLSH_CMD) $(TOP)/ext/fts5/tool/mkfts5c.tcl
+        cp $(TOP)/ext/fts5/fts5.h .
+
+fts5.lo:        fts5.c $(HDR) $(EXTHDR)
+        $(LTCOMPILE) -DSQLITE_CORE -c fts5.c
+
 
 # Rules to build the 'testfixture' application.
 #
 # If using the amalgamation, use sqlite3.c directly to build the test
 # fixture.  Otherwise link against libsqlite3.la.  (This distinction is
 # necessary because the test fixture requires non-API symbols which are
 # hidden when the library is built via the amalgamation).
 #
 TESTFIXTURE_FLAGS  = -DTCLSH=1 -DSQLITE_TEST=1 -DSQLITE_CRASH_TEST=1
 TESTFIXTURE_FLAGS += -DSQLITE_SERVER=1 -DSQLITE_PRIVATE="" -DSQLITE_CORE 
 TESTFIXTURE_FLAGS += -DBUILD_sqlite
 
 TESTFIXTURE_SRC0 = $(TESTSRC2) libsqlite3.la
 TESTFIXTURE_SRC1 = sqlite3.c
 TESTFIXTURE_SRC = $(TESTSRC) $(TOP)/src/tclsqlite.c
 TESTFIXTURE_SRC += $(TESTFIXTURE_SRC$(USE_AMALGAMATION))
 
 testfixture$(TEXE):     $(TESTFIXTURE_SRC)
         $(LTLINK) -DSQLITE_NO_SYNC=1 $(TEMP_STORE) $(TESTFIXTURE_FLAGS) \
                 -o $@ $(TESTFIXTURE_SRC) $(LIBTCL) $(TLIBS)
 
+# A very detailed test running most or all test cases
+fulltest:       $(TESTPROGS) fuzztest
+        ./testfixture$(TEXE) $(TOP)/test/all.test $(TESTOPTS)
 
-fulltest:       testfixture$(TEXE) sqlite3$(TEXE)
-        ./testfixture$(TEXE) $(TOP)/test/all.test
+# Really really long testing
+soaktest:       $(TESTPROGS)
+        ./testfixture$(TEXE) $(TOP)/test/all.test -soak=1 $(TESTOPTS)
 
-soaktest:       testfixture$(TEXE) sqlite3$(TEXE)
-        ./testfixture$(TEXE) $(TOP)/test/all.test -soak=1
-
-fulltestonly:   testfixture$(TEXE) sqlite3$(TEXE)
+# Do extra testing but not everything.
+fulltestonly:   $(TESTPROGS) fuzztest
         ./testfixture$(TEXE) $(TOP)/test/full.test
 
-test:   testfixture$(TEXE) sqlite3$(TEXE)
-        ./testfixture$(TEXE) $(TOP)/test/veryquick.test
+# Fuzz testing
+fuzztest:       fuzzcheck$(TEXE) $(FUZZDATA)
+        ./fuzzcheck$(TEXE) $(FUZZDATA)
 
-sqlite3_analyzer.c: sqlite3.c $(TOP)/src/test_stat.c $(TOP)/src/tclsqlite.c $(TOP)/tool/spaceanal.tcl
+fastfuzztest:   fuzzcheck$(TEXE) $(FUZZDATA)
+        ./fuzzcheck$(TEXE) --limit-mem 100M $(FUZZDATA)
+
+valgrindfuzz:   fuzzcheck$(TEXT) $(FUZZDATA)
+        valgrind ./fuzzcheck$(TEXE) --cell-size-check --limit-mem 10M --timeout 600 $(FUZZDATA)
+
+# Minimal testing that runs in less than 3 minutes
+#
+quicktest:      ./testfixture$(TEXE)
+        ./testfixture$(TEXE) $(TOP)/test/extraquick.test $(TESTOPTS)
+
+# This is the common case.  Run many tests that do not take too long,
+# including fuzzcheck, sqlite3_analyzer, and sqldiff tests.
+#
+test:   $(TESTPROGS) fastfuzztest
+        ./testfixture$(TEXE) $(TOP)/test/veryquick.test $(TESTOPTS)
+
+# Run a test using valgrind.  This can take a really long time
+# because valgrind is so much slower than a native machine.
+#
+valgrindtest:   $(TESTPROGS) valgrindfuzz
+        OMIT_MISUSE=1 valgrind -v ./testfixture$(TEXE) $(TOP)/test/permutations.test valgrind $(TESTOPTS)
+
+# A very fast test that checks basic sanity.  The name comes from
+# the 60s-era electronics testing:  "Turn it on and see if smoke
+# comes out."
+#
+smoketest:      $(TESTPROGS) fuzzcheck$(TEXE)
+        ./testfixture$(TEXE) $(TOP)/test/main.test $(TESTOPTS)
+
+sqlite3_analyzer.c: sqlite3.c $(TOP)/src/tclsqlite.c $(TOP)/tool/spaceanal.tcl
         echo "#define TCLSH 2" > $@
-        cat sqlite3.c $(TOP)/src/test_stat.c $(TOP)/src/tclsqlite.c >> $@
+        echo "#define SQLITE_ENABLE_DBSTAT_VTAB 1" >> $@
+        cat sqlite3.c $(TOP)/src/tclsqlite.c >> $@
         echo "static const char *tclsh_main_loop(void){" >> $@
         echo "static const char *zMainloop = " >> $@
-        $(NAWK) -f $(TOP)/tool/tostr.awk $(TOP)/tool/spaceanal.tcl >> $@
+        $(TCLSH_CMD) $(TOP)/tool/tostr.tcl $(TOP)/tool/spaceanal.tcl >> $@
         echo "; return zMainloop; }" >> $@
 
 sqlite3_analyzer$(TEXE): sqlite3_analyzer.c
         $(LTLINK) sqlite3_analyzer.c -o $@ $(LIBTCL) $(TLIBS)
 
 showdb$(TEXE):  $(TOP)/tool/showdb.c sqlite3.lo
         $(LTLINK) -o $@ $(TOP)/tool/showdb.c sqlite3.lo $(TLIBS)
 
 showstat4$(TEXE):       $(TOP)/tool/showstat4.c sqlite3.lo
         $(LTLINK) -o $@ $(TOP)/tool/showstat4.c sqlite3.lo $(TLIBS)
 
 showjournal$(TEXE):     $(TOP)/tool/showjournal.c sqlite3.lo
         $(LTLINK) -o $@ $(TOP)/tool/showjournal.c sqlite3.lo $(TLIBS)
 
 showwal$(TEXE): $(TOP)/tool/showwal.c sqlite3.lo
         $(LTLINK) -o $@ $(TOP)/tool/showwal.c sqlite3.lo $(TLIBS)
 
 rollback-test$(TEXE):   $(TOP)/tool/rollback-test.c sqlite3.lo
         $(LTLINK) -o $@ $(TOP)/tool/rollback-test.c sqlite3.lo $(TLIBS)
 
 LogEst$(TEXE):  $(TOP)/tool/logest.c sqlite3.h
         $(LTLINK) -I. -o $@ $(TOP)/tool/logest.c
 
 wordcount$(TEXE):       $(TOP)/test/wordcount.c sqlite3.c
         $(LTLINK) -o $@ $(TOP)/test/wordcount.c sqlite3.c $(TLIBS)
 
-speedtest1$(TEXE):      $(TOP)/test/wordcount.c sqlite3.lo
+speedtest1$(TEXE):      $(TOP)/test/speedtest1.c sqlite3.lo
         $(LTLINK) -o $@ $(TOP)/test/speedtest1.c sqlite3.lo $(TLIBS)
 
+# This target will fail if the SQLite amalgamation contains any exported
+# symbols that do not begin with "sqlite3_". It is run as part of the
+# releasetest.tcl script.
+#
+checksymbols: sqlite3.lo
+        nm -g --defined-only sqlite3.o | grep -v " sqlite3_" ; test $$? -ne 0
+        echo '0 errors out of 1 tests'
+
+# Build the amalgamation-autoconf package.
+#
+amalgamation-tarball: sqlite3.c
+        TOP=$(TOP) sh $(TOP)/tool/mkautoconfamal.sh
+
+# The next two rules are used to support the "threadtest" target. Building
+# threadtest runs a few thread-safety tests that are implemented in C. This
+# target is invoked by the releasetest.tcl script.
+# 
+THREADTEST3_SRC = $(TOP)/test/threadtest3.c    \
+                  $(TOP)/test/tt3_checkpoint.c \
+                  $(TOP)/test/tt3_index.c      \
+                  $(TOP)/test/tt3_vacuum.c      \
+                  $(TOP)/test/tt3_stress.c      \
+                  $(TOP)/test/tt3_lookaside1.c
+
+threadtest3$(TEXE): sqlite3.lo $(THREADTEST3_SRC)
+        $(LTLINK) $(TOP)/test/threadtest3.c $(TOP)/src/test_multiplex.c sqlite3.lo -o $@ $(TLIBS)
+
+threadtest: threadtest3$(TEXE)
+        ./threadtest3$(TEXE)
+
+releasetest:    
+        $(TCLSH_CMD) $(TOP)/test/releasetest.tcl
+
 # Standard install and cleanup targets
 #
 lib_install:    libsqlite3.la
         $(INSTALL) -d $(DESTDIR)$(libdir)
         $(LTINSTALL) libsqlite3.la $(DESTDIR)$(libdir)
         
 install:        sqlite3$(BEXE) lib_install sqlite3.h sqlite3.pc ${HAVE_TCL:1=tcl_install}
         $(INSTALL) -d $(DESTDIR)$(bindir)
         $(LTINSTALL) sqlite3$(BEXE) $(DESTDIR)$(bindir)
         $(INSTALL) -d $(DESTDIR)$(includedir)
         $(INSTALL) -m 0644 sqlite3.h $(DESTDIR)$(includedir)
         $(INSTALL) -m 0644 $(TOP)/src/sqlite3ext.h $(DESTDIR)$(includedir)
         $(INSTALL) -d $(DESTDIR)$(pkgconfigdir)
         $(INSTALL) -m 0644 sqlite3.pc $(DESTDIR)$(pkgconfigdir)
 
 pkgIndex.tcl:
-        echo 'package ifneeded sqlite3 $(RELEASE) [list load $(TCLLIBDIR)/libtclsqlite3.so sqlite3]' > $@
+        echo 'package ifneeded sqlite3 $(RELEASE) [list load $(TCLLIBDIR)/libtclsqlite3$(SHLIB_SUFFIX) sqlite3]' > $@
 tcl_install:    lib_install libtclsqlite3.la pkgIndex.tcl
         $(INSTALL) -d $(DESTDIR)$(TCLLIBDIR)
         $(LTINSTALL) libtclsqlite3.la $(DESTDIR)$(TCLLIBDIR)
         rm -f $(DESTDIR)$(TCLLIBDIR)/libtclsqlite3.la $(DESTDIR)$(TCLLIBDIR)/libtclsqlite3.a
         $(INSTALL) -m 0644 pkgIndex.tcl $(DESTDIR)$(TCLLIBDIR)
 
 clean:  
         rm -f *.lo *.la *.o sqlite3$(TEXE) libsqlite3.la
         rm -f sqlite3.h opcodes.*
         rm -rf .libs .deps
         rm -f lemon$(BEXE) lempar.c parse.* sqlite*.tar.gz
         rm -f mkkeywordhash$(BEXE) keywordhash.h
         rm -f *.da *.bb *.bbg gmon.out
         rm -rf quota2a quota2b quota2c
         rm -rf tsrc .target_source
         rm -f tclsqlite3$(TEXE)
         rm -f testfixture$(TEXE) test.db
         rm -f LogEst$(TEXE) fts3view$(TEXE) rollback-test$(TEXE) showdb$(TEXE)
         rm -f showjournal$(TEXE) showstat4$(TEXE) showwal$(TEXE) speedtest1$(TEXE)
         rm -f wordcount$(TEXE)
         rm -f sqlite3.dll sqlite3.lib sqlite3.exp sqlite3.def
         rm -f sqlite3.c
         rm -f sqlite3rc.h
         rm -f shell.c sqlite3ext.h
         rm -f sqlite3_analyzer$(TEXE) sqlite3_analyzer.c
         rm -f sqlite-*-output.vsix
         rm -f mptester mptester.exe
+        rm -f fuzzershell fuzzershell.exe
+        rm -f fuzzcheck fuzzcheck.exe
+        rm -f sqldiff sqldiff.exe
+        rm -f fts5.* fts5parse.*
 
 distclean:      clean
-        rm -f config.log config.status libtool Makefile sqlite3.pc
+        rm -f config.h config.log config.status libtool Makefile sqlite3.pc
 
 #
 # Windows section
 #
 dll: sqlite3.dll
 
 REAL_LIBOBJ = $(LIBOBJ:%.lo=.libs/%.o)
 
 $(REAL_LIBOBJ): $(LIBOBJ)
 
 sqlite3.def: $(REAL_LIBOBJ)
         echo 'EXPORTS' >sqlite3.def
         nm $(REAL_LIBOBJ) | grep ' T ' | grep ' _sqlite3_' \
                 | sed 's/^.* _//' >>sqlite3.def
 
 sqlite3.dll: $(REAL_LIBOBJ) sqlite3.def
         $(TCC) -shared -o $@ sqlite3.def \
                 -Wl,"--strip-all" $(REAL_LIBOBJ)