Fix a header dependency in nmake Makefile.

FossilOrigin-Name: 54492212af6c4be5d5546b370398ef771c16f430

diff --git a/Makefile.msc b/Makefile.msc
index 4102a33cfeb59fcbfff2261c7aeb1e082d72308b..68a66bcb4537feec0d0d38fd9135323a6847273d 100644 (file)
--- a/Makefile.msc
+++ b/Makefile.msc
@@ -1,5 +1,5 @@
 #
-# nmake Makefile for SQLITE
+# nmake Makefile for SQLite
 #
 
 # The toplevel directory of the source tree.  This is the directory
@@ -11,6 +11,12 @@ TOP = .
 #
 USE_AMALGAMATION = 1
 
+# Version numbers and release number for the SQLite being compiled.
+#
+VERSION = 3.7
+VERSION_NUMBER = 3007007
+RELEASE = 3.7.7
+
 # C Compiler and options for use in building executables that
 # will run on the platform that is doing the build.
 #
@@ -97,12 +103,6 @@ TCC = $(TCC) $(OPT_FEATURE_FLAGS)
 # ie.  make "OPTS=-DSQLITE_ENABLE_FOO=1 -DSQLITE_OMIT_FOO=1".
 TCC = $(TCC) $(OPTS)
 
-# Version numbers and release number for the SQLite being compiled.
-#
-VERSION = 3.7
-VERSION_NUMBER = 3007007
-RELEASE = 3.7.7
-
 # libtool compile/link
 LTCOMPILE = $(TCC) -Fo$@
 LTLINK = $(TCC) -Fe$@
@@ -379,7 +379,6 @@ TESTSRC2 = \
   $(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
@@ -431,7 +430,7 @@ EXTHDR = $(EXTHDR) \
 # 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.lib sqlite3.exe libtclsqlite3.lib
+all:   libsqlite3.lib sqlite3.exe libtclsqlite3.lib
 
 libsqlite3.lib:        $(LIBOBJ)
        $(LTLIB) -OUT:$@ $(LIBOBJ) $(TLIBS)
@@ -705,9 +704,6 @@ tclsqlite.lo:       $(TOP)\src\tclsqlite.c $(HDR)
 tclsqlite-shell.lo:    $(TOP)\src\tclsqlite.c $(HDR)
        $(LTCOMPILE) -DTCLSH=1 -DBUILD_sqlite -I$(TCLINCDIR) -c $(TOP)\src\tclsqlite.c
 
-tclsqlite-stubs.lo:    $(TOP)\src\tclsqlite.c $(HDR)
-       $(LTCOMPILE) -DUSE_TCL_STUBS=1 -DBUILD_sqlite -I$(TCLINCDIR) -c $(TOP)\src\tclsqlite.c
-
 tclsqlite3.exe:        tclsqlite-shell.lo libsqlite3.lib
        $(LTLINK) tclsqlite-shell.lo \
                /link /LIBPATH:$(TCLLIBDIR) libsqlite3.lib $(LIBTCL)
@@ -817,7 +813,7 @@ TESTFIXTURE_SRC = $(TESTSRC) $(TOP)\src\tclsqlite.c $(TESTFIXTURE_SRC0)
 TESTFIXTURE_SRC = $(TESTSRC) $(TOP)\src\tclsqlite.c $(TESTFIXTURE_SRC1)
 !ENDIF
 
-testfixture.exe:       $(TESTFIXTURE_SRC)
+testfixture.exe:       $(TESTFIXTURE_SRC) $(HDR)
        $(LTLINK) -DSQLITE_NO_SYNC=1 $(TESTFIXTURE_FLAGS) \
                -DBUILD_sqlite -I$(TCLINCDIR) \
                $(TESTFIXTURE_SRC) /link /LIBPATH:$(TCLLIBDIR) $(LIBTCL) $(TLIBS)
@@ -848,10 +844,10 @@ clean:
        del /Q mkkeywordhash.exe keywordhash.h
        -rmdir /Q/S tsrc
        del /Q .target_source
-       del /Q testfixture.exe test.db
+       del /Q testfixture.exe testfixture.exp test.db
        del /Q sqlite3.dll sqlite3.lib sqlite3.exp sqlite3.def
        del /Q sqlite3.c
-       del /Q sqlite3_analyzer.exe spaceanal_tcl.h
+       del /Q sqlite3_analyzer.exe sqlite3_analyzer.exp spaceanal_tcl.h
 
 #
 # Windows section

diff --git a/manifest b/manifest
index 155d28276be3f7199a4d03187bbbdd6430578490..ce32a1ff36b63f7722c40af7cec43a2e3e762494 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,9 +1,9 @@
-C Avoid\sloading\sdoclists\sfor\sinfrequent\sterms\sthat\sare\spart\sof\sphrases\stwice.
-D 2011-06-17T17:37:31.284
+C Fix\sa\sheader\sdependency\sin\snmake\sMakefile.
+D 2011-06-17T18:52:07.172
 F Makefile.arm-wince-mingw32ce-gcc d6df77f1f48d690bd73162294bbba7f59507c72f
 F Makefile.in c1d7a7f4fd8da6b1815032efca950e3d5125407e
 F Makefile.linux-gcc 91d710bdc4998cb015f39edf3cb314ec4f4d7e23
-F Makefile.msc b84e4a1636babdf33ba1c339da6ae4e30d61bdce
+F Makefile.msc ce73810c83d4bd202deb59d547a5df4a5cfef7c9
 F Makefile.vxworks c85ec1d8597fe2f7bc225af12ac1666e21379151
 F README cd04a36fbc7ea56932a4052d7d0b7f09f27c33d6
 F VERSION 3fcdd7fbe3eb282df3978fe77288544543767961
@@ -946,7 +946,7 @@ F tool/split-sqlite3c.tcl d9be87f1c340285a3e081eb19b4a247981ed290c
 F tool/symbols.sh bc2a3709940d47c8ac8e0a1fdf17ec801f015a00
 F tool/vdbe-compress.tcl d70ea6d8a19e3571d7ab8c9b75cba86d1173ff0f
 F tool/warnings.sh 347d974d143cf132f953b565fbc03026f19fcb4d
-P 3bfd4466f50711eb71d1a13231025ff4e1e76246
-R cd3d6544b7cd834ce139927827bd3fe8
-U dan
-Z fa9494c386a1e1a2787b09d7f28a7b96
+P 8f939723f742329cedba8930f71dff42004f3d0d
+R d5bee1c0649d20e80531413a35f05bd9
+U shaneh
+Z 03c84e62572562693578ac95748470fd

diff --git a/manifest.uuid b/manifest.uuid
index cda471ef2511cfd95533e3b08ab0acb778fbd219..769a2d893dcb25d6cd35a6effb47c56ae7f566e7 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-8f939723f742329cedba8930f71dff42004f3d0d
\ No newline at end of file
+54492212af6c4be5d5546b370398ef771c16f430
\ No newline at end of file