Improvements to the auxiliary "main.mk" makefile so that it works better with

multi-threaded builds.

FossilOrigin-Name: d1873054d8e1006a370ea7891dbb9a62e7d36ce98cb92b58dcb0daf271265de3

diff --git a/main.mk b/main.mk
index e47e85fdfbfeae8f4f2c5889aeae8a93599b2ab4..dfaf7db15eaee1877e6e0d054195cae736db0d21 100644 (file)
--- a/main.mk
+++ b/main.mk
@@ -550,13 +550,13 @@ ST_OPT = -DSQLITE_THREADSAFE=0
 # 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.a sqlite3$(EXE)
+all:   sqlite3.h sqlite3ext.h libsqlite3.a sqlite3$(EXE)
 
-libsqlite3.a:  $(LIBOBJ)
+libsqlite3.a: sqlite3.h        $(LIBOBJ)
        $(AR) libsqlite3.a $(LIBOBJ)
        $(RANLIB) libsqlite3.a
 
-sqlite3$(EXE): shell.c libsqlite3.a sqlite3.h
+sqlite3$(EXE): sqlite3.h libsqlite3.a shell.c
        $(TCCX) $(READLINE_FLAGS) -o sqlite3$(EXE) $(SHELL_OPT) \
                shell.c libsqlite3.a $(LIBREADLINE) $(TLIBS) $(THREADLIB)
 
@@ -824,13 +824,13 @@ fts3_unicode2.o:  $(TOP)/ext/fts3/fts3_unicode2.c $(HDR) $(EXTHDR)
 fts3_write.o:  $(TOP)/ext/fts3/fts3_write.c $(HDR) $(EXTHDR)
        $(TCCX) -DSQLITE_CORE -c $(TOP)/ext/fts3/fts3_write.c
 
-fts5.o:        fts5.c
+fts5.o:        fts5.c  sqlite3ext.h sqlite3.h
        $(TCCX) -DSQLITE_CORE -c fts5.c
 
-json1.o:       $(TOP)/ext/misc/json1.c
+json1.o:       $(TOP)/ext/misc/json1.c sqlite3ext.h sqlite3.h
        $(TCCX) -DSQLITE_CORE -c $(TOP)/ext/misc/json1.c
 
-stmt.o:        $(TOP)/ext/misc/stmt.c
+stmt.o:        $(TOP)/ext/misc/stmt.c sqlite3ext.h sqlite3.h
        $(TCCX) -DSQLITE_CORE -c $(TOP)/ext/misc/stmt.c
 
 rtree.o:       $(TOP)/ext/rtree/rtree.c $(HDR) $(EXTHDR)

diff --git a/manifest b/manifest
index 1f0fed3243a1bd3ed6ca867f4710a606fadb3b53..df9622f9fcaa26eb7cfeebf8990ffa631e47e883 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Add\stests\sfor\ssqlite3session_memory_used()\sinterface.
-D 2021-01-20T10:59:47.320
+C Improvements\sto\sthe\sauxiliary\s"main.mk"\smakefile\sso\sthat\sit\sworks\sbetter\swith\nmulti-threaded\sbuilds.
+D 2021-01-20T23:01:31.158
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -463,7 +463,7 @@ F ext/userauth/userauth.c 7f00cded7dcaa5d47f54539b290a43d2e59f4b1eb5f447545fa865
 F install-sh 9d4de14ab9fb0facae2f48780b874848cbf2f895 x
 F ltmain.sh 3ff0879076df340d2e23ae905484d8c15d5fdea8
 F magic.txt 8273bf49ba3b0c8559cb2774495390c31fd61c60
-F main.mk 57451ea5b3d5cd86e9c5324b10c9de184b12e8dcccc31c65d24fbcb55ccd9c53
+F main.mk 443a4ec1ca89ad267cbde45dadc68861154b99c7bd26e7b7dc74303a664002b8
 F mkso.sh fd21c06b063bb16a5d25deea1752c2da6ac3ed83
 F mptest/config01.test 3c6adcbc50b991866855f1977ff172eb6d901271
 F mptest/config02.test 4415dfe36c48785f751e16e32c20b077c28ae504
@@ -1898,7 +1898,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 dc7938d2d715301595dee2fac6880af3716c4b3d1cbe7c3578d7fd30ba146a23
-R 2a7f82e5717f1cb1207576a8070164d7
-U dan
-Z 837106ab8ad362dbfd49cfef88809376
+P 5596611f96f3401262b9dadc591bf7e3411d2c4a6f5be5cfe524e203d9820fd1
+R e4325fbe06f6c9247629eb04294fa661
+U drh
+Z 1b9b0d992b3d4f78ff264eba5ac968ed

diff --git a/manifest.uuid b/manifest.uuid
index 92afa750c7a0717ef9b2da36a6e4ae7cea1c8a83..7e5a82c2e6eaff4835277b70f84f57dd73ea55e2 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-5596611f96f3401262b9dadc591bf7e3411d2c4a6f5be5cfe524e203d9820fd1
\ No newline at end of file
+d1873054d8e1006a370ea7891dbb9a62e7d36ce98cb92b58dcb0daf271265de3
\ No newline at end of file