From 59c80e05333cfc23861481c8cd3000b847e92ace Mon Sep 17 00:00:00 2001
From: drh <>
Date: Thu, 14 Nov 2024 19:06:00 +0000
Subject: [PATCH] Add new makefile target "sqlite3d" (where the "d" means
 either "development" or "debug") that always uses separate source files,
 regardless of the --disable-amalgmation setting.

FossilOrigin-Name: 91da205beb7e5cab7a76be98e4cfddc4fb4c07022825ea645bc97f331c6bcdaa
---
 main.mk       | 13 +++++++++++++
 manifest      | 14 +++++++-------
 manifest.uuid |  2 +-
 3 files changed, 21 insertions(+), 8 deletions(-)

diff --git a/main.mk b/main.mk
index 8cc37ff775..61e0514822 100644
--- a/main.mk
+++ b/main.mk
@@ -1915,12 +1915,25 @@ threadtest5: sqlite3.c $(TOP)/test/threadtest5.c
 	$(T.link) $(TOP)/test/threadtest5.c sqlite3.c -o $@ $(LDFLAGS.libsqlite3)
 xbin: threadtest5
 
+# The standard CLI is built using the amalgamation since it uses
+# special compile-time options that are interpreted by individual
+# source files within the amalgamation.
+#
 sqlite3$(T.exe):	shell.c sqlite3.c
 	$(T.link) -o $@ \
 		shell.c sqlite3.c \
 		$(CFLAGS.readline) $(SHELL_OPT) \
 		$(LDFLAGS.libsqlite3) $(LDFLAGS.readline)
 
+# The "sqlite3d" CLI is build using separate source files.  This
+# is useful during development and debugging.
+#
+sqlite3d$(T.exe):	shell.c $(LIBOBJS0)
+	$(T.link) -o $@ \
+		shell.c $(LIBOBJS0) \
+		$(CFLAGS.readline) $(SHELL_OPT) \
+		$(LDFLAGS.libsqlite3) $(LDFLAGS.readline)
+
 #
 # Build sqlite3$(T.exe) by default except in wasi-sdk builds.  Yes, the
 # semantics of 0 and 1 are confusingly swapped here.
diff --git a/manifest b/manifest
index cf36dbfee1..73fd9d1401 100644
--- a/manifest
+++ b/manifest
@@ -1,5 +1,5 @@
-C Add\s--enable-dev\sconfigure\sflag\swhich\ssets\svarious\sother\sflags.
-D 2024-11-14T17:52:59.923
+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
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md e108e1e69ae8e8a59e93c455654b8ac9356a11720d3345df2a4743e9590fb20d
@@ -696,7 +696,7 @@ F ext/wasm/tests/opfs/concurrency/test.js d08889a5bb6e61937d0b8cbb78c9efbefbf65a
 F ext/wasm/tests/opfs/concurrency/worker.js 0a8c1a3e6ebb38aabbee24f122693f1fb29d599948915c76906681bb7da1d3d2
 F ext/wasm/wasmfs.make bc8bb227f35d5bd3863a7bd2233437c37472a0d81585979f058f9b9b503bef35
 F magic.txt 5ade0bc977aa135e79e3faaea894d5671b26107cc91e70783aa7dc83f22f3ba0
-F main.mk cd92df46e074ce11466d43530cfe23cef48ac541aee4714181369e3fe92df05a
+F main.mk 51e0eb180616a4863865e785bab5a4687326df5e9c0be3ab6005b775bd292f5b
 F mptest/config01.test 3c6adcbc50b991866855f1977ff172eb6d901271
 F mptest/config02.test 4415dfe36c48785f751e16e32c20b077c28ae504
 F mptest/crash01.test 61e61469e257df0850df4293d7d4d6c2af301421
@@ -2198,8 +2198,8 @@ F tool/version-info.c 3b36468a90faf1bbd59c65fd0eb66522d9f941eedd364fabccd7227350
 F tool/warnings-clang.sh bbf6a1e685e534c92ec2bfba5b1745f34fb6f0bc2a362850723a9ee87c1b31a7
 F tool/warnings.sh 49a486c5069de041aedcbde4de178293e0463ae9918ecad7539eedf0ec77a139
 F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f
-P bba54e26de56ddf804990f5cd9a1978a14580f06c5771a79803907013df8491e
-R 52449d4304f2eea2db488af261c0c62f
-U stephan
-Z 77b9d9984833e746e00359840a52aebd
+P ea79c363a42484357ac4ac3422f3466e5bc5cb56e5b2a06a3dc4ec90fea1c190
+R f73cd6f3e9db5bb5c6986a07c9399aad
+U drh
+Z 85bc26d605e98ed3bdc053f173922b85
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index 86860b0279..5bc74f1324 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-ea79c363a42484357ac4ac3422f3466e5bc5cb56e5b2a06a3dc4ec90fea1c190
+91da205beb7e5cab7a76be98e4cfddc4fb4c07022825ea645bc97f331c6bcdaa
-- 
2.47.2