From: stephan Date: Thu, 24 Oct 2024 05:33:30 +0000 (+0000) Subject: More potentially-controversial makefile symbol renaming. This is simply more readable... X-Git-Tag: major-relase~351^2~25 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=30b20563e453759481548699b73e9a4f1cfc7b18;p=thirdparty%2Fsqlite.git More potentially-controversial makefile symbol renaming. This is simply more readable to my eyes. FossilOrigin-Name: 6d4d1d5fefb82ec7458efc2e93c933d9dc415dfa06fa46ff4725c30fc920ca5a --- diff --git a/Makefile.in b/Makefile.in index 436ab3941d..31f715fe62 100644 --- a/Makefile.in +++ b/Makefile.in @@ -94,8 +94,8 @@ includedir ?= @includedir@ INSTALL = @BIN_INSTALL@ AR = @AR@ CC = @CC@ -BCC = @BUILD_CC@ @BUILD_CFLAGS@ -TCC = $(CC) $(CFLAGS) +B.cc = @BUILD_CC@ @BUILD_CFLAGS@ +T.cc = $(CC) $(CFLAGS) CFLAGS = @CFLAGS@ @SH_CFLAGS@ LDFLAGS.shobj = @SHOBJ_LDFLAGS@ @@ -110,15 +110,15 @@ CFLAGS.readline = -DHAVE_READLINE=@HAVE_READLINE@ @CFLAGS_READLINE@ ENABLE_SHARED = @ENABLE_SHARED@ HAVE_WASI_SDK = @HAVE_WASI_SDK@ -TCC.sqlite = $(TCC) @TARGET_DEBUG@ +T.cc.sqlite = $(T.cc) @TARGET_DEBUG@ # # Define -D_HAVE_SQLITE_CONFIG_H so that the code knows it # can include the generated sqlite_cfg.h. # -TCC.sqlite += -D_HAVE_SQLITE_CONFIG_H -DBUILD_sqlite +T.cc.sqlite += -D_HAVE_SQLITE_CONFIG_H -DBUILD_sqlite # -# main.mk will fill out TCC.sqlite with some flags common to all builds. +# main.mk will fill out T.cc.sqlite with some flags common to all builds. #XX#CFLAGS.readline += -DHAVE_EDITLINE=@TARGET_HAVE_EDITLINE@ #XX#CFLAGS.readline += -DHAVE_LINENOISE=@TARGET_HAVE_LINENOISE@ @@ -129,7 +129,7 @@ TCC.sqlite += -D_HAVE_SQLITE_CONFIG_H -DBUILD_sqlite #XX# #XX## Should the database engine be compiled threadsafe #XX## -#XX#TCC += -DSQLITE_THREADSAFE=@SQLITE_THREADSAFE@ +#XX#T.cc += -DSQLITE_THREADSAFE=@SQLITE_THREADSAFE@ # # $(JIMSH) and $(CFLAGS.JIMSH) are documented in main.mk. @@ -138,10 +138,10 @@ CFLAGS.JIMSH = @CFLAGS_JIMSH@ JIMSH = $(TOP)/jimsh$(TEXE) # -# $(BTCLSH) is documented in main.mk. +# $(B.tclsh) is documented in main.mk. # -BTCLSH = @BTCLSH@ -$(BTCLSH): +B.tclsh = @BTCLSH@ +$(B.tclsh): # # $(CFLAGS.libsqlite3) is documented in main.mk. @@ -150,7 +150,7 @@ CFLAGS.libsqlite3 = $(CFLAGS) -DSQLITE_TEMP_STORE=@TEMP_STORE@ OPT_FEATURE_FLAGS = @OPT_FEATURE_FLAGS@ $(OPTIONS) -TCC += $(OPT_FEATURE_FLAGS) +T.cc += $(OPT_FEATURE_FLAGS) # # Add in any optional global compilation flags on the make commane @@ -158,7 +158,7 @@ TCC += $(OPT_FEATURE_FLAGS) # #XX# FIXME: rename one or the other of $(OPTS) and $(OPTIONS), as they #XX# serve different purposes. -TCC += $(OPTS) +T.cc += $(OPTS) # # Release (X.Y.Z) and version (X.Y) numbers for the SQLite being @@ -170,12 +170,12 @@ VERSION.XYZ = @VERSION_XYZ@ # # Filename extensions for binaries and libraries # -BEXE = @BUILD_EXEEXT@ -TEXE = @TARGET_EXEEXT@ -BDLL = @BUILD_DLLEXT@ -TDLL = @TARGET_DLLEXT@ -BLIB = @BUILD_LIBEXT@ -TLIB = @TARGET_LIBEXT@ +B.exe = @BUILD_EXEEXT@ +T.exe = @TARGET_EXEEXT@ +B.dll = @BUILD_DLLEXT@ +T.dll = @TARGET_DLLEXT@ +B.lib = @BUILD_LIBEXT@ +T.lib = @TARGET_LIBEXT@ # # $(HAVE_TCL) is 1 if the configure script was able to locate the @@ -231,8 +231,8 @@ TCLLIBDIR = @TCLLIBDIR@ CFLAGS.GCOV1 = -DSQLITE_COVERAGE_TEST=1 -fprofile-arcs -ftest-coverage LDFLAGS.GCOV1 = -lgcov USE_GCOV = @USE_GCOV@ -TCOMPILE.EXTRAS += $(CFLAGS.GCOV$(USE_GCOV)) -TLINK.EXTRAS += $(LDFLAGS.GCOV$(USE_GCOV)) +T.compile.extras += $(CFLAGS.GCOV$(USE_GCOV)) +T.link.extras += $(LDFLAGS.GCOV$(USE_GCOV)) # # Vars with the AS_ prefix are specifically related to AutoSetup. @@ -250,7 +250,7 @@ USE_AMALGAMATION ?= @USE_AMALGAMATION@ AMALGAMATION_GEN_FLAGS ?= --linemacros=@AMALGAMATION_LINE_MACROS@ # -# CFLAGS for sqlite3$(TEXE) +# CFLAGS for sqlite3$(T.exe) # SHELL_OPT ?= @OPT_SHELL@ @@ -323,7 +323,7 @@ distclean: distclean-autosetup # tool/version-info: a utility for emitting sqlite3 version info # in various forms. # -version-info$(TEXE): $(TOP)/tool/version-info.c Makefile sqlite3.h - $(TLINK) $(ST_OPT) -o $@ $(TOP)/tool/version-info.c +version-info$(T.exe): $(TOP)/tool/version-info.c Makefile sqlite3.h + $(T.link) $(ST_OPT) -o $@ $(TOP)/tool/version-info.c include $(TOP)/main.mk diff --git a/main.mk b/main.mk index 69ebeaa9bc..e8567d3694 100644 --- a/main.mk +++ b/main.mk @@ -31,55 +31,55 @@ TOP ?= $(PWD) # VERSION.XYZ ?= # -# $(BCC) = +# $(B.cc) = # # C Compiler and options for use in building executables that will run # on the platform that is doing the build. # -BCC ?= $(CC) +B.cc ?= $(CC) # -# $(TCC) = +# $(T.cc) = # # C Compiler and options for use in building executables that will run -# on the target platform. This is usually the same as BCC, unless you +# on the target platform. This is usually the same as B.cc, unless you # are cross-compiling. Note that it should only contain flags which # are used by _all_ build targets. Flags needed only by specific # targets are defined elsewhere and applied on a per-target basis. # -TCC ?= $(BCC) +T.cc ?= $(B.cc) # # $(AR) = # Tool used to build a static library from object files. # AR ?= ar # -# $(BEXE) = +# $(B.exe) = # # File extension for executables on the build platform. ".exe" for # Windows and "" everywhere else. # -BEXE ?= +B.exe ?= # -# $(BDLL) and $(BLIB) = +# $(B.dll) and $(B.lib) = # -# The DLL resp. static library counterparts of $(BEXE). +# The DLL resp. static library counterparts of $(B.exe). # -BDLL ?= .so -BLIB ?= .lib +B.dll ?= .so +B.lib ?= .lib # -# $(TEXE) = +# $(T.exe) = # # File extension for executables on the target platform. ".exe" for # Windows and "" everywhere else. # -TEXE ?= +T.exe ?= # -# $(TDLL) and $(TLIB) = +# $(T.dll) and $(T.lib) = # -# The DLL resp. static library counterparts of $(TEXE). +# The DLL resp. static library counterparts of $(T.exe). # -TDLL ?= .so -TLIB ?= .lib +T.dll ?= .so +T.lib ?= .lib # # $(TCLSH_CMD) = # @@ -99,16 +99,16 @@ TCLSH_CMD ?= tclsh # can be used as a shell command. # CFLAGS.JIMSH ?= -DHAVE_REALPATH -JIMSH ?= ./jimsh$(TEXE) +JIMSH ?= ./jimsh$(T.exe) # -# $(BTCLSH) = +# $(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 # it's JimTCL, it must be compiled with -DHAVE_REALPATH or # -DHAVE__FULLPATH. # -BTCLSH ?= $(JIMSH) +B.tclsh ?= $(JIMSH) # # $(LDFLAGS.{feature}) and $(CFLAGS.{feature}) = @@ -151,7 +151,7 @@ INSTALL ?= install # # $(ENABLE_SHARED) = # -# 1 if libsqlite3.$(TDLL) should be built. +# 1 if libsqlite3.$(T.dll) should be built. # ENABLE_SHARED ?= 1 # @@ -220,12 +220,12 @@ HAVE_WASI_SDK ?= 0 # CFLAGS.libsqlite3 ?= $(CFLAGS) # -# $(TCC.sqlite) is $(TCC) plus any flags which are desired for the +# $(T.cc.sqlite) is $(T.cc) plus any flags which are desired for the # library as a whole, but not necessarily needed for every binary. It # will normally get initially populated with flags by the # configure-generated makefile. # -TCC.sqlite ?= $(TCC) +T.cc.sqlite ?= $(T.cc) # # ... and many, many more. Sane defaults are selected where possible. # @@ -248,10 +248,10 @@ INSTALL.noexec = $(INSTALL) -m 0644 # ^^^ do not use GNU-specific flags to $(INSTALL), e.g. --mode=... # -# $(TCOMPILE) = generic target platform compiler invocation -# $(TCOMPILE.EXTRAS) = config-specific flags for $(TCOMPILE) +# $(T.compile) = generic target platform compiler invocation +# $(T.compile.extras) = config-specific flags for $(T.compile) # -TCOMPILE = $(TCC) $(TCOMPILE.EXTRAS) +T.compile = $(T.cc) $(T.compile.extras) # # $(CFLAGS.intree_includes) = -I... flags relevant specifically to @@ -262,31 +262,31 @@ CFLAGS.intree_includes = \ -I. -I$(TOP)/src -I$(TOP)/ext/rtree -I$(TOP)/ext/icu \ -I$(TOP)/ext/fts3 -I$(TOP)/ext/async -I$(TOP)/ext/session \ -I$(TOP)/ext/misc -I$(TOP)/ext/userauth -TCC.sqlite += $(CFLAGS.intree_includes) +T.cc.sqlite += $(CFLAGS.intree_includes) # -# $(TCC.extension) = compiler invocation for loadable extensions. +# $(T.cc.extension) = compiler invocation for loadable extensions. # -TCC.extension = $(TCOMPILE) -I. -I$(TOP)/src -DSQLITE_CORE +T.cc.extension = $(T.compile) -I. -I$(TOP)/src -DSQLITE_CORE # -# $(TLINK) = compiler invocation for when the target will be an +# $(T.link) = compiler invocation for when the target will be an # executable. # -# $(TLINK.EXTRAS) = optional config-specific flags for $(TLINK) +# $(T.link.extras) = optional config-specific flags for $(T.link) # -TLINK = $(TCC.sqlite) $(TLINK.EXTRAS) +T.link = $(T.cc.sqlite) $(T.link.extras) # -# $(TLINK.shared) = $(TLINK) invocation specifically for shared libraries +# $(T.link.shared) = $(T.link) invocation specifically for shared libraries # -TLINK.shared = $(TLINK) $(LDFLAGS.shobj) +T.link.shared = $(T.link) $(LDFLAGS.shobj) # # LDFLAGS.libsqlite3 should be used with any target which either # results in building libsqlite3.so, compiles sqlite3.c directly, or # links in either of $(LIBOBJSO) or $(LIBOBJS1). Note that these # flags are for the target build platform, not necessarily localhost. -# i.e. it should be used with $(TCC.sqlite) or $(TLINK) but not $(BCC). +# i.e. it should be used with $(T.cc.sqlite) or $(T.link) but not $(B.cc). # LDFLAGS.libsqlite3 = \ $(LDFLAGS.rpath) $(LDFLAGS.pthread) \ @@ -328,7 +328,7 @@ $(install-dir.all): # accepts only a single argument. # $(JIMSH): $(TOP)/autosetup/jimsh0.c - $(BCC) -o $@ $(CFLAGS.JIMSH) $(TOP)/autosetup/jimsh0.c + $(B.cc) -o $@ $(CFLAGS.JIMSH) $(TOP)/autosetup/jimsh0.c @if [ x = "x$$($(JIMSH) -e 'file normalize $(JIMSH)' 2>/dev/null)" ]; then \ echo "$(JIMSH) was built without -DHAVE_REALPATH or -DHAVE__FULLPATH." 1>&2; \ exit 1; \ @@ -356,10 +356,10 @@ $(MAKE_SANITY_CHECK): $(MAKEFILE_LIST) @if [ ! -d "$(TOP)" ]; then echo "$(TOP) is not a directory" 1>&2; exit 1; fi @if [ ! -f "$(TOP)/auto.def" ]; then echo "$(TOP) does not appear to be the top-most source dir" 1>&2; exit 1; fi @if [ x = "x$(VERSION.XYZ)" ]; then echo "VERSION.XYZ must be set to the library's X.Y.Z-format version number" 1>&2; exit 1; fi - @if [ x = "x$(BCC)" ]; then echo "Missing BCC var" 1>&2; exit 1; fi - @if [ x = "x$(TCC)" ]; then echo "Missing TCC var" 1>&2; exit 1; fi + @if [ x = "x$(B.cc)" ]; then echo "Missing B.cc var" 1>&2; exit 1; fi + @if [ x = "x$(T.cc)" ]; then echo "Missing T.cc var" 1>&2; exit 1; fi @if [ x = "x$(VERSION.XYZ)" ]; then echo "Missing VERSION.XYZ var" 1>&2; exit 1; fi - @if [ x = "x$(BTCLSH)" ]; then echo "Missing BTCLSH var" 1>&2; exit 1; fi + @if [ x = "x$(B.tclsh)" ]; then echo "Missing B.tclsh var" 1>&2; exit 1; fi touch $@ clean-sanity-check: rm -f $(MAKE_SANITY_CHECK) @@ -770,12 +770,12 @@ EXTHDR += \ # Executables needed for testing # TESTPROGS = \ - testfixture$(TEXE) \ - sqlite3$(TEXE) \ - sqlite3_analyzer$(TEXE) \ - sqldiff$(TEXE) \ - dbhash$(TEXE) \ - sqltclsh$(TEXE) + testfixture$(T.exe) \ + sqlite3$(T.exe) \ + sqlite3_analyzer$(T.exe) \ + sqldiff$(T.exe) \ + dbhash$(T.exe) \ + sqltclsh$(T.exe) # Databases containing fuzzer test cases # @@ -877,49 +877,49 @@ has_tclconfig: # all that automatic generation. # .target_source: $(MAKE_SANITY_CHECK) $(SRC) $(TOP)/tool/vdbe-compress.tcl \ - fts5.c $(BTCLSH) # has_tclsh84 + fts5.c $(B.tclsh) # has_tclsh84 rm -rf tsrc mkdir tsrc cp -f $(SRC) tsrc rm tsrc/sqlite.h.in tsrc/parse.y - $(BTCLSH) $(TOP)/tool/vdbe-compress.tcl $(OPTS) vdbe.new + $(B.tclsh) $(TOP)/tool/vdbe-compress.tcl $(OPTS) vdbe.new mv vdbe.new tsrc/vdbe.c cp fts5.c fts5.h tsrc touch .target_source -libsqlite3.LIB = libsqlite3$(TLIB) -libsqlite3.SO = libsqlite3$(TDLL) +libsqlite3.LIB = libsqlite3$(T.lib) +libsqlite3.SO = libsqlite3$(T.dll) # Rules to build the LEMON compiler generator # -lemon$(BEXE): $(MAKE_SANITY_CHECK) $(TOP)/tool/lemon.c $(TOP)/tool/lempar.c - $(BCC) -o $@ $(TOP)/tool/lemon.c +lemon$(B.exe): $(MAKE_SANITY_CHECK) $(TOP)/tool/lemon.c $(TOP)/tool/lempar.c + $(B.cc) -o $@ $(TOP)/tool/lemon.c cp $(TOP)/tool/lempar.c . # Rules to build the program that generates the source-id # -mksourceid$(BEXE): $(MAKE_SANITY_CHECK) $(TOP)/tool/mksourceid.c - $(BCC) -o $@ $(TOP)/tool/mksourceid.c +mksourceid$(B.exe): $(MAKE_SANITY_CHECK) $(TOP)/tool/mksourceid.c + $(B.cc) -o $@ $(TOP)/tool/mksourceid.c sqlite3.h: $(MAKE_SANITY_CHECK) $(TOP)/src/sqlite.h.in \ - $(TOP)/manifest mksourceid$(BEXE) \ - $(TOP)/VERSION $(BTCLSH) # has_tclsh84 - $(BTCLSH) $(TOP)/tool/mksqlite3h.tcl $(TOP) >sqlite3.h + $(TOP)/manifest mksourceid$(B.exe) \ + $(TOP)/VERSION $(B.tclsh) # has_tclsh84 + $(B.tclsh) $(TOP)/tool/mksqlite3h.tcl $(TOP) >sqlite3.h sqlite3.c: .target_source sqlite3.h $(TOP)/tool/mksqlite3c.tcl src-verify \ - $(BTCLSH) # has_tclsh84 - $(BTCLSH) $(TOP)/tool/mksqlite3c.tcl $(AMALGAMATION_GEN_FLAGS) $(EXTRA_SRC) + $(B.tclsh) # has_tclsh84 + $(B.tclsh) $(TOP)/tool/mksqlite3c.tcl $(AMALGAMATION_GEN_FLAGS) $(EXTRA_SRC) cp tsrc/sqlite3ext.h . cp $(TOP)/ext/session/sqlite3session.h . -sqlite3r.h: sqlite3.h $(BTCLSH) # has_tclsh84 - $(BTCLSH) $(TOP)/tool/mksqlite3h.tcl $(TOP) --enable-recover >sqlite3r.h +sqlite3r.h: sqlite3.h $(B.tclsh) # has_tclsh84 + $(B.tclsh) $(TOP)/tool/mksqlite3h.tcl $(TOP) --enable-recover >sqlite3r.h -sqlite3r.c: sqlite3.c sqlite3r.h $(BTCLSH) # has_tclsh84 +sqlite3r.c: sqlite3.c sqlite3r.h $(B.tclsh) # has_tclsh84 cp $(TOP)/ext/recover/sqlite3recover.c tsrc/ cp $(TOP)/ext/recover/sqlite3recover.h tsrc/ cp $(TOP)/ext/recover/dbdata.c tsrc/ - $(BTCLSH) $(TOP)/tool/mksqlite3c.tcl --enable-recover $(AMALGAMATION_GEN_FLAGS) $(EXTRA_SRC) + $(B.tclsh) $(TOP)/tool/mksqlite3c.tcl --enable-recover $(AMALGAMATION_GEN_FLAGS) $(EXTRA_SRC) sqlite3ext.h: .target_source cp tsrc/sqlite3ext.h . @@ -932,303 +932,303 @@ sqlite3ext.h: .target_source # DEPS_OBJ_COMMON = $(MAKE_SANITY_CHECK) $(HDR) parse.o: parse.c $(DEPS_OBJ_COMMON) - $(TCC.sqlite) $(CFLAGS.libsqlite3) -c parse.c + $(T.cc.sqlite) $(CFLAGS.libsqlite3) -c parse.c opcodes.o: opcodes.c - $(TCC.sqlite) $(CFLAGS.libsqlite3) -c opcodes.c + $(T.cc.sqlite) $(CFLAGS.libsqlite3) -c opcodes.c # Rules to build individual *.o files from files in the src directory. # alter.o: $(TOP)/src/alter.c $(DEPS_OBJ_COMMON) - $(TCC.sqlite) $(CFLAGS.libsqlite3) -c $(TOP)/src/alter.c + $(T.cc.sqlite) $(CFLAGS.libsqlite3) -c $(TOP)/src/alter.c analyze.o: $(TOP)/src/analyze.c $(DEPS_OBJ_COMMON) - $(TCC.sqlite) $(CFLAGS.libsqlite3) -c $(TOP)/src/analyze.c + $(T.cc.sqlite) $(CFLAGS.libsqlite3) -c $(TOP)/src/analyze.c attach.o: $(TOP)/src/attach.c $(DEPS_OBJ_COMMON) - $(TCC.sqlite) $(CFLAGS.libsqlite3) -c $(TOP)/src/attach.c + $(T.cc.sqlite) $(CFLAGS.libsqlite3) -c $(TOP)/src/attach.c auth.o: $(TOP)/src/auth.c $(DEPS_OBJ_COMMON) - $(TCC.sqlite) $(CFLAGS.libsqlite3) -c $(TOP)/src/auth.c + $(T.cc.sqlite) $(CFLAGS.libsqlite3) -c $(TOP)/src/auth.c backup.o: $(TOP)/src/backup.c $(DEPS_OBJ_COMMON) - $(TCC.sqlite) $(CFLAGS.libsqlite3) -c $(TOP)/src/backup.c + $(T.cc.sqlite) $(CFLAGS.libsqlite3) -c $(TOP)/src/backup.c bitvec.o: $(TOP)/src/bitvec.c $(DEPS_OBJ_COMMON) - $(TCC.sqlite) $(CFLAGS.libsqlite3) -c $(TOP)/src/bitvec.c + $(T.cc.sqlite) $(CFLAGS.libsqlite3) -c $(TOP)/src/bitvec.c btmutex.o: $(TOP)/src/btmutex.c $(DEPS_OBJ_COMMON) - $(TCC.sqlite) $(CFLAGS.libsqlite3) -c $(TOP)/src/btmutex.c + $(T.cc.sqlite) $(CFLAGS.libsqlite3) -c $(TOP)/src/btmutex.c btree.o: $(TOP)/src/btree.c $(DEPS_OBJ_COMMON) $(TOP)/src/pager.h - $(TCC.sqlite) $(CFLAGS.libsqlite3) -c $(TOP)/src/btree.c + $(T.cc.sqlite) $(CFLAGS.libsqlite3) -c $(TOP)/src/btree.c build.o: $(TOP)/src/build.c $(DEPS_OBJ_COMMON) - $(TCC.sqlite) $(CFLAGS.libsqlite3) -c $(TOP)/src/build.c + $(T.cc.sqlite) $(CFLAGS.libsqlite3) -c $(TOP)/src/build.c callback.o: $(TOP)/src/callback.c $(DEPS_OBJ_COMMON) - $(TCC.sqlite) $(CFLAGS.libsqlite3) -c $(TOP)/src/callback.c + $(T.cc.sqlite) $(CFLAGS.libsqlite3) -c $(TOP)/src/callback.c complete.o: $(TOP)/src/complete.c $(DEPS_OBJ_COMMON) - $(TCC.sqlite) $(CFLAGS.libsqlite3) -c $(TOP)/src/complete.c + $(T.cc.sqlite) $(CFLAGS.libsqlite3) -c $(TOP)/src/complete.c ctime.o: $(TOP)/src/ctime.c $(DEPS_OBJ_COMMON) - $(TCC.sqlite) $(CFLAGS.libsqlite3) -c $(TOP)/src/ctime.c + $(T.cc.sqlite) $(CFLAGS.libsqlite3) -c $(TOP)/src/ctime.c date.o: $(TOP)/src/date.c $(DEPS_OBJ_COMMON) - $(TCC.sqlite) $(CFLAGS.libsqlite3) -c $(TOP)/src/date.c + $(T.cc.sqlite) $(CFLAGS.libsqlite3) -c $(TOP)/src/date.c dbpage.o: $(TOP)/src/dbpage.c $(DEPS_OBJ_COMMON) - $(TCC.sqlite) $(CFLAGS.libsqlite3) -c $(TOP)/src/dbpage.c + $(T.cc.sqlite) $(CFLAGS.libsqlite3) -c $(TOP)/src/dbpage.c dbstat.o: $(TOP)/src/dbstat.c $(DEPS_OBJ_COMMON) - $(TCC.sqlite) $(CFLAGS.libsqlite3) -c $(TOP)/src/dbstat.c + $(T.cc.sqlite) $(CFLAGS.libsqlite3) -c $(TOP)/src/dbstat.c delete.o: $(TOP)/src/delete.c $(DEPS_OBJ_COMMON) - $(TCC.sqlite) $(CFLAGS.libsqlite3) -c $(TOP)/src/delete.c + $(T.cc.sqlite) $(CFLAGS.libsqlite3) -c $(TOP)/src/delete.c expr.o: $(TOP)/src/expr.c $(DEPS_OBJ_COMMON) - $(TCC.sqlite) $(CFLAGS.libsqlite3) -c $(TOP)/src/expr.c + $(T.cc.sqlite) $(CFLAGS.libsqlite3) -c $(TOP)/src/expr.c fault.o: $(TOP)/src/fault.c $(DEPS_OBJ_COMMON) - $(TCC.sqlite) $(CFLAGS.libsqlite3) -c $(TOP)/src/fault.c + $(T.cc.sqlite) $(CFLAGS.libsqlite3) -c $(TOP)/src/fault.c fkey.o: $(TOP)/src/fkey.c $(DEPS_OBJ_COMMON) - $(TCC.sqlite) $(CFLAGS.libsqlite3) -c $(TOP)/src/fkey.c + $(T.cc.sqlite) $(CFLAGS.libsqlite3) -c $(TOP)/src/fkey.c func.o: $(TOP)/src/func.c $(DEPS_OBJ_COMMON) - $(TCC.sqlite) $(CFLAGS.libsqlite3) -c $(TOP)/src/func.c + $(T.cc.sqlite) $(CFLAGS.libsqlite3) -c $(TOP)/src/func.c global.o: $(TOP)/src/global.c $(DEPS_OBJ_COMMON) - $(TCC.sqlite) $(CFLAGS.libsqlite3) -c $(TOP)/src/global.c + $(T.cc.sqlite) $(CFLAGS.libsqlite3) -c $(TOP)/src/global.c hash.o: $(TOP)/src/hash.c $(DEPS_OBJ_COMMON) - $(TCC.sqlite) $(CFLAGS.libsqlite3) -c $(TOP)/src/hash.c + $(T.cc.sqlite) $(CFLAGS.libsqlite3) -c $(TOP)/src/hash.c insert.o: $(TOP)/src/insert.c $(DEPS_OBJ_COMMON) - $(TCC.sqlite) $(CFLAGS.libsqlite3) -c $(TOP)/src/insert.c + $(T.cc.sqlite) $(CFLAGS.libsqlite3) -c $(TOP)/src/insert.c json.o: $(TOP)/src/json.c $(DEPS_OBJ_COMMON) - $(TCC.sqlite) $(CFLAGS.libsqlite3) -c $(TOP)/src/json.c + $(T.cc.sqlite) $(CFLAGS.libsqlite3) -c $(TOP)/src/json.c legacy.o: $(TOP)/src/legacy.c $(DEPS_OBJ_COMMON) - $(TCC.sqlite) $(CFLAGS.libsqlite3) -c $(TOP)/src/legacy.c + $(T.cc.sqlite) $(CFLAGS.libsqlite3) -c $(TOP)/src/legacy.c loadext.o: $(TOP)/src/loadext.c $(DEPS_OBJ_COMMON) - $(TCC.sqlite) $(CFLAGS.libsqlite3) -c $(TOP)/src/loadext.c + $(T.cc.sqlite) $(CFLAGS.libsqlite3) -c $(TOP)/src/loadext.c main.o: $(TOP)/src/main.c $(DEPS_OBJ_COMMON) - $(TCC.sqlite) $(CFLAGS.libsqlite3) -c $(TOP)/src/main.c + $(T.cc.sqlite) $(CFLAGS.libsqlite3) -c $(TOP)/src/main.c malloc.o: $(TOP)/src/malloc.c $(DEPS_OBJ_COMMON) - $(TCC.sqlite) $(CFLAGS.libsqlite3) -c $(TOP)/src/malloc.c + $(T.cc.sqlite) $(CFLAGS.libsqlite3) -c $(TOP)/src/malloc.c mem0.o: $(TOP)/src/mem0.c $(DEPS_OBJ_COMMON) - $(TCC.sqlite) $(CFLAGS.libsqlite3) -c $(TOP)/src/mem0.c + $(T.cc.sqlite) $(CFLAGS.libsqlite3) -c $(TOP)/src/mem0.c mem1.o: $(TOP)/src/mem1.c $(DEPS_OBJ_COMMON) - $(TCC.sqlite) $(CFLAGS.libsqlite3) -c $(TOP)/src/mem1.c + $(T.cc.sqlite) $(CFLAGS.libsqlite3) -c $(TOP)/src/mem1.c mem2.o: $(TOP)/src/mem2.c $(DEPS_OBJ_COMMON) - $(TCC.sqlite) $(CFLAGS.libsqlite3) -c $(TOP)/src/mem2.c + $(T.cc.sqlite) $(CFLAGS.libsqlite3) -c $(TOP)/src/mem2.c mem3.o: $(TOP)/src/mem3.c $(DEPS_OBJ_COMMON) - $(TCC.sqlite) $(CFLAGS.libsqlite3) -c $(TOP)/src/mem3.c + $(T.cc.sqlite) $(CFLAGS.libsqlite3) -c $(TOP)/src/mem3.c mem5.o: $(TOP)/src/mem5.c $(DEPS_OBJ_COMMON) - $(TCC.sqlite) $(CFLAGS.libsqlite3) -c $(TOP)/src/mem5.c + $(T.cc.sqlite) $(CFLAGS.libsqlite3) -c $(TOP)/src/mem5.c memdb.o: $(TOP)/src/memdb.c $(DEPS_OBJ_COMMON) - $(TCC.sqlite) $(CFLAGS.libsqlite3) -c $(TOP)/src/memdb.c + $(T.cc.sqlite) $(CFLAGS.libsqlite3) -c $(TOP)/src/memdb.c memjournal.o: $(TOP)/src/memjournal.c $(DEPS_OBJ_COMMON) - $(TCC.sqlite) $(CFLAGS.libsqlite3) -c $(TOP)/src/memjournal.c + $(T.cc.sqlite) $(CFLAGS.libsqlite3) -c $(TOP)/src/memjournal.c mutex.o: $(TOP)/src/mutex.c $(DEPS_OBJ_COMMON) - $(TCC.sqlite) $(CFLAGS.libsqlite3) -c $(TOP)/src/mutex.c + $(T.cc.sqlite) $(CFLAGS.libsqlite3) -c $(TOP)/src/mutex.c mutex_noop.o: $(TOP)/src/mutex_noop.c $(DEPS_OBJ_COMMON) - $(TCC.sqlite) $(CFLAGS.libsqlite3) -c $(TOP)/src/mutex_noop.c + $(T.cc.sqlite) $(CFLAGS.libsqlite3) -c $(TOP)/src/mutex_noop.c mutex_unix.o: $(TOP)/src/mutex_unix.c $(DEPS_OBJ_COMMON) - $(TCC.sqlite) $(CFLAGS.libsqlite3) -c $(TOP)/src/mutex_unix.c + $(T.cc.sqlite) $(CFLAGS.libsqlite3) -c $(TOP)/src/mutex_unix.c mutex_w32.o: $(TOP)/src/mutex_w32.c $(DEPS_OBJ_COMMON) - $(TCC.sqlite) $(CFLAGS.libsqlite3) -c $(TOP)/src/mutex_w32.c + $(T.cc.sqlite) $(CFLAGS.libsqlite3) -c $(TOP)/src/mutex_w32.c notify.o: $(TOP)/src/notify.c $(DEPS_OBJ_COMMON) - $(TCC.sqlite) $(CFLAGS.libsqlite3) -c $(TOP)/src/notify.c + $(T.cc.sqlite) $(CFLAGS.libsqlite3) -c $(TOP)/src/notify.c pager.o: $(TOP)/src/pager.c $(DEPS_OBJ_COMMON) $(TOP)/src/pager.h - $(TCC.sqlite) $(CFLAGS.libsqlite3) -c $(TOP)/src/pager.c + $(T.cc.sqlite) $(CFLAGS.libsqlite3) -c $(TOP)/src/pager.c pcache.o: $(TOP)/src/pcache.c $(DEPS_OBJ_COMMON) $(TOP)/src/pcache.h - $(TCC.sqlite) $(CFLAGS.libsqlite3) -c $(TOP)/src/pcache.c + $(T.cc.sqlite) $(CFLAGS.libsqlite3) -c $(TOP)/src/pcache.c pcache1.o: $(TOP)/src/pcache1.c $(DEPS_OBJ_COMMON) $(TOP)/src/pcache.h - $(TCC.sqlite) $(CFLAGS.libsqlite3) -c $(TOP)/src/pcache1.c + $(T.cc.sqlite) $(CFLAGS.libsqlite3) -c $(TOP)/src/pcache1.c os.o: $(TOP)/src/os.c $(DEPS_OBJ_COMMON) - $(TCC.sqlite) $(CFLAGS.libsqlite3) -c $(TOP)/src/os.c + $(T.cc.sqlite) $(CFLAGS.libsqlite3) -c $(TOP)/src/os.c os_kv.o: $(TOP)/src/os_kv.c $(DEPS_OBJ_COMMON) - $(TCC.sqlite) $(CFLAGS.libsqlite3) -c $(TOP)/src/os_kv.c + $(T.cc.sqlite) $(CFLAGS.libsqlite3) -c $(TOP)/src/os_kv.c os_unix.o: $(TOP)/src/os_unix.c $(DEPS_OBJ_COMMON) - $(TCC.sqlite) $(CFLAGS.libsqlite3) -c $(TOP)/src/os_unix.c + $(T.cc.sqlite) $(CFLAGS.libsqlite3) -c $(TOP)/src/os_unix.c os_win.o: $(TOP)/src/os_win.c $(DEPS_OBJ_COMMON) - $(TCC.sqlite) $(CFLAGS.libsqlite3) -c $(TOP)/src/os_win.c + $(T.cc.sqlite) $(CFLAGS.libsqlite3) -c $(TOP)/src/os_win.c pragma.o: $(TOP)/src/pragma.c $(DEPS_OBJ_COMMON) - $(TCC.sqlite) $(CFLAGS.libsqlite3) -c $(TOP)/src/pragma.c + $(T.cc.sqlite) $(CFLAGS.libsqlite3) -c $(TOP)/src/pragma.c prepare.o: $(TOP)/src/prepare.c $(DEPS_OBJ_COMMON) - $(TCC.sqlite) $(CFLAGS.libsqlite3) -c $(TOP)/src/prepare.c + $(T.cc.sqlite) $(CFLAGS.libsqlite3) -c $(TOP)/src/prepare.c printf.o: $(TOP)/src/printf.c $(DEPS_OBJ_COMMON) - $(TCC.sqlite) $(CFLAGS.libsqlite3) -c $(TOP)/src/printf.c + $(T.cc.sqlite) $(CFLAGS.libsqlite3) -c $(TOP)/src/printf.c random.o: $(TOP)/src/random.c $(DEPS_OBJ_COMMON) - $(TCC.sqlite) $(CFLAGS.libsqlite3) -c $(TOP)/src/random.c + $(T.cc.sqlite) $(CFLAGS.libsqlite3) -c $(TOP)/src/random.c resolve.o: $(TOP)/src/resolve.c $(DEPS_OBJ_COMMON) - $(TCC.sqlite) $(CFLAGS.libsqlite3) -c $(TOP)/src/resolve.c + $(T.cc.sqlite) $(CFLAGS.libsqlite3) -c $(TOP)/src/resolve.c rowset.o: $(TOP)/src/rowset.c $(DEPS_OBJ_COMMON) - $(TCC.sqlite) $(CFLAGS.libsqlite3) -c $(TOP)/src/rowset.c + $(T.cc.sqlite) $(CFLAGS.libsqlite3) -c $(TOP)/src/rowset.c select.o: $(TOP)/src/select.c $(DEPS_OBJ_COMMON) - $(TCC.sqlite) $(CFLAGS.libsqlite3) -c $(TOP)/src/select.c + $(T.cc.sqlite) $(CFLAGS.libsqlite3) -c $(TOP)/src/select.c status.o: $(TOP)/src/status.c $(DEPS_OBJ_COMMON) - $(TCC.sqlite) $(CFLAGS.libsqlite3) -c $(TOP)/src/status.c + $(T.cc.sqlite) $(CFLAGS.libsqlite3) -c $(TOP)/src/status.c sqlite3.o: sqlite3.h sqlite3.c - $(TCC.sqlite) $(CFLAGS.libsqlite3) -c sqlite3.c + $(T.cc.sqlite) $(CFLAGS.libsqlite3) -c sqlite3.c table.o: $(TOP)/src/table.c $(DEPS_OBJ_COMMON) - $(TCC.sqlite) $(CFLAGS.libsqlite3) -c $(TOP)/src/table.c + $(T.cc.sqlite) $(CFLAGS.libsqlite3) -c $(TOP)/src/table.c threads.o: $(TOP)/src/threads.c $(DEPS_OBJ_COMMON) - $(TCC.sqlite) $(CFLAGS.libsqlite3) -c $(TOP)/src/threads.c + $(T.cc.sqlite) $(CFLAGS.libsqlite3) -c $(TOP)/src/threads.c tokenize.o: $(TOP)/src/tokenize.c keywordhash.h $(DEPS_OBJ_COMMON) - $(TCC.sqlite) $(CFLAGS.libsqlite3) -c $(TOP)/src/tokenize.c + $(T.cc.sqlite) $(CFLAGS.libsqlite3) -c $(TOP)/src/tokenize.c treeview.o: $(TOP)/src/treeview.c $(DEPS_OBJ_COMMON) - $(TCC.sqlite) $(CFLAGS.libsqlite3) -c $(TOP)/src/treeview.c + $(T.cc.sqlite) $(CFLAGS.libsqlite3) -c $(TOP)/src/treeview.c trigger.o: $(TOP)/src/trigger.c $(DEPS_OBJ_COMMON) - $(TCC.sqlite) $(CFLAGS.libsqlite3) -c $(TOP)/src/trigger.c + $(T.cc.sqlite) $(CFLAGS.libsqlite3) -c $(TOP)/src/trigger.c update.o: $(TOP)/src/update.c $(DEPS_OBJ_COMMON) - $(TCC.sqlite) $(CFLAGS.libsqlite3) -c $(TOP)/src/update.c + $(T.cc.sqlite) $(CFLAGS.libsqlite3) -c $(TOP)/src/update.c upsert.o: $(TOP)/src/upsert.c $(DEPS_OBJ_COMMON) - $(TCC.sqlite) $(CFLAGS.libsqlite3) -c $(TOP)/src/upsert.c + $(T.cc.sqlite) $(CFLAGS.libsqlite3) -c $(TOP)/src/upsert.c utf.o: $(TOP)/src/utf.c $(DEPS_OBJ_COMMON) - $(TCC.sqlite) $(CFLAGS.libsqlite3) -c $(TOP)/src/utf.c + $(T.cc.sqlite) $(CFLAGS.libsqlite3) -c $(TOP)/src/utf.c util.o: $(TOP)/src/util.c $(DEPS_OBJ_COMMON) - $(TCC.sqlite) $(CFLAGS.libsqlite3) -c $(TOP)/src/util.c + $(T.cc.sqlite) $(CFLAGS.libsqlite3) -c $(TOP)/src/util.c vacuum.o: $(TOP)/src/vacuum.c $(DEPS_OBJ_COMMON) - $(TCC.sqlite) $(CFLAGS.libsqlite3) -c $(TOP)/src/vacuum.c + $(T.cc.sqlite) $(CFLAGS.libsqlite3) -c $(TOP)/src/vacuum.c vdbe.o: $(TOP)/src/vdbe.c $(DEPS_OBJ_COMMON) - $(TCC.sqlite) $(CFLAGS.libsqlite3) -c $(TOP)/src/vdbe.c + $(T.cc.sqlite) $(CFLAGS.libsqlite3) -c $(TOP)/src/vdbe.c vdbeapi.o: $(TOP)/src/vdbeapi.c $(DEPS_OBJ_COMMON) - $(TCC.sqlite) $(CFLAGS.libsqlite3) -c $(TOP)/src/vdbeapi.c + $(T.cc.sqlite) $(CFLAGS.libsqlite3) -c $(TOP)/src/vdbeapi.c vdbeaux.o: $(TOP)/src/vdbeaux.c $(DEPS_OBJ_COMMON) - $(TCC.sqlite) $(CFLAGS.libsqlite3) -c $(TOP)/src/vdbeaux.c + $(T.cc.sqlite) $(CFLAGS.libsqlite3) -c $(TOP)/src/vdbeaux.c vdbeblob.o: $(TOP)/src/vdbeblob.c $(DEPS_OBJ_COMMON) - $(TCC.sqlite) $(CFLAGS.libsqlite3) -c $(TOP)/src/vdbeblob.c + $(T.cc.sqlite) $(CFLAGS.libsqlite3) -c $(TOP)/src/vdbeblob.c vdbemem.o: $(TOP)/src/vdbemem.c $(DEPS_OBJ_COMMON) - $(TCC.sqlite) $(CFLAGS.libsqlite3) -c $(TOP)/src/vdbemem.c + $(T.cc.sqlite) $(CFLAGS.libsqlite3) -c $(TOP)/src/vdbemem.c vdbesort.o: $(TOP)/src/vdbesort.c $(DEPS_OBJ_COMMON) - $(TCC.sqlite) $(CFLAGS.libsqlite3) -c $(TOP)/src/vdbesort.c + $(T.cc.sqlite) $(CFLAGS.libsqlite3) -c $(TOP)/src/vdbesort.c vdbetrace.o: $(TOP)/src/vdbetrace.c $(DEPS_OBJ_COMMON) - $(TCC.sqlite) $(CFLAGS.libsqlite3) -c $(TOP)/src/vdbetrace.c + $(T.cc.sqlite) $(CFLAGS.libsqlite3) -c $(TOP)/src/vdbetrace.c vdbevtab.o: $(TOP)/src/vdbevtab.c $(DEPS_OBJ_COMMON) - $(TCC.sqlite) $(CFLAGS.libsqlite3) -c $(TOP)/src/vdbevtab.c + $(T.cc.sqlite) $(CFLAGS.libsqlite3) -c $(TOP)/src/vdbevtab.c vtab.o: $(TOP)/src/vtab.c $(DEPS_OBJ_COMMON) - $(TCC.sqlite) $(CFLAGS.libsqlite3) -c $(TOP)/src/vtab.c + $(T.cc.sqlite) $(CFLAGS.libsqlite3) -c $(TOP)/src/vtab.c wal.o: $(TOP)/src/wal.c $(DEPS_OBJ_COMMON) - $(TCC.sqlite) $(CFLAGS.libsqlite3) -c $(TOP)/src/wal.c + $(T.cc.sqlite) $(CFLAGS.libsqlite3) -c $(TOP)/src/wal.c walker.o: $(TOP)/src/walker.c $(DEPS_OBJ_COMMON) - $(TCC.sqlite) $(CFLAGS.libsqlite3) -c $(TOP)/src/walker.c + $(T.cc.sqlite) $(CFLAGS.libsqlite3) -c $(TOP)/src/walker.c where.o: $(TOP)/src/where.c $(DEPS_OBJ_COMMON) - $(TCC.sqlite) $(CFLAGS.libsqlite3) -c $(TOP)/src/where.c + $(T.cc.sqlite) $(CFLAGS.libsqlite3) -c $(TOP)/src/where.c wherecode.o: $(TOP)/src/wherecode.c $(DEPS_OBJ_COMMON) - $(TCC.sqlite) $(CFLAGS.libsqlite3) -c $(TOP)/src/wherecode.c + $(T.cc.sqlite) $(CFLAGS.libsqlite3) -c $(TOP)/src/wherecode.c whereexpr.o: $(TOP)/src/whereexpr.c $(DEPS_OBJ_COMMON) - $(TCC.sqlite) $(CFLAGS.libsqlite3) -c $(TOP)/src/whereexpr.c + $(T.cc.sqlite) $(CFLAGS.libsqlite3) -c $(TOP)/src/whereexpr.c window.o: $(TOP)/src/window.c $(DEPS_OBJ_COMMON) - $(TCC.sqlite) $(CFLAGS.libsqlite3) -c $(TOP)/src/window.c + $(T.cc.sqlite) $(CFLAGS.libsqlite3) -c $(TOP)/src/window.c tclsqlite.o: $(TOP)/src/tclsqlite.c $(DEPS_OBJ_COMMON) - $(TCOMPILE) -DUSE_TCL_STUBS=1 $(TCL_INCLUDE_SPEC) $(CFLAGS.intree_includes) \ + $(T.compile) -DUSE_TCL_STUBS=1 $(TCL_INCLUDE_SPEC) $(CFLAGS.intree_includes) \ -c $(TOP)/src/tclsqlite.c tclsqlite-shell.o: $(TOP)/src/tclsqlite.c $(DEPS_OBJ_COMMON) - $(TCOMPILE) -DTCLSH -o $@ -c $(TOP)/src/tclsqlite.c $(TCL_INCLUDE_SPEC) + $(T.compile) -DTCLSH -o $@ -c $(TOP)/src/tclsqlite.c $(TCL_INCLUDE_SPEC) tclsqlite-stubs.o: $(TOP)/src/tclsqlite.c $(DEPS_OBJ_COMMON) - $(TCOMPILE) -DUSE_TCL_STUBS=1 -o $@ -c $(TOP)/src/tclsqlite.c $(TCL_INCLUDE_SPEC) + $(T.compile) -DUSE_TCL_STUBS=1 -o $@ -c $(TOP)/src/tclsqlite.c $(TCL_INCLUDE_SPEC) -tclsqlite3$(TEXE): has_tclconfig tclsqlite-shell.o $(libsqlite3.LIB) - $(TLINK) -o $@ tclsqlite-shell.o \ +tclsqlite3$(T.exe): has_tclconfig tclsqlite-shell.o $(libsqlite3.LIB) + $(T.link) -o $@ tclsqlite-shell.o \ $(libsqlite3.LIB) $(TCL_INCLUDE_SPEC) $(TCL_LIB_SPEC) $(LDFLAGS.libsqlite3) # Rules to build opcodes.c and opcodes.h # -opcodes.c: opcodes.h $(TOP)/tool/mkopcodec.tcl $(BTCLSH) # has_tclsh84 - $(BTCLSH) $(TOP)/tool/mkopcodec.tcl opcodes.h >opcodes.c +opcodes.c: opcodes.h $(TOP)/tool/mkopcodec.tcl $(B.tclsh) # has_tclsh84 + $(B.tclsh) $(TOP)/tool/mkopcodec.tcl opcodes.h >opcodes.c opcodes.h: parse.h $(TOP)/src/vdbe.c \ - $(TOP)/tool/mkopcodeh.tcl $(BTCLSH) # has_tclsh84 - cat parse.h $(TOP)/src/vdbe.c | $(BTCLSH) $(TOP)/tool/mkopcodeh.tcl >opcodes.h + $(TOP)/tool/mkopcodeh.tcl $(B.tclsh) # has_tclsh84 + cat parse.h $(TOP)/src/vdbe.c | $(B.tclsh) $(TOP)/tool/mkopcodeh.tcl >opcodes.h # Rules to build parse.c and parse.h - the outputs of lemon. # parse.h: parse.c -parse.c: $(TOP)/src/parse.y lemon$(BEXE) +parse.c: $(TOP)/src/parse.y lemon$(B.exe) cp $(TOP)/src/parse.y . - ./lemon$(BEXE) $(OPT_FEATURE_FLAGS) $(OPTS) -S parse.y + ./lemon$(B.exe) $(OPT_FEATURE_FLAGS) $(OPTS) -S parse.y -sqlite3rc.h: $(TOP)/src/sqlite3.rc $(TOP)/VERSION $(BTCLSH) # has_tclsh84 +sqlite3rc.h: $(TOP)/src/sqlite3.rc $(TOP)/VERSION $(B.tclsh) # has_tclsh84 echo '#ifndef SQLITE_RESOURCE_VERSION' >$@ echo -n '#define SQLITE_RESOURCE_VERSION ' >>$@ - cat $(TOP)/VERSION | $(BTCLSH) $(TOP)/tool/replace.tcl exact . , >>$@ + cat $(TOP)/VERSION | $(B.tclsh) $(TOP)/tool/replace.tcl exact . , >>$@ echo '#endif' >>sqlite3rc.h -mkkeywordhash$(BEXE): $(TOP)/tool/mkkeywordhash.c - $(BCC) -o $@ $(OPT_FEATURE_FLAGS) $(OPTS) $(TOP)/tool/mkkeywordhash.c -keywordhash.h: mkkeywordhash$(BEXE) - ./mkkeywordhash$(BEXE) > $@ +mkkeywordhash$(B.exe): $(TOP)/tool/mkkeywordhash.c + $(B.cc) -o $@ $(OPT_FEATURE_FLAGS) $(OPTS) $(TOP)/tool/mkkeywordhash.c +keywordhash.h: mkkeywordhash$(B.exe) + ./mkkeywordhash$(B.exe) > $@ # # sqlite3.c split into many smaller files. # -sqlite3-all.c: sqlite3.c $(TOP)/tool/split-sqlite3c.tcl $(BTCLSH) # has_tclsh84 - $(BTCLSH) $(TOP)/tool/split-sqlite3c.tcl +sqlite3-all.c: sqlite3.c $(TOP)/tool/split-sqlite3c.tcl $(B.tclsh) # has_tclsh84 + $(B.tclsh) $(TOP)/tool/split-sqlite3c.tcl # # Static libsqlite3 @@ -1242,7 +1242,7 @@ all: lib # Dynamic libsqlite3 # $(libsqlite3.SO): $(LIBOBJ) - $(TLINK.shared) -o $@ $(LIBOBJ) $(LDFLAGS.libsqlite3) + $(T.link.shared) -o $@ $(LIBOBJ) $(LDFLAGS.libsqlite3) $(libsqlite3.SO)-1: $(libsqlite3.SO) $(libsqlite3.SO)-0 $(libsqlite3.SO)-: so: $(libsqlite3.SO)-$(ENABLE_SHARED) @@ -1289,9 +1289,9 @@ install: install-includes # pkgIndex.tcl: echo 'package ifneeded sqlite3 $(VERSION.XYZ) [list load [file join $$dir libtclsqlite3[info sharedlibextension]] sqlite3]' > $@ -libtclsqlite3.SO = libtclsqlite3$(TDLL) +libtclsqlite3.SO = libtclsqlite3$(T.dll) $(libtclsqlite3.SO): tclsqlite.o $(libsqlite3.LIB) - $(TLINK.shared) -o $@ tclsqlite.o \ + $(T.link.shared) -o $@ tclsqlite.o \ $(TCL_INCLUDE_SPEC) $(TCL_STUB_LIB_SPEC) $(LDFLAGS.libsqlite3) \ $(libsqlite3.LIB) $(TCLLIB_RPATH) $(libtclsqlite3.SO)-1: $(libtclsqlite3.SO) @@ -1363,22 +1363,22 @@ FTS5_SRC = \ $(TOP)/ext/fts5/fts5_varint.c \ $(TOP)/ext/fts5/fts5_vocab.c \ -fts5parse.c: $(TOP)/ext/fts5/fts5parse.y lemon$(BEXE) +fts5parse.c: $(TOP)/ext/fts5/fts5parse.y lemon$(B.exe) cp $(TOP)/ext/fts5/fts5parse.y . rm -f fts5parse.h - ./lemon$(BEXE) $(OPTS) -S fts5parse.y + ./lemon$(B.exe) $(OPTS) -S fts5parse.y fts5parse.h: fts5parse.c -fts5.c: $(FTS5_SRC) $(BTCLSH) # has_tclsh84 - $(BTCLSH) $(TOP)/ext/fts5/tool/mkfts5c.tcl +fts5.c: $(FTS5_SRC) $(B.tclsh) # has_tclsh84 + $(B.tclsh) $(TOP)/ext/fts5/tool/mkfts5c.tcl cp $(TOP)/ext/fts5/fts5.h . fts5.o: fts5.c $(DEPS_OBJ_COMMON) $(EXTHDR) - $(TCC.extension) -c fts5.c + $(T.cc.extension) -c fts5.c sqlite3rbu.o: $(TOP)/ext/rbu/sqlite3rbu.c $(DEPS_OBJ_COMMON) $(EXTHDR) - $(TCC.extension) -c $(TOP)/ext/rbu/sqlite3rbu.c + $(T.cc.extension) -c $(TOP)/ext/rbu/sqlite3rbu.c # @@ -1407,30 +1407,30 @@ TESTFIXTURE_SRC1 = sqlite3.c TESTFIXTURE_SRC = $(TESTSRC) $(TOP)/src/tclsqlite.c TESTFIXTURE_SRC += $(TESTFIXTURE_SRC$(USE_AMALGAMATION)) -testfixture$(TEXE): has_tclconfig has_tclsh85 $(TESTFIXTURE_SRC) - $(TLINK) -DSQLITE_NO_SYNC=1 $(TESTFIXTURE_FLAGS) \ +testfixture$(T.exe): has_tclconfig has_tclsh85 $(TESTFIXTURE_SRC) + $(T.link) -DSQLITE_NO_SYNC=1 $(TESTFIXTURE_FLAGS) \ -o $@ $(TESTFIXTURE_SRC) \ $(TCL_LIB_SPEC) $(TCL_INCLUDE_SPEC) \ $(CFLAGS.libsqlite3) $(LDFLAGS.libsqlite3) -coretestprogs: testfixture$(BEXE) sqlite3$(BEXE) +coretestprogs: testfixture$(B.exe) sqlite3$(B.exe) -testprogs: $(TESTPROGS) srcck1$(BEXE) fuzzcheck$(TEXE) sessionfuzz$(TEXE) +testprogs: $(TESTPROGS) srcck1$(B.exe) fuzzcheck$(T.exe) sessionfuzz$(T.exe) # A very detailed test running most or all test cases fulltest: alltest fuzztest # Run most or all tcl test cases alltest: $(TESTPROGS) - ./testfixture$(TEXE) $(TOP)/test/all.test $(TESTOPTS) + ./testfixture$(T.exe) $(TOP)/test/all.test $(TESTOPTS) # Really really long testing soaktest: $(TESTPROGS) - ./testfixture$(TEXE) $(TOP)/test/all.test -soak=1 $(TESTOPTS) + ./testfixture$(T.exe) $(TOP)/test/all.test -soak=1 $(TESTOPTS) # Do extra testing but not everything. fulltestonly: $(TESTPROGS) fuzztest - ./testfixture$(TEXE) $(TOP)/test/full.test + ./testfixture$(T.exe) $(TOP)/test/full.test # # Fuzz testing @@ -1440,26 +1440,26 @@ fulltestonly: $(TESTPROGS) fuzztest # commands. Therefore, if this target is updated, then code in # testrunner_data.tcl (search for "trd_fuzztest_data") must also be updated. # -fuzztest: fuzzcheck$(TEXE) $(FUZZDATA) sessionfuzz$(TEXE) - ./fuzzcheck$(TEXE) $(FUZZDATA) - ./sessionfuzz$(TEXE) run $(TOP)/test/sessionfuzz-data1.db +fuzztest: fuzzcheck$(T.exe) $(FUZZDATA) sessionfuzz$(T.exe) + ./fuzzcheck$(T.exe) $(FUZZDATA) + ./sessionfuzz$(T.exe) run $(TOP)/test/sessionfuzz-data1.db -valgrindfuzz: fuzzcheck$(TEXT) $(FUZZDATA) sessionfuzz$(TEXE) - valgrind ./fuzzcheck$(TEXE) --cell-size-check --limit-mem 10M $(FUZZDATA) - valgrind ./sessionfuzz$(TEXE) run $(TOP)/test/sessionfuzz-data1.db +valgrindfuzz: fuzzcheck$(TEXT) $(FUZZDATA) sessionfuzz$(T.exe) + valgrind ./fuzzcheck$(T.exe) --cell-size-check --limit-mem 10M $(FUZZDATA) + valgrind ./sessionfuzz$(T.exe) run $(TOP)/test/sessionfuzz-data1.db # # The veryquick.test TCL tests. # -tcltest: ./testfixture$(TEXE) - ./testfixture$(TEXE) $(TOP)/test/veryquick.test $(TESTOPTS) +tcltest: ./testfixture$(T.exe) + ./testfixture$(T.exe) $(TOP)/test/veryquick.test $(TESTOPTS) # # Runs all the same tests cases as the "tcltest" target but uses # the testrunner.tcl script to run them in multiple cores # concurrently. -testrunner: testfixture$(TEXE) - ./testfixture$(TEXE) $(TOP)/test/testrunner.tcl +testrunner: testfixture$(T.exe) + ./testfixture$(T.exe) $(TOP)/test/testrunner.tcl # # This is the testing target preferred by the core SQLite developers. @@ -1493,8 +1493,8 @@ releasetest: srctree-check has_tclsh85 verify-source # # Minimal testing that runs in less than 3 minutes # -quicktest: ./testfixture$(TEXE) - ./testfixture$(TEXE) $(TOP)/test/extraquick.test $(TESTOPTS) +quicktest: ./testfixture$(T.exe) + ./testfixture$(T.exe) $(TOP)/test/extraquick.test $(TESTOPTS) # # Try to run tests on whatever options are specified by the @@ -1510,42 +1510,42 @@ test: srctree-check fuzztest sourcetest $(TESTPROGS) tcltest # because valgrind is so much slower than a native machine. # valgrindtest: $(TESTPROGS) valgrindfuzz - OMIT_MISUSE=1 valgrind -v ./testfixture$(TEXE) $(TOP)/test/permutations.test valgrind $(TESTOPTS) + OMIT_MISUSE=1 valgrind -v ./testfixture$(T.exe) $(TOP)/test/permutations.test valgrind $(TESTOPTS) # # A very fast test that checks basic sanity. The name comes from # the 60s-era electronics testing: "Turn it on and see if smoke # comes out." # -smoketest: $(TESTPROGS) fuzzcheck$(TEXE) - ./testfixture$(TEXE) $(TOP)/test/main.test $(TESTOPTS) +smoketest: $(TESTPROGS) fuzzcheck$(T.exe) + ./testfixture$(T.exe) $(TOP)/test/main.test $(TESTOPTS) shelltest: $(TCLSH_CMD) $(TOP)/test/testrunner.tcl release shell sqlite3_analyzer.c: sqlite3.c $(TOP)/src/tclsqlite.c $(TOP)/tool/spaceanal.tcl \ $(TOP)/tool/mkccode.tcl $(TOP)/tool/sqlite3_analyzer.c.in has_tclsh85 - $(BTCLSH) $(TOP)/tool/mkccode.tcl $(TOP)/tool/sqlite3_analyzer.c.in >sqlite3_analyzer.c + $(B.tclsh) $(TOP)/tool/mkccode.tcl $(TOP)/tool/sqlite3_analyzer.c.in >sqlite3_analyzer.c -sqlite3_analyzer$(TEXE): has_tclconfig sqlite3_analyzer.c - $(TLINK) sqlite3_analyzer.c -o $@ $(TCL_LIB_SPEC) $(TCL_INCLUDE_SPEC) $(LDFLAGS.libsqlite3) +sqlite3_analyzer$(T.exe): has_tclconfig sqlite3_analyzer.c + $(T.link) sqlite3_analyzer.c -o $@ $(TCL_LIB_SPEC) $(TCL_INCLUDE_SPEC) $(LDFLAGS.libsqlite3) sqltclsh.c: sqlite3.c $(TOP)/src/tclsqlite.c $(TOP)/tool/sqltclsh.tcl \ $(TOP)/ext/misc/appendvfs.c $(TOP)/tool/mkccode.tcl \ $(TOP)/tool/sqltclsh.c.in has_tclsh85 - $(BTCLSH) $(TOP)/tool/mkccode.tcl $(TOP)/tool/sqltclsh.c.in >sqltclsh.c + $(B.tclsh) $(TOP)/tool/mkccode.tcl $(TOP)/tool/sqltclsh.c.in >sqltclsh.c -sqltclsh$(TEXE): has_tclconfig sqltclsh.c - $(TLINK) sqltclsh.c -o $@ $(TCL_INCLUDE_SPEC) $(CFLAGS.libsqlite3) $(TCL_LIB_SPEC) $(LDFLAGS.libsqlite3) +sqltclsh$(T.exe): has_tclconfig sqltclsh.c + $(T.link) sqltclsh.c -o $@ $(TCL_INCLUDE_SPEC) $(CFLAGS.libsqlite3) $(TCL_LIB_SPEC) $(LDFLAGS.libsqlite3) # xbin: target for generic binaries which aren't usually built. It is # used primarily for testing the build process. -xbin: sqltclsh$(TEXE) +xbin: sqltclsh$(T.exe) -sqlite3_expert$(TEXE): $(TOP)/ext/expert/sqlite3expert.h $(TOP)/ext/expert/sqlite3expert.c \ +sqlite3_expert$(T.exe): $(TOP)/ext/expert/sqlite3expert.h $(TOP)/ext/expert/sqlite3expert.c \ $(TOP)/ext/expert/expert.c sqlite3.c - $(TLINK) $(TOP)/ext/expert/sqlite3expert.h $(TOP)/ext/expert/sqlite3expert.c \ + $(T.link) $(TOP)/ext/expert/sqlite3expert.h $(TOP)/ext/expert/sqlite3expert.c \ $(TOP)/ext/expert/expert.c sqlite3.c -o sqlite3_expert $(LDFLAGS.libsqlite3) -xbin: sqlite3_expert$(TEXE) +xbin: sqlite3_expert$(T.exe) CHECKER_DEPS =\ $(TOP)/tool/mkccode.tcl \ @@ -1558,91 +1558,91 @@ CHECKER_DEPS =\ $(TOP)/ext/repair/sqlite3_checker.c.in sqlite3_checker.c: $(CHECKER_DEPS) has_tclsh85 - $(BTCLSH) $(TOP)/tool/mkccode.tcl $(TOP)/ext/repair/sqlite3_checker.c.in >$@ + $(B.tclsh) $(TOP)/tool/mkccode.tcl $(TOP)/ext/repair/sqlite3_checker.c.in >$@ -sqlite3_checker$(TEXE): has_tclconfig sqlite3_checker.c - $(TLINK) sqlite3_checker.c -o $@ $(TCL_INCLUDE_SPEC) $(CFLAGS.libsqlite3) $(TCL_LIB_SPEC) $(LDFLAGS.libsqlite3) -xbin: sqlite3_checker$(TEXE) +sqlite3_checker$(T.exe): has_tclconfig sqlite3_checker.c + $(T.link) sqlite3_checker.c -o $@ $(TCL_INCLUDE_SPEC) $(CFLAGS.libsqlite3) $(TCL_LIB_SPEC) $(LDFLAGS.libsqlite3) +xbin: sqlite3_checker$(T.exe) -dbdump$(TEXE): $(TOP)/ext/misc/dbdump.c sqlite3.o - $(TLINK) -DDBDUMP_STANDALONE -o $@ \ +dbdump$(T.exe): $(TOP)/ext/misc/dbdump.c sqlite3.o + $(T.link) -DDBDUMP_STANDALONE -o $@ \ $(TOP)/ext/misc/dbdump.c sqlite3.o $(LDFLAGS.libsqlite3) -xbin: dbdump$(TEXE) +xbin: dbdump$(T.exe) -dbtotxt$(TEXE): $(TOP)/tool/dbtotxt.c - $(TLINK)-o $@ $(TOP)/tool/dbtotxt.c -xbin: dbtotxt$(TEXE) +dbtotxt$(T.exe): $(TOP)/tool/dbtotxt.c + $(T.link)-o $@ $(TOP)/tool/dbtotxt.c +xbin: dbtotxt$(T.exe) -showdb$(TEXE): $(TOP)/tool/showdb.c sqlite3.o - $(TLINK) -o $@ $(TOP)/tool/showdb.c sqlite3.o $(LDFLAGS.libsqlite3) -xbin: showdb$(TEXE) +showdb$(T.exe): $(TOP)/tool/showdb.c sqlite3.o + $(T.link) -o $@ $(TOP)/tool/showdb.c sqlite3.o $(LDFLAGS.libsqlite3) +xbin: showdb$(T.exe) -showstat4$(TEXE): $(TOP)/tool/showstat4.c sqlite3.o - $(TLINK) -o $@ $(TOP)/tool/showstat4.c sqlite3.o $(LDFLAGS.libsqlite3) -xbin: showstat4$(TEXE) +showstat4$(T.exe): $(TOP)/tool/showstat4.c sqlite3.o + $(T.link) -o $@ $(TOP)/tool/showstat4.c sqlite3.o $(LDFLAGS.libsqlite3) +xbin: showstat4$(T.exe) -showjournal$(TEXE): $(TOP)/tool/showjournal.c sqlite3.o - $(TLINK) -o $@ $(TOP)/tool/showjournal.c sqlite3.o $(LDFLAGS.libsqlite3) -xbin: showjournal$(TEXE) +showjournal$(T.exe): $(TOP)/tool/showjournal.c sqlite3.o + $(T.link) -o $@ $(TOP)/tool/showjournal.c sqlite3.o $(LDFLAGS.libsqlite3) +xbin: showjournal$(T.exe) -showwal$(TEXE): $(TOP)/tool/showwal.c sqlite3.o - $(TLINK) -o $@ $(TOP)/tool/showwal.c sqlite3.o $(LDFLAGS.libsqlite3) -xbin: showwal$(TEXE) +showwal$(T.exe): $(TOP)/tool/showwal.c sqlite3.o + $(T.link) -o $@ $(TOP)/tool/showwal.c sqlite3.o $(LDFLAGS.libsqlite3) +xbin: showwal$(T.exe) -showshm$(TEXE): $(TOP)/tool/showshm.c - $(TLINK) -o $@ $(TOP)/tool/showshm.c -xbin: showshm$(TEXE) +showshm$(T.exe): $(TOP)/tool/showshm.c + $(T.link) -o $@ $(TOP)/tool/showshm.c +xbin: showshm$(T.exe) -index_usage$(TEXE): $(TOP)/tool/index_usage.c sqlite3.o - $(TLINK) $(SHELL_OPT) -o $@ $(TOP)/tool/index_usage.c sqlite3.o $(LDFLAGS.libsqlite3) -xbin: index_usage$(TEXE) +index_usage$(T.exe): $(TOP)/tool/index_usage.c sqlite3.o + $(T.link) $(SHELL_OPT) -o $@ $(TOP)/tool/index_usage.c sqlite3.o $(LDFLAGS.libsqlite3) +xbin: index_usage$(T.exe) # Reminder: changeset does not build without -DSQLITE_ENABLE_SESSION -changeset$(TEXE): $(TOP)/ext/session/changeset.c sqlite3.o - $(TLINK) -o $@ $(TOP)/ext/session/changeset.c sqlite3.o $(LDFLAGS.libsqlite3) -xbin: changeset$(TEXE) +changeset$(T.exe): $(TOP)/ext/session/changeset.c sqlite3.o + $(T.link) -o $@ $(TOP)/ext/session/changeset.c sqlite3.o $(LDFLAGS.libsqlite3) +xbin: changeset$(T.exe) -changesetfuzz$(TEXE): $(TOP)/ext/session/changesetfuzz.c sqlite3.o - $(TLINK) -o $@ $(TOP)/ext/session/changesetfuzz.c sqlite3.o $(LDFLAGS.libsqlite3) -xbin: changesetfuzz$(TEXE) +changesetfuzz$(T.exe): $(TOP)/ext/session/changesetfuzz.c sqlite3.o + $(T.link) -o $@ $(TOP)/ext/session/changesetfuzz.c sqlite3.o $(LDFLAGS.libsqlite3) +xbin: changesetfuzz$(T.exe) -rollback-test$(TEXE): $(TOP)/tool/rollback-test.c sqlite3.o - $(TLINK) -o $@ $(TOP)/tool/rollback-test.c sqlite3.o $(LDFLAGS.libsqlite3) -xbin: rollback-test$(TEXE) +rollback-test$(T.exe): $(TOP)/tool/rollback-test.c sqlite3.o + $(T.link) -o $@ $(TOP)/tool/rollback-test.c sqlite3.o $(LDFLAGS.libsqlite3) +xbin: rollback-test$(T.exe) atrc$(TEXX): $(TOP)/test/atrc.c sqlite3.o - $(TLINK) -o $@ $(TOP)/test/atrc.c sqlite3.o $(LDFLAGS.libsqlite3) + $(T.link) -o $@ $(TOP)/test/atrc.c sqlite3.o $(LDFLAGS.libsqlite3) xbin: atrc$(TEXX) -LogEst$(TEXE): $(TOP)/tool/logest.c sqlite3.h - $(TLINK) -I. -o $@ $(TOP)/tool/logest.c -xbin: LogEst$(TEXE) +LogEst$(T.exe): $(TOP)/tool/logest.c sqlite3.h + $(T.link) -I. -o $@ $(TOP)/tool/logest.c +xbin: LogEst$(T.exe) -wordcount$(TEXE): $(TOP)/test/wordcount.c sqlite3.o - $(TLINK) -o $@ $(TOP)/test/wordcount.c sqlite3.o $(LDFLAGS.libsqlite3) -xbin: wordcount$(TEXE) +wordcount$(T.exe): $(TOP)/test/wordcount.c sqlite3.o + $(T.link) -o $@ $(TOP)/test/wordcount.c sqlite3.o $(LDFLAGS.libsqlite3) +xbin: wordcount$(T.exe) -speedtest1$(TEXE): $(TOP)/test/speedtest1.c sqlite3.c Makefile - $(TLINK) $(ST_OPT) -o $@ $(TOP)/test/speedtest1.c sqlite3.c $(LDFLAGS.libsqlite3) -xbin: speedtest1$(TEXE) +speedtest1$(T.exe): $(TOP)/test/speedtest1.c sqlite3.c Makefile + $(T.link) $(ST_OPT) -o $@ $(TOP)/test/speedtest1.c sqlite3.c $(LDFLAGS.libsqlite3) +xbin: speedtest1$(T.exe) -startup$(TEXE): $(TOP)/test/startup.c sqlite3.c - $(TLINK) -Os -g -USQLITE_THREADSAFE -DSQLITE_THREADSAFE=0 -o $@ $(TOP)/test/startup.c sqlite3.c $(LDFLAGS.libsqlite3) -xbin: startup$(TEXE) +startup$(T.exe): $(TOP)/test/startup.c sqlite3.c + $(T.link) -Os -g -USQLITE_THREADSAFE -DSQLITE_THREADSAFE=0 -o $@ $(TOP)/test/startup.c sqlite3.c $(LDFLAGS.libsqlite3) +xbin: startup$(T.exe) KV_OPT += -DSQLITE_DIRECT_OVERFLOW_READ -kvtest$(TEXE): $(TOP)/test/kvtest.c sqlite3.c - $(TLINK) $(KV_OPT) -o $@ $(TOP)/test/kvtest.c sqlite3.c $(LDFLAGS.libsqlite3) -xbin: kvtest$(TEXE) +kvtest$(T.exe): $(TOP)/test/kvtest.c sqlite3.c + $(T.link) $(KV_OPT) -o $@ $(TOP)/test/kvtest.c sqlite3.c $(LDFLAGS.libsqlite3) +xbin: kvtest$(T.exe) -#rbu$(EXE): $(TOP)/ext/rbu/rbu.c $(TOP)/ext/rbu/sqlite3rbu.c sqlite3.o -# $(TLINK) -I. -o $@ $(TOP)/ext/rbu/rbu.c sqlite3.o $(LDFLAGS.libsqlite3) -#xbin: rbu$(EXE) +#rbu$(T.exe): $(TOP)/ext/rbu/rbu.c $(TOP)/ext/rbu/sqlite3rbu.c sqlite3.o +# $(T.link) -I. -o $@ $(TOP)/ext/rbu/rbu.c sqlite3.o $(LDFLAGS.libsqlite3) +#xbin: rbu$(T.exe) -loadfts$(EXE): $(TOP)/tool/loadfts.c $(libsqlite3.LIB) - $(TLINK) $(TOP)/tool/loadfts.c $(libsqlite3.LIB) -o $@ $(LDFLAGS.libsqlite3) -xbin: loadfts$(EXE) +loadfts$(T.exe): $(TOP)/tool/loadfts.c $(libsqlite3.LIB) + $(T.link) $(TOP)/tool/loadfts.c $(libsqlite3.LIB) -o $@ $(LDFLAGS.libsqlite3) +xbin: loadfts$(T.exe) # This target will fail if the SQLite amalgamation contains any exported # symbols that do not begin with "sqlite3_". It is run as part of the @@ -1656,10 +1656,10 @@ checksymbols: sqlite3.o # Build a ZIP archive containing various command-line tools. # -tool-zip: testfixture$(TEXE) sqlite3$(TEXE) sqldiff$(TEXE) \ - sqlite3_analyzer$(TEXE) sqlite3_rsync$(TEXE) $(TOP)/tool/mktoolzip.tcl - strip sqlite3$(TEXE) sqldiff$(TEXE) sqlite3_analyzer$(TEXE) sqlite3_rsync$(TEXE) - ./testfixture$(TEXE) $(TOP)/tool/mktoolzip.tcl +tool-zip: testfixture$(T.exe) sqlite3$(T.exe) sqldiff$(T.exe) \ + sqlite3_analyzer$(T.exe) sqlite3_rsync$(T.exe) $(TOP)/tool/mktoolzip.tcl + strip sqlite3$(T.exe) sqldiff$(T.exe) sqlite3_analyzer$(T.exe) sqlite3_rsync$(T.exe) + ./testfixture$(T.exe) $(TOP)/tool/mktoolzip.tcl clean-tool-zip: rm -f sqlite-tools-*.zip clean: clean-tool-zip @@ -1687,44 +1687,44 @@ THREADTEST3_SRC = $(TOP)/test/threadtest3.c \ $(TOP)/test/tt3_stress.c \ $(TOP)/test/tt3_lookaside1.c -threadtest3$(TEXE): sqlite3.o $(THREADTEST3_SRC) - $(TLINK) $(TOP)/test/threadtest3.c $(TOP)/src/test_multiplex.c sqlite3.o -o $@ $(LDFLAGS.libsqlite3) -xbin: threadtest3$(TEXE) +threadtest3$(T.exe): sqlite3.o $(THREADTEST3_SRC) + $(T.link) $(TOP)/test/threadtest3.c $(TOP)/src/test_multiplex.c sqlite3.o -o $@ $(LDFLAGS.libsqlite3) +xbin: threadtest3$(T.exe) -threadtest: threadtest3$(TEXE) - ./threadtest3$(TEXE) +threadtest: threadtest3$(T.exe) + ./threadtest3$(T.exe) threadtest5: sqlite3.c $(TOP)/test/threadtest5.c - $(TLINK) $(TOP)/test/threadtest5.c sqlite3.c -o $@ $(LDFLAGS.libsqlite3) + $(T.link) $(TOP)/test/threadtest5.c sqlite3.c -o $@ $(LDFLAGS.libsqlite3) xbin: threadtest5 -sqlite3$(TEXE): shell.c sqlite3.c - $(TLINK) $(CFLAGS.readline) $(SHELL_OPT) -o $@ \ +sqlite3$(T.exe): shell.c sqlite3.c + $(T.link) $(CFLAGS.readline) $(SHELL_OPT) -o $@ \ shell.c sqlite3.c \ $(LDFLAGS.libsqlite3) $(LDFLAGS.readline) # -# Build sqlite3$(TEXE) by default except in wasi-sdk builds. Yes, the +# Build sqlite3$(T.exe) by default except in wasi-sdk builds. Yes, the # semantics of 0 and 1 are confusingly swapped here. # -sqlite3$(TEXE)-1: -sqlite3$(TEXE)-0 sqlite3$(TEXE)-: sqlite3$(TEXE) -all: sqlite3$(TEXE)-$(HAVE_WASI_SDK) +sqlite3$(T.exe)-1: +sqlite3$(T.exe)-0 sqlite3$(T.exe)-: sqlite3$(T.exe) +all: sqlite3$(T.exe)-$(HAVE_WASI_SDK) install-shell-0: sqlite3$(TEXT) $(install-dir.bin) $(INSTALL) -s sqlite3$(TEXT) $(install-dir.bin) install-shell-1 install-shell-: install: install-shell-$(HAVE_WASI_SDK) -sqldiff$(TEXE): $(TOP)/tool/sqldiff.c $(TOP)/ext/misc/sqlite3_stdio.h sqlite3.o sqlite3.h - $(TLINK) -o $@ $(TOP)/tool/sqldiff.c sqlite3.o $(LDFLAGS.libsqlite3) +sqldiff$(T.exe): $(TOP)/tool/sqldiff.c $(TOP)/ext/misc/sqlite3_stdio.h sqlite3.o sqlite3.h + $(T.link) -o $@ $(TOP)/tool/sqldiff.c sqlite3.o $(LDFLAGS.libsqlite3) -install-diff: sqldiff$(TEXE) $(install-dir.bin) +install-diff: sqldiff$(T.exe) $(install-dir.bin) $(INSTALL) -s sqldiff$(TEXT) $(install-dir.bin) #install: install-diff -dbhash$(TEXE): $(TOP)/tool/dbhash.c sqlite3.o sqlite3.h - $(TLINK) -o $@ $(TOP)/tool/dbhash.c sqlite3.o $(LDFLAGS.libsqlite3) -xbin: dbhash$(TEXE) +dbhash$(T.exe): $(TOP)/tool/dbhash.c sqlite3.o sqlite3.h + $(T.link) -o $@ $(TOP)/tool/dbhash.c sqlite3.o $(LDFLAGS.libsqlite3) +xbin: dbhash$(T.exe) RSYNC_SRC = \ $(TOP)/tool/sqlite3_rsync.c \ @@ -1737,11 +1737,11 @@ RSYNC_OPT = \ -DSQLITE_OMIT_LOAD_EXTENSION \ -DSQLITE_OMIT_DEPRECATED -sqlite3_rsync$(TEXE): $(RSYNC_SRC) - $(TCC.sqlite) -o $@ $(RSYNC_OPT) $(RSYNC_SRC) $(LDFLAGS.libsqlite3) -xbin: sqlite3_rsync$(TEXE) +sqlite3_rsync$(T.exe): $(RSYNC_SRC) + $(T.cc.sqlite) -o $@ $(RSYNC_OPT) $(RSYNC_SRC) $(LDFLAGS.libsqlite3) +xbin: sqlite3_rsync$(T.exe) -install-rsync: sqlite3_rsync$(TEXE) $(install-dir.bin) +install-rsync: sqlite3_rsync$(T.exe) $(install-dir.bin) $(INSTALL) sqlite3_rsync$(TEXT) $(install-dir.bin) #install: install-rsync @@ -1755,47 +1755,47 @@ install: install-man1 install-pc: sqlite3.pc $(install-dir.pkgconfig) $(INSTALL.noexec) sqlite3.pc $(install-dir.pkgconfig) -scrub$(TEXE): $(TOP)/ext/misc/scrub.c sqlite3.o - $(TLINK) -o $@ -I. -DSCRUB_STANDALONE \ +scrub$(T.exe): $(TOP)/ext/misc/scrub.c sqlite3.o + $(T.link) -o $@ -I. -DSCRUB_STANDALONE \ $(TOP)/ext/misc/scrub.c sqlite3.o $(LDFLAGS.libsqlite3) -xbin: scrub$(TEXE) +xbin: scrub$(T.exe) -srcck1$(BEXE): $(TOP)/tool/srcck1.c - $(BCC) -o srcck1$(BEXE) $(TOP)/tool/srcck1.c -xbin: srcck1$(BEXE) +srcck1$(B.exe): $(TOP)/tool/srcck1.c + $(B.cc) -o srcck1$(B.exe) $(TOP)/tool/srcck1.c +xbin: srcck1$(B.exe) -sourcetest: srcck1$(BEXE) sqlite3.c - ./srcck1$(BEXE) sqlite3.c +sourcetest: srcck1$(B.exe) sqlite3.c + ./srcck1$(B.exe) sqlite3.c -src-verify$(BEXE): $(TOP)/tool/src-verify.c - $(BCC) -o src-verify$(BEXE) $(TOP)/tool/src-verify.c -xbin: src-verify$(BEXE) +src-verify$(B.exe): $(TOP)/tool/src-verify.c + $(B.cc) -o src-verify$(B.exe) $(TOP)/tool/src-verify.c +xbin: src-verify$(B.exe) -verify-source: ./src-verify$(BEXE) - ./src-verify$(BEXE) $(TOP) +verify-source: ./src-verify$(B.exe) + ./src-verify$(B.exe) $(TOP) -fuzzershell$(TEXE): $(TOP)/tool/fuzzershell.c sqlite3.c sqlite3.h - $(TLINK) -o $@ $(FUZZERSHELL_OPT) \ +fuzzershell$(T.exe): $(TOP)/tool/fuzzershell.c sqlite3.c sqlite3.h + $(T.link) -o $@ $(FUZZERSHELL_OPT) \ $(TOP)/tool/fuzzershell.c sqlite3.c $(LDFLAGS.libsqlite3) -fuzzy: fuzzershell$(TEXE) -xbin: fuzzershell$(TEXE) +fuzzy: fuzzershell$(T.exe) +xbin: fuzzershell$(T.exe) -fuzzcheck$(TEXE): $(FUZZCHECK_SRC) sqlite3.c sqlite3.h $(FUZZCHECK_DEP) - $(TLINK) -o $@ $(FUZZCHECK_OPT) $(FUZZCHECK_SRC) sqlite3.c $(LDFLAGS.libsqlite3) -fuzzy: fuzzcheck$(TEXE) -xbin: fuzzcheck$(TEXE) +fuzzcheck$(T.exe): $(FUZZCHECK_SRC) sqlite3.c sqlite3.h $(FUZZCHECK_DEP) + $(T.link) -o $@ $(FUZZCHECK_OPT) $(FUZZCHECK_SRC) sqlite3.c $(LDFLAGS.libsqlite3) +fuzzy: fuzzcheck$(T.exe) +xbin: fuzzcheck$(T.exe) -fuzzcheck-asan$(TEXE): $(FUZZCHECK_SRC) sqlite3.c sqlite3.h $(FUZZCHECK_DEP) - $(TLINK) -o $@ -fsanitize=address $(FUZZCHECK_OPT) $(FUZZCHECK_SRC) \ +fuzzcheck-asan$(T.exe): $(FUZZCHECK_SRC) sqlite3.c sqlite3.h $(FUZZCHECK_DEP) + $(T.link) -o $@ -fsanitize=address $(FUZZCHECK_OPT) $(FUZZCHECK_SRC) \ sqlite3.c $(LDFLAGS.libsqlite3) -fuzzy: fuzzcheck-asan$(TEXE) -xbin: fuzzcheck-asan$(TEXE) +fuzzy: fuzzcheck-asan$(T.exe) +xbin: fuzzcheck-asan$(T.exe) -fuzzcheck-ubsan$(TEXE): $(FUZZCHECK_SRC) sqlite3.c sqlite3.h $(FUZZCHECK_DEP) - $(TLINK) -o $@ -fsanitize=undefined $(FUZZCHECK_OPT) $(FUZZCHECK_SRC) \ +fuzzcheck-ubsan$(T.exe): $(FUZZCHECK_SRC) sqlite3.c sqlite3.h $(FUZZCHECK_DEP) + $(T.link) -o $@ -fsanitize=undefined $(FUZZCHECK_OPT) $(FUZZCHECK_SRC) \ sqlite3.c $(LDFLAGS.libsqlite3) -fuzzy: fuzzcheck-ubsan$(TEXE) -xbin: fuzzcheck-ubsan$(TEXE) +fuzzy: fuzzcheck-ubsan$(T.exe) +xbin: fuzzcheck-ubsan$(T.exe) # Usage: FUZZDB=filename make run-fuzzcheck # @@ -1806,26 +1806,26 @@ xbin: fuzzcheck-ubsan$(TEXE) # # FUZZDB=test/fuzzdata*.db make run-fuzzcheck # -run-fuzzcheck: fuzzcheck$(TEXE) fuzzcheck-asan$(TEXE) fuzzcheck-ubsan$(TEXE) +run-fuzzcheck: fuzzcheck$(T.exe) fuzzcheck-asan$(T.exe) fuzzcheck-ubsan$(T.exe) @if test "$(FUZZDB)" = ""; then echo 'ERROR: No FUZZDB specified. Rerun with FUZZDB=filename'; exit 1; fi - ./fuzzcheck$(TEXE) --spinner $(FUZZDB) - ./fuzzcheck-asan$(TEXE) --spinner $(FUZZDB) - ./fuzzcheck-ubsan$(TEXE) --spinner $(FUZZDB) + ./fuzzcheck$(T.exe) --spinner $(FUZZDB) + ./fuzzcheck-asan$(T.exe) --spinner $(FUZZDB) + ./fuzzcheck-ubsan$(T.exe) --spinner $(FUZZDB) -ossshell$(TEXE): $(TOP)/test/ossfuzz.c $(TOP)/test/ossshell.c sqlite3.c sqlite3.h - $(TLINK) -o $@ $(FUZZCHECK_OPT) $(TOP)/test/ossshell.c \ +ossshell$(T.exe): $(TOP)/test/ossfuzz.c $(TOP)/test/ossshell.c sqlite3.c sqlite3.h + $(T.link) -o $@ $(FUZZCHECK_OPT) $(TOP)/test/ossshell.c \ $(TOP)/test/ossfuzz.c sqlite3.c $(LDFLAGS.libsqlite3) -fuzzy: ossshell$(TEXE) -xbin: ossshell$(TEXE) +fuzzy: ossshell$(T.exe) +xbin: ossshell$(T.exe) -sessionfuzz$(TEXE): $(TOP)/test/sessionfuzz.c sqlite3.c sqlite3.h - $(TLINK) -o $@ $(TOP)/test/sessionfuzz.c $(LDFLAGS.libsqlite3) -fuzzy: sessionfuzz$(TEXE) +sessionfuzz$(T.exe): $(TOP)/test/sessionfuzz.c sqlite3.c sqlite3.h + $(T.link) -o $@ $(TOP)/test/sessionfuzz.c $(LDFLAGS.libsqlite3) +fuzzy: sessionfuzz$(T.exe) -dbfuzz$(TEXE): $(TOP)/test/dbfuzz.c sqlite3.c sqlite3.h - $(TLINK) -o $@ $(DBFUZZ_OPT) $(TOP)/test/dbfuzz.c sqlite3.c $(LDFLAGS.libsqlite3) -fuzzy: dbfuzz$(TEXE) -xbin: dbfuzz$(TEXE) +dbfuzz$(T.exe): $(TOP)/test/dbfuzz.c sqlite3.c sqlite3.h + $(T.link) -o $@ $(DBFUZZ_OPT) $(TOP)/test/dbfuzz.c sqlite3.c $(LDFLAGS.libsqlite3) +fuzzy: dbfuzz$(T.exe) +xbin: dbfuzz$(T.exe) DBFUZZ2_OPTS = \ -USQLITE_THREADSAFE \ @@ -1838,23 +1838,23 @@ DBFUZZ2_OPTS = \ -DSQLITE_ENABLE_FTS4 \ -DSQLITE_ENABLE_FTS5 -dbfuzz2$(TEXE): $(TOP)/test/dbfuzz2.c sqlite3.c sqlite3.h - $(CC) $(OPT_FEATURE_FLAGS) $(OPTS) -I. -g -O0 \ +dbfuzz2$(T.exe): $(TOP)/test/dbfuzz2.c sqlite3.c sqlite3.h + $(T.cc) $(OPT_FEATURE_FLAGS) $(OPTS) -I. -g -O0 \ -DSTANDALONE -o dbfuzz2 \ $(DBFUZZ2_OPTS) $(TOP)/test/dbfuzz2.c sqlite3.c $(LDFLAGS.libsqlite3) mkdir -p dbfuzz2-dir cp $(TOP)/test/dbfuzz2-seed* dbfuzz2-dir -fuzzy: dbfuzz2$(TEXE) -xbin: dbfuzz2$(TEXE) +fuzzy: dbfuzz2$(T.exe) +xbin: dbfuzz2$(T.exe) -mptester$(TEXE): $(libsqlite3.LIB) $(TOP)/mptest/mptest.c - $(TLINK) -o $@ -I. $(TOP)/mptest/mptest.c $(libsqlite3.LIB) \ +mptester$(T.exe): $(libsqlite3.LIB) $(TOP)/mptest/mptest.c + $(T.link) -o $@ -I. $(TOP)/mptest/mptest.c $(libsqlite3.LIB) \ $(LDFLAGS.libsqlite3) -xbin: mptester$(TEXE) +xbin: mptester$(T.exe) -MPTEST1=./mptester$(TEXE) mptest.db $(TOP)/mptest/crash01.test --repeat 20 -MPTEST2=./mptester$(TEXE) mptest.db $(TOP)/mptest/multiwrite01.test --repeat 20 -mptest: mptester$(TEXE) +MPTEST1=./mptester$(T.exe) mptest.db $(TOP)/mptest/crash01.test --repeat 20 +MPTEST2=./mptester$(T.exe) mptest.db $(TOP)/mptest/multiwrite01.test --repeat 20 +mptest: mptester$(T.exe) rm -f mptest.db $(MPTEST1) --journalmode DELETE $(MPTEST2) --journalmode WAL @@ -1898,66 +1898,66 @@ SHELL_DEP = \ $(TOP)/src/test_windirent.c \ $(TOP)/src/test_windirent.h -shell.c: $(SHELL_DEP) $(TOP)/tool/mkshellc.tcl $(BTCLSH) # has_tclsh84 - $(BTCLSH) $(TOP)/tool/mkshellc.tcl >shell.c +shell.c: $(SHELL_DEP) $(TOP)/tool/mkshellc.tcl $(B.tclsh) # has_tclsh84 + $(B.tclsh) $(TOP)/tool/mkshellc.tcl >shell.c # # Rules to build the extension objects. # DEPS_EXT_COMMON = $(DEPS_OBJ_COMMON) $(EXTHDR) icu.o: $(TOP)/ext/icu/icu.c $(DEPS_EXT_COMMON) - $(TCC.extension) -c $(TOP)/ext/icu/icu.c + $(T.cc.extension) -c $(TOP)/ext/icu/icu.c fts3.o: $(TOP)/ext/fts3/fts3.c $(DEPS_EXT_COMMON) - $(TCC.extension) -c $(TOP)/ext/fts3/fts3.c + $(T.cc.extension) -c $(TOP)/ext/fts3/fts3.c fts3_aux.o: $(TOP)/ext/fts3/fts3_aux.c $(DEPS_EXT_COMMON) - $(TCC.extension) -c $(TOP)/ext/fts3/fts3_aux.c + $(T.cc.extension) -c $(TOP)/ext/fts3/fts3_aux.c fts3_expr.o: $(TOP)/ext/fts3/fts3_expr.c $(DEPS_EXT_COMMON) - $(TCC.extension) -c $(TOP)/ext/fts3/fts3_expr.c + $(T.cc.extension) -c $(TOP)/ext/fts3/fts3_expr.c fts3_hash.o: $(TOP)/ext/fts3/fts3_hash.c $(DEPS_EXT_COMMON) - $(TCC.extension) -c $(TOP)/ext/fts3/fts3_hash.c + $(T.cc.extension) -c $(TOP)/ext/fts3/fts3_hash.c fts3_icu.o: $(TOP)/ext/fts3/fts3_icu.c $(DEPS_EXT_COMMON) - $(TCC.extension) -c $(TOP)/ext/fts3/fts3_icu.c + $(T.cc.extension) -c $(TOP)/ext/fts3/fts3_icu.c fts3_porter.o: $(TOP)/ext/fts3/fts3_porter.c $(DEPS_EXT_COMMON) - $(TCC.extension) -c $(TOP)/ext/fts3/fts3_porter.c + $(T.cc.extension) -c $(TOP)/ext/fts3/fts3_porter.c fts3_snippet.o: $(TOP)/ext/fts3/fts3_snippet.c $(DEPS_EXT_COMMON) - $(TCC.extension) -c $(TOP)/ext/fts3/fts3_snippet.c + $(T.cc.extension) -c $(TOP)/ext/fts3/fts3_snippet.c fts3_tokenizer.o: $(TOP)/ext/fts3/fts3_tokenizer.c $(DEPS_EXT_COMMON) - $(TCC.extension) -c $(TOP)/ext/fts3/fts3_tokenizer.c + $(T.cc.extension) -c $(TOP)/ext/fts3/fts3_tokenizer.c fts3_tokenizer1.o: $(TOP)/ext/fts3/fts3_tokenizer1.c $(DEPS_EXT_COMMON) - $(TCC.extension) -c $(TOP)/ext/fts3/fts3_tokenizer1.c + $(T.cc.extension) -c $(TOP)/ext/fts3/fts3_tokenizer1.c fts3_tokenize_vtab.o: $(TOP)/ext/fts3/fts3_tokenize_vtab.c $(DEPS_EXT_COMMON) - $(TCC.extension) -c $(TOP)/ext/fts3/fts3_tokenize_vtab.c + $(T.cc.extension) -c $(TOP)/ext/fts3/fts3_tokenize_vtab.c fts3_unicode.o: $(TOP)/ext/fts3/fts3_unicode.c $(DEPS_EXT_COMMON) - $(TCC.extension) -c $(TOP)/ext/fts3/fts3_unicode.c + $(T.cc.extension) -c $(TOP)/ext/fts3/fts3_unicode.c fts3_unicode2.o: $(TOP)/ext/fts3/fts3_unicode2.c $(DEPS_EXT_COMMON) - $(TCC.extension) -c $(TOP)/ext/fts3/fts3_unicode2.c + $(T.cc.extension) -c $(TOP)/ext/fts3/fts3_unicode2.c fts3_write.o: $(TOP)/ext/fts3/fts3_write.c $(DEPS_EXT_COMMON) - $(TCC.extension) -c $(TOP)/ext/fts3/fts3_write.c + $(T.cc.extension) -c $(TOP)/ext/fts3/fts3_write.c rtree.o: $(TOP)/ext/rtree/rtree.c $(DEPS_EXT_COMMON) - $(TCC.extension) -c $(TOP)/ext/rtree/rtree.c + $(T.cc.extension) -c $(TOP)/ext/rtree/rtree.c userauth.o: $(TOP)/ext/userauth/userauth.c $(DEPS_EXT_COMMON) - $(TCC.extension) -c $(TOP)/ext/userauth/userauth.c + $(T.cc.extension) -c $(TOP)/ext/userauth/userauth.c sqlite3session.o: $(TOP)/ext/session/sqlite3session.c $(DEPS_EXT_COMMON) - $(TCC.extension) -c $(TOP)/ext/session/sqlite3session.c + $(T.cc.extension) -c $(TOP)/ext/session/sqlite3session.c stmt.o: $(TOP)/ext/misc/stmt.c $(DEPS_EXT_COMMON) - $(TCC.extension) -c $(TOP)/ext/misc/stmt.c + $(T.cc.extension) -c $(TOP)/ext/misc/stmt.c # # Windows section @@ -1969,7 +1969,7 @@ sqlite3.def: $(LIBOBJ) | sed 's/^.* _//' >>sqlite3.def sqlite3.dll: $(LIBOBJ) sqlite3.def - $(TCC.sqlite) $(LDFLAGS.shobj) -o $@ sqlite3.def \ + $(T.cc.sqlite) $(LDFLAGS.shobj) -o $@ sqlite3.def \ -Wl,"--strip-all" $(LIBOBJ) @@ -1981,30 +1981,30 @@ sqlite3.dll: $(LIBOBJ) sqlite3.def # tidy-.: tidy: tidy-. - rm -f *.o *.c *.da *.bb *.bbg gmon.* *.rws sqlite3$(TEXE) + rm -f *.o *.c *.da *.bb *.bbg gmon.* *.rws sqlite3$(T.exe) rm -f fts5.h keywordhash.h opcodes.h sqlite3.h sqlite3ext.h sqlite3session.h rm -rf .libs .deps tsrc .target_source - rm -f lemon$(BEXE) sqlite*.tar.gz - rm -f mkkeywordhash$(BEXE) mksourceid$(BEXE) + rm -f lemon$(B.exe) sqlite*.tar.gz + rm -f mkkeywordhash$(B.exe) mksourceid$(B.exe) rm -f parse.* fts5parse.* rm -f $(libsqlite3.SO) $(libsqlite3.LIB) $(libtclsqlite3.SO) - rm -f tclsqlite3$(TEXE) $(TESTPROGS) - rm -f LogEst$(TEXE) fts3view$(TEXE) rollback-test$(TEXE) showdb$(TEXE) - rm -f showjournal$(TEXE) showstat4$(TEXE) showwal$(TEXE) speedtest1$(TEXE) - rm -f wordcount$(TEXE) changeset$(TEXE) version-info$(TEXE) + rm -f tclsqlite3$(T.exe) $(TESTPROGS) + rm -f LogEst$(T.exe) fts3view$(T.exe) rollback-test$(T.exe) showdb$(T.exe) + rm -f showjournal$(T.exe) showstat4$(T.exe) showwal$(T.exe) speedtest1$(T.exe) + rm -f wordcount$(T.exe) changeset$(T.exe) version-info$(T.exe) rm -f *.exp *.vsix pkgIndex.tcl - rm -f sqlite3_analyzer$(TEXE) sqlite3_rsync$(TEXE) sqlite3_expert$(TEXE) - rm -f mptester$(TEXE) rbu$(TEXE) srcck1$(TEXE) - rm -f fuzzershell$(TEXE) fuzzcheck$(TEXE) sqldiff$(TEXE) dbhash$(TEXE) - rm -f dbfuzz$(TEXE) dbfuzz2$(TEXE) + rm -f sqlite3_analyzer$(T.exe) sqlite3_rsync$(T.exe) sqlite3_expert$(T.exe) + rm -f mptester$(T.exe) rbu$(T.exe) srcck1$(T.exe) + rm -f fuzzershell$(T.exe) fuzzcheck$(T.exe) sqldiff$(T.exe) dbhash$(T.exe) + rm -f dbfuzz$(T.exe) dbfuzz2$(T.exe) rm -fr dbfuzz2-dir - rm -f fuzzcheck-asan$(TEXE) fuzzcheck-ubsan$(TEXE) ossshell$(TEXE) - rm -f scrub$(TEXE) showshm$(TEXE) sqlite3_checker$(TEXE) loadfts$(EXE) - rm -f index_usage$(TEXE) kvtest$(TEXE) startup$(TEXE) threadtest3$(TEXE) - rm -f sessionfuzz$(TEXE) changesetfuzz$(TEXE) - rm -f dbdump$(TEXE) dbtotxt$(TEXE) atrc$(TEXX) - rm -f threadtest5$(TEXE) - rm -f src-verify$(BEXE) has_tclsh* has_tclconfig + rm -f fuzzcheck-asan$(T.exe) fuzzcheck-ubsan$(T.exe) ossshell$(T.exe) + rm -f scrub$(T.exe) showshm$(T.exe) sqlite3_checker$(T.exe) loadfts$(T.exe) + rm -f index_usage$(T.exe) kvtest$(T.exe) startup$(T.exe) threadtest3$(T.exe) + rm -f sessionfuzz$(T.exe) changesetfuzz$(T.exe) + rm -f dbdump$(T.exe) dbtotxt$(T.exe) atrc$(T.exe) + rm -f threadtest5$(T.exe) + rm -f src-verify$(B.exe) has_tclsh* has_tclconfig rm -f tclsqlite3.c rm -f sqlite3rc.h sqlite3.def diff --git a/manifest b/manifest index 3523ba29b6..616a839251 100644 --- a/manifest +++ b/manifest @@ -1,9 +1,9 @@ -C Bump\sversion\snumber\sto\s3.48.0\s(in\sthis\sbranch\sonly\s-\sin\strunk,\sdoing\sso\srequires\sa\sspecific\sautoconf\sversion)\sand\srename\sthe\sRELEASE\sand\sVERSION\smakefile\ssymbols\sfor\sclarity's\ssake. -D 2024-10-24T05:03:20.051 +C More\spotentially-controversial\smakefile\ssymbol\srenaming.\sThis\sis\ssimply\smore\sreadable\sto\smy\seyes. +D 2024-10-24T05:33:30.843 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724 -F Makefile.in bd9798f56bbdc342f8d563ef7f5da7a87eb3cd95e52bfe3f834c1c86e9862538 +F Makefile.in 52f39f64dd0b5d925987adf433695db1a6bf7a5b009c8231303741a7620616d0 F Makefile.linux-generic eb13e3e981a1950c99ce26c177fe2c2d2a268da4c0b1fcba85bfdf56142be298 F Makefile.msc 58b69eda1faad5d475092b8aeffab9156ee4901a82db089b166607f2ec907ee4 F README.md c3c0f19532ce28f6297a71870f3c7b424729f0e6d9ab889616d3587dd2332159 @@ -707,7 +707,7 @@ F ext/wasm/wasmfs.make bc8bb227f35d5bd3863a7bd2233437c37472a0d81585979f058f9b9b5 F install-sh 9d4de14ab9fb0facae2f48780b874848cbf2f895 x F ltmain.sh 3ff0879076df340d2e23ae905484d8c15d5fdea8 F magic.txt 5ade0bc977aa135e79e3faaea894d5671b26107cc91e70783aa7dc83f22f3ba0 -F main.mk e083730779a0c9c0ee686c8bfd50f3b1920d6923cd1711f63a2a113fdd9342dc +F main.mk c75886e8126c083e85fabc287d9d4649305f8c90e8d98fde23e8e1f338884e0f F mptest/config01.test 3c6adcbc50b991866855f1977ff172eb6d901271 F mptest/config02.test 4415dfe36c48785f751e16e32c20b077c28ae504 F mptest/crash01.test 61e61469e257df0850df4293d7d4d6c2af301421 @@ -2236,8 +2236,8 @@ F vsixtest/vsixtest.tcl 6195aba1f12a5e10efc2b8c0009532167be5e301abe5b31385638080 F vsixtest/vsixtest.vcxproj.data 2ed517e100c66dc455b492e1a33350c1b20fbcdc F vsixtest/vsixtest.vcxproj.filters 37e51ffedcdb064aad6ff33b6148725226cd608e F vsixtest/vsixtest_TemporaryKey.pfx e5b1b036facdb453873e7084e1cae9102ccc67a0 -P 7eceb7539dcce16104a93ad0ca1f755f23621751878cc4b01465e61333795b72 -R 706f84b6afa1da7be99c001c09d178a8 +P 4193d90f2158e25fe25f9bcf579ae38a6e0ab6c26f52cd07a777d67b87107632 +R 4feb62569d5755832ec6d50a1a994ac9 U stephan -Z 9e7d56afc7541bc2579fecb7499ab27a +Z fdd999fe051cb1883eb5d46f2f11b028 # Remove this line to create a well-formed Fossil manifest. diff --git a/manifest.uuid b/manifest.uuid index 737f06142b..2b974d21a1 100644 --- a/manifest.uuid +++ b/manifest.uuid @@ -1 +1 @@ -4193d90f2158e25fe25f9bcf579ae38a6e0ab6c26f52cd07a777d67b87107632 +6d4d1d5fefb82ec7458efc2e93c933d9dc415dfa06fa46ff4725c30fc920ca5a