From: larrybr <larrybr@noemail.net>
Date: Wed, 6 Apr 2022 16:47:56 +0000 (+0000)
Subject: Add sqlite3x target to other makefiles.
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=2a9d64214f1a3e8dcd18e48c963d83be72b9348e;p=thirdparty%2Fsqlite.git

Add sqlite3x target to other makefiles.

FossilOrigin-Name: efc9f08dcb1d64b92dd08e8776abc805d911fbb905758f8af6977f31a6633bb4
---

diff --git a/Makefile.msc b/Makefile.msc
index d67b7f0b86..8215677a21 100644
--- a/Makefile.msc
+++ b/Makefile.msc
@@ -311,6 +311,7 @@ SQLITE3EXE = winsqlite3shell.exe
 SQLITE3EXE = sqlite3.exe
 !ENDIF
 !ENDIF
+SQLITE3XEXE = sqlite3x.exe
 
 # This is the argument used to set the program database (PDB) file for the
 # SQLite shell executable (EXE).
@@ -1692,6 +1693,9 @@ SHELL_COMPILE_OPTS = $(SHELL_COMPILE_OPTS) -DSQLITE_ENABLE_EXPLAIN_COMMENTS=1
 SHELL_COMPILE_OPTS = $(SHELL_COMPILE_OPTS) -DSQLITE_ENABLE_OFFSET_SQL_FUNC=1
 !ENDIF
 
+# 
+SHELL_NOEXT_COMPILE_OPTS = $(SHELL_COMPILE_OPTS) -DSHELL_OMIT_EXTENSIONS=7
+
 # <<mark>>
 # Extra compiler options for various test tools.
 #
@@ -1780,6 +1784,10 @@ sqlite3.def:	libsqlite3.lib
 # <</block2>>
 
 $(SQLITE3EXE):	shell.c $(SHELL_CORE_DEP) $(LIBRESOBJS) $(SHELL_CORE_SRC) $(SQLITE3H)
+	$(LTLINK) $(SHELL_NOEXT_COMPILE_OPTS) $(READLINE_FLAGS) shell.c $(SHELL_CORE_SRC) \
+		/link $(SQLITE3EXEPDB) $(LDFLAGS) $(LTLINKOPTS) $(SHELL_LINK_OPTS) $(LTLIBPATHS) $(LIBRESOBJS) $(LIBREADLINE) $(LTLIBS) $(TLIBS)
+
+$(SQLITE3XEXE):	shell.c $(SHELL_CORE_DEP) $(LIBRESOBJS) $(SHELL_CORE_SRC) $(SQLITE3H)
 	$(LTLINK) $(SHELL_COMPILE_OPTS) $(READLINE_FLAGS) shell.c $(SHELL_CORE_SRC) \
 		/link $(SQLITE3EXEPDB) $(LDFLAGS) $(LTLINKOPTS) $(SHELL_LINK_OPTS) $(LTLIBPATHS) $(LIBRESOBJS) $(LIBREADLINE) $(LTLIBS) $(TLIBS)
 
diff --git a/main.mk b/main.mk
index be16034e55..1c5d5e3594 100644
--- a/main.mk
+++ b/main.mk
@@ -549,6 +549,7 @@ FUZZCHECK_OPT += -DSQLITE_ENABLE_BYTECODE_VTAB
 DBFUZZ_OPT =
 KV_OPT = -DSQLITE_THREADSAFE=0 -DSQLITE_DIRECT_OVERFLOW_READ
 ST_OPT = -DSQLITE_THREADSAFE=0
+SHELL_OPT_NOEXT = $(SHELL_OPT) -DSHELL_OMIT_EXTENSIONS=7
 
 # This is the default Makefile target.  The objects listed here
 # are what get build when you type just "make" with no arguments.
@@ -560,6 +561,10 @@ libsqlite3.a: sqlite3.h	$(LIBOBJ)
 	$(RANLIB) libsqlite3.a
 
 sqlite3$(EXE):	sqlite3.h libsqlite3.a shell.c
+	$(TCCX) $(READLINE_FLAGS) -o sqlite3$(EXE) $(SHELL_OPT_NOEXT) \
+		shell.c libsqlite3.a $(LIBREADLINE) $(TLIBS) $(THREADLIB)
+
+sqlite3x$(EXE):	sqlite3.h libsqlite3.a shell.c
 	$(TCCX) $(READLINE_FLAGS) -o sqlite3$(EXE) $(SHELL_OPT) \
 		shell.c libsqlite3.a $(LIBREADLINE) $(TLIBS) $(THREADLIB)
 
diff --git a/manifest b/manifest
index d91bbaaf7a..9f31da9c4e 100644
--- a/manifest
+++ b/manifest
@@ -1,11 +1,11 @@
-C Add\ssqlite3x\sbuild\starget.\sCure\sCLI\sbuild\swarning.\sTweak\sCLI\stest.
-D 2022-04-06T16:19:16.378
+C Add\ssqlite3x\starget\sto\sother\smakefiles.
+D 2022-04-06T16:47:56.538
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
 F Makefile.in 204f3f2e09c721ef2e0414e0e4cda0bbf52428b9557d44e26ab81c4f2558fe95
 F Makefile.linux-gcc f609543700659711fbd230eced1f01353117621dccae7b9fb70daa64236c5241
-F Makefile.msc b28a8a7a977e7312f6859f560348e1eb110c21bd6cf9fab0d16537c0a514eef3
+F Makefile.msc 689726a2785027e0eb34ea9ce8e67ac94bc4aebbaa6def20ddb6fa9f7b0c43b5
 F README.md 2dd87a5c1d108b224921f3dd47dea567973f706e1f6959386282a626f459a70c
 F VERSION fa8e7d2d1cc962f9e14c6d410387cf75860ee139462763fda887c1be4261f824
 F aclocal.m4 a5c22d164aff7ed549d53a90fa56d56955281f50
@@ -475,7 +475,7 @@ F ext/userauth/userauth.c 7f00cded7dcaa5d47f54539b290a43d2e59f4b1eb5f447545fa865
 F install-sh 9d4de14ab9fb0facae2f48780b874848cbf2f895 x
 F ltmain.sh 3ff0879076df340d2e23ae905484d8c15d5fdea8
 F magic.txt 8273bf49ba3b0c8559cb2774495390c31fd61c60
-F main.mk 80ac3d2f82eb21c6fb4423f9c7f8e207abb51be6676845a00e246cfb22f9c77c
+F main.mk b685af8628262105cdc7173ca7d6e4803eb8186069c9d51fcb3089cfc9d96a52
 F mkso.sh fd21c06b063bb16a5d25deea1752c2da6ac3ed83
 F mptest/config01.test 3c6adcbc50b991866855f1977ff172eb6d901271
 F mptest/config02.test 4415dfe36c48785f751e16e32c20b077c28ae504
@@ -1951,8 +1951,8 @@ F vsixtest/vsixtest.tcl 6a9a6ab600c25a91a7acc6293828957a386a8a93
 F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc
 F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e
 F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0
-P 761208132d99ad602b80c3fe2f0780020c54a3a4ca5be3d2b69b2e3c25e83bc1
-R 18602373e73fcb3f0aaeaf27861e5ee2
+P 45736d46cdca75d0f6eb1a0b9f2702b86851bd1da85f34c0687a3aaadf628975
+R b2e6b06c6246ce010e557fdebac85c3d
 U larrybr
-Z 64853d04da23969e3518d3d6c5835753
+Z 43415bae21e15d4b000956dcbb54dd2e
 # Remove this line to create a well-formed Fossil manifest.
diff --git a/manifest.uuid b/manifest.uuid
index 9863c49ef0..c45f0078be 100644
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-45736d46cdca75d0f6eb1a0b9f2702b86851bd1da85f34c0687a3aaadf628975
\ No newline at end of file
+efc9f08dcb1d64b92dd08e8776abc805d911fbb905758f8af6977f31a6633bb4
\ No newline at end of file