[sql] Import SQLite 3.17.0.

third_party/sqlite/src/main.mk

 ###############################################################################
 # The following macros should be defined before this script is
 # invoked:
 #
 # TOP              The toplevel directory of the source tree.  This is the
 #                  directory that contains this "Makefile.in" and the
 #                  "configure.in" script.
 #
 # BCC              C Compiler and options for use in building executables that
 #                  will run on the platform that is doing the build.
@@ skipping 28 matching lines @@
 #
 # Once the macros above are defined, the rest of this make script will
 # build the SQLite library and testing tools.
 ################################################################################
 
 # This is how we compile
 #
 TCCX =  $(TCC) $(OPTS) -I. -I$(TOP)/src -I$(TOP) 
 TCCX += -I$(TOP)/ext/rtree -I$(TOP)/ext/icu -I$(TOP)/ext/fts3
 TCCX += -I$(TOP)/ext/async -I$(TOP)/ext/userauth
+TCCX += -I$(TOP)/ext/session
 TCCX += -I$(TOP)/ext/fts5
 THREADLIB += $(LIBS)
 
 # Object files for the SQLite library.
 #
 LIBOBJ+= vdbe.o parse.o \
          alter.o analyze.o attach.o auth.o \
          backup.o bitvec.o btmutex.o btree.o build.o \
          callback.o complete.o ctime.o date.o dbstat.o delete.o expr.o \
          fault.o fkey.o \
          fts3.o fts3_aux.o fts3_expr.o fts3_hash.o fts3_icu.o fts3_porter.o \
          fts3_snippet.o fts3_tokenizer.o fts3_tokenizer1.o \
          fts3_tokenize_vtab.o \
          fts3_unicode.o fts3_unicode2.o \
          fts3_write.o fts5.o func.o global.o hash.o \
-         icu.o insert.o journal.o json1.o legacy.o loadext.o \
+         icu.o insert.o json1.o legacy.o loadext.o \
          main.o malloc.o mem0.o mem1.o mem2.o mem3.o mem5.o \
          memjournal.o \
          mutex.o mutex_noop.o mutex_unix.o mutex_w32.o \
          notify.o opcodes.o os.o os_unix.o os_win.o \
          pager.o pcache.o pcache1.o pragma.o prepare.o printf.o \
-         random.o recover.o recover_varint.o resolve.o rowset.o rtree.o \
-         select.o sqlite3rbu.o status.o \
+         random.o resolve.o rowset.o rtree.o select.o sqlite3rbu.o status.o \
          table.o threads.o tokenize.o treeview.o trigger.o \
          update.o userauth.o util.o vacuum.o \
          vdbeapi.o vdbeaux.o vdbeblob.o vdbemem.o vdbesort.o \
          vdbetrace.o wal.o walker.o where.o wherecode.o whereexpr.o \
          utf.o vtab.o
 
+LIBOBJ += recover.o recover_varint.o resolve.o
+
+LIBOBJ += sqlite3session.o
 
 # 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 \
@@ skipping 10 matching lines @@
   $(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 \
@@ skipping 99 matching lines @@
   $(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/sqlite3rtree.h \
   $(TOP)/ext/rtree/rtree.h \
   $(TOP)/ext/rtree/rtree.c
 SRC += \
+  $(TOP)/ext/session/sqlite3session.c \
+  $(TOP)/ext/session/sqlite3session.h
+SRC += \
   $(TOP)/ext/userauth/userauth.c \
   $(TOP)/ext/userauth/sqlite3userauth.h 
 SRC += \
   $(TOP)/ext/rbu/sqlite3rbu.c \
   $(TOP)/ext/rbu/sqlite3rbu.h
 SRC += \
   $(TOP)/ext/misc/json1.c
 
 
 # FTS5 things
@@ skipping 41 matching lines @@
   $(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_bestindex.c \
   $(TOP)/src/test_blob.c \
   $(TOP)/src/test_btree.c \
   $(TOP)/src/test_config.c \
+  $(TOP)/src/test_delete.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 \
@@ skipping 11 matching lines @@
   $(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
 
 # Extensions to be statically loaded.
 #
 TESTSRC += \
   $(TOP)/ext/misc/amatch.c \
+  $(TOP)/ext/misc/carray.c \
   $(TOP)/ext/misc/closure.c \
+  $(TOP)/ext/misc/csv.c \
   $(TOP)/ext/misc/eval.c \
   $(TOP)/ext/misc/fileio.c \
   $(TOP)/ext/misc/fuzzer.c \
   $(TOP)/ext/misc/ieee754.c \
   $(TOP)/ext/misc/nextchar.c \
   $(TOP)/ext/misc/percentile.c \
   $(TOP)/ext/misc/regexp.c \
+  $(TOP)/ext/misc/remember.c \
   $(TOP)/ext/misc/series.c \
   $(TOP)/ext/misc/spellfix.c \
   $(TOP)/ext/misc/totype.c \
   $(TOP)/ext/misc/wholenumber.c \
   $(TOP)/ext/misc/vfslog.c \
   $(TOP)/ext/fts5/fts5_tcl.c \
-  $(TOP)/ext/fts5/fts5_test_mi.c
+  $(TOP)/ext/fts5/fts5_test_mi.c \
+  $(TOP)/ext/fts5/fts5_test_tok.c 
 
 
 #TESTSRC += $(TOP)/ext/fts2/fts2_tokenizer.c
 #TESTSRC += $(TOP)/ext/fts3/fts3_tokenizer.c
 
 TESTSRC2 = \
   $(TOP)/src/attach.c \
   $(TOP)/src/backup.c \
   $(TOP)/src/btree.c \
   $(TOP)/src/build.c \
@@ skipping 28 matching lines @@
   $(TOP)/src/vdbemem.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_tokenizer.c \
   $(TOP)/ext/fts3/fts3_write.c \
-  $(TOP)/ext/async/sqlite3async.c
+  $(TOP)/ext/async/sqlite3async.c \
+  $(TOP)/ext/session/sqlite3session.c \
+  $(TOP)/ext/session/test_session.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 \
@@ skipping 41 matching lines @@
   $(TOP)/ext/fts5/fts5.h 
 EXTHDR += \
   $(TOP)/ext/userauth/sqlite3userauth.h
 
 # executables needed for testing
 #
 TESTPROGS = \
   testfixture$(EXE) \
   sqlite3$(EXE) \
   sqlite3_analyzer$(EXE) \
-  sqldiff$(EXE)
+  sqldiff$(EXE) \
+  dbhash$(EXE)
 
 # Databases containing fuzzer test cases
 #
 FUZZDATA = \
   $(TOP)/test/fuzzdata1.db \
   $(TOP)/test/fuzzdata2.db \
   $(TOP)/test/fuzzdata3.db \
-  $(TOP)/test/fuzzdata4.db
+  $(TOP)/test/fuzzdata4.db \
+  $(TOP)/test/fuzzdata5.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
+SHELL_OPT += -DSQLITE_ENABLE_EXPLAIN_COMMENTS
+SHELL_OPT += -DSQLITE_ENABLE_UNKNOWN_SQL_FUNCTION
 FUZZERSHELL_OPT = -DSQLITE_ENABLE_JSON1
 FUZZCHECK_OPT = -DSQLITE_ENABLE_JSON1 -DSQLITE_ENABLE_MEMSYS5
+DBFUZZ_OPT =
+KV_OPT = -DSQLITE_THREADSAFE=0 -DSQLITE_DIRECT_OVERFLOW_READ
+DBSELFTEST_OPT = -DSQLITE_THREADSAFE=0 -DSQLITE_OMIT_LOAD_EXTENSION
+DBSELFTEST_OPT += -DSQLITE_ENABLE_RTREE -DSQLITE_ENABLE_FTS4 -DSQLITE_ENABLE_FTS5
+ST_OPT = -DSQLITE_THREADSAFE=0
 
 # 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.a sqlite3$(EXE)
 
 libsqlite3.a:   $(LIBOBJ)
         $(AR) libsqlite3.a $(LIBOBJ)
         $(RANLIB) libsqlite3.a
 
 sqlite3$(EXE):  $(TOP)/src/shell.c libsqlite3.a sqlite3.h
         $(TCCX) $(READLINE_FLAGS) -o sqlite3$(EXE) $(SHELL_OPT) \
                 $(TOP)/src/shell.c $(SHELL_ICU) libsqlite3.a $(LIBREADLINE) $(TLIBS) $(THREADLIB)
 
 sqldiff$(EXE):  $(TOP)/tool/sqldiff.c sqlite3.c sqlite3.h
         $(TCCX) -o sqldiff$(EXE) -DSQLITE_THREADSAFE=0 \
                 $(TOP)/tool/sqldiff.c sqlite3.c $(TLIBS) $(THREADLIB)
 
+dbhash$(EXE):   $(TOP)/tool/dbhash.c sqlite3.c sqlite3.h
+        $(TCCX) -o dbhash$(EXE) -DSQLITE_THREADSAFE=0 \
+                $(TOP)/tool/dbhash.c sqlite3.c $(TLIBS) $(THREADLIB)
+
+scrub$(EXE):    $(TOP)/ext/misc/scrub.c sqlite3.o
+        $(TCC) -I. -DSCRUB_STANDALONE -o scrub$(EXE) $(TOP)/ext/misc/scrub.c sqlite3.o $(THREADLIB)
+
+srcck1$(EXE):   $(TOP)/tool/srcck1.c
+        $(BCC) -o srcck1$(EXE) $(TOP)/tool/srcck1.c
+
+sourcetest:     srcck1$(EXE) sqlite3.c
+        ./srcck1 sqlite3.c
+
 fuzzershell$(EXE):      $(TOP)/tool/fuzzershell.c sqlite3.c sqlite3.h
         $(TCCX) -o fuzzershell$(EXE) -DSQLITE_THREADSAFE=0 -DSQLITE_OMIT_LOAD_EXTENSION \
           $(FUZZERSHELL_OPT) $(TOP)/tool/fuzzershell.c sqlite3.c \
           $(TLIBS) $(THREADLIB)
 
-fuzzcheck$(EXE):        $(TOP)/test/fuzzcheck.c sqlite3.c sqlite3.h
+dbfuzz$(EXE):   $(TOP)/test/dbfuzz.c sqlite3.c sqlite3.h
+        $(TCCX) -o dbfuzz$(EXE) -DSQLITE_THREADSAFE=0 -DSQLITE_OMIT_LOAD_EXTENSION \
+          $(DBFUZZ_OPT) $(TOP)/test/dbfuzz.c sqlite3.c \
+          $(TLIBS) $(THREADLIB)
+
+fuzzcheck$(EXE):        $(TOP)/test/fuzzcheck.c sqlite3.c sqlite3.h $(TOP)/test/ossfuzz.c
         $(TCCX) -o fuzzcheck$(EXE) -DSQLITE_THREADSAFE=0 -DSQLITE_OMIT_LOAD_EXTENSION \
+                -DSQLITE_ENABLE_MEMSYS5 $(FUZZCHECK_OPT) -DSQLITE_OSS_FUZZ \
+                $(TOP)/test/fuzzcheck.c $(TOP)/test/ossfuzz.c sqlite3.c $(TLIBS) $(THREADLIB)
+
+ossshell$(EXE): $(TOP)/test/ossfuzz.c $(TOP)/test/ossshell.c sqlite3.c sqlite3.h
+        $(TCCX) -o ossshell$(EXE) -DSQLITE_THREADSAFE=0 -DSQLITE_OMIT_LOAD_EXTENSION \
                 -DSQLITE_ENABLE_MEMSYS5 $(FUZZCHECK_OPT) \
-                $(TOP)/test/fuzzcheck.c sqlite3.c $(TLIBS) $(THREADLIB)
+                $(TOP)/test/ossfuzz.c $(TOP)/test/ossshell.c sqlite3.c $(TLIBS) $(THREADLIB)
 
 mptester$(EXE): sqlite3.c $(TOP)/mptest/mptest.c
         $(TCCX) -o $@ -I. $(TOP)/mptest/mptest.c sqlite3.c \
                 $(TLIBS) $(THREADLIB)
 
-MPTEST1=./mptester$(EXE) mptest.db $(TOP)/mptest/crash01.test --repeat 20
-MPTEST2=./mptester$(EXE) mptest.db $(TOP)/mptest/multiwrite01.test --repeat 20
+MPTEST1=./mptester$(EXE) mptest1.db $(TOP)/mptest/crash01.test --repeat 20
+MPTEST2=./mptester$(EXE) mptest2.db $(TOP)/mptest/multiwrite01.test --repeat 20
 mptest: mptester$(EXE)
-        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
 
 sqlite3.o:      sqlite3.c
@@ skipping 11 matching lines @@
         cp -f $(SRC) tsrc
         rm tsrc/sqlite.h.in tsrc/parse.y
         tclsh $(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 $(TOP)/tool/mksqlite3c.tcl
         cp tsrc/shell.c tsrc/sqlite3ext.h .
+        cp $(TOP)/ext/session/sqlite3session.h .
         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
 
 sqlite3ext.h:   target_source
         cp tsrc/sqlite3ext.h .
 
 sqlite3.c-debug:        target_source $(TOP)/tool/mksqlite3c.tcl
         tclsh $(TOP)/tool/mksqlite3c.tcl --linemacros
@@ skipping 146 matching lines @@
 
 fts5parse.h: fts5parse.c
 
 fts5.c: $(FTS5_SRC) $(FTS5_HDR)
         tclsh $(TOP)/ext/fts5/tool/mkfts5c.tcl
         cp $(TOP)/ext/fts5/fts5.h .
 
 userauth.o:     $(TOP)/ext/userauth/userauth.c $(HDR) $(EXTHDR)
         $(TCCX) -DSQLITE_CORE -c $(TOP)/ext/userauth/userauth.c
 
+sqlite3session.o:       $(TOP)/ext/session/sqlite3session.c $(HDR) $(EXTHDR)
+        $(TCCX) -DSQLITE_CORE -c $(TOP)/ext/session/sqlite3session.c
+
 sqlite3rbu.o:   $(TOP)/ext/rbu/sqlite3rbu.c $(HDR) $(EXTHDR)
         $(TCCX) -DSQLITE_CORE -c $(TOP)/ext/rbu/sqlite3rbu.c
 
-
 # Rules for building test programs and for running tests
 #
 tclsqlite3:     $(TOP)/src/tclsqlite.c libsqlite3.a
         $(TCCX) $(TCL_FLAGS) -DTCLSH=1 -o tclsqlite3 \
                 $(TOP)/src/tclsqlite.c libsqlite3.a $(LIBTCL) $(THREADLIB)
 
 sqlite3_analyzer.c: sqlite3.c $(TOP)/src/tclsqlite.c $(TOP)/tool/spaceanal.tcl
         echo "#define TCLSH 2" > $@
         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 = " >> $@
         tclsh $(TOP)/tool/tostr.tcl $(TOP)/tool/spaceanal.tcl >> $@
         echo "; return zMainloop; }" >> $@
 
 sqlite3_analyzer$(EXE): sqlite3_analyzer.c
         $(TCCX) $(TCL_FLAGS) sqlite3_analyzer.c -o $@ $(LIBTCL) $(TLIBS) $(THREADLIB)
 
 # Rules to build the 'testfixture' application.
 #
 TESTFIXTURE_FLAGS  = -DSQLITE_TEST=1 -DSQLITE_CRASH_TEST=1
-TESTFIXTURE_FLAGS += -DSQLITE_SERVER=1 -DSQLITE_PRIVATE="" -DSQLITE_CORE 
+TESTFIXTURE_FLAGS += -DSQLITE_SERVER=1 -DSQLITE_PRIVATE="" -DSQLITE_CORE
+TESTFIXTURE_FLAGS += -DSQLITE_SERIES_CONSTRAINT_VERIFY=1
+TESTFIXTURE_FLAGS += -DSQLITE_DEFAULT_PAGE_SIZE=1024
 TESTFIXTURE_FLAGS += -DDEFAULT_ENABLE_RECOVER=1
 
 testfixture$(EXE): $(TESTSRC2) libsqlite3.a $(TESTSRC) $(TOP)/src/tclsqlite.c
         $(TCCX) $(TCL_FLAGS) -DTCLSH=1 $(TESTFIXTURE_FLAGS)                  \
                 $(TESTSRC) $(TESTSRC2) $(TOP)/src/tclsqlite.c                \
                 -o testfixture$(EXE) $(LIBTCL) libsqlite3.a $(THREADLIB)
 
-amalgamation-testfixture$(EXE): sqlite3.c $(TESTSRC) $(TOP)/src/tclsqlite.c
+amalgamation-testfixture$(EXE): sqlite3.c $(TESTSRC) $(TOP)/src/tclsqlite.c  \
+                                $(TOP)/ext/session/test_session.c
         $(TCCX) $(TCL_FLAGS) -DTCLSH=1 $(TESTFIXTURE_FLAGS)                  \
                 $(TESTSRC) $(TOP)/src/tclsqlite.c sqlite3.c                  \
+                $(TOP)/ext/session/test_session.c                            \
                 -o testfixture$(EXE) $(LIBTCL) $(THREADLIB)
 
 fts3-testfixture$(EXE): sqlite3.c fts3amal.c $(TESTSRC) $(TOP)/src/tclsqlite.c
         $(TCCX) $(TCL_FLAGS) -DTCLSH=1 $(TESTFIXTURE_FLAGS)                  \
         -DSQLITE_ENABLE_FTS3=1                                               \
                 $(TESTSRC) $(TOP)/src/tclsqlite.c sqlite3.c fts3amal.c       \
                 -o testfixture$(EXE) $(LIBTCL) $(THREADLIB)
 
 fulltest:       $(TESTPROGS) fuzztest
         ./testfixture$(EXE) $(TOP)/test/all.test $(TESTOPTS)
 
 soaktest:       $(TESTPROGS)
         ./testfixture$(EXE) $(TOP)/test/all.test -soak=1 $(TESTOPTS)
 
 fulltestonly:   $(TESTPROGS) fuzztest
         ./testfixture$(EXE) $(TOP)/test/full.test $(TESTOPTS)
 
 queryplantest:  testfixture$(EXE) sqlite3$(EXE)
         ./testfixture$(EXE) $(TOP)/test/permutations.test queryplanner $(TESTOPTS)
 
 fuzztest:       fuzzcheck$(EXE) $(FUZZDATA)
         ./fuzzcheck$(EXE) $(FUZZDATA)
 
 fastfuzztest:   fuzzcheck$(EXE) $(FUZZDATA)
         ./fuzzcheck$(EXE) --limit-mem 100M $(FUZZDATA)
 
 valgrindfuzz:   fuzzcheck$(EXE) $(FUZZDATA)
         valgrind ./fuzzcheck$(EXE) --cell-size-check --limit-mem 10M --timeout 600 $(FUZZDATA)
 
+# The veryquick.test TCL tests.
+#
+tcltest:        ./testfixture$(EXE)
+        ./testfixture$(EXE) $(TOP)/test/veryquick.test $(TESTOPTS)
+
 # A very quick test using only testfixture and omitting all the slower
 # tests.  Designed to run in under 3 minutes on a workstation.
 #
 quicktest:      ./testfixture$(EXE)
         ./testfixture$(EXE) $(TOP)/test/extraquick.test $(TESTOPTS)
 
 # The default test case.  Runs most of the faster standard TCL tests,
 # and fuzz tests, and sqlite3_analyzer and sqldiff tests.
-#
-test:   $(TESTPROGS) fastfuzztest
-        ./testfixture$(EXE) $(TOP)/test/veryquick.test $(TESTOPTS)
+test:   fastfuzztest sourcetest $(TESTPROGS) tcltest
 
 # 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$(EXE) $(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
@@ skipping 35 matching lines @@
                 $(TOP)/tool/showstat4.c sqlite3.o $(THREADLIB)
 
 showjournal$(EXE):      $(TOP)/tool/showjournal.c sqlite3.o
         $(TCC) -DSQLITE_THREADSAFE=0 -DSQLITE_OMIT_LOAD_EXTENSION -o showjournal$(EXE) \
                 $(TOP)/tool/showjournal.c sqlite3.o $(THREADLIB)
 
 showwal$(EXE):  $(TOP)/tool/showwal.c sqlite3.o
         $(TCC) -DSQLITE_THREADSAFE=0 -DSQLITE_OMIT_LOAD_EXTENSION -o showwal$(EXE) \
                 $(TOP)/tool/showwal.c sqlite3.o $(THREADLIB)
 
+changeset$(EXE):        $(TOP)/ext/session/changeset.c sqlite3.o
+        $(TCC) -DSQLITE_THREADSAFE=0 -DSQLITE_OMIT_LOAD_EXTENSION -o changeset$(EXE) \
+                $(TOP)/ext/session/changeset.c sqlite3.o $(THREADLIB)
+
 fts3view$(EXE): $(TOP)/ext/fts3/tool/fts3view.c sqlite3.o
         $(TCC) -DSQLITE_THREADSAFE=0 -DSQLITE_OMIT_LOAD_EXTENSION -o fts3view$(EXE) \
                 $(TOP)/ext/fts3/tool/fts3view.c sqlite3.o $(THREADLIB)
 
 rollback-test$(EXE):    $(TOP)/tool/rollback-test.c sqlite3.o
         $(TCC) -DSQLITE_THREADSAFE=0 -DSQLITE_OMIT_LOAD_EXTENSION -o rollback-test$(EXE) \
                 $(TOP)/tool/rollback-test.c sqlite3.o $(THREADLIB)
 
 LogEst$(EXE):   $(TOP)/tool/logest.c sqlite3.h
         $(TCC) -o LogEst$(EXE) $(TOP)/tool/logest.c
 
 wordcount$(EXE):        $(TOP)/test/wordcount.c sqlite3.c
         $(TCC) -DSQLITE_THREADSAFE=0 -DSQLITE_OMIT_LOAD_EXTENSION -o wordcount$(EXE) \
                 $(TOP)/test/wordcount.c sqlite3.c
 
-speedtest1$(EXE):       $(TOP)/test/speedtest1.c sqlite3.o
-        $(TCC) -I. $(OTAFLAGS) -o speedtest1$(EXE) $(TOP)/test/speedtest1.c sqlite3.o $(THREADLIB) 
+speedtest1$(EXE):       $(TOP)/test/speedtest1.c sqlite3.c
+        $(TCCX) -I. $(ST_OPT) -o speedtest1$(EXE) $(TOP)/test/speedtest1.c sqlite3.c $(THREADLIB) 
+
+kvtest$(EXE):   $(TOP)/test/kvtest.c sqlite3.c
+        $(TCCX) -I. $(KV_OPT) -o kvtest$(EXE) $(TOP)/test/kvtest.c sqlite3.c $(THREADLIB) 
+
+dbselftest$(EXE):       $(TOP)/test/dbselftest.c sqlite3.c
+        $(TCCX) -I. $(DBSELFTEST_OPT) -o dbselftest$(EXE) $(TOP)/test/dbselftest.c sqlite3.c $(THREADLIB)
 
 rbu$(EXE): $(TOP)/ext/rbu/rbu.c $(TOP)/ext/rbu/sqlite3rbu.c sqlite3.o 
         $(TCC) -I. -o rbu$(EXE) $(TOP)/ext/rbu/rbu.c sqlite3.o \
           $(THREADLIB)
 
 loadfts: $(TOP)/tool/loadfts.c libsqlite3.a
         $(TCC) $(TOP)/tool/loadfts.c libsqlite3.a -o loadfts $(THREADLIB)
 
 # 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.o
         nm -g --defined-only sqlite3.o | grep -v " sqlite3_" ; test $$? -ne 0
 
-# Build the amalgamation-autoconf package.
+# Build the amalgamation-autoconf package.  The amalamgation-tarball target builds
+# a tarball named for the version number.  Ex:  sqlite-autoconf-3110000.tar.gz.
+# The snapshot-tarball target builds a tarball named by the SHA1 hash
 #
 amalgamation-tarball: sqlite3.c
-        TOP=$(TOP) sh $(TOP)/tool/mkautoconfamal.sh
+        TOP=$(TOP) sh $(TOP)/tool/mkautoconfamal.sh --normal
+
+snapshot-tarball: sqlite3.c
+        TOP=$(TOP) sh $(TOP)/tool/mkautoconfamal.sh --snapshot
 
 
 # Standard install and cleanup targets
 #
 install:        sqlite3 libsqlite3.a sqlite3.h
         mv sqlite3 /usr/bin
         mv libsqlite3.a /usr/lib
         mv sqlite3.h /usr/include
 
 clean:  
         rm -f *.o sqlite3 sqlite3.exe libsqlite3.a sqlite3.h opcodes.*
         rm -f lemon lemon.exe lempar.c parse.* sqlite*.tar.gz
         rm -f mkkeywordhash mkkeywordhash.exe keywordhash.h
         rm -f $(PUBLISH)
         rm -f *.da *.bb *.bbg gmon.out
-        rm -rf quota2a quota2b quota2c
         rm -rf tsrc target_source
         rm -f testloadext.dll libtestloadext.so
         rm -f amalgamation-testfixture amalgamation-testfixture.exe
         rm -f fts3-testfixture fts3-testfixture.exe
         rm -f testfixture testfixture.exe
         rm -f threadtest3 threadtest3.exe
         rm -f LogEst LogEst.exe
         rm -f fts3view fts3view.exe
         rm -f rollback-test rollback-test.exe
         rm -f showdb showdb.exe
         rm -f showjournal showjournal.exe
         rm -f showstat4 showstat4.exe
         rm -f showwal showwal.exe
+        rm -f changeset changeset.exe
         rm -f speedtest1 speedtest1.exe
         rm -f wordcount wordcount.exe
+        rm -f rbu rbu.exe
+        rm -f srcck1 srcck1.exe
         rm -f sqlite3.c sqlite3-*.c fts?amal.c tclsqlite3.c
         rm -f sqlite3rc.h
         rm -f shell.c sqlite3ext.h
         rm -f sqlite3_analyzer sqlite3_analyzer.exe 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.*