[sql] Rewrite sqlite patching "system".

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 44 matching lines @@
          callback.o complete.o ctime.o date.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_write.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_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 \
+         random.o recover.o resolve.o rowset.o rtree.o select.o status.o \
          table.o tokenize.o trigger.o \
          update.o util.o vacuum.o \
          vdbe.o vdbeapi.o vdbeaux.o vdbeblob.o vdbemem.o vdbetrace.o \
          wal.o walker.o where.o utf.o vtab.o
 
 
-LIBOBJ += fts2.o \
-          fts2_hash.o \
-          fts2_icu.o \
-          fts2_porter.o \
-          fts2_tokenizer.o \
-          fts2_tokenizer1.o
+LIBOBJ+= fts2.o \
+         fts2_hash.o \
+         fts2_icu.o \
+         fts2_porter.o \
+         fts2_tokenizer.o \
+         fts2_tokenizer1.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 43 matching lines @@
   $(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/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 \
@@ skipping 109 matching lines @@
   $(TOP)/src/test_server.c \
   $(TOP)/src/test_stat.c \
   $(TOP)/src/test_superlock.c \
   $(TOP)/src/test_syscall.c \
   $(TOP)/src/test_tclvar.c \
   $(TOP)/src/test_thread.c \
   $(TOP)/src/test_vfs.c \
   $(TOP)/src/test_wholenumber.c \
   $(TOP)/src/test_wsd.c
 
-TESTSRC += \
-  $(TOP)/ext/fts2/fts2.c \
-  $(TOP)/ext/fts2/fts2.h \
-  $(TOP)/ext/fts2/fts2_hash.c \
-  $(TOP)/ext/fts2/fts2_hash.h \
-  $(TOP)/ext/fts2/fts2_icu.c \
-  $(TOP)/ext/fts2/fts2_porter.c \
-  $(TOP)/ext/fts2/fts2_tokenizer.h \
-  $(TOP)/ext/fts2/fts2_tokenizer.c \
-  $(TOP)/ext/fts2/fts2_tokenizer1.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 \
   $(TOP)/src/date.c \
   $(TOP)/src/expr.c \
   $(TOP)/src/func.c \
   $(TOP)/src/insert.c \
   $(TOP)/src/wal.c \
   $(TOP)/src/mem5.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/recover.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/where.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
 
+TESTSRC2 += \
+  $(TOP)/ext/fts2/fts2.c \
+  $(TOP)/ext/fts2/fts2.h \
+  $(TOP)/ext/fts2/fts2_hash.c \
+  $(TOP)/ext/fts2/fts2_hash.h \
+  $(TOP)/ext/fts2/fts2_icu.c \
+  $(TOP)/ext/fts2/fts2_porter.c \
+  $(TOP)/ext/fts2/fts2_tokenizer.h \
+  $(TOP)/ext/fts2/fts2_tokenizer.c \
+  $(TOP)/ext/fts2/fts2_tokenizer1.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/mutex.h \
    opcodes.h \
@@ skipping 34 matching lines @@
 #
 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)                  \
                 $(TOP)/src/shell.c $(SHELL_ICU)                     \
-                libsqlite3.a $(LIBREADLINE) $(TLIBS) $(THREADLIB) -ldl
+                libsqlite3.a $(LIBREADLINE) $(TLIBS) $(THREADLIB)
 
 # 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
         rm -rf tsrc
         mkdir tsrc
@@ skipping 135 matching lines @@
 
 
 # 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$(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) $(THREADLIB) libsqlite3.a
+                $(LIBTCL) $(THREADLIB) libsqlite3.a $(TLIBS)
+        mv a.out testfixture$(EXE)
 
 amalgamation-testfixture$(EXE): sqlite3.c $(TESTSRC) $(TOP)/src/tclsqlite.c
         $(TCCX) $(TCL_FLAGS) -DTCLSH=1 $(TESTFIXTURE_FLAGS)                  \
                 $(TESTSRC) $(TOP)/src/tclsqlite.c sqlite3.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       \
@@ skipping 12 matching lines @@
 # threadtest runs a few thread-safety tests that are implemented in C. This
 # target is invoked by the releasetest.tcl script.
 # 
 threadtest3$(EXE): sqlite3.o $(TOP)/test/threadtest3.c $(TOP)/test/tt3_checkpoint.c
         $(TCCX) -O2 sqlite3.o $(TOP)/test/threadtest3.c \
                 -o threadtest3$(EXE) $(THREADLIB)
 
 threadtest: threadtest3$(EXE)
         ./threadtest3$(EXE)
 
-fts2test:       testfixture$(EXE) sqlite3$(EXE)
-        ./testfixture$(EXE) $(TOP)/test/fts2.test
-
 sqlite3_analyzer$(EXE): $(TOP)/src/tclsqlite.c sqlite3.c $(TESTSRC) \
                         $(TOP)/tool/spaceanal.tcl
         sed \
           -e '/^#/d' \
           -e 's,\\,\\\\,g' \
           -e 's,",\\",g' \
           -e 's,^,",' \
           -e 's,$$,\\n",' \
           $(TOP)/tool/spaceanal.tcl >spaceanal_tcl.h
         $(TCCX) $(TCL_FLAGS) -DTCLSH=2 $(TESTFIXTURE_FLAGS)                    \
@@ skipping 18 matching lines @@
         mv sqlite3.h /usr/include
 
 clean:  
         rm -f *.o sqlite3 libsqlite3.a sqlite3.h opcodes.*
         rm -f lemon lempar.c parse.* sqlite*.tar.gz mkkeywordhash keywordhash.h
         rm -f $(PUBLISH)
         rm -f *.da *.bb *.bbg gmon.out
         rm -rf tsrc target_source
         rm -f testloadext.dll libtestloadext.so
         rm -f sqlite3.c fts?amal.c tclsqlite3.c