From: stephan <stephan@noemail.net>
Date: Tue, 27 Feb 2024 11:02:31 +0000 (+0000)
Subject: Extend sqlite3.c makefile rule to support EXTRA_SRC=list-of-c-files to append to... 
X-Git-Tag: version-3.46.0~189
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=5b985fee645ded026ef6970fa4a9c6ff567b1063;p=thirdparty%2Fsqlite.git

Extend sqlite3.c makefile rule to support EXTRA_SRC=list-of-c-files to append to the generated sqlite3.c, as discussed in/around [forum:ccda88cf6f1754c5|forum post ccda88cf6f1754c5].

FossilOrigin-Name: 61676f1e18a405e4f3b6007488f2e68f3f55b312c107359ae5e52929f0c104c8
---

5b985fee645ded026ef6970fa4a9c6ff567b1063
diff --cc Makefile.msc
index 7d9dbd2c2b,00be58c08d..d0875c92e1
--- a/Makefile.msc
+++ b/Makefile.msc
@@@ -16,8 -16,12 +16,15 @@@ TOP = 
  !IFNDEF USE_AMALGAMATION
  USE_AMALGAMATION = 1
  !ENDIF
 +# <</mark>>
  
++# Optionally set EXTRA_SRC to a list of C files to append to
++# the generated sqlite3.c.
++#
+ !IFNDEF EXTRA_SRC
+ EXTRA_SRC =
+ !ENDIF
 -# <</mark>>
+ 
  # Set this non-0 to enable full warnings (-W4, etc) when compiling.
  #
  !IFNDEF USE_FULLWARN
diff --cc autoconf/Makefile.msc
index 45a07a9f31,45a07a9f31..a4270fb2ae
--- a/autoconf/Makefile.msc
+++ b/autoconf/Makefile.msc
@@@ -18,6 -18,6 +18,13 @@@
  TOP = .
  
  
++# Optionally set EXTRA_SRC to a list of C files to append to
++# the generated sqlite3.c.
++#
++!IFNDEF EXTRA_SRC
++EXTRA_SRC =
++!ENDIF
++
  # Set this non-0 to enable full warnings (-W4, etc) when compiling.
  #
  !IFNDEF USE_FULLWARN
diff --cc manifest
index 6970ed9a23,3c48bc3389..d3e4f1efbe
--- a/manifest
+++ b/manifest
@@@ -1,11 -1,11 +1,11 @@@
- C Allow\s"_"\scharacters\sto\sappear\sbetween\sany\stwo\sdigits\sin\san\sinteger,\sreal\sor\shexadecimal\sSQL\sliteral.
- D 2024-02-27T10:52:41.798
 -C Bring\sthe\sextra-src\sbranch\sup\sto\sdate\swith\sthe\strunk.
 -D 2024-02-27T00:58:51.735
++C Extend\ssqlite3.c\smakefile\srule\sto\ssupport\sEXTRA_SRC=list-of-c-files\sto\sappend\sto\sthe\sgenerated\ssqlite3.c,\sas\sdiscussed\sin/around\s[forum:ccda88cf6f1754c5|forum\spost\sccda88cf6f1754c5].
++D 2024-02-27T11:02:31.114
  F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
  F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
  F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
- F Makefile.in 216eea0cc5a9613d9f4f21402a4b759c2fce2a0cb9567513933562b65e30670b
+ F Makefile.in 3c4f4879b2301e5486939f68cc64f84430861d246ac11430ff1a1d7347ed5b8c
  F Makefile.linux-gcc f3842a0b1efbfbb74ac0ef60e56b301836d05b4d867d014f714fa750048f1ab6
- F Makefile.msc a496ca640052c1e102daaa6e2d2216ae482f22995498c7c9492fd7f841481400
 -F Makefile.msc 108f24dc3b1801795de7550870c47e6aeb205707dc298660fd46091c8ff06eb0
++F Makefile.msc 15a875f6016c4200e7093db92365fabb8b32eb09f9e40e1aadeedeecad4050d5
  F README.md 6358805260a03ebead84e168bbf3740ddf3f683b477e478567186aa7afb490d3
  F VERSION c84541c6a9e8426462176fbb1f9ecb5cfd7d1bb56228053ff7eeba8841673eb6
  F aclocal.m4 a5c22d164aff7ed549d53a90fa56d56955281f50
@@@ -17,7 -17,7 +17,7 @@@ F art/sqlite370.jpg d512473dae7e378a67e
  F autoconf/INSTALL 83e4a25da9fd053c7b3665eaaaf7919707915903
  F autoconf/Makefile.am adedc1324b6a87fdd1265ddd336d2fb7d4f36a0e77b86ea553ae7cc4ea239347
  F autoconf/Makefile.fallback 22fe523eb36dfce31e0f6349f782eb084e86a5620b2b0b4f84a2d6133f53f5ac
--F autoconf/Makefile.msc ac338c36a338f6b49475da71930f45145a181d6b551578d5a7a64f113ef27b2c
++F autoconf/Makefile.msc 7ac6c331fc3b8aa57b6782db995b8c0e49230352decd4e2662fd07c06a9ed623
  F autoconf/README.first 6c4f34fe115ff55d4e8dbfa3cecf04a0188292f7
  F autoconf/README.txt 42cfd21d0b19dc7d5d85fb5c405c5f3c6a4c923021c39128f6ba685355d8fd56
  F autoconf/configure.ac ec7fa914c5e74ff212fe879f9bb6918e1234497e05facfb641f30c4d5893b277
@@@ -2175,9 -2173,8 +2175,9 @@@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a9
  F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
  F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
  F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
- P 85dd79a6edecfc8c6307c6d215998f76dab086aa14528ddc64eb9955501becfd d57407ef59baf699b72c8c4859abfaa7977dd41f6f16eb8fe1d53a68806eb966
- R 2bb770f6c73721aa4e91255456fc2d3d
- T +closed d57407ef59baf699b72c8c4859abfaa7977dd41f6f16eb8fe1d53a68806eb966
- U dan
- Z 792e93767edab5c1fae195fbe183eb96
 -P 44f3d7d054055fab4cca0ba753e75e237ca159ae868ffd1d13ed45a874a772f2 85dd79a6edecfc8c6307c6d215998f76dab086aa14528ddc64eb9955501becfd
 -R 80d4ad79d9a78fa9f0de62d1574b5434
++P 0e6700f43f133510c8049b2c5a2610cb3be29da7ed4d39b1fa65dc22c4cf529b 12ff5c5c4162951a29b638a5bc6cffa50e057c5a5e8f5e9c627af5f4ab1e4cdb
++R 3761d49c69043110886de38dec3e1778
++T +closed 12ff5c5c4162951a29b638a5bc6cffa50e057c5a5e8f5e9c627af5f4ab1e4cdb Closed\sby\sintegrate-merge.
+ U stephan
 -Z 135136d2573db3fdaa7f02d94a8dab93
++Z 795a2e3ba4d03563f379b9c2ce97fa52
  # Remove this line to create a well-formed Fossil manifest.
diff --cc manifest.uuid
index 194c395455,32e46f2308..8da06a5ae2
--- a/manifest.uuid
+++ b/manifest.uuid
@@@ -1,1 -1,1 +1,1 @@@
- 0e6700f43f133510c8049b2c5a2610cb3be29da7ed4d39b1fa65dc22c4cf529b
 -12ff5c5c4162951a29b638a5bc6cffa50e057c5a5e8f5e9c627af5f4ab1e4cdb
++61676f1e18a405e4f3b6007488f2e68f3f55b312c107359ae5e52929f0c104c8