From: stephan Date: Wed, 13 Aug 2025 11:46:05 +0000 (+0000) Subject: Doc cleanups in main.mk. No functional changes. X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=16478dbfdd15844322902ecbaf20532419925f7e;p=thirdparty%2Fsqlite.git Doc cleanups in main.mk. No functional changes. FossilOrigin-Name: 839c998443880161af06b9f7470ebfc828251c3c1accdae5f0fbbcc13408474c --- diff --git a/main.mk b/main.mk index 97dfd853d1..b30c220bdf 100644 --- a/main.mk +++ b/main.mk @@ -11,8 +11,8 @@ # POSIX Make compatible. "bmake" (BSD make) is available on most # Linux systems, so compatibility is relatively easy to test. As a # harmless exception, this file sometimes uses $(MAKEFILE_LIST) as a -# dependency. That var, in GNU Make, lists all of the makefile -# currently loaded. +# dependency. That var, in GNU Make, holds a list of all of the +# makefiles currently loaded. # # The variables listed below must be defined before this script is # invoked. This file will use defaults, very possibly invalid, for any @@ -62,8 +62,8 @@ AR.flags ?= cr # # $(B.exe) = # -# File extension for executables on the build platform. ".exe" for -# Windows and "" everywhere else. +# File extension for executables on the build platform:. .exe for +# Windows and empty everywhere else. # B.exe ?= # @@ -76,8 +76,8 @@ B.lib ?= .a # # $(T.exe) = # -# File extension for executables on the target platform. ".exe" for -# Windows and "" everywhere else. +# File extension for executables on the target platform: .exe for +# Windows and empty everywhere else. # T.exe ?= $(B.exe) # @@ -100,7 +100,7 @@ TCLSH_CMD ?= tclsh # # JimTCL is part of the autosetup suite and is suitable for all # current in-tree code-generation TCL jobs, but it requires that we -# build it with non-default flags. Note that the build tree will, if +# build it with non-default flags. The canonical build tree will, if # no system-level tclsh is found, also have a ./jimsh0 binary. That # one is a bare-bones build for the configure process, whereas we need # to build it with another option enabled for use with the various @@ -118,9 +118,10 @@ JIMSH ?= ./jimsh$(T.exe) # $(B.tclsh) = # # The TCL interpreter for in-tree code generation. May be either the -# in-tree JimTCL ($(JIMSH)) or the canonical TCL ($(TCLSH_CMD). If +# in-tree JimTCL ($(JIMSH)) or the canonical TCL ($(TCLSH_CMD)). If # it's JimTCL, it must be compiled with -DHAVE_REALPATH (Unix) or -# -DHAVE__FULLPATH (Windows). +# -DHAVE__FULLPATH (Windows) so that the Tcl function [file normalize] +# can work. # B.tclsh ?= $(JIMSH) @@ -253,20 +254,20 @@ EXTRA_SRC ?= # and ENABLE flags must be passed to the LEMON parser generator and # the mkkeywordhash tool as well. This is normally set by the # configure process, and passing a custom value to a -# coonfigure-filtered Makefile may not work. +# configure-filtered Makefile may not work. # # When using the canonical makefile, add $(OPTIONS)=... on the make # command line to append additional options to the -# $(OPT_FEATURE_FLAGS). Note that some flags, because they influence -# generation of the SQL parser, only work if the build is specifically -# configured to account for them. Adding them later, when compiling -# the amalgamation separately, may or may not work. +# $(OPT_FEATURE_FLAGS). Some flags, because they influence generation +# of the SQL parser, only work if the build is specifically configured +# to account for them. Adding them later, when compiling the +# amalgamation separately, may or may not work. # # $(OPTS)=... is another way of influencing C compilation. It is # distinctly separate from $(OPTIONS) and $(OPT_FEATURE_FLAGS) but, # like those, $(OPTS) applies to all invocations of $(T.cc) (and some -# invocations of $(B.cc). The configure process does not set either of -# $(OPTIONS) or $(OPTS). +# invocations of $(B.cc)). The configure process does not set either +# of $(OPTIONS) or $(OPTS). # OPT_FEATURE_FLAGS ?= # @@ -1123,7 +1124,9 @@ libsqlite3.LIB = libsqlite3$(T.lib) # # libsqlite3.DLL.install-rules => the suffix of the symoblic name of -# the makefile rules for installing the DLL. +# the makefile rules for installing the DLL. Must be one of +# (unix-generic, msys, mingw, cygwin, darwin) and a target named +# install-dll-THATNAME is responsible for DLL installation. libsqlite3.DLL.install-rules ?= unix-generic # Rules to build the LEMON compiler generator @@ -1686,7 +1689,7 @@ CFLAGS.tclextension = $(CFLAGS.intree_includes) $(CFLAGS.env) $(OPT_FEATURE_FLAG # # Build the SQLite TCL extension in a way that make it compatible # with whatever version of TCL is running as $TCLSH_CMD, possibly defined -# by --with-tclsh= +# by --with-tclsh=/path/to/tclsh. # tclextension: tclsqlite3.c $(TCLSH_CMD) $(TOP)/tool/buildtclext.tcl --build-only \ diff --git a/manifest b/manifest index 92e539fb64..f148bf5e07 100644 --- a/manifest +++ b/manifest @@ -1,5 +1,5 @@ -C Fix\sa\sproblem\swith\sreading\swal\smode\sdatabases\sfrom\sUNC\sshares\son\swindows\sintroduced\sby\s[e88212b10a7829ff]. -D 2025-08-12T19:02:48.857 +C Doc\scleanups\sin\smain.mk.\sNo\sfunctional\schanges. +D 2025-08-13T11:46:05.360 F .fossil-settings/binary-glob 61195414528fb3ea9693577e1980230d78a1f8b0a54c78cf1b9b24d0a409ed6a x F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea @@ -665,7 +665,7 @@ F ext/wasm/tests/opfs/sahpool/sahpool-pausing.js f264925cfc82155de38cecb3d204c36 F ext/wasm/tests/opfs/sahpool/sahpool-worker.js bd25a43fc2ab2d1bafd8f2854ad3943ef673f7c3be03e95ecf1612ff6e8e2a61 F ext/wasm/wasmfs.make 411dd94b40406572caddf88392a1ccc4deed0f88d260516e59ca6e0c887ee861 F magic.txt 5ade0bc977aa135e79e3faaea894d5671b26107cc91e70783aa7dc83f22f3ba0 -F main.mk db007da34d6529993138c8445ef9610318ba3db5ef5166b545072b93ab27f5c5 +F main.mk d83e31f37ba77f7a5398d96629a486b3f6b8c9cc5417f92a2e55f3857324894e F mptest/config01.test 3c6adcbc50b991866855f1977ff172eb6d901271 F mptest/config02.test 4415dfe36c48785f751e16e32c20b077c28ae504 F mptest/crash01.test 61e61469e257df0850df4293d7d4d6c2af301421 @@ -2169,8 +2169,8 @@ F tool/version-info.c 3b36468a90faf1bbd59c65fd0eb66522d9f941eedd364fabccd7227350 F tool/warnings-clang.sh bbf6a1e685e534c92ec2bfba5b1745f34fb6f0bc2a362850723a9ee87c1b31a7 F tool/warnings.sh 1ad0169b022b280bcaaf94a7fa231591be96b514230ab5c98fbf15cd7df842dd F tool/win/sqlite.vsix deb315d026cc8400325c5863eef847784a219a2f -P a836126bbec5c14432ed7fc7e9e6f8ebcd5dd1116d3ac8a9a0d25c8f62cc51fe 9e6fa73467892eb2333c0a94ca38b66b7cc0432326de93ff131ecde4c165114e -R 18674a1a51901a5d53c84c6dfa4ba3a6 -U dan -Z 42097e4404b87bcc5b9a7240b577b022 +P f341e7812984b41acd7dd2dd795a1716a8826af4326578dcdf7d7fdd55124ceb +R e32cc38c3ce8f20f725baa66d3c12e90 +U stephan +Z 76cf94dc64de248e58289319551a4731 # Remove this line to create a well-formed Fossil manifest. diff --git a/manifest.uuid b/manifest.uuid index a3ac013ed6..c9e36a7127 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -f341e7812984b41acd7dd2dd795a1716a8826af4326578dcdf7d7fdd55124ceb +839c998443880161af06b9f7470ebfc828251c3c1accdae5f0fbbcc13408474c