Fix a problem in main.mk preventing the amalgamation-testfixture target from building.

FossilOrigin-Name: ccf00a0e22a2a9815ff7db1c6c6457fce35aaf50843c1b5ff2adda22d6f70314

diff --git a/main.mk b/main.mk
index c0d84ed96e30b74daa3e648ed65adef9c197ee6c..76c62fcecdb5812ffe83388e93a480956f257f53 100644 (file)
--- a/main.mk
+++ b/main.mk
@@ -390,7 +390,10 @@ TESTSRC += \
   $(TOP)/ext/fts5/fts5_tcl.c \
   $(TOP)/ext/fts5/fts5_test_mi.c \
   $(TOP)/ext/fts5/fts5_test_tok.c \
-  $(TOP)/ext/rtree/test_rtreedoc.c
+  $(TOP)/ext/rtree/test_rtreedoc.c \
+  $(TOP)/ext/recover/sqlite3recover.c \
+  $(TOP)/ext/recover/dbdata.c \
+  $(TOP)/ext/recover/test_recover.c
 
 
 #TESTSRC += $(TOP)/ext/fts2/fts2_tokenizer.c
@@ -446,9 +449,6 @@ TESTSRC2 = \
   $(TOP)/ext/misc/stmt.c \
   $(TOP)/ext/session/sqlite3session.c \
   $(TOP)/ext/session/test_session.c \
-  $(TOP)/ext/recover/sqlite3recover.c \
-  $(TOP)/ext/recover/dbdata.c \
-  $(TOP)/ext/recover/test_recover.c \
   fts5.c
 
 # Header files used by all library source files.

diff --git a/manifest b/manifest
index 0916bc7d1a459fb71e5bece6c2227f3f09c4d51f..81ae51dfb95c122e25b790a68b6da4fe898853e1 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Further\simprovements\sto\sthe\shandling\sof\sthe\su32\sand\su16\stypedefs\sin\sthe\nshell.c\ssource\sfile.
-D 2022-11-07T19:40:20.023
+C Fix\sa\sproblem\sin\smain.mk\spreventing\sthe\samalgamation-testfixture\starget\sfrom\sbuilding.
+D 2022-11-08T15:49:12.915
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
@@ -556,7 +556,7 @@ F ext/wasm/wasmfs.make edfd60691d10fd19ada4c061280fd7fbe4cf5f6bf6b913268e8ebedfc
 F install-sh 9d4de14ab9fb0facae2f48780b874848cbf2f895 x
 F ltmain.sh 3ff0879076df340d2e23ae905484d8c15d5fdea8
 F magic.txt 5ade0bc977aa135e79e3faaea894d5671b26107cc91e70783aa7dc83f22f3ba0
-F main.mk 73410c1f180660fd95c8203f35e1d4c1003e033d6bd0dbcb2c41610e4166500d
+F main.mk fd90f1bd90bd4070c9af7e9c8396bd0cf4208a0186c8d18fa6e2609dff447d5d
 F mkso.sh fd21c06b063bb16a5d25deea1752c2da6ac3ed83
 F mptest/config01.test 3c6adcbc50b991866855f1977ff172eb6d901271
 F mptest/config02.test 4415dfe36c48785f751e16e32c20b077c28ae504
@@ -2055,8 +2055,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 3645585f37631d60cefab1d55cdb1ee060aae87317b9b158a01329ca8a4d3e1e
-R 464a7490d5785cedceee206c55537caa
-U drh
-Z 18e20ce83905083b1118871788a6f38f
+P 55a19677d723147aeb2b4a86bbd01756ddeb2072cba72c3145ad32d335e203b0
+R e35be0c56965a970c718b1c71996a354
+U dan
+Z 4058b34591c1752ecb37a0b494045ec5
 # Remove this line to create a well-formed Fossil manifest.

diff --git a/manifest.uuid b/manifest.uuid
index f87dd57dfe18d5ebde69123aa1fd1e6307b00a95..29091737983574118c5fdb76d12476f98fd180dc 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-55a19677d723147aeb2b4a86bbd01756ddeb2072cba72c3145ad32d335e203b0
\ No newline at end of file
+ccf00a0e22a2a9815ff7db1c6c6457fce35aaf50843c1b5ff2adda22d6f70314
\ No newline at end of file