Fix the Makefile.in to avoid unnecessary recompiles of sqlite3.c.

FossilOrigin-Name: 67c39e16442d9359b24d60d5f97bd66c19eff16a

diff --git a/Makefile.in b/Makefile.in
index 29c9174afa51eebb8765a6093e0132a2840f6ebc..b9f684e6171ff0f9fedc505b245274f8deb12a01 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -588,15 +588,15 @@ sqlite3$(TEXE):   $(TOP)/src/shell.c sqlite3.c
                $(TOP)/src/shell.c sqlite3.c \
                $(LIBREADLINE) $(TLIBS) -rpath "$(libdir)"
 
-sqldiff$(TEXE):        $(TOP)/tool/sqldiff.c sqlite3.c sqlite3.h
-       $(LTLINK) -o $@ $(TOP)/tool/sqldiff.c sqlite3.c $(TLIBS)
+sqldiff$(TEXE):        $(TOP)/tool/sqldiff.c sqlite3.lo sqlite3.h
+       $(LTLINK) -o $@ $(TOP)/tool/sqldiff.c sqlite3.lo $(TLIBS)
 
-dbhash$(TEXE): $(TOP)/tool/dbhash.c sqlite3.c sqlite3.h
-       $(LTLINK) -o $@ $(TOP)/tool/dbhash.c sqlite3.c $(TLIBS)
+dbhash$(TEXE): $(TOP)/tool/dbhash.c sqlite3.lo sqlite3.h
+       $(LTLINK) -o $@ $(TOP)/tool/dbhash.c sqlite3.lo $(TLIBS)
 
-scrub$(TEXE):  $(TOP)/ext/misc/scrub.c sqlite3.o
+scrub$(TEXE):  $(TOP)/ext/misc/scrub.c sqlite3.lo
        $(LTLINK) -o $@ -I. -DSCRUB_STANDALONE \
-               $(TOP)/ext/misc/scrub.c sqlite3.o $(TLIBS)
+               $(TOP)/ext/misc/scrub.c sqlite3.lo $(TLIBS)
 
 srcck1$(BEXE): $(TOP)/tool/srcck1.c
        $(BCC) -o srcck1$(BEXE) $(TOP)/tool/srcck1.c
@@ -611,8 +611,8 @@ fuzzershell$(TEXE): $(TOP)/tool/fuzzershell.c sqlite3.c sqlite3.h
 fuzzcheck$(TEXE):      $(TOP)/test/fuzzcheck.c sqlite3.c sqlite3.h
        $(LTLINK) -o $@ $(FUZZCHECK_OPT) $(TOP)/test/fuzzcheck.c sqlite3.c $(TLIBS)
 
-mptester$(TEXE):       sqlite3.c $(TOP)/mptest/mptest.c
-       $(LTLINK) -o $@ -I. $(TOP)/mptest/mptest.c sqlite3.c \
+mptester$(TEXE):       sqlite3.lo $(TOP)/mptest/mptest.c
+       $(LTLINK) -o $@ -I. $(TOP)/mptest/mptest.c sqlite3.lo \
                $(TLIBS) -rpath "$(libdir)"
 
 MPTEST1=./mptester$(TEXE) mptest.db $(TOP)/mptest/crash01.test --repeat 20
@@ -1156,8 +1156,8 @@ rollback-test$(TEXE):     $(TOP)/tool/rollback-test.c sqlite3.lo
 LogEst$(TEXE): $(TOP)/tool/logest.c sqlite3.h
        $(LTLINK) -I. -o $@ $(TOP)/tool/logest.c
 
-wordcount$(TEXE):      $(TOP)/test/wordcount.c sqlite3.c
-       $(LTLINK) -o $@ $(TOP)/test/wordcount.c sqlite3.c $(TLIBS)
+wordcount$(TEXE):      $(TOP)/test/wordcount.c sqlite3.lo
+       $(LTLINK) -o $@ $(TOP)/test/wordcount.c sqlite3.lo $(TLIBS)
 
 speedtest1$(TEXE):     $(TOP)/test/speedtest1.c sqlite3.lo
        $(LTLINK) -o $@ $(TOP)/test/speedtest1.c sqlite3.lo $(TLIBS)
@@ -1174,7 +1174,7 @@ loadfts$(EXE): $(TOP)/tool/loadfts.c libsqlite3.la
 #
 VALIDIDS=' sqlite3(changeset|changegroup|session)?_'
 checksymbols: sqlite3.lo
-       nm -g --defined-only sqlite3.o | egrep -v $(VALIDIDS); test $$? -ne 0
+       nm -g --defined-only sqlite3.lo | egrep -v $(VALIDIDS); test $$? -ne 0
        echo '0 errors out of 1 tests'
 
 # Build the amalgamation-autoconf package.  The amalamgation-tarball target builds

diff --git a/manifest b/manifest
index 6ede4001aae5c9ee4f9057855defa92a17ddbdd7..c80dd74edf6a1d3e8a9f578cb309a4c527172b6a 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,6 +1,6 @@
-C Update\sthe\ssqldiff\sutility\sso\sthat\sif\sthe\s--vtab\sswitch\sis\sspecified\s"rtree",\s"fts3",\s"fts4"\sand\s"fts5"\stables\sare\sdiff'd\sdirectly\sand\sthe\sunderlying\sreal\sdatabase\stables\signored.\sWithout\sthis\sswitch,\sall\svirtual\stables\sare\signored\sand\sthe\sdiff\sis\sperformed\son\sthe\sunderlying\sreal\stables.
-D 2016-06-23T16:48:35.249
-F Makefile.in f3f7d2060ce03af4584e711ef3a626ef0b1d6340
+C Fix\sthe\sMakefile.in\sto\savoid\sunnecessary\srecompiles\sof\ssqlite3.c.
+D 2016-06-24T02:50:44.909
+F Makefile.in bc2b4864a23a4a21c3e26d7b4350f51bab324d45
 F Makefile.linux-gcc 7bc79876b875010e8c8f9502eb935ca92aa3c434
 F Makefile.msc 50149765ef72f4e652b9a0f1f6462c4784bb9423
 F README.md 8ecc12493ff9f820cdea6520a9016001cb2e59b7
@@ -1502,8 +1502,7 @@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a91a7acc6293828957a386a8a93
 F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
 F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
 F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
-P 911131424857430d46784b167399ecf192584ca2 5d0a9d4c45730e47576bc77373fa7075a74051a5
-R 208a102d85ab541408c6c49f684969ef
-T +closed 5d0a9d4c45730e47576bc77373fa7075a74051a5
-U dan
-Z c85e872c7e55cfaaf069baf7060cb813
+P b8671e9434180878cfe15d70b793fdee69aabccf
+R bb5fcfa23277d6cebd22a760da9dcde6
+U drh
+Z 138a4cc0f4ecfcd1f7ccb81cfc01b8ef

diff --git a/manifest.uuid b/manifest.uuid
index e7770916f29056d85154b95d83bfe92e0e2512cb..8c3593deb696e88e8503b6cc85d20e1187608816 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-b8671e9434180878cfe15d70b793fdee69aabccf
\ No newline at end of file
+67c39e16442d9359b24d60d5f97bd66c19eff16a
\ No newline at end of file