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

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

FossilOrigin-Name: 098400d36140b90e1d6dab5f54b080568c633875916a1130b6627599b4f99469
---

083aaa551ca83e62bdf4899a517d02a29317194c
diff --cc manifest
index 07109976b7,6154a16529..22b0f22811
--- a/manifest
+++ b/manifest
@@@ -1,5 -1,5 +1,5 @@@
- C Merge\smakefile\senhancements\sfrom\strunk\sinto\sthe\scommit-and-begin\sbranch.
- D 2024-11-14T19:08:15.706
 -C Fix\stypo\sin\sthe\shandling\sof\sthe\snew\s--dev\sflag\swhich\scaused\sit\sto\sset\sthe\s--debug\sflag\sinstead\sof\sthe\s--with-debug\sflag\s(the\sformer\sis\sfor\sautosetup's\sinternal\suse).
 -D 2024-11-14T19:34:28.930
++C Merge\smore\smakefile\senhancements\sfrom\strunk\sinto\sthe\scommit-and-begin\sbranch.
++D 2024-11-14T19:36:41.253
  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 05fb5d30750d20db86bbee1c27bd5965f999116a05de6414ab2aef060b407ad2 91da205beb7e5cab7a76be98e4cfddc4fb4c07022825ea645bc97f331c6bcdaa
- R 5d17e177d4a3e1789155de081dc3705b
 -P f778dfdd6d6a4975c903d8ca0ebfb4fa917d543289136ea0ab740cb47d2510c1
 -R 8f1a4b67fcbeb88fc42130b5848bb2cd
 -U stephan
 -Z 1bce6ce0c64505db6d931db182e302d9
++P b5dd11e0ac059573c2cc14640f0cd127a9f4c3d629023b21745f5442cb2de28a 81202d2ab5963fdcf20555b6d0b31cc955ac27f1cd87656faea5c0611c9a2ee8
++R 1e5c4f447532cf60ecddd07f5ef428a5
 +U drh
- Z 00b996643cdcbdf4144333dfb78a81c7
++Z 9bdfdb55a678363a84673d86e3e0775a
  # Remove this line to create a well-formed Fossil manifest.
diff --cc manifest.uuid
index 7d88da6d31,4f7ed134be..29f62a6298
--- a/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- b5dd11e0ac059573c2cc14640f0cd127a9f4c3d629023b21745f5442cb2de28a
 -81202d2ab5963fdcf20555b6d0b31cc955ac27f1cd87656faea5c0611c9a2ee8
++098400d36140b90e1d6dab5f54b080568c633875916a1130b6627599b4f99469