Bring makefiles and build scripts into alignment with the sessions branch.

No changes to code.

FossilOrigin-Name: d1f41089aba075eef45fd696599e5d3a74c84d0c

diff --git a/Makefile.in b/Makefile.in
index 652928b8cc26bb647ad1faf70119aee5ad1c9fbd..1ecaf2bbd58c01c4979690d16c011767e27339c8 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -519,6 +519,7 @@ sqlite3$(TEXE):     $(TOP)/src/shell.c libsqlite3.la sqlite3.h
 
 sqlite3.c:     .target_source $(TOP)/tool/mksqlite3c.tcl
        $(TCLSH_CMD) $(TOP)/tool/mksqlite3c.tcl
+       cp tsrc/shell.c tsrc/sqlite3ext.h .
 
 tclsqlite3.c:  sqlite3.c
        echo '#ifndef USE_SYSTEM_SQLITE' >tclsqlite3.c
@@ -878,7 +879,8 @@ TESTFIXTURE_FLAGS += -DBUILD_sqlite
 
 TESTFIXTURE_SRC0 = $(TESTSRC2) libsqlite3.la
 TESTFIXTURE_SRC1 = sqlite3.c
-TESTFIXTURE_SRC = $(TESTSRC) $(TOP)/src/tclsqlite.c $(TESTFIXTURE_SRC$(USE_AMALGAMATION))
+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) \

diff --git a/Makefile.msc b/Makefile.msc
index 2fb9687655fed7cc9914b9966ecd4f47e39a7f02..df6ed4d46d0ce8f42b4c968ad1632fece74e9e0c 100644 (file)
--- a/Makefile.msc
+++ b/Makefile.msc
@@ -830,6 +830,8 @@ sqlite3.exe:        $(TOP)\src\shell.c libsqlite3.lib $(LIBRESOBJS) sqlite3.h
 
 sqlite3.c:     .target_source $(TOP)\tool\mksqlite3c.tcl
        $(TCLSH_CMD) $(TOP)\tool\mksqlite3c.tcl
+       copy tsrc\shell.c .
+       copy tsrc\sqlite3ext.h .
 
 sqlite3-all.c: sqlite3.c $(TOP)\tool\split-sqlite3c.tcl
        $(TCLSH_CMD) $(TOP)\tool\split-sqlite3c.tcl

diff --git a/main.mk b/main.mk
index 2430d3ffe9d9d56a21f5d01e9d64b247e3497132..d644079f59e86442afe817743ba60b8511dd5b3a 100644 (file)
--- a/main.mk
+++ b/main.mk
@@ -385,6 +385,7 @@ target_source:      $(SRC) $(TOP)/tool/vdbe-compress.tcl
 
 sqlite3.c:     target_source $(TOP)/tool/mksqlite3c.tcl
        tclsh $(TOP)/tool/mksqlite3c.tcl
+       cp tsrc/shell.c tsrc/sqlite3ext.h .
        echo '#ifndef USE_SYSTEM_SQLITE' >tclsqlite3.c
        cat sqlite3.c >>tclsqlite3.c
        echo '#endif /* USE_SYSTEM_SQLITE */' >>tclsqlite3.c

diff --git a/manifest b/manifest
index ef5a11261863cbc0cb5a0c9b8bdfd5290634f151..4e0fb3f191ee7fecc36c33647f974c9b8092d75b 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,9 +1,9 @@
-C Clarifications\sto\sthe\sdocumentation\sfor\sthe\ssqlite3_aggregate_context()\sAPI.\nAlso,\sshorten\san\sover-length\ssource\sline\sin\ssqlite.h.in.
-D 2013-03-18T17:18:18.835
+C Bring\smakefiles\sand\sbuild\sscripts\sinto\salignment\swith\sthe\ssessions\sbranch.\nNo\schanges\sto\scode.
+D 2013-03-19T16:12:40.639
 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
-F Makefile.in 9a804abbd3cae82d196e4d33aba13239e32522a5
+F Makefile.in df3e48659d80e1b7765785d8d66c86b320f72cc7
 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
-F Makefile.msc 1bed3bca025ee90441bb0c9f95f36f42b70bd839
+F Makefile.msc 0c1abc21c8deefc88e8a32ad6a07e5f96e158761
 F Makefile.vxworks b18ad88e9a8c6a001f5cf4a389116a4f1a7ab45f
 F README cd04a36fbc7ea56932a4052d7d0b7f09f27c33d6
 F VERSION 6d4f66eaebabc42ef8c2a4d2d0caf4ce7ee81137
@@ -103,7 +103,7 @@ F ext/rtree/tkt3363.test 142ab96eded44a3615ec79fba98c7bde7d0f96de
 F ext/rtree/viewrtree.tcl eea6224b3553599ae665b239bd827e182b466024
 F install-sh 9d4de14ab9fb0facae2f48780b874848cbf2f895 x
 F ltmain.sh 3ff0879076df340d2e23ae905484d8c15d5fdea8
-F main.mk 404cd38114d1a94ef6ad5aa01a1c8bb46da36161
+F main.mk c5437f64aad34844d18efe7b2d2adaa36efca49c
 F mkdll.sh 7d09b23c05d56532e9d44a50868eb4b12ff4f74a
 F mkextu.sh 416f9b7089d80e5590a29692c9d9280a10dbad9f
 F mkextw.sh 4123480947681d9b434a5e7b1ee08135abe409ac
@@ -1009,8 +1009,8 @@ F tool/mkkeywordhash.c bb52064aa614e1426445e4b2b9b00eeecd23cc79
 F tool/mkopts.tcl 66ac10d240cc6e86abd37dc908d50382f84ff46e
 F tool/mkspeedsql.tcl a1a334d288f7adfe6e996f2e712becf076745c97
 F tool/mksqlite3c-noext.tcl 8bce31074e4cbe631bb7676526a048335f4c9f02
-F tool/mksqlite3c.tcl 589c7f44e990be1b8443cfe4808dce392b0327fa
-F tool/mksqlite3h.tcl 78013ad79a5e492e5f764f3c7a8ef834255061f8
+F tool/mksqlite3c.tcl a570a0b0847f5659482087f70e409ac45ce93b91
+F tool/mksqlite3h.tcl ba24038056f51fde07c0079c41885ab85e2cff12
 F tool/mksqlite3internalh.tcl 3dca7bb5374cee003379b8cbac73714f610ef795
 F tool/mkvsix.tcl 0be7f7a591f1e83f9199cb82911b66668ca484c9
 F tool/offsets.c fe4262fdfa378e8f5499a42136d17bf3b98f6091
@@ -1038,7 +1038,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 66d5f2b76750f3520eb7a495f6247206758f5b90
-R 6b3383461c64bf451ee04663b065cc63
+P 4fe2db1d866c80fe51f7fddbf9ce6753fb55b5f6
+R 7758dd15e3a5f0387c3f17443ec025d8
 U drh
-Z f8cab3c95e26c38e205a97060fe1ac3e
+Z 7c5d1dfbeba3270fc7d5841fae61579f

diff --git a/manifest.uuid b/manifest.uuid
index 14df4dedc453616c2583fc6fd34f7e8fd549a492..ac1d43b9fa2b60a814577adbf1577a354b4e3ace 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-4fe2db1d866c80fe51f7fddbf9ce6753fb55b5f6
\ No newline at end of file
+d1f41089aba075eef45fd696599e5d3a74c84d0c
\ No newline at end of file

diff --git a/tool/mksqlite3c.tcl b/tool/mksqlite3c.tcl
index 2c569d7a4eb494e28977dcc95ea975b13e43af2a..7c8a7d54ada15e411cb7ae776cdd1b864fd4a116 100644 (file)
--- a/tool/mksqlite3c.tcl
+++ b/tool/mksqlite3c.tcl
@@ -23,7 +23,7 @@
 #
 
 # Begin by reading the "sqlite3.h" header file.  Extract the version number
-# from in this file.  The versioon number is needed to generate the header
+# from in this file.  The version number is needed to generate the header
 # comment of the amalgamation.
 #
 if {[lsearch $argv --nostatic]>=0} {

diff --git a/tool/mksqlite3h.tcl b/tool/mksqlite3h.tcl
index f68f61a3689144c57cf43bb87ee36f63e1c32be3..a89b9f9beb0df39ff4123108212e1072786b763f 100644 (file)
--- a/tool/mksqlite3h.tcl
+++ b/tool/mksqlite3h.tcl
@@ -68,9 +68,14 @@ set declpattern {^ *[a-zA-Z][a-zA-Z_0-9 ]+ \**sqlite3_[_a-zA-Z0-9]+\(}
 # Force the output to use unix line endings, even on Windows.
 fconfigure stdout -translation lf
 
-# Process the src/sqlite.h.in ext/rtree/sqlite3rtree.h files.
+set filelist [subst {
+  $TOP/src/sqlite.h.in
+  $TOP/ext/rtree/sqlite3rtree.h
+}]
+
+# Process the source files.
 #
-foreach file [list $TOP/src/sqlite.h.in $TOP/ext/rtree/sqlite3rtree.h] {
+foreach file $filelist {
   set in [open $file]
   while {![eof $in]} {