Fix main.mk so that it builds the amalgamation correctly.

FossilOrigin-Name: 0b84e277245f10f928c010ea5958923681c6d582

diff --git a/main.mk b/main.mk
index d5b8d69811d2a82f443c017c1578cfc5ba388c99..dbd29d0ac77e71873281b798738f7c98c6ca1a86 100644 (file)
--- a/main.mk
+++ b/main.mk
@@ -207,6 +207,9 @@ SRC += \
 SRC += \
   $(TOP)/ext/rtree/rtree.h \
   $(TOP)/ext/rtree/rtree.c
+SRC += \
+  $(TOP)/ext/session/sqlite3session.c \
+  $(TOP)/ext/session/sqlite3session.h
 
 
 # Generated source code files
@@ -533,7 +536,8 @@ 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/test_stat.c $(TOP)/src/tclsqlite.c $(TOP)/tool/spaceanal.tcl
+sqlite3_analyzer.c: sqlite3.c $(TOP)/src/test_stat.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 "static const char *tclsh_main_loop(void){" >> $@
@@ -581,7 +585,8 @@ test:       testfixture$(EXE) sqlite3$(EXE)
 # 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
+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)
 

diff --git a/manifest b/manifest
index 10fc1652325fce073a5a21d2bbe7cab6f4dc5d7a..82a4228fcdc3678088b1f3a95cd4e46850c867a4 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Fix\sa\scompiler\swarning\sin\ssqlite3VdbePreUpdateHook().\nAdd\ssqlite3session.c\sto\sthe\samalgamation.\nFix\sthe\sMakefile.in\sto\swork\swith\ssessions.
-D 2013-03-13T11:42:00.694
+C Fix\smain.mk\sso\sthat\sit\sbuilds\sthe\samalgamation\scorrectly.
+D 2013-03-13T12:20:15.110
 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 F Makefile.in f33fad60e6fa3cc15f6a39609a256b340a1c12d9
 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
@@ -115,7 +115,7 @@ F ext/session/sqlite3session.h f374c9c4c96e08f67ac418871c29d423245c7673
 F ext/session/test_session.c ea4dc9b4a1895c8e6bddcbfe3838d7eb57df2d99
 F install-sh 9d4de14ab9fb0facae2f48780b874848cbf2f895 x
 F ltmain.sh 3ff0879076df340d2e23ae905484d8c15d5fdea8
-F main.mk 787401c56823d6cf0d2fa01540d04bd438b11ee5
+F main.mk 9422cb87866650146b89d742c666e8abd5e1ab6a
 F mkdll.sh 7d09b23c05d56532e9d44a50868eb4b12ff4f74a
 F mkextu.sh 416f9b7089d80e5590a29692c9d9280a10dbad9f
 F mkextw.sh 4123480947681d9b434a5e7b1ee08135abe409ac
@@ -1051,7 +1051,7 @@ F tool/vdbe-compress.tcl f12c884766bd14277f4fcedcae07078011717381
 F tool/warnings-clang.sh f6aa929dc20ef1f856af04a730772f59283631d4
 F tool/warnings.sh fbc018d67fd7395f440c28f33ef0f94420226381
 F tool/win/sqlite.vsix 97894c2790eda7b5bce3cc79cb2a8ec2fde9b3ac
-P d6cd3c780c6bc718d37e0f0b884e3e9a423d57be
-R 8d8bef3ec05b88293bab641b3f53c396
+P e54b0225f226a163ec874df7d4b738efba12b3a7
+R df3120294f1b47f95d03bbfec72e5f33
 U drh
-Z 2a31f3327a39b82b184325a96aea6d38
+Z 1665add974d8ea78c75d5773b499e48a

diff --git a/manifest.uuid b/manifest.uuid
index cad3cf810734506f6e27ac5a2c3e65027391fbd3..6803c7b87d2c28f8f555d5ba6eb193434959bb42 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-e54b0225f226a163ec874df7d4b738efba12b3a7
\ No newline at end of file
+0b84e277245f10f928c010ea5958923681c6d582
\ No newline at end of file