From: drh <>
Date: Thu, 14 Nov 2024 19:08:15 +0000 (+0000)
Subject: Merge makefile enhancements from trunk into the commit-and-begin branch.
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=361549342c82a37ef1ea9655d194ab564ec9c812;p=thirdparty%2Fsqlite.git

Merge makefile enhancements from trunk into the commit-and-begin branch.

FossilOrigin-Name: b5dd11e0ac059573c2cc14640f0cd127a9f4c3d629023b21745f5442cb2de28a
---

361549342c82a37ef1ea9655d194ab564ec9c812
diff --cc manifest
index eea03f7d24,73fd9d1401..07109976b7
--- a/manifest
+++ b/manifest
@@@ -1,5 -1,5 +1,5 @@@
- C Merge\sthe\slatest\strunk\senhancements\sand\sfixes\sinto\sthe\scommit-and-begin\sbranch.
- D 2024-11-14T17:25:28.116
 -C Add\snew\smakefile\starget\s"sqlite3d"\s(where\sthe\s"d"\smeans\seither\s"development"\sor\n"debug")\sthat\salways\suses\sseparate\ssource\sfiles,\sregardless\sof\sthe\s\n--disable-amalgmation\ssetting.
 -D 2024-11-14T19:06:00.821
++C Merge\smakefile\senhancements\sfrom\strunk\sinto\sthe\scommit-and-begin\sbranch.
++D 2024-11-14T19:08:15.706
  F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
  F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
  F LICENSE.md e108e1e69ae8e8a59e93c455654b8ac9356a11720d3345df2a4743e9590fb20d
@@@ -2198,8 -2198,8 +2198,8 @@@ F tool/version-info.c 3b36468a90faf1bbd
  F tool/warnings-clang.sh bbf6a1e685e534c92ec2bfba5b1745f34fb6f0bc2a362850723a9ee87c1b31a7
  F tool/warnings.sh 49a486c5069de041aedcbde4de178293e0463ae9918ecad7539eedf0ec77a139
  F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f
- P ddac5973215478d0cacdd99c697345019018916453ec0657868a4e2c21601779 bba54e26de56ddf804990f5cd9a1978a14580f06c5771a79803907013df8491e
- R 88a0f2f3f68d0319800000ddbfb28067
 -P ea79c363a42484357ac4ac3422f3466e5bc5cb56e5b2a06a3dc4ec90fea1c190
 -R f73cd6f3e9db5bb5c6986a07c9399aad
++P 05fb5d30750d20db86bbee1c27bd5965f999116a05de6414ab2aef060b407ad2 91da205beb7e5cab7a76be98e4cfddc4fb4c07022825ea645bc97f331c6bcdaa
++R 5d17e177d4a3e1789155de081dc3705b
  U drh
- Z 176ed4d30c3860002a7d625868143768
 -Z 85bc26d605e98ed3bdc053f173922b85
++Z 00b996643cdcbdf4144333dfb78a81c7
  # Remove this line to create a well-formed Fossil manifest.
diff --cc manifest.uuid
index fa0d4c64ae,5bc74f1324..7d88da6d31
--- a/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 05fb5d30750d20db86bbee1c27bd5965f999116a05de6414ab2aef060b407ad2
 -91da205beb7e5cab7a76be98e4cfddc4fb4c07022825ea645bc97f331c6bcdaa
++b5dd11e0ac059573c2cc14640f0cd127a9f4c3d629023b21745f5442cb2de28a