Rename some build vars for legibility. Fix hwaci-make-from-dot-in when the input...

FossilOrigin-Name: fdb584421578cae825365d457cd533721839e3503f3744c77832c5925815b537

diff --git a/Makefile.in b/Makefile.in
index 529da336b37382d6616e3605daa12307228e78c8..cd92c822ce13ea7da3e96138a825ce802596b923 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -100,13 +100,15 @@ CFLAGS_READLINE = -DHAVE_READLINE=@HAVE_READLINE@ @CFLAGS_READLINE@
 ENABLE_SHARED = @ENABLE_SHARED@
 HAVE_WASI_SDK = @HAVE_WASI_SDK@
 
-TCCX = $(TCC) @TARGET_DEBUG@
-# Define this for the autoconf-based build, so that the code knows it
+TCC.sqlite = $(TCC) @TARGET_DEBUG@
+
+#
+# Define -D_HAVE_SQLITE_CONFIG_H so that the code knows it
 # can include the generated sqlite_cfg.h.
 #
-TCCX += -D_HAVE_SQLITE_CONFIG_H -DBUILD_sqlite
+TCC.sqlite += -D_HAVE_SQLITE_CONFIG_H -DBUILD_sqlite
 #
-# main.mk will fill out TCCX with some flags common to all builds.
+# main.mk will fill out TCC.sqlite with some flags common to all builds.
 
 #XX#CFLAGS_READLINE += -DHAVE_EDITLINE=@TARGET_HAVE_EDITLINE@
 #XX#CFLAGS_READLINE += -DHAVE_LINENOISE=@TARGET_HAVE_LINENOISE@

diff --git a/autosetup/hwaci-common.tcl b/autosetup/hwaci-common.tcl
index d2974591b08dd639a758dbd83d06def91538eb0f..602c32660d3722b48cce73496a1c394d0e61a8c9 100644 (file)
--- a/autosetup/hwaci-common.tcl
+++ b/autosetup/hwaci-common.tcl
@@ -439,6 +439,7 @@ proc hwaci-make-from-dot-in {args} {
     set filename [lrange $args 1 end]
   }
   foreach f $filename {
+    set f [string trim $f]
     catch { exec chmod u+w $f }
     make-template $f.in $f
     if {$touch} {

diff --git a/main.mk b/main.mk
index 59db681c9eb7f35c7166804a14c3bff2de4ed2ff..630bb40b4fd2ac7873c76ee9dc4af77eac553dc9 100644 (file)
--- a/main.mk
+++ b/main.mk
@@ -5,10 +5,11 @@
 # a higher-level makefile which configures any dynamic state needed by
 # this one.
 #
-# Maintenance reminder: this file must remain devoid of GNU Make-isms.
-# i.e. it must be POSIX Make compatible. "bmake" (BSD make) is
-# available on most Linux systems, so compatibility is relatively easy
-# to test.
+# Maintenance reminders:
+#
+#  - This file must remain devoid of GNU Make-isms.  i.e. it must be
+#  POSIX Make compatible. "bmake" (BSD make) is available on most
+#  Linux systems, so compatibility is relatively easy to test.
 #
 #XX# Lines starting with #XX# are TODOs for the port to autosetup
 #
@@ -198,23 +199,14 @@ INSTALL_noexec = $(INSTALL) -m 0644
 # $(TCOMPILE_EXTRAS) = config-specific flags for $(TCOMPILE)
 #
 TCOMPILE = $(TCC) $(TCOMPILE_EXTRAS)
-#
-# $(TLINK) = compiler invocation for when the target will be an executable
-# $(TLINK_EXTRAS) = config-specific flags for $(TLINK)
-#
-TLINK = $(TCCX) $(TLINK_EXTRAS)
-#
-# $(TLINK_shared) = $(TLINK) invocation specifically for shared libraries
-#
-TLINK_shared = $(TLINK) $(LDFLAGS_SHOBJ)
 
 #
-# $(TCCX) is $(TCC) plus any flags which are desired for the library
+# $(TCC.sqlite) is $(TCC) 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 by the configure-generated
 # makefile, so should not be overwritten here.
 #
-TCCX ?= $(TCC)
+TCC.sqlite ?= $(TCC)
 #
 # $(CFLAGS_intree_includes) = -I... flags relevant specifically to
 # this tree, including any subdirectories commonly needed for building
@@ -224,12 +216,24 @@ 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
-TCCX += $(CFLAGS_intree_includes)
+TCC.sqlite += $(CFLAGS_intree_includes)
 
 #
-# $(TCC_EXT) = compiler invocation for loadable extensions.
+# $(TCC.extension) = compiler invocation for loadable extensions.
+#
+TCC.extension = $(TCOMPILE) -I. -I$(TOP)/src -DSQLITE_CORE
+
+#
+# $(TLINK) = compiler invocation for when the target will be an
+# executable.
+#
+# $(TLINK_EXTRAS) = config-specific flags for $(TLINK)
+#
+TLINK = $(TCC.sqlite) $(TLINK_EXTRAS)
+#
+# $(TLINK.shared) = $(TLINK) invocation specifically for shared libraries
 #
-TCC_EXT = $(TCOMPILE) -I. -I$(TOP)/src -DSQLITE_CORE
+TLINK.shared = $(TLINK) $(LDFLAGS_SHOBJ)
 
 #
 # $(CFLAGS_libsqlite3) must contain any CFLAGS which are relevant for
@@ -249,7 +253,7 @@ CFLAGS_libsqlite3 ?= -DSQLITE_TEMP_STORE=1
 # 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 $(TCCX) or $(TLINK) but not $(BCC).
+# i.e. it should be used with $(TCC.sqlite) or $(TLINK) but not $(BCC).
 #
 LDFLAGS_libsqlite3 = \
   $(LDFLAGS_RPATH) $(LDFLAGS_PTHREAD) \
@@ -840,255 +844,255 @@ sqlite3ext.h:   .target_source
 #     opcodes.o
 #
 parse.o:       parse.c $(HDR)
-       $(TCCX) $(CFLAGS_libsqlite3) -c parse.c
+       $(TCC.sqlite) $(CFLAGS_libsqlite3) -c parse.c
 
 opcodes.o:     opcodes.c
-       $(TCCX) $(CFLAGS_libsqlite3) -c opcodes.c
+       $(TCC.sqlite) $(CFLAGS_libsqlite3) -c opcodes.c
 
 # Rules to build individual *.o files from files in the src directory.
 #
 alter.o:       $(TOP)/src/alter.c $(HDR)
-       $(TCCX) $(CFLAGS_libsqlite3) -c $(TOP)/src/alter.c
+       $(TCC.sqlite) $(CFLAGS_libsqlite3) -c $(TOP)/src/alter.c
 
 analyze.o:     $(TOP)/src/analyze.c $(HDR)
-       $(TCCX) $(CFLAGS_libsqlite3) -c $(TOP)/src/analyze.c
+       $(TCC.sqlite) $(CFLAGS_libsqlite3) -c $(TOP)/src/analyze.c
 
 attach.o:      $(TOP)/src/attach.c $(HDR)
-       $(TCCX) $(CFLAGS_libsqlite3) -c $(TOP)/src/attach.c
+       $(TCC.sqlite) $(CFLAGS_libsqlite3) -c $(TOP)/src/attach.c
 
 auth.o:        $(TOP)/src/auth.c $(HDR)
-       $(TCCX) $(CFLAGS_libsqlite3) -c $(TOP)/src/auth.c
+       $(TCC.sqlite) $(CFLAGS_libsqlite3) -c $(TOP)/src/auth.c
 
 backup.o:      $(TOP)/src/backup.c $(HDR)
-       $(TCCX) $(CFLAGS_libsqlite3) -c $(TOP)/src/backup.c
+       $(TCC.sqlite) $(CFLAGS_libsqlite3) -c $(TOP)/src/backup.c
 
 bitvec.o:      $(TOP)/src/bitvec.c $(HDR)
-       $(TCCX) $(CFLAGS_libsqlite3) -c $(TOP)/src/bitvec.c
+       $(TCC.sqlite) $(CFLAGS_libsqlite3) -c $(TOP)/src/bitvec.c
 
 btmutex.o:     $(TOP)/src/btmutex.c $(HDR)
-       $(TCCX) $(CFLAGS_libsqlite3) -c $(TOP)/src/btmutex.c
+       $(TCC.sqlite) $(CFLAGS_libsqlite3) -c $(TOP)/src/btmutex.c
 
 btree.o:       $(TOP)/src/btree.c $(HDR) $(TOP)/src/pager.h
-       $(TCCX) $(CFLAGS_libsqlite3) -c $(TOP)/src/btree.c
+       $(TCC.sqlite) $(CFLAGS_libsqlite3) -c $(TOP)/src/btree.c
 
 build.o:       $(TOP)/src/build.c $(HDR)
-       $(TCCX) $(CFLAGS_libsqlite3) -c $(TOP)/src/build.c
+       $(TCC.sqlite) $(CFLAGS_libsqlite3) -c $(TOP)/src/build.c
 
 callback.o:    $(TOP)/src/callback.c $(HDR)
-       $(TCCX) $(CFLAGS_libsqlite3) -c $(TOP)/src/callback.c
+       $(TCC.sqlite) $(CFLAGS_libsqlite3) -c $(TOP)/src/callback.c
 
 complete.o:    $(TOP)/src/complete.c $(HDR)
-       $(TCCX) $(CFLAGS_libsqlite3) -c $(TOP)/src/complete.c
+       $(TCC.sqlite) $(CFLAGS_libsqlite3) -c $(TOP)/src/complete.c
 
 ctime.o:       $(TOP)/src/ctime.c $(HDR)
-       $(TCCX) $(CFLAGS_libsqlite3) -c $(TOP)/src/ctime.c
+       $(TCC.sqlite) $(CFLAGS_libsqlite3) -c $(TOP)/src/ctime.c
 
 date.o:        $(TOP)/src/date.c $(HDR)
-       $(TCCX) $(CFLAGS_libsqlite3) -c $(TOP)/src/date.c
+       $(TCC.sqlite) $(CFLAGS_libsqlite3) -c $(TOP)/src/date.c
 
 dbpage.o:      $(TOP)/src/dbpage.c $(HDR)
-       $(TCCX) $(CFLAGS_libsqlite3) -c $(TOP)/src/dbpage.c
+       $(TCC.sqlite) $(CFLAGS_libsqlite3) -c $(TOP)/src/dbpage.c
 
 dbstat.o:      $(TOP)/src/dbstat.c $(HDR)
-       $(TCCX) $(CFLAGS_libsqlite3) -c $(TOP)/src/dbstat.c
+       $(TCC.sqlite) $(CFLAGS_libsqlite3) -c $(TOP)/src/dbstat.c
 
 delete.o:      $(TOP)/src/delete.c $(HDR)
-       $(TCCX) $(CFLAGS_libsqlite3) -c $(TOP)/src/delete.c
+       $(TCC.sqlite) $(CFLAGS_libsqlite3) -c $(TOP)/src/delete.c
 
 expr.o:        $(TOP)/src/expr.c $(HDR)
-       $(TCCX) $(CFLAGS_libsqlite3) -c $(TOP)/src/expr.c
+       $(TCC.sqlite) $(CFLAGS_libsqlite3) -c $(TOP)/src/expr.c
 
 fault.o:       $(TOP)/src/fault.c $(HDR)
-       $(TCCX) $(CFLAGS_libsqlite3) -c $(TOP)/src/fault.c
+       $(TCC.sqlite) $(CFLAGS_libsqlite3) -c $(TOP)/src/fault.c
 
 fkey.o:        $(TOP)/src/fkey.c $(HDR)
-       $(TCCX) $(CFLAGS_libsqlite3) -c $(TOP)/src/fkey.c
+       $(TCC.sqlite) $(CFLAGS_libsqlite3) -c $(TOP)/src/fkey.c
 
 func.o:        $(TOP)/src/func.c $(HDR)
-       $(TCCX) $(CFLAGS_libsqlite3) -c $(TOP)/src/func.c
+       $(TCC.sqlite) $(CFLAGS_libsqlite3) -c $(TOP)/src/func.c
 
 global.o:      $(TOP)/src/global.c $(HDR)
-       $(TCCX) $(CFLAGS_libsqlite3) -c $(TOP)/src/global.c
+       $(TCC.sqlite) $(CFLAGS_libsqlite3) -c $(TOP)/src/global.c
 
 hash.o:        $(TOP)/src/hash.c $(HDR)
-       $(TCCX) $(CFLAGS_libsqlite3) -c $(TOP)/src/hash.c
+       $(TCC.sqlite) $(CFLAGS_libsqlite3) -c $(TOP)/src/hash.c
 
 insert.o:      $(TOP)/src/insert.c $(HDR)
-       $(TCCX) $(CFLAGS_libsqlite3) -c $(TOP)/src/insert.c
+       $(TCC.sqlite) $(CFLAGS_libsqlite3) -c $(TOP)/src/insert.c
 
 json.o:        $(TOP)/src/json.c $(HDR)
-       $(TCCX) $(CFLAGS_libsqlite3) -c $(TOP)/src/json.c
+       $(TCC.sqlite) $(CFLAGS_libsqlite3) -c $(TOP)/src/json.c
 
 legacy.o:      $(TOP)/src/legacy.c $(HDR)
-       $(TCCX) $(CFLAGS_libsqlite3) -c $(TOP)/src/legacy.c
+       $(TCC.sqlite) $(CFLAGS_libsqlite3) -c $(TOP)/src/legacy.c
 
 loadext.o:     $(TOP)/src/loadext.c $(HDR)
-       $(TCCX) $(CFLAGS_libsqlite3) -c $(TOP)/src/loadext.c
+       $(TCC.sqlite) $(CFLAGS_libsqlite3) -c $(TOP)/src/loadext.c
 
 main.o:        $(TOP)/src/main.c $(HDR)
-       $(TCCX) $(CFLAGS_libsqlite3) -c $(TOP)/src/main.c
+       $(TCC.sqlite) $(CFLAGS_libsqlite3) -c $(TOP)/src/main.c
 
 malloc.o:      $(TOP)/src/malloc.c $(HDR)
-       $(TCCX) $(CFLAGS_libsqlite3) -c $(TOP)/src/malloc.c
+       $(TCC.sqlite) $(CFLAGS_libsqlite3) -c $(TOP)/src/malloc.c
 
 mem0.o:        $(TOP)/src/mem0.c $(HDR)
-       $(TCCX) $(CFLAGS_libsqlite3) -c $(TOP)/src/mem0.c
+       $(TCC.sqlite) $(CFLAGS_libsqlite3) -c $(TOP)/src/mem0.c
 
 mem1.o:        $(TOP)/src/mem1.c $(HDR)
-       $(TCCX) $(CFLAGS_libsqlite3) -c $(TOP)/src/mem1.c
+       $(TCC.sqlite) $(CFLAGS_libsqlite3) -c $(TOP)/src/mem1.c
 
 mem2.o:        $(TOP)/src/mem2.c $(HDR)
-       $(TCCX) $(CFLAGS_libsqlite3) -c $(TOP)/src/mem2.c
+       $(TCC.sqlite) $(CFLAGS_libsqlite3) -c $(TOP)/src/mem2.c
 
 mem3.o:        $(TOP)/src/mem3.c $(HDR)
-       $(TCCX) $(CFLAGS_libsqlite3) -c $(TOP)/src/mem3.c
+       $(TCC.sqlite) $(CFLAGS_libsqlite3) -c $(TOP)/src/mem3.c
 
 mem5.o:        $(TOP)/src/mem5.c $(HDR)
-       $(TCCX) $(CFLAGS_libsqlite3) -c $(TOP)/src/mem5.c
+       $(TCC.sqlite) $(CFLAGS_libsqlite3) -c $(TOP)/src/mem5.c
 
 memdb.o:       $(TOP)/src/memdb.c $(HDR)
-       $(TCCX) $(CFLAGS_libsqlite3) -c $(TOP)/src/memdb.c
+       $(TCC.sqlite) $(CFLAGS_libsqlite3) -c $(TOP)/src/memdb.c
 
 memjournal.o:  $(TOP)/src/memjournal.c $(HDR)
-       $(TCCX) $(CFLAGS_libsqlite3) -c $(TOP)/src/memjournal.c
+       $(TCC.sqlite) $(CFLAGS_libsqlite3) -c $(TOP)/src/memjournal.c
 
 mutex.o:       $(TOP)/src/mutex.c $(HDR)
-       $(TCCX) $(CFLAGS_libsqlite3) -c $(TOP)/src/mutex.c
+       $(TCC.sqlite) $(CFLAGS_libsqlite3) -c $(TOP)/src/mutex.c
 
 mutex_noop.o:  $(TOP)/src/mutex_noop.c $(HDR)
-       $(TCCX) $(CFLAGS_libsqlite3) -c $(TOP)/src/mutex_noop.c
+       $(TCC.sqlite) $(CFLAGS_libsqlite3) -c $(TOP)/src/mutex_noop.c
 
 mutex_unix.o:  $(TOP)/src/mutex_unix.c $(HDR)
-       $(TCCX) $(CFLAGS_libsqlite3) -c $(TOP)/src/mutex_unix.c
+       $(TCC.sqlite) $(CFLAGS_libsqlite3) -c $(TOP)/src/mutex_unix.c
 
 mutex_w32.o:   $(TOP)/src/mutex_w32.c $(HDR)
-       $(TCCX) $(CFLAGS_libsqlite3) -c $(TOP)/src/mutex_w32.c
+       $(TCC.sqlite) $(CFLAGS_libsqlite3) -c $(TOP)/src/mutex_w32.c
 
 notify.o:      $(TOP)/src/notify.c $(HDR)
-       $(TCCX) $(CFLAGS_libsqlite3) -c $(TOP)/src/notify.c
+       $(TCC.sqlite) $(CFLAGS_libsqlite3) -c $(TOP)/src/notify.c
 
 pager.o:       $(TOP)/src/pager.c $(HDR) $(TOP)/src/pager.h
-       $(TCCX) $(CFLAGS_libsqlite3) -c $(TOP)/src/pager.c
+       $(TCC.sqlite) $(CFLAGS_libsqlite3) -c $(TOP)/src/pager.c
 
 pcache.o:      $(TOP)/src/pcache.c $(HDR) $(TOP)/src/pcache.h
-       $(TCCX) $(CFLAGS_libsqlite3) -c $(TOP)/src/pcache.c
+       $(TCC.sqlite) $(CFLAGS_libsqlite3) -c $(TOP)/src/pcache.c
 
 pcache1.o:     $(TOP)/src/pcache1.c $(HDR) $(TOP)/src/pcache.h
-       $(TCCX) $(CFLAGS_libsqlite3) -c $(TOP)/src/pcache1.c
+       $(TCC.sqlite) $(CFLAGS_libsqlite3) -c $(TOP)/src/pcache1.c
 
 os.o:  $(TOP)/src/os.c $(HDR)
-       $(TCCX) $(CFLAGS_libsqlite3) -c $(TOP)/src/os.c
+       $(TCC.sqlite) $(CFLAGS_libsqlite3) -c $(TOP)/src/os.c
 
 os_kv.o:       $(TOP)/src/os_kv.c $(HDR)
-       $(TCCX) $(CFLAGS_libsqlite3) -c $(TOP)/src/os_kv.c
+       $(TCC.sqlite) $(CFLAGS_libsqlite3) -c $(TOP)/src/os_kv.c
 
 os_unix.o:     $(TOP)/src/os_unix.c $(HDR)
-       $(TCCX) $(CFLAGS_libsqlite3) -c $(TOP)/src/os_unix.c
+       $(TCC.sqlite) $(CFLAGS_libsqlite3) -c $(TOP)/src/os_unix.c
 
 os_win.o:      $(TOP)/src/os_win.c $(HDR)
-       $(TCCX) $(CFLAGS_libsqlite3) -c $(TOP)/src/os_win.c
+       $(TCC.sqlite) $(CFLAGS_libsqlite3) -c $(TOP)/src/os_win.c
 
 pragma.o:      $(TOP)/src/pragma.c $(HDR)
-       $(TCCX) $(CFLAGS_libsqlite3) -c $(TOP)/src/pragma.c
+       $(TCC.sqlite) $(CFLAGS_libsqlite3) -c $(TOP)/src/pragma.c
 
 prepare.o:     $(TOP)/src/prepare.c $(HDR)
-       $(TCCX) $(CFLAGS_libsqlite3) -c $(TOP)/src/prepare.c
+       $(TCC.sqlite) $(CFLAGS_libsqlite3) -c $(TOP)/src/prepare.c
 
 printf.o:      $(TOP)/src/printf.c $(HDR)
-       $(TCCX) $(CFLAGS_libsqlite3) -c $(TOP)/src/printf.c
+       $(TCC.sqlite) $(CFLAGS_libsqlite3) -c $(TOP)/src/printf.c
 
 random.o:      $(TOP)/src/random.c $(HDR)
-       $(TCCX) $(CFLAGS_libsqlite3) -c $(TOP)/src/random.c
+       $(TCC.sqlite) $(CFLAGS_libsqlite3) -c $(TOP)/src/random.c
 
 resolve.o:     $(TOP)/src/resolve.c $(HDR)
-       $(TCCX) $(CFLAGS_libsqlite3) -c $(TOP)/src/resolve.c
+       $(TCC.sqlite) $(CFLAGS_libsqlite3) -c $(TOP)/src/resolve.c
 
 rowset.o:      $(TOP)/src/rowset.c $(HDR)
-       $(TCCX) $(CFLAGS_libsqlite3) -c $(TOP)/src/rowset.c
+       $(TCC.sqlite) $(CFLAGS_libsqlite3) -c $(TOP)/src/rowset.c
 
 select.o:      $(TOP)/src/select.c $(HDR)
-       $(TCCX) $(CFLAGS_libsqlite3) -c $(TOP)/src/select.c
+       $(TCC.sqlite) $(CFLAGS_libsqlite3) -c $(TOP)/src/select.c
 
 status.o:      $(TOP)/src/status.c $(HDR)
-       $(TCCX) $(CFLAGS_libsqlite3) -c $(TOP)/src/status.c
+       $(TCC.sqlite) $(CFLAGS_libsqlite3) -c $(TOP)/src/status.c
 
 sqlite3.o:     sqlite3.h sqlite3.c
-       $(TCCX) $(CFLAGS_libsqlite3) -c sqlite3.c
+       $(TCC.sqlite) $(CFLAGS_libsqlite3) -c sqlite3.c
 
 table.o:       $(TOP)/src/table.c $(HDR)
-       $(TCCX) $(CFLAGS_libsqlite3) -c $(TOP)/src/table.c
+       $(TCC.sqlite) $(CFLAGS_libsqlite3) -c $(TOP)/src/table.c
 
 threads.o:     $(TOP)/src/threads.c $(HDR)
-       $(TCCX) $(CFLAGS_libsqlite3) -c $(TOP)/src/threads.c
+       $(TCC.sqlite) $(CFLAGS_libsqlite3) -c $(TOP)/src/threads.c
 
 tokenize.o:    $(TOP)/src/tokenize.c keywordhash.h $(HDR)
-       $(TCCX) $(CFLAGS_libsqlite3) -c $(TOP)/src/tokenize.c
+       $(TCC.sqlite) $(CFLAGS_libsqlite3) -c $(TOP)/src/tokenize.c
 
 treeview.o:    $(TOP)/src/treeview.c $(HDR)
-       $(TCCX) $(CFLAGS_libsqlite3) -c $(TOP)/src/treeview.c
+       $(TCC.sqlite) $(CFLAGS_libsqlite3) -c $(TOP)/src/treeview.c
 
 trigger.o:     $(TOP)/src/trigger.c $(HDR)
-       $(TCCX) $(CFLAGS_libsqlite3) -c $(TOP)/src/trigger.c
+       $(TCC.sqlite) $(CFLAGS_libsqlite3) -c $(TOP)/src/trigger.c
 
 update.o:      $(TOP)/src/update.c $(HDR)
-       $(TCCX) $(CFLAGS_libsqlite3) -c $(TOP)/src/update.c
+       $(TCC.sqlite) $(CFLAGS_libsqlite3) -c $(TOP)/src/update.c
 
 upsert.o:      $(TOP)/src/upsert.c $(HDR)
-       $(TCCX) $(CFLAGS_libsqlite3) -c $(TOP)/src/upsert.c
+       $(TCC.sqlite) $(CFLAGS_libsqlite3) -c $(TOP)/src/upsert.c
 
 utf.o: $(TOP)/src/utf.c $(HDR)
-       $(TCCX) $(CFLAGS_libsqlite3) -c $(TOP)/src/utf.c
+       $(TCC.sqlite) $(CFLAGS_libsqlite3) -c $(TOP)/src/utf.c
 
 util.o:        $(TOP)/src/util.c $(HDR)
-       $(TCCX) $(CFLAGS_libsqlite3) -c $(TOP)/src/util.c
+       $(TCC.sqlite) $(CFLAGS_libsqlite3) -c $(TOP)/src/util.c
 
 vacuum.o:      $(TOP)/src/vacuum.c $(HDR)
-       $(TCCX) $(CFLAGS_libsqlite3) -c $(TOP)/src/vacuum.c
+       $(TCC.sqlite) $(CFLAGS_libsqlite3) -c $(TOP)/src/vacuum.c
 
 vdbe.o:        $(TOP)/src/vdbe.c $(HDR)
-       $(TCCX) $(CFLAGS_libsqlite3) -c $(TOP)/src/vdbe.c
+       $(TCC.sqlite) $(CFLAGS_libsqlite3) -c $(TOP)/src/vdbe.c
 
 vdbeapi.o:     $(TOP)/src/vdbeapi.c $(HDR)
-       $(TCCX) $(CFLAGS_libsqlite3) -c $(TOP)/src/vdbeapi.c
+       $(TCC.sqlite) $(CFLAGS_libsqlite3) -c $(TOP)/src/vdbeapi.c
 
 vdbeaux.o:     $(TOP)/src/vdbeaux.c $(HDR)
-       $(TCCX) $(CFLAGS_libsqlite3) -c $(TOP)/src/vdbeaux.c
+       $(TCC.sqlite) $(CFLAGS_libsqlite3) -c $(TOP)/src/vdbeaux.c
 
 vdbeblob.o:    $(TOP)/src/vdbeblob.c $(HDR)
-       $(TCCX) $(CFLAGS_libsqlite3) -c $(TOP)/src/vdbeblob.c
+       $(TCC.sqlite) $(CFLAGS_libsqlite3) -c $(TOP)/src/vdbeblob.c
 
 vdbemem.o:     $(TOP)/src/vdbemem.c $(HDR)
-       $(TCCX) $(CFLAGS_libsqlite3) -c $(TOP)/src/vdbemem.c
+       $(TCC.sqlite) $(CFLAGS_libsqlite3) -c $(TOP)/src/vdbemem.c
 
 vdbesort.o:    $(TOP)/src/vdbesort.c $(HDR)
-       $(TCCX) $(CFLAGS_libsqlite3) -c $(TOP)/src/vdbesort.c
+       $(TCC.sqlite) $(CFLAGS_libsqlite3) -c $(TOP)/src/vdbesort.c
 
 vdbetrace.o:   $(TOP)/src/vdbetrace.c $(HDR)
-       $(TCCX) $(CFLAGS_libsqlite3) -c $(TOP)/src/vdbetrace.c
+       $(TCC.sqlite) $(CFLAGS_libsqlite3) -c $(TOP)/src/vdbetrace.c
 
 vdbevtab.o:    $(TOP)/src/vdbevtab.c $(HDR)
-       $(TCCX) $(CFLAGS_libsqlite3) -c $(TOP)/src/vdbevtab.c
+       $(TCC.sqlite) $(CFLAGS_libsqlite3) -c $(TOP)/src/vdbevtab.c
 
 vtab.o:        $(TOP)/src/vtab.c $(HDR)
-       $(TCCX) $(CFLAGS_libsqlite3) -c $(TOP)/src/vtab.c
+       $(TCC.sqlite) $(CFLAGS_libsqlite3) -c $(TOP)/src/vtab.c
 
 wal.o: $(TOP)/src/wal.c $(HDR)
-       $(TCCX) $(CFLAGS_libsqlite3) -c $(TOP)/src/wal.c
+       $(TCC.sqlite) $(CFLAGS_libsqlite3) -c $(TOP)/src/wal.c
 
 walker.o:      $(TOP)/src/walker.c $(HDR)
-       $(TCCX) $(CFLAGS_libsqlite3) -c $(TOP)/src/walker.c
+       $(TCC.sqlite) $(CFLAGS_libsqlite3) -c $(TOP)/src/walker.c
 
 where.o:       $(TOP)/src/where.c $(HDR)
-       $(TCCX) $(CFLAGS_libsqlite3) -c $(TOP)/src/where.c
+       $(TCC.sqlite) $(CFLAGS_libsqlite3) -c $(TOP)/src/where.c
 
 wherecode.o:   $(TOP)/src/wherecode.c $(HDR)
-       $(TCCX) $(CFLAGS_libsqlite3) -c $(TOP)/src/wherecode.c
+       $(TCC.sqlite) $(CFLAGS_libsqlite3) -c $(TOP)/src/wherecode.c
 
 whereexpr.o:   $(TOP)/src/whereexpr.c $(HDR)
-       $(TCCX) $(CFLAGS_libsqlite3) -c $(TOP)/src/whereexpr.c
+       $(TCC.sqlite) $(CFLAGS_libsqlite3) -c $(TOP)/src/whereexpr.c
 
 window.o:      $(TOP)/src/window.c $(HDR)
-       $(TCCX) $(CFLAGS_libsqlite3) -c $(TOP)/src/window.c
+       $(TCC.sqlite) $(CFLAGS_libsqlite3) -c $(TOP)/src/window.c
 
 tclsqlite.o:   $(TOP)/src/tclsqlite.c $(HDR)
        $(TCOMPILE) -DUSE_TCL_STUBS=1 $(TCL_INCLUDE_SPEC) $(CFLAGS_intree_includes) \
@@ -1150,7 +1154,7 @@ all: lib
 # Dynamic libsqlite3
 #
 $(libsqlite3.SO):      $(LIBOBJ)
-       $(TLINK_shared) -o $@ $(LIBOBJ) $(LDFLAGS_libsqlite3)
+       $(TLINK.shared) -o $@ $(LIBOBJ) $(LDFLAGS_libsqlite3)
 $(libsqlite3.SO)-1: $(libsqlite3.SO)
 $(libsqlite3.SO)-0 $(libsqlite3.SO)-:
 so: $(libsqlite3.SO)-$(ENABLE_SHARED)
@@ -1199,7 +1203,7 @@ pkgIndex.tcl:
        echo 'package ifneeded sqlite3 $(RELEASE) [list load [file join $$dir libtclsqlite3[info sharedlibextension]] sqlite3]' > $@
 libtclsqlite3.SO = libtclsqlite3$(TDLL)
 $(libtclsqlite3.SO): tclsqlite.o $(libsqlite3.LIB)
-       $(TLINK_shared) -o $@ tclsqlite.o \
+       $(TLINK.shared) -o $@ tclsqlite.o \
                $(TCL_INCLUDE_SPEC) $(TCL_STUB_LIB_SPEC) $(LDFLAGS_libsqlite3) \
                $(libsqlite3.LIB) $(TCLLIB_RPATH)
 $(libtclsqlite3.SO)-1: $(libtclsqlite3.SO)
@@ -1283,10 +1287,10 @@ fts5.c: $(FTS5_SRC) $(BTCLSH) # has_tclsh84
        cp $(TOP)/ext/fts5/fts5.h .
 
 fts5.o:        fts5.c $(HDR) $(EXTHDR)
-       $(TCC_EXT) -c fts5.c
+       $(TCC.extension) -c fts5.c
 
 sqlite3rbu.o:  $(TOP)/ext/rbu/sqlite3rbu.c $(HDR) $(EXTHDR)
-       $(TCC_EXT) -c $(TOP)/ext/rbu/sqlite3rbu.c
+       $(TCC.extension) -c $(TOP)/ext/rbu/sqlite3rbu.c
 
 
 #
@@ -1646,7 +1650,7 @@ RSYNC_OPT = \
   -DSQLITE_OMIT_DEPRECATED
 
 sqlite3_rsync$(TEXE):  $(RSYNC_SRC)
-       $(TCCX) -o $@ $(RSYNC_OPT) $(RSYNC_SRC) $(LDFLAGS_libsqlite3)
+       $(TCC.sqlite) -o $@ $(RSYNC_OPT) $(RSYNC_SRC) $(LDFLAGS_libsqlite3)
 xbin: sqlite3_rsync$(TEXE)
 
 install-rsync: sqlite3_rsync$(TEXE) $(install-dir.bin)
@@ -1813,58 +1817,58 @@ shell.c:        $(SHELL_DEP) $(TOP)/tool/mkshellc.tcl $(BTCLSH) # has_tclsh84
 # Rules to build the extension objects.
 #
 icu.o: $(TOP)/ext/icu/icu.c $(HDR) $(EXTHDR)
-       $(TCC_EXT) -c $(TOP)/ext/icu/icu.c
+       $(TCC.extension) -c $(TOP)/ext/icu/icu.c
 
 fts3.o:        $(TOP)/ext/fts3/fts3.c $(HDR) $(EXTHDR)
-       $(TCC_EXT) -c $(TOP)/ext/fts3/fts3.c
+       $(TCC.extension) -c $(TOP)/ext/fts3/fts3.c
 
 fts3_aux.o:    $(TOP)/ext/fts3/fts3_aux.c $(HDR) $(EXTHDR)
-       $(TCC_EXT) -c $(TOP)/ext/fts3/fts3_aux.c
+       $(TCC.extension) -c $(TOP)/ext/fts3/fts3_aux.c
 
 fts3_expr.o:   $(TOP)/ext/fts3/fts3_expr.c $(HDR) $(EXTHDR)
-       $(TCC_EXT) -c $(TOP)/ext/fts3/fts3_expr.c
+       $(TCC.extension) -c $(TOP)/ext/fts3/fts3_expr.c
 
 fts3_hash.o:   $(TOP)/ext/fts3/fts3_hash.c $(HDR) $(EXTHDR)
-       $(TCC_EXT) -c $(TOP)/ext/fts3/fts3_hash.c
+       $(TCC.extension) -c $(TOP)/ext/fts3/fts3_hash.c
 
 fts3_icu.o:    $(TOP)/ext/fts3/fts3_icu.c $(HDR) $(EXTHDR)
-       $(TCC_EXT) -c $(TOP)/ext/fts3/fts3_icu.c
+       $(TCC.extension) -c $(TOP)/ext/fts3/fts3_icu.c
 
 fts3_porter.o: $(TOP)/ext/fts3/fts3_porter.c $(HDR) $(EXTHDR)
-       $(TCC_EXT) -c $(TOP)/ext/fts3/fts3_porter.c
+       $(TCC.extension) -c $(TOP)/ext/fts3/fts3_porter.c
 
 fts3_snippet.o:        $(TOP)/ext/fts3/fts3_snippet.c $(HDR) $(EXTHDR)
-       $(TCC_EXT) -c $(TOP)/ext/fts3/fts3_snippet.c
+       $(TCC.extension) -c $(TOP)/ext/fts3/fts3_snippet.c
 
 fts3_tokenizer.o:      $(TOP)/ext/fts3/fts3_tokenizer.c $(HDR) $(EXTHDR)
-       $(TCC_EXT) -c $(TOP)/ext/fts3/fts3_tokenizer.c
+       $(TCC.extension) -c $(TOP)/ext/fts3/fts3_tokenizer.c
 
 fts3_tokenizer1.o:     $(TOP)/ext/fts3/fts3_tokenizer1.c $(HDR) $(EXTHDR)
-       $(TCC_EXT) -c $(TOP)/ext/fts3/fts3_tokenizer1.c
+       $(TCC.extension) -c $(TOP)/ext/fts3/fts3_tokenizer1.c
 
 fts3_tokenize_vtab.o:  $(TOP)/ext/fts3/fts3_tokenize_vtab.c $(HDR) $(EXTHDR)
-       $(TCC_EXT) -c $(TOP)/ext/fts3/fts3_tokenize_vtab.c
+       $(TCC.extension) -c $(TOP)/ext/fts3/fts3_tokenize_vtab.c
 
 fts3_unicode.o:        $(TOP)/ext/fts3/fts3_unicode.c $(HDR) $(EXTHDR)
-       $(TCC_EXT) -c $(TOP)/ext/fts3/fts3_unicode.c
+       $(TCC.extension) -c $(TOP)/ext/fts3/fts3_unicode.c
 
 fts3_unicode2.o:       $(TOP)/ext/fts3/fts3_unicode2.c $(HDR) $(EXTHDR)
-       $(TCC_EXT) -c $(TOP)/ext/fts3/fts3_unicode2.c
+       $(TCC.extension) -c $(TOP)/ext/fts3/fts3_unicode2.c
 
 fts3_write.o:  $(TOP)/ext/fts3/fts3_write.c $(HDR) $(EXTHDR)
-       $(TCC_EXT) -c $(TOP)/ext/fts3/fts3_write.c
+       $(TCC.extension) -c $(TOP)/ext/fts3/fts3_write.c
 
 rtree.o:       $(TOP)/ext/rtree/rtree.c $(HDR) $(EXTHDR)
-       $(TCC_EXT) -c $(TOP)/ext/rtree/rtree.c
+       $(TCC.extension) -c $(TOP)/ext/rtree/rtree.c
 
 userauth.o:    $(TOP)/ext/userauth/userauth.c $(HDR) $(EXTHDR)
-       $(TCC_EXT) -c $(TOP)/ext/userauth/userauth.c
+       $(TCC.extension) -c $(TOP)/ext/userauth/userauth.c
 
 sqlite3session.o:      $(TOP)/ext/session/sqlite3session.c $(HDR) $(EXTHDR)
-       $(TCC_EXT) -c $(TOP)/ext/session/sqlite3session.c
+       $(TCC.extension) -c $(TOP)/ext/session/sqlite3session.c
 
 stmt.o:        $(TOP)/ext/misc/stmt.c
-       $(TCC_EXT) -c $(TOP)/ext/misc/stmt.c
+       $(TCC.extension) -c $(TOP)/ext/misc/stmt.c
 
 #
 # tool/version-info: a utility for emitting sqlite3 version info
@@ -1883,7 +1887,7 @@ sqlite3.def: $(LIBOBJ)
                | sed 's/^.* _//' >>sqlite3.def
 
 sqlite3.dll: $(LIBOBJ) sqlite3.def
-       $(TCCX) $(LDFLAGS_SHOBJ) -o $@ sqlite3.def \
+       $(TCC.sqlite) $(LDFLAGS_SHOBJ) -o $@ sqlite3.def \
                -Wl,"--strip-all" $(LIBOBJ)
 
 

diff --git a/manifest b/manifest
index f94d2c1c1bdb2d6b3837b7d0ceba63d4268c2c98..3653671844569ebce4dd581a4686f0ba965bbbe1 100644 (file)
--- a/manifest
+++ b/manifest
@@ -1,9 +1,9 @@
-C Fix\sout-of-tree\sbuilds\sconfigured\swith\s--disable-amalgamation.
-D 2024-10-24T00:02:44.736
+C Rename\ssome\sbuild\svars\sfor\slegibility.\sFix\shwaci-make-from-dot-in\swhen\sthe\sinput\sfile\slist\sis\smulti-line.
+D 2024-10-24T01:26:50.001
 F .fossil-settings/empty-dirs dbb81e8fc0401ac46a1491ab34a7f2c7c0452f2f06b54ebb845d024ca8283ef1
 F .fossil-settings/ignore-glob 35175cdfcf539b2318cb04a9901442804be81cd677d8b889fcc9149c21f239ea
 F LICENSE.md df5091916dbb40e6e9686186587125e1b2ff51f022cc334e886c19a0e9982724
-F Makefile.in c26ffc3c7ddc87640e5a511bf9bc327c8752638f505ce81cd2e8de4601c4b44c
+F Makefile.in 4b18845678335be6e56dbe6257a8a777d416ead26c72dd71a08b0bb1a0d59575
 F Makefile.linux-gcc f3842a0b1efbfbb74ac0ef60e56b301836d05b4d867d014f714fa750048f1ab6
 F Makefile.msc 58b69eda1faad5d475092b8aeffab9156ee4901a82db089b166607f2ec907ee4
 F README.md c3c0f19532ce28f6297a71870f3c7b424729f0e6d9ab889616d3587dd2332159
@@ -48,7 +48,7 @@ F autosetup/cc-lib.tcl 493c5935b5dd3bf9bd4eca89b07c8b1b1a9356d61783035144e21795f
 F autosetup/cc-shared.tcl 4f024e94a47f427ba61de1739f6381ef0080210f9fae89112d5c1de1e5460d78
 F autosetup/cc.tcl 7e2fe943ae9d45cf39e9f5b05b6230df8e719415edea5af06c30eb68680bde14
 F autosetup/default.auto 5cdf016de2140e50f1db190a02039dc42fb390af1dda4cc4853e3042a9ef0e82
-F autosetup/hwaci-common.tcl 3e9ae4dbdda198e5dea56e2bdf0a073f2acf60f76e83dc3ee25a00390d3f6bc7
+F autosetup/hwaci-common.tcl 3513a7dbe685d4776e70d23fa41d6695098627ca063245cac163f8ed3dc696f9
 F autosetup/jimsh0.c 838968b1159a6061452d751a48df3646830b04b118e35790da97e998208bc5ae
 F autosetup/pkg-config.tcl 4e635bf39022ff65e0d5434339dd41503ea48fc53822c9c5bde88b02d3d952ba
 F autosetup/system.tcl 3a39d6e0b3bfba526fd39afe07c1d0d325e5a31925013a1ba7c671e1128e31bb
@@ -708,7 +708,7 @@ F ext/wasm/wasmfs.make bc8bb227f35d5bd3863a7bd2233437c37472a0d81585979f058f9b9b5
 F install-sh 9d4de14ab9fb0facae2f48780b874848cbf2f895 x
 F ltmain.sh 3ff0879076df340d2e23ae905484d8c15d5fdea8
 F magic.txt 5ade0bc977aa135e79e3faaea894d5671b26107cc91e70783aa7dc83f22f3ba0
-F main.mk 2f1961b82b66dc53ade0745967e279d7afe88024a54981b066dd906ffb18dfb9
+F main.mk 244408dfbc1891f8a2dae883e07953218370007fcd20db49ec6f00cf6b3e3913
 F mptest/config01.test 3c6adcbc50b991866855f1977ff172eb6d901271
 F mptest/config02.test 4415dfe36c48785f751e16e32c20b077c28ae504
 F mptest/crash01.test 61e61469e257df0850df4293d7d4d6c2af301421
@@ -2237,8 +2237,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 d73ac7286aba8e8f9d1236dd06f6055bc3026879ff15efb151cc54175d02e315
-R bcb1899a7d5c22323efb7aa674de32c5
+P 182dac1c46f8ada2e1f3abd4959ac72f0ecfd451b41fbe699f5077f338ae7d62
+R 243b1b295b7d39496ee8f02f5822532a
 U stephan
-Z 732b1afd3b16514e16edefcfd886b58a
+Z 76aba5b639a66a5a98cbfb78d58f5288
 # Remove this line to create a well-formed Fossil manifest.

diff --git a/manifest.uuid b/manifest.uuid
index 6e1282c617e409df96e3480076d2a417520a1dd1..6583cc46269a20f26ac7da3ca84a901dd8ce7ffb 100644 (file)
--- a/manifest.uuid
+++ b/manifest.uuid
@@ -1 +1 @@
-182dac1c46f8ada2e1f3abd4959ac72f0ecfd451b41fbe699f5077f338ae7d62
+fdb584421578cae825365d457cd533721839e3503f3744c77832c5925815b537