From: dan Date: Tue, 12 Jul 2022 15:10:16 +0000 (+0000) Subject: Update makefiles to fix building the non-amalgamation testfixture with SQLITE_DEBUG. X-Git-Tag: version-3.40.0~310 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=8d48e30b397626c09b1e5815011084bc642bf85e;p=thirdparty%2Fsqlite.git Update makefiles to fix building the non-amalgamation testfixture with SQLITE_DEBUG. FossilOrigin-Name: d9c4a9d09b6b22d7d95420b495dc7d7a42a0638be5824f6af6630539fe787cd4 --- diff --git a/Makefile.in b/Makefile.in index 94fa96ea83..526504b069 100644 --- a/Makefile.in +++ b/Makefile.in @@ -503,6 +503,7 @@ TESTSRC2 = \ $(TOP)/src/pcache1.c \ $(TOP)/src/select.c \ $(TOP)/src/tokenize.c \ + $(TOP)/src/treeview.c \ $(TOP)/src/utf.c \ $(TOP)/src/util.c \ $(TOP)/src/vdbeapi.c \ diff --git a/main.mk b/main.mk index 1926a08859..35e42d6ca2 100644 --- a/main.mk +++ b/main.mk @@ -423,6 +423,7 @@ TESTSRC2 = \ $(TOP)/src/select.c \ $(TOP)/src/threads.c \ $(TOP)/src/tokenize.c \ + $(TOP)/src/treeview.c \ $(TOP)/src/utf.c \ $(TOP)/src/util.c \ $(TOP)/src/vdbeapi.c \ diff --git a/manifest b/manifest index 45fcfefe57..ada57a2c1c 100644 --- a/manifest +++ b/manifest @@ -1,9 +1,9 @@ -C Fix\sa\sbug\sin\swapptest.tcl\sintroduced\sby\s[51255bad4c1fb607]. -D 2022-07-12T10:46:02.702 +C Update\smakefiles\sto\sfix\sbuilding\sthe\snon-amalgamation\stestfixture\swith\sSQLITE_DEBUG. +D 2022-07-12T15:10:16.068 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724 -F Makefile.in ab82a7cf01fd4d2b1164c8cb20513b59f4223a1a6e713938b1fb5b842418020d +F Makefile.in fea7bbb25e4b59bc16631f6ff897acc88525013b62fdeba0a36456ef1548a27f F Makefile.linux-gcc f609543700659711fbd230eced1f01353117621dccae7b9fb70daa64236c5241 F Makefile.msc de7cb3e095ce2fdc33513ccd76ebdaeda1483d0ddab0410fe65cbdeadd4c0ee1 F README.md 8b8df9ca852aeac4864eb1e400002633ee6db84065bd01b78c33817f97d31f5e @@ -491,7 +491,7 @@ F ext/userauth/userauth.c 7f00cded7dcaa5d47f54539b290a43d2e59f4b1eb5f447545fa865 F install-sh 9d4de14ab9fb0facae2f48780b874848cbf2f895 x F ltmain.sh 3ff0879076df340d2e23ae905484d8c15d5fdea8 F magic.txt 8273bf49ba3b0c8559cb2774495390c31fd61c60 -F main.mk a5412510e5ec952915a7fda34e02079bb4e6ff8f97903f2a3d9ad2dee3e18044 +F main.mk 50e98928657b6d5aeb9445f6130964bd644861cfa049d689db41da317d449517 F mkso.sh fd21c06b063bb16a5d25deea1752c2da6ac3ed83 F mptest/config01.test 3c6adcbc50b991866855f1977ff172eb6d901271 F mptest/config02.test 4415dfe36c48785f751e16e32c20b077c28ae504 @@ -1979,8 +1979,8 @@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a91a7acc6293828957a386a8a93 F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0 -P ee059ad5a811a1511e37158f041a7bf9070529d530410d2f1c4395cdd25c6d33 -R 045391b1c16f142da84fbbaaea1c1d59 -U drh -Z 054267434d9e9a8e380eb13bbd806a61 +P b26d097e099b18ff434467adafe83fc55429488dbb8ce9c879bb03d8c5b7d3eb +R 22ab8a0d5553115981b624fa454c10d5 +U dan +Z ee54ba27f709e5af1b5cefb61125f247 # Remove this line to create a well-formed Fossil manifest. diff --git a/manifest.uuid b/manifest.uuid index 00118e387a..2ee5fcf49b 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -b26d097e099b18ff434467adafe83fc55429488dbb8ce9c879bb03d8c5b7d3eb \ No newline at end of file +d9c4a9d09b6b22d7d95420b495dc7d7a42a0638be5824f6af6630539fe787cd4 \ No newline at end of file