From 06a0ea9a681338d5165703ec5eb6601301df56fb Mon Sep 17 00:00:00 2001
From: larrybr <larrybr@noemail.net>
Date: Tue, 13 Jul 2021 20:55:26 +0000
Subject: [PATCH] Get correct #line tags into amalgamation for other builds
 too.

FossilOrigin-Name: 999eb80018f1bb8a8ad73483610400faf5fb37b1be446ce30edbf7028340f50b
---
 Makefile.msc  | 11 ++++++-----
 main.mk       |  3 ++-
 manifest      | 14 +++++++-------
 manifest.uuid |  2 +-
 4 files changed, 16 insertions(+), 14 deletions(-)

diff --git a/Makefile.msc b/Makefile.msc
index 4f20c0c0c1..2b369d7b09 100644
--- a/Makefile.msc
+++ b/Makefile.msc
@@ -235,8 +235,9 @@ DEBUG = 0
 !ENDIF
 
 # <<mark>>
-# Disable use of the --linemacros argument to the mksqlite3c.tcl tool, which
-# is used to build the amalgamation.
+# By default, use --line_tags=1 argument to the mksqlite3c.tcl tool, which
+# is used to build the amalgamation. This can be turned off to ease debug
+# of the amalgamation away from the source tree.
 #
 !IFNDEF NO_LINEMACROS
 NO_LINEMACROS = 0
@@ -787,10 +788,10 @@ MKSQLITE3C_TOOL = $(TOP)\tool\mksqlite3c.tcl
 !ENDIF
 
 !IFNDEF MKSQLITE3C_ARGS
-!IF $(DEBUG)>1 && $(NO_LINEMACROS)==0
-MKSQLITE3C_ARGS = --linemacros
+!IF $(NO_LINEMACROS)==0
+MKSQLITE3C_ARGS = --line_tags=1
 !ELSE
-MKSQLITE3C_ARGS =
+MKSQLITE3C_ARGS = --line_tags=0
 !ENDIF
 !IF $(USE_STDCALL)!=0 || $(FOR_WIN10)!=0
 MKSQLITE3C_ARGS = $(MKSQLITE3C_ARGS) --useapicall
diff --git a/main.mk b/main.mk
index 16d72ff924..152202cefc 100644
--- a/main.mk
+++ b/main.mk
@@ -1,3 +1,4 @@
+
 ###############################################################################
 # The following macros should be defined before this script is
 # invoked:
@@ -663,7 +664,7 @@ sqlite3ext.h:	target_source
 	cp tsrc/sqlite3ext.h .
 
 sqlite3.c-debug:	target_source $(TOP)/tool/mksqlite3c.tcl
-	tclsh $(TOP)/tool/mksqlite3c.tcl --linemacros
+	tclsh $(TOP)/tool/mksqlite3c.tcl --line_tags=1
 	echo '#ifndef USE_SYSTEM_SQLITE' >tclsqlite3.c
 	cat sqlite3.c >>tclsqlite3.c
 	echo '#endif /* USE_SYSTEM_SQLITE */' >>tclsqlite3.c
diff --git a/manifest b/manifest
index 935a4ad9f9..023e749344 100644
--- a/manifest
+++ b/manifest
@@ -1,11 +1,11 @@
-C Get\s#line\stags\sinto\samalgamation,\ssubject\sto\sconfigure.
-D 2021-07-13T11:59:17.680
+C Get\scorrect\s#line\stags\sinto\samalgamation\sfor\sother\sbuilds\stoo.
+D 2021-07-13T20:55:26.417
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
 F Makefile.in 31b3f386d47577c610dedf116aa5deab039c749d36b7735e9bc01a6f31c90f2b
 F Makefile.linux-gcc f609543700659711fbd230eced1f01353117621dccae7b9fb70daa64236c5241
-F Makefile.msc 8285e1ea7264f32b08702866d69dd127c0f663bbc2002323d853c68c27c6b6e4
+F Makefile.msc a44ead80b4676506954d27c2de6a4d669153f2f7967dedf588b6d9c7c5f46edc
 F README.md 27fb76aa7eb57ed63a53bbba7292b6bf71f51125554f79f16b5d040edd1e6110
 F VERSION c6595fef606851f2bc3ebed6a7386c73751835fc909feab7c093739fa4b3c1d1
 F aclocal.m4 a5c22d164aff7ed549d53a90fa56d56955281f50
@@ -466,7 +466,7 @@ F ext/userauth/userauth.c 7f00cded7dcaa5d47f54539b290a43d2e59f4b1eb5f447545fa865
 F install-sh 9d4de14ab9fb0facae2f48780b874848cbf2f895 x
 F ltmain.sh 3ff0879076df340d2e23ae905484d8c15d5fdea8
 F magic.txt 8273bf49ba3b0c8559cb2774495390c31fd61c60
-F main.mk c0c95f0aa2e3b731eb0c5a85869d4d6abef91647ec8e87a4013059bd1b910c0a
+F main.mk 6e3aceeb728ac72a6c265e24817166c4eb126e17cc49d419591b53372d9db817
 F mkso.sh fd21c06b063bb16a5d25deea1752c2da6ac3ed83
 F mptest/config01.test 3c6adcbc50b991866855f1977ff172eb6d901271
 F mptest/config02.test 4415dfe36c48785f751e16e32c20b077c28ae504
@@ -1920,7 +1920,7 @@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a91a7acc6293828957a386a8a93
 F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
 F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
 F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
-P 385db794477e046b5dde726489375786d7565b113084f6e730efb050b08f9a6e 9327f73c1b87fb9ca78e261d16b092763f497bb9c6f9784a33eabdc961b06343
-R dbca2ff374fa12dc1b7d55e8c48721d1
+P 5d81b598a7cd2cea2553fdf6ca38d2f65f0f1b2d5a8eea8a01c1800f68aa2422
+R 8047cbd4c8070d900b13d435b1c9a26f
 U larrybr
-Z 63da48257739363f6cf3cff556a25d79
+Z cd87850b5562004651d7c32e14873964
diff --git a/manifest.uuid b/manifest.uuid
index 31c27e4dfb..bf85853f3f 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-5d81b598a7cd2cea2553fdf6ca38d2f65f0f1b2d5a8eea8a01c1800f68aa2422
\ No newline at end of file
+999eb80018f1bb8a8ad73483610400faf5fb37b1be446ce30edbf7028340f50b
\ No newline at end of file