Fossil SCM

Makefile vars which leak into Makefile.msv renamed to replace '.' characters, as nmake does not like those.

stephan 2021-12-25 19:10 code-movement

Commit 6454f7bcd1cff6b8abebc91105a560f5cac5b5e5a4edcf88847c2b749b78f4b2

Parent d49bdb6cc223ad5…

8 files changed +2 -2 +1 -1 +37 -37 +89 -89 +1 -1 +9 -9 +29 -29 +13 -13

~ Makefile.in ~ auto.def ~ src/main.mk ~ tools/makemake.tcl ~ win/Makefile.PellesCGMake ~ win/Makefile.dmc ~ win/Makefile.mingw ~ win/Makefile.msc

M Makefile.in

+2 -2

		--- Makefile.in
		+++ Makefile.in
		@@ -9,14 +9,14 @@
9	9	# the following to point from the build directory to the src/ folder.
10	10	#
11	11	SRCDIR = @srcdir@/src
12	12	#### Upstream source files included directly in this repository.
13	13	#
14		-SRCDIR.extsrc = @srcdir@/extsrc
	14	+SRCDIR_extsrc = @srcdir@/extsrc
15	15	#### In-tree tools such as code generators and translators:
16	16	#
17		-SRCDIR.tools = @srcdir@/tools
	17	+SRCDIR_tools = @srcdir@/tools
18	18
19	19	#### The directory into which object code files should be written.
20	20	# Having a "./" prefix in the value of this variable breaks our use of the
21	21	# "makeheaders" tool when running make on the MinGW platform, apparently
22	22	# due to some command line argument manipulation performed automatically
23	23

	--- Makefile.in
	+++ Makefile.in
	@@ -9,14 +9,14 @@
9	# the following to point from the build directory to the src/ folder.
10	#
11	SRCDIR = @srcdir@/src
12	#### Upstream source files included directly in this repository.
13	#
14	SRCDIR.extsrc = @srcdir@/extsrc
15	#### In-tree tools such as code generators and translators:
16	#
17	SRCDIR.tools = @srcdir@/tools
18
19	#### The directory into which object code files should be written.
20	# Having a "./" prefix in the value of this variable breaks our use of the
21	# "makeheaders" tool when running make on the MinGW platform, apparently
22	# due to some command line argument manipulation performed automatically
23

	--- Makefile.in
	+++ Makefile.in
	@@ -9,14 +9,14 @@
9	# the following to point from the build directory to the src/ folder.
10	#
11	SRCDIR = @srcdir@/src
12	#### Upstream source files included directly in this repository.
13	#
14	SRCDIR_extsrc = @srcdir@/extsrc
15	#### In-tree tools such as code generators and translators:
16	#
17	SRCDIR_tools = @srcdir@/tools
18
19	#### The directory into which object code files should be written.
20	# Having a "./" prefix in the value of this variable breaks our use of the
21	# "makeheaders" tool when running make on the MinGW platform, apparently
22	# due to some command line argument manipulation performed automatically
23

M auto.def

+1 -1

		--- auto.def
		+++ auto.def
		@@ -521,11 +521,11 @@
521	521	}
522	522	} elseif {![cc-check-includes sqlite3.h] \|\| ![check-function-in-lib sqlite3_open_v2 sqlite3]} {
523	523	user-error "libsqlite3 not found please install it or specify the location with --with-sqlite"
524	524	}
525	525	}
526		-define-append CFLAGS_INCLUDE {-I. -I$(SRCDIR) -I$(SRCDIR.extsrc)}
	526	+define-append CFLAGS_INCLUDE {-I. -I$(SRCDIR) -I$(SRCDIR_extsrc)}
527	527
528	528	set tclpath [opt-val with-tcl]
529	529	if {$tclpath ne ""} {
530	530	set tclprivatestubs [opt-bool with-tcl-private-stubs]
531	531	# Note parse-tclconfig-sh is in autosetup/local.tcl
532	532

	--- auto.def
	+++ auto.def
	@@ -521,11 +521,11 @@
521	}
522	} elseif {![cc-check-includes sqlite3.h] \|\| ![check-function-in-lib sqlite3_open_v2 sqlite3]} {
523	user-error "libsqlite3 not found please install it or specify the location with --with-sqlite"
524	}
525	}
526	define-append CFLAGS_INCLUDE {-I. -I$(SRCDIR) -I$(SRCDIR.extsrc)}
527
528	set tclpath [opt-val with-tcl]
529	if {$tclpath ne ""} {
530	set tclprivatestubs [opt-bool with-tcl-private-stubs]
531	# Note parse-tclconfig-sh is in autosetup/local.tcl
532

	--- auto.def
	+++ auto.def
	@@ -521,11 +521,11 @@
521	}
522	} elseif {![cc-check-includes sqlite3.h] \|\| ![check-function-in-lib sqlite3_open_v2 sqlite3]} {
523	user-error "libsqlite3 not found please install it or specify the location with --with-sqlite"
524	}
525	}
526	define-append CFLAGS_INCLUDE {-I. -I$(SRCDIR) -I$(SRCDIR_extsrc)}
527
528	set tclpath [opt-val with-tcl]
529	if {$tclpath ne ""} {
530	set tclprivatestubs [opt-bool with-tcl-private-stubs]
531	# Note parse-tclconfig-sh is in autosetup/local.tcl
532

M src/main.mk

+37 -37

		--- src/main.mk
		+++ src/main.mk
		@@ -580,27 +580,27 @@
580	580	$(OBJDIR)/codecheck1 $(TRANS_SRC)
581	581
582	582	$(OBJDIR):
583	583	-mkdir $(OBJDIR)
584	584
585		-$(OBJDIR)/translate: $(SRCDIR.tools)/translate.c
586		- $(XBCC) -o $(OBJDIR)/translate $(SRCDIR.tools)/translate.c
587		-
588		-$(OBJDIR)/makeheaders: $(SRCDIR.tools)/makeheaders.c
589		- $(XBCC) -o $(OBJDIR)/makeheaders $(SRCDIR.tools)/makeheaders.c
590		-
591		-$(OBJDIR)/mkindex: $(SRCDIR.tools)/mkindex.c
592		- $(XBCC) -o $(OBJDIR)/mkindex $(SRCDIR.tools)/mkindex.c
593		-
594		-$(OBJDIR)/mkbuiltin: $(SRCDIR.tools)/mkbuiltin.c
595		- $(XBCC) -o $(OBJDIR)/mkbuiltin $(SRCDIR.tools)/mkbuiltin.c
596		-
597		-$(OBJDIR)/mkversion: $(SRCDIR.tools)/mkversion.c
598		- $(XBCC) -o $(OBJDIR)/mkversion $(SRCDIR.tools)/mkversion.c
599		-
600		-$(OBJDIR)/codecheck1: $(SRCDIR.tools)/codecheck1.c
601		- $(XBCC) -o $(OBJDIR)/codecheck1 $(SRCDIR.tools)/codecheck1.c
	585	+$(OBJDIR)/translate: $(SRCDIR_tools)/translate.c
	586	+ $(XBCC) -o $(OBJDIR)/translate $(SRCDIR_tools)/translate.c
	587	+
	588	+$(OBJDIR)/makeheaders: $(SRCDIR_tools)/makeheaders.c
	589	+ $(XBCC) -o $(OBJDIR)/makeheaders $(SRCDIR_tools)/makeheaders.c
	590	+
	591	+$(OBJDIR)/mkindex: $(SRCDIR_tools)/mkindex.c
	592	+ $(XBCC) -o $(OBJDIR)/mkindex $(SRCDIR_tools)/mkindex.c
	593	+
	594	+$(OBJDIR)/mkbuiltin: $(SRCDIR_tools)/mkbuiltin.c
	595	+ $(XBCC) -o $(OBJDIR)/mkbuiltin $(SRCDIR_tools)/mkbuiltin.c
	596	+
	597	+$(OBJDIR)/mkversion: $(SRCDIR_tools)/mkversion.c
	598	+ $(XBCC) -o $(OBJDIR)/mkversion $(SRCDIR_tools)/mkversion.c
	599	+
	600	+$(OBJDIR)/codecheck1: $(SRCDIR_tools)/codecheck1.c
	601	+ $(XBCC) -o $(OBJDIR)/codecheck1 $(SRCDIR_tools)/codecheck1.c
602	602
603	603	# Run the test suite.
604	604	# Other flags that can be included in TESTFLAGS are:
605	605	#
606	606	# -halt Stop testing after the first failed test
		@@ -720,19 +720,19 @@
720	720
721	721	# The USE_SEE variable may be undefined, 0 or 1. If undefined or 0,
722	722	# in-tree SQLite is used. If 1, then sqlite3-see.c (not part of the
723	723	# source tree) is used and extra flags are provided to enable the
724	724	# SQLite Encryption Extension.
725		-SQLITE3_SRC.0 = $(SRCDIR.extsrc)/sqlite3.c
726		-SQLITE3_SRC.1 = $(SRCDIR.extsrc)/sqlite3-see.c
	725	+SQLITE3_SRC.0 = $(SRCDIR_extsrc)/sqlite3.c
	726	+SQLITE3_SRC.1 = $(SRCDIR_extsrc)/sqlite3-see.c
727	727	# SQLITE3_SRC.2 is set by top-level configure/makefile process.
728		-SQLITE3_SRC. = $(SRCDIR.extsrc)/sqlite3.c
	728	+SQLITE3_SRC. = $(SRCDIR_extsrc)/sqlite3.c
729	729	SQLITE3_SRC = $(SQLITE3_SRC.$(SQLITE3_ORIGIN))
730		-SQLITE3_SHELL_SRC.0 = $(SRCDIR.extsrc)/shell.c
731		-SQLITE3_SHELL_SRC.1 = $(SRCDIR.extsrc)/shell-see.c
	730	+SQLITE3_SHELL_SRC.0 = $(SRCDIR_extsrc)/shell.c
	731	+SQLITE3_SHELL_SRC.1 = $(SRCDIR_extsrc)/shell-see.c
732	732	# SQLITE3_SHELL_SRC.2 comes from the configure process
733		-SQLITE3_SHELL_SRC. = $(SRCDIR.extsrc)/shell.c
	733	+SQLITE3_SHELL_SRC. = $(SRCDIR_extsrc)/shell.c
734	734	SQLITE3_SHELL_SRC = $(SQLITE3_SHELL_SRC.$(SQLITE3_ORIGIN))
735	735	SEE_FLAGS.0 =
736	736	SEE_FLAGS.1 = -DSQLITE_HAS_CODEC -DSQLITE_SHELL_DBKEY_PROC=fossil_key
737	737	SEE_FLAGS. =
738	738	SEE_FLAGS = $(SEE_FLAGS.$(USE_SEE))
		@@ -916,13 +916,13 @@
916	916	$(OBJDIR)/winfile_.c:$(OBJDIR)/winfile.h \
917	917	$(OBJDIR)/winhttp_.c:$(OBJDIR)/winhttp.h \
918	918	$(OBJDIR)/xfer_.c:$(OBJDIR)/xfer.h \
919	919	$(OBJDIR)/xfersetup_.c:$(OBJDIR)/xfersetup.h \
920	920	$(OBJDIR)/zip_.c:$(OBJDIR)/zip.h \
921		- $(SRCDIR.extsrc)/miniz.c:$(OBJDIR)/miniz.h \
922		- $(SRCDIR.extsrc)/pikchr.c:$(OBJDIR)/pikchr.h \
923		- $(SRCDIR.extsrc)/sqlite3.h \
	921	+ $(SRCDIR_extsrc)/miniz.c:$(OBJDIR)/miniz.h \
	922	+ $(SRCDIR_extsrc)/pikchr.c:$(OBJDIR)/pikchr.h \
	923	+ $(SRCDIR_extsrc)/sqlite3.h \
924	924	$(SRCDIR)/th.h \
925	925	$(OBJDIR)/VERSION.h
926	926	touch $(OBJDIR)/headers
927	927	$(OBJDIR)/headers: Makefile
928	928	$(OBJDIR)/json.o $(OBJDIR)/json_artifact.o $(OBJDIR)/json_branch.o $(OBJDIR)/json_config.o $(OBJDIR)/json_diff.o $(OBJDIR)/json_dir.o $(OBJDIR)/json_finfo.o $(OBJDIR)/json_login.o $(OBJDIR)/json_query.o $(OBJDIR)/json_report.o $(OBJDIR)/json_status.o $(OBJDIR)/json_tag.o $(OBJDIR)/json_timeline.o $(OBJDIR)/json_user.o $(OBJDIR)/json_wiki.o : $(SRCDIR)/json_detail.h
		@@ -2104,15 +2104,15 @@
2104	2104	$(OBJDIR)/zip.h: $(OBJDIR)/headers
2105	2105
2106	2106	$(OBJDIR)/sqlite3.o: $(SQLITE3_SRC)
2107	2107	$(XTCC) $(SQLITE_OPTIONS) $(SQLITE_CFLAGS) $(SEE_FLAGS) \
2108	2108	-c $(SQLITE3_SRC) -o $@
2109		-$(OBJDIR)/shell.o: $(SQLITE3_SHELL_SRC) $(SRCDIR.extsrc)/sqlite3.h
	2109	+$(OBJDIR)/shell.o: $(SQLITE3_SHELL_SRC) $(SRCDIR_extsrc)/sqlite3.h
2110	2110	$(XTCC) $(SHELL_OPTIONS) $(SHELL_CFLAGS) $(SEE_FLAGS) $(LINENOISE_DEF.$(USE_LINENOISE)) -c $(SQLITE3_SHELL_SRC) -o $@
2111	2111
2112		-$(OBJDIR)/linenoise.o: $(SRCDIR.extsrc)/linenoise.c $(SRCDIR.extsrc)/linenoise.h
2113		- $(XTCC) -c $(SRCDIR.extsrc)/linenoise.c -o $@
	2112	+$(OBJDIR)/linenoise.o: $(SRCDIR_extsrc)/linenoise.c $(SRCDIR_extsrc)/linenoise.h
	2113	+ $(XTCC) -c $(SRCDIR_extsrc)/linenoise.c -o $@
2114	2114
2115	2115	$(OBJDIR)/th.o: $(SRCDIR)/th.c
2116	2116	$(XTCC) -c $(SRCDIR)/th.c -o $@
2117	2117
2118	2118	$(OBJDIR)/th_lang.o: $(SRCDIR)/th_lang.c
		@@ -2120,21 +2120,21 @@
2120	2120
2121	2121	$(OBJDIR)/th_tcl.o: $(SRCDIR)/th_tcl.c
2122	2122	$(XTCC) -c $(SRCDIR)/th_tcl.c -o $@
2123	2123
2124	2124
2125		-$(OBJDIR)/miniz.o: $(SRCDIR.extsrc)/miniz.c
2126		- $(XTCC) $(MINIZ_OPTIONS) -c $(SRCDIR.extsrc)/miniz.c -o $@
2127		-
2128		-$(OBJDIR)/pikchr.o: $(SRCDIR.extsrc)/pikchr.c
2129		- $(XTCC) -c $(SRCDIR.extsrc)/pikchr.c -o $@
2130		-
2131		-$(OBJDIR)/cson_amalgamation.o: $(SRCDIR.extsrc)/cson_amalgamation.c
2132		- $(XTCC) -c $(SRCDIR.extsrc)/cson_amalgamation.c -o $@
	2125	+$(OBJDIR)/miniz.o: $(SRCDIR_extsrc)/miniz.c
	2126	+ $(XTCC) $(MINIZ_OPTIONS) -c $(SRCDIR_extsrc)/miniz.c -o $@
	2127	+
	2128	+$(OBJDIR)/pikchr.o: $(SRCDIR_extsrc)/pikchr.c
	2129	+ $(XTCC) -c $(SRCDIR_extsrc)/pikchr.c -o $@
	2130	+
	2131	+$(OBJDIR)/cson_amalgamation.o: $(SRCDIR_extsrc)/cson_amalgamation.c
	2132	+ $(XTCC) -c $(SRCDIR_extsrc)/cson_amalgamation.c -o $@
2133	2133
2134	2134	#
2135	2135	# The list of all the targets that do not correspond to real files. This stops
2136	2136	# 'make' from getting confused when someone makes an error in a rule.
2137	2137	#
2138	2138
2139	2139	.PHONY: all install test clean
2140	2140
2141	2141

	--- src/main.mk
	+++ src/main.mk
	@@ -580,27 +580,27 @@
580	$(OBJDIR)/codecheck1 $(TRANS_SRC)
581
582	$(OBJDIR):
583	-mkdir $(OBJDIR)
584
585	$(OBJDIR)/translate: $(SRCDIR.tools)/translate.c
586	$(XBCC) -o $(OBJDIR)/translate $(SRCDIR.tools)/translate.c
587
588	$(OBJDIR)/makeheaders: $(SRCDIR.tools)/makeheaders.c
589	$(XBCC) -o $(OBJDIR)/makeheaders $(SRCDIR.tools)/makeheaders.c
590
591	$(OBJDIR)/mkindex: $(SRCDIR.tools)/mkindex.c
592	$(XBCC) -o $(OBJDIR)/mkindex $(SRCDIR.tools)/mkindex.c
593
594	$(OBJDIR)/mkbuiltin: $(SRCDIR.tools)/mkbuiltin.c
595	$(XBCC) -o $(OBJDIR)/mkbuiltin $(SRCDIR.tools)/mkbuiltin.c
596
597	$(OBJDIR)/mkversion: $(SRCDIR.tools)/mkversion.c
598	$(XBCC) -o $(OBJDIR)/mkversion $(SRCDIR.tools)/mkversion.c
599
600	$(OBJDIR)/codecheck1: $(SRCDIR.tools)/codecheck1.c
601	$(XBCC) -o $(OBJDIR)/codecheck1 $(SRCDIR.tools)/codecheck1.c
602
603	# Run the test suite.
604	# Other flags that can be included in TESTFLAGS are:
605	#
606	# -halt Stop testing after the first failed test
	@@ -720,19 +720,19 @@
720
721	# The USE_SEE variable may be undefined, 0 or 1. If undefined or 0,
722	# in-tree SQLite is used. If 1, then sqlite3-see.c (not part of the
723	# source tree) is used and extra flags are provided to enable the
724	# SQLite Encryption Extension.
725	SQLITE3_SRC.0 = $(SRCDIR.extsrc)/sqlite3.c
726	SQLITE3_SRC.1 = $(SRCDIR.extsrc)/sqlite3-see.c
727	# SQLITE3_SRC.2 is set by top-level configure/makefile process.
728	SQLITE3_SRC. = $(SRCDIR.extsrc)/sqlite3.c
729	SQLITE3_SRC = $(SQLITE3_SRC.$(SQLITE3_ORIGIN))
730	SQLITE3_SHELL_SRC.0 = $(SRCDIR.extsrc)/shell.c
731	SQLITE3_SHELL_SRC.1 = $(SRCDIR.extsrc)/shell-see.c
732	# SQLITE3_SHELL_SRC.2 comes from the configure process
733	SQLITE3_SHELL_SRC. = $(SRCDIR.extsrc)/shell.c
734	SQLITE3_SHELL_SRC = $(SQLITE3_SHELL_SRC.$(SQLITE3_ORIGIN))
735	SEE_FLAGS.0 =
736	SEE_FLAGS.1 = -DSQLITE_HAS_CODEC -DSQLITE_SHELL_DBKEY_PROC=fossil_key
737	SEE_FLAGS. =
738	SEE_FLAGS = $(SEE_FLAGS.$(USE_SEE))
	@@ -916,13 +916,13 @@
916	$(OBJDIR)/winfile_.c:$(OBJDIR)/winfile.h \
917	$(OBJDIR)/winhttp_.c:$(OBJDIR)/winhttp.h \
918	$(OBJDIR)/xfer_.c:$(OBJDIR)/xfer.h \
919	$(OBJDIR)/xfersetup_.c:$(OBJDIR)/xfersetup.h \
920	$(OBJDIR)/zip_.c:$(OBJDIR)/zip.h \
921	$(SRCDIR.extsrc)/miniz.c:$(OBJDIR)/miniz.h \
922	$(SRCDIR.extsrc)/pikchr.c:$(OBJDIR)/pikchr.h \
923	$(SRCDIR.extsrc)/sqlite3.h \
924	$(SRCDIR)/th.h \
925	$(OBJDIR)/VERSION.h
926	touch $(OBJDIR)/headers
927	$(OBJDIR)/headers: Makefile
928	$(OBJDIR)/json.o $(OBJDIR)/json_artifact.o $(OBJDIR)/json_branch.o $(OBJDIR)/json_config.o $(OBJDIR)/json_diff.o $(OBJDIR)/json_dir.o $(OBJDIR)/json_finfo.o $(OBJDIR)/json_login.o $(OBJDIR)/json_query.o $(OBJDIR)/json_report.o $(OBJDIR)/json_status.o $(OBJDIR)/json_tag.o $(OBJDIR)/json_timeline.o $(OBJDIR)/json_user.o $(OBJDIR)/json_wiki.o : $(SRCDIR)/json_detail.h
	@@ -2104,15 +2104,15 @@
2104	$(OBJDIR)/zip.h: $(OBJDIR)/headers
2105
2106	$(OBJDIR)/sqlite3.o: $(SQLITE3_SRC)
2107	$(XTCC) $(SQLITE_OPTIONS) $(SQLITE_CFLAGS) $(SEE_FLAGS) \
2108	-c $(SQLITE3_SRC) -o $@
2109	$(OBJDIR)/shell.o: $(SQLITE3_SHELL_SRC) $(SRCDIR.extsrc)/sqlite3.h
2110	$(XTCC) $(SHELL_OPTIONS) $(SHELL_CFLAGS) $(SEE_FLAGS) $(LINENOISE_DEF.$(USE_LINENOISE)) -c $(SQLITE3_SHELL_SRC) -o $@
2111
2112	$(OBJDIR)/linenoise.o: $(SRCDIR.extsrc)/linenoise.c $(SRCDIR.extsrc)/linenoise.h
2113	$(XTCC) -c $(SRCDIR.extsrc)/linenoise.c -o $@
2114
2115	$(OBJDIR)/th.o: $(SRCDIR)/th.c
2116	$(XTCC) -c $(SRCDIR)/th.c -o $@
2117
2118	$(OBJDIR)/th_lang.o: $(SRCDIR)/th_lang.c
	@@ -2120,21 +2120,21 @@
2120
2121	$(OBJDIR)/th_tcl.o: $(SRCDIR)/th_tcl.c
2122	$(XTCC) -c $(SRCDIR)/th_tcl.c -o $@
2123
2124
2125	$(OBJDIR)/miniz.o: $(SRCDIR.extsrc)/miniz.c
2126	$(XTCC) $(MINIZ_OPTIONS) -c $(SRCDIR.extsrc)/miniz.c -o $@
2127
2128	$(OBJDIR)/pikchr.o: $(SRCDIR.extsrc)/pikchr.c
2129	$(XTCC) -c $(SRCDIR.extsrc)/pikchr.c -o $@
2130
2131	$(OBJDIR)/cson_amalgamation.o: $(SRCDIR.extsrc)/cson_amalgamation.c
2132	$(XTCC) -c $(SRCDIR.extsrc)/cson_amalgamation.c -o $@
2133
2134	#
2135	# The list of all the targets that do not correspond to real files. This stops
2136	# 'make' from getting confused when someone makes an error in a rule.
2137	#
2138
2139	.PHONY: all install test clean
2140
2141

	--- src/main.mk
	+++ src/main.mk
	@@ -580,27 +580,27 @@
580	$(OBJDIR)/codecheck1 $(TRANS_SRC)
581
582	$(OBJDIR):
583	-mkdir $(OBJDIR)
584
585	$(OBJDIR)/translate: $(SRCDIR_tools)/translate.c
586	$(XBCC) -o $(OBJDIR)/translate $(SRCDIR_tools)/translate.c
587
588	$(OBJDIR)/makeheaders: $(SRCDIR_tools)/makeheaders.c
589	$(XBCC) -o $(OBJDIR)/makeheaders $(SRCDIR_tools)/makeheaders.c
590
591	$(OBJDIR)/mkindex: $(SRCDIR_tools)/mkindex.c
592	$(XBCC) -o $(OBJDIR)/mkindex $(SRCDIR_tools)/mkindex.c
593
594	$(OBJDIR)/mkbuiltin: $(SRCDIR_tools)/mkbuiltin.c
595	$(XBCC) -o $(OBJDIR)/mkbuiltin $(SRCDIR_tools)/mkbuiltin.c
596
597	$(OBJDIR)/mkversion: $(SRCDIR_tools)/mkversion.c
598	$(XBCC) -o $(OBJDIR)/mkversion $(SRCDIR_tools)/mkversion.c
599
600	$(OBJDIR)/codecheck1: $(SRCDIR_tools)/codecheck1.c
601	$(XBCC) -o $(OBJDIR)/codecheck1 $(SRCDIR_tools)/codecheck1.c
602
603	# Run the test suite.
604	# Other flags that can be included in TESTFLAGS are:
605	#
606	# -halt Stop testing after the first failed test
	@@ -720,19 +720,19 @@
720
721	# The USE_SEE variable may be undefined, 0 or 1. If undefined or 0,
722	# in-tree SQLite is used. If 1, then sqlite3-see.c (not part of the
723	# source tree) is used and extra flags are provided to enable the
724	# SQLite Encryption Extension.
725	SQLITE3_SRC.0 = $(SRCDIR_extsrc)/sqlite3.c
726	SQLITE3_SRC.1 = $(SRCDIR_extsrc)/sqlite3-see.c
727	# SQLITE3_SRC.2 is set by top-level configure/makefile process.
728	SQLITE3_SRC. = $(SRCDIR_extsrc)/sqlite3.c
729	SQLITE3_SRC = $(SQLITE3_SRC.$(SQLITE3_ORIGIN))
730	SQLITE3_SHELL_SRC.0 = $(SRCDIR_extsrc)/shell.c
731	SQLITE3_SHELL_SRC.1 = $(SRCDIR_extsrc)/shell-see.c
732	# SQLITE3_SHELL_SRC.2 comes from the configure process
733	SQLITE3_SHELL_SRC. = $(SRCDIR_extsrc)/shell.c
734	SQLITE3_SHELL_SRC = $(SQLITE3_SHELL_SRC.$(SQLITE3_ORIGIN))
735	SEE_FLAGS.0 =
736	SEE_FLAGS.1 = -DSQLITE_HAS_CODEC -DSQLITE_SHELL_DBKEY_PROC=fossil_key
737	SEE_FLAGS. =
738	SEE_FLAGS = $(SEE_FLAGS.$(USE_SEE))
	@@ -916,13 +916,13 @@
916	$(OBJDIR)/winfile_.c:$(OBJDIR)/winfile.h \
917	$(OBJDIR)/winhttp_.c:$(OBJDIR)/winhttp.h \
918	$(OBJDIR)/xfer_.c:$(OBJDIR)/xfer.h \
919	$(OBJDIR)/xfersetup_.c:$(OBJDIR)/xfersetup.h \
920	$(OBJDIR)/zip_.c:$(OBJDIR)/zip.h \
921	$(SRCDIR_extsrc)/miniz.c:$(OBJDIR)/miniz.h \
922	$(SRCDIR_extsrc)/pikchr.c:$(OBJDIR)/pikchr.h \
923	$(SRCDIR_extsrc)/sqlite3.h \
924	$(SRCDIR)/th.h \
925	$(OBJDIR)/VERSION.h
926	touch $(OBJDIR)/headers
927	$(OBJDIR)/headers: Makefile
928	$(OBJDIR)/json.o $(OBJDIR)/json_artifact.o $(OBJDIR)/json_branch.o $(OBJDIR)/json_config.o $(OBJDIR)/json_diff.o $(OBJDIR)/json_dir.o $(OBJDIR)/json_finfo.o $(OBJDIR)/json_login.o $(OBJDIR)/json_query.o $(OBJDIR)/json_report.o $(OBJDIR)/json_status.o $(OBJDIR)/json_tag.o $(OBJDIR)/json_timeline.o $(OBJDIR)/json_user.o $(OBJDIR)/json_wiki.o : $(SRCDIR)/json_detail.h
	@@ -2104,15 +2104,15 @@
2104	$(OBJDIR)/zip.h: $(OBJDIR)/headers
2105
2106	$(OBJDIR)/sqlite3.o: $(SQLITE3_SRC)
2107	$(XTCC) $(SQLITE_OPTIONS) $(SQLITE_CFLAGS) $(SEE_FLAGS) \
2108	-c $(SQLITE3_SRC) -o $@
2109	$(OBJDIR)/shell.o: $(SQLITE3_SHELL_SRC) $(SRCDIR_extsrc)/sqlite3.h
2110	$(XTCC) $(SHELL_OPTIONS) $(SHELL_CFLAGS) $(SEE_FLAGS) $(LINENOISE_DEF.$(USE_LINENOISE)) -c $(SQLITE3_SHELL_SRC) -o $@
2111
2112	$(OBJDIR)/linenoise.o: $(SRCDIR_extsrc)/linenoise.c $(SRCDIR_extsrc)/linenoise.h
2113	$(XTCC) -c $(SRCDIR_extsrc)/linenoise.c -o $@
2114
2115	$(OBJDIR)/th.o: $(SRCDIR)/th.c
2116	$(XTCC) -c $(SRCDIR)/th.c -o $@
2117
2118	$(OBJDIR)/th_lang.o: $(SRCDIR)/th_lang.c
	@@ -2120,21 +2120,21 @@
2120
2121	$(OBJDIR)/th_tcl.o: $(SRCDIR)/th_tcl.c
2122	$(XTCC) -c $(SRCDIR)/th_tcl.c -o $@
2123
2124
2125	$(OBJDIR)/miniz.o: $(SRCDIR_extsrc)/miniz.c
2126	$(XTCC) $(MINIZ_OPTIONS) -c $(SRCDIR_extsrc)/miniz.c -o $@
2127
2128	$(OBJDIR)/pikchr.o: $(SRCDIR_extsrc)/pikchr.c
2129	$(XTCC) -c $(SRCDIR_extsrc)/pikchr.c -o $@
2130
2131	$(OBJDIR)/cson_amalgamation.o: $(SRCDIR_extsrc)/cson_amalgamation.c
2132	$(XTCC) -c $(SRCDIR_extsrc)/cson_amalgamation.c -o $@
2133
2134	#
2135	# The list of all the targets that do not correspond to real files. This stops
2136	# 'make' from getting confused when someone makes an error in a rule.
2137	#
2138
2139	.PHONY: all install test clean
2140
2141

M tools/makemake.tcl

+89 -89

		--- tools/makemake.tcl
		+++ tools/makemake.tcl
		@@ -379,27 +379,27 @@
379	379	$(OBJDIR)/codecheck1 $(TRANS_SRC)
380	380
381	381	$(OBJDIR):
382	382	-mkdir $(OBJDIR)
383	383
384		-$(OBJDIR)/translate: $(SRCDIR.tools)/translate.c
385		- $(XBCC) -o $(OBJDIR)/translate $(SRCDIR.tools)/translate.c
386		-
387		-$(OBJDIR)/makeheaders: $(SRCDIR.tools)/makeheaders.c
388		- $(XBCC) -o $(OBJDIR)/makeheaders $(SRCDIR.tools)/makeheaders.c
389		-
390		-$(OBJDIR)/mkindex: $(SRCDIR.tools)/mkindex.c
391		- $(XBCC) -o $(OBJDIR)/mkindex $(SRCDIR.tools)/mkindex.c
392		-
393		-$(OBJDIR)/mkbuiltin: $(SRCDIR.tools)/mkbuiltin.c
394		- $(XBCC) -o $(OBJDIR)/mkbuiltin $(SRCDIR.tools)/mkbuiltin.c
395		-
396		-$(OBJDIR)/mkversion: $(SRCDIR.tools)/mkversion.c
397		- $(XBCC) -o $(OBJDIR)/mkversion $(SRCDIR.tools)/mkversion.c
398		-
399		-$(OBJDIR)/codecheck1: $(SRCDIR.tools)/codecheck1.c
400		- $(XBCC) -o $(OBJDIR)/codecheck1 $(SRCDIR.tools)/codecheck1.c
	384	+$(OBJDIR)/translate: $(SRCDIR_tools)/translate.c
	385	+ $(XBCC) -o $(OBJDIR)/translate $(SRCDIR_tools)/translate.c
	386	+
	387	+$(OBJDIR)/makeheaders: $(SRCDIR_tools)/makeheaders.c
	388	+ $(XBCC) -o $(OBJDIR)/makeheaders $(SRCDIR_tools)/makeheaders.c
	389	+
	390	+$(OBJDIR)/mkindex: $(SRCDIR_tools)/mkindex.c
	391	+ $(XBCC) -o $(OBJDIR)/mkindex $(SRCDIR_tools)/mkindex.c
	392	+
	393	+$(OBJDIR)/mkbuiltin: $(SRCDIR_tools)/mkbuiltin.c
	394	+ $(XBCC) -o $(OBJDIR)/mkbuiltin $(SRCDIR_tools)/mkbuiltin.c
	395	+
	396	+$(OBJDIR)/mkversion: $(SRCDIR_tools)/mkversion.c
	397	+ $(XBCC) -o $(OBJDIR)/mkversion $(SRCDIR_tools)/mkversion.c
	398	+
	399	+$(OBJDIR)/codecheck1: $(SRCDIR_tools)/codecheck1.c
	400	+ $(XBCC) -o $(OBJDIR)/codecheck1 $(SRCDIR_tools)/codecheck1.c
401	401
402	402	# Run the test suite.
403	403	# Other flags that can be included in TESTFLAGS are:
404	404	#
405	405	# -halt Stop testing after the first failed test
		@@ -463,19 +463,19 @@
463	463
464	464	# The USE_SEE variable may be undefined, 0 or 1. If undefined or 0,
465	465	# in-tree SQLite is used. If 1, then sqlite3-see.c (not part of the
466	466	# source tree) is used and extra flags are provided to enable the
467	467	# SQLite Encryption Extension.
468		-SQLITE3_SRC.0 = $(SRCDIR.extsrc)/sqlite3.c
469		-SQLITE3_SRC.1 = $(SRCDIR.extsrc)/sqlite3-see.c
	468	+SQLITE3_SRC.0 = $(SRCDIR_extsrc)/sqlite3.c
	469	+SQLITE3_SRC.1 = $(SRCDIR_extsrc)/sqlite3-see.c
470	470	# SQLITE3_SRC.2 is set by top-level configure/makefile process.
471		-SQLITE3_SRC. = $(SRCDIR.extsrc)/sqlite3.c
	471	+SQLITE3_SRC. = $(SRCDIR_extsrc)/sqlite3.c
472	472	SQLITE3_SRC = $(SQLITE3_SRC.$(SQLITE3_ORIGIN))
473		-SQLITE3_SHELL_SRC.0 = $(SRCDIR.extsrc)/shell.c
474		-SQLITE3_SHELL_SRC.1 = $(SRCDIR.extsrc)/shell-see.c
	473	+SQLITE3_SHELL_SRC.0 = $(SRCDIR_extsrc)/shell.c
	474	+SQLITE3_SHELL_SRC.1 = $(SRCDIR_extsrc)/shell-see.c
475	475	# SQLITE3_SHELL_SRC.2 comes from the configure process
476		-SQLITE3_SHELL_SRC. = $(SRCDIR.extsrc)/shell.c
	476	+SQLITE3_SHELL_SRC. = $(SRCDIR_extsrc)/shell.c
477	477	SQLITE3_SHELL_SRC = $(SQLITE3_SHELL_SRC.$(SQLITE3_ORIGIN))
478	478	SEE_FLAGS.0 =
479	479	SEE_FLAGS.1 = -DSQLITE_HAS_CODEC -DSQLITE_SHELL_DBKEY_PROC=fossil_key
480	480	SEE_FLAGS. =
481	481	SEE_FLAGS = $(SEE_FLAGS.$(USE_SEE))
		@@ -514,16 +514,16 @@
514	514	foreach s [lsort $src] {
515	515	append mhargs "\$(OBJDIR)/${s}_.c:\$(OBJDIR)/$s.h <<<NEXT_LINE>>>"
516	516	set extra_h($s) { }
517	517	}
518	518	foreach s [lsort $src_ext] {
519		- append mhargs "\$(SRCDIR.extsrc)/${s}.c:\$(OBJDIR)/$s.h <<<NEXT_LINE>>>"
	519	+ append mhargs "\$(SRCDIR_extsrc)/${s}.c:\$(OBJDIR)/$s.h <<<NEXT_LINE>>>"
520	520	set extra_h($s) { }
521	521	}
522		-append mhargs "\$(SRCDIR.extsrc)/sqlite3.h <<<NEXT_LINE>>>"
	522	+append mhargs "\$(SRCDIR_extsrc)/sqlite3.h <<<NEXT_LINE>>>"
523	523	append mhargs "\$(SRCDIR)/th.h <<<NEXT_LINE>>>"
524		-#append mhargs "\$(SRCDIR.extsrc)/cson_amalgamation.h <<<NEXT_LINE>>>"
	524	+#append mhargs "\$(SRCDIR_extsrc)/cson_amalgamation.h <<<NEXT_LINE>>>"
525	525	append mhargs "\$(OBJDIR)/VERSION.h "
526	526	set mhargs [string map [list <<<NEXT_LINE>>> \\\n\t] $mhargs]
527	527	writeln "\$(OBJDIR)/page_index.h: \$(TRANS_SRC) \$(OBJDIR)/mkindex"
528	528	writeln "\t\$(OBJDIR)/mkindex \$(TRANS_SRC) >\$@\n"
529	529
		@@ -550,15 +550,15 @@
550	550
551	551	writeln "\$(OBJDIR)/sqlite3.o:\t\$(SQLITE3_SRC)"
552	552	writeln "\t\$(XTCC) \$(SQLITE_OPTIONS) \$(SQLITE_CFLAGS) \$(SEE_FLAGS) \\"
553	553	writeln "\t\t-c \$(SQLITE3_SRC) -o \$@"
554	554
555		-writeln "\$(OBJDIR)/shell.o:\t\$(SQLITE3_SHELL_SRC) \$(SRCDIR.extsrc)/sqlite3.h"
	555	+writeln "\$(OBJDIR)/shell.o:\t\$(SQLITE3_SHELL_SRC) \$(SRCDIR_extsrc)/sqlite3.h"
556	556	writeln "\t\$(XTCC) \$(SHELL_OPTIONS) \$(SHELL_CFLAGS) \$(SEE_FLAGS) \$(LINENOISE_DEF.\$(USE_LINENOISE)) -c \$(SQLITE3_SHELL_SRC) -o \$@\n"
557	557
558		-writeln "\$(OBJDIR)/linenoise.o:\t\$(SRCDIR.extsrc)/linenoise.c \$(SRCDIR.extsrc)/linenoise.h"
559		-writeln "\t\$(XTCC) -c \$(SRCDIR.extsrc)/linenoise.c -o \$@\n"
	558	+writeln "\$(OBJDIR)/linenoise.o:\t\$(SRCDIR_extsrc)/linenoise.c \$(SRCDIR_extsrc)/linenoise.h"
	559	+writeln "\t\$(XTCC) -c \$(SRCDIR_extsrc)/linenoise.c -o \$@\n"
560	560
561	561	writeln "\$(OBJDIR)/th.o:\t\$(SRCDIR)/th.c"
562	562	writeln "\t\$(XTCC) -c \$(SRCDIR)/th.c -o \$@\n"
563	563
564	564	writeln "\$(OBJDIR)/th_lang.o:\t\$(SRCDIR)/th_lang.c"
		@@ -566,18 +566,18 @@
566	566
567	567	writeln "\$(OBJDIR)/th_tcl.o:\t\$(SRCDIR)/th_tcl.c"
568	568	writeln "\t\$(XTCC) -c \$(SRCDIR)/th_tcl.c -o \$@\n"
569	569
570	570	writeln {
571		-$(OBJDIR)/miniz.o: $(SRCDIR.extsrc)/miniz.c
572		- $(XTCC) $(MINIZ_OPTIONS) -c $(SRCDIR.extsrc)/miniz.c -o $@
573		-
574		-$(OBJDIR)/pikchr.o: $(SRCDIR.extsrc)/pikchr.c
575		- $(XTCC) -c $(SRCDIR.extsrc)/pikchr.c -o $@
576		-
577		-$(OBJDIR)/cson_amalgamation.o: $(SRCDIR.extsrc)/cson_amalgamation.c
578		- $(XTCC) -c $(SRCDIR.extsrc)/cson_amalgamation.c -o $@
	571	+$(OBJDIR)/miniz.o: $(SRCDIR_extsrc)/miniz.c
	572	+ $(XTCC) $(MINIZ_OPTIONS) -c $(SRCDIR_extsrc)/miniz.c -o $@
	573	+
	574	+$(OBJDIR)/pikchr.o: $(SRCDIR_extsrc)/pikchr.c
	575	+ $(XTCC) -c $(SRCDIR_extsrc)/pikchr.c -o $@
	576	+
	577	+$(OBJDIR)/cson_amalgamation.o: $(SRCDIR_extsrc)/cson_amalgamation.c
	578	+ $(XTCC) -c $(SRCDIR_extsrc)/cson_amalgamation.c -o $@
579	579
580	580	#
581	581	# The list of all the targets that do not correspond to real files. This stops
582	582	# 'make' from getting confused when someone makes an error in a rule.
583	583	#
		@@ -1086,16 +1086,16 @@
1086	1086	writeln {
1087	1087	all: $(OBJDIR) $(APPNAME)
1088	1088
1089	1089	$(OBJDIR)/fossil.o: $(SRCDIR)/../win/fossil.rc $(OBJDIR)/VERSION.h
1090	1090	ifdef USE_WINDOWS
1091		- $(CAT) $(subst /,\,$(SRCDIR.extsrc)\miniz.c) \| $(GREP) "define MZ_VERSION" > $(subst /,\,$(OBJDIR)\minizver.h)
	1091	+ $(CAT) $(subst /,\,$(SRCDIR_extsrc)\miniz.c) \| $(GREP) "define MZ_VERSION" > $(subst /,\,$(OBJDIR)\minizver.h)
1092	1092	$(CP) $(subst /,\,$(SRCDIR)\..\win\fossil.rc) $(subst /,\,$(OBJDIR))
1093	1093	$(CP) $(subst /,\,$(SRCDIR)\..\win\fossil.ico) $(subst /,\,$(OBJDIR))
1094	1094	$(CP) $(subst /,\,$(SRCDIR)\..\win\fossil.exe.manifest) $(subst /,\,$(OBJDIR))
1095	1095	else
1096		- $(CAT) $(SRCDIR.extsrc)/miniz.c \| $(GREP) "define MZ_VERSION" > $(OBJDIR)/minizver.h
	1096	+ $(CAT) $(SRCDIR_extsrc)/miniz.c \| $(GREP) "define MZ_VERSION" > $(OBJDIR)/minizver.h
1097	1097	$(CP) $(SRCDIR)/../win/fossil.rc $(OBJDIR)
1098	1098	$(CP) $(SRCDIR)/../win/fossil.ico $(OBJDIR)
1099	1099	$(CP) $(SRCDIR)/../win/fossil.exe.manifest $(OBJDIR)
1100	1100	endif
1101	1101	$(RCC) $(OBJDIR)/fossil.rc -o $(OBJDIR)/fossil.o
		@@ -1114,27 +1114,27 @@
1114	1114	$(MKDIR) $(subst /,\,$(OBJDIR))
1115	1115	else
1116	1116	$(MKDIR) $(OBJDIR)
1117	1117	endif
1118	1118
1119		-$(TRANSLATE): $(SRCDIR.tools)/translate.c
1120		- $(XBCC) -o $@ $(SRCDIR.tools)/translate.c
1121		-
1122		-$(MAKEHEADERS): $(SRCDIR.tools)/makeheaders.c
1123		- $(XBCC) -o $@ $(SRCDIR.tools)/makeheaders.c
1124		-
1125		-$(MKINDEX): $(SRCDIR.tools)/mkindex.c
1126		- $(XBCC) -o $@ $(SRCDIR.tools)/mkindex.c
	1119	+$(TRANSLATE): $(SRCDIR_tools)/translate.c
	1120	+ $(XBCC) -o $@ $(SRCDIR_tools)/translate.c
	1121	+
	1122	+$(MAKEHEADERS): $(SRCDIR_tools)/makeheaders.c
	1123	+ $(XBCC) -o $@ $(SRCDIR_tools)/makeheaders.c
	1124	+
	1125	+$(MKINDEX): $(SRCDIR_tools)/mkindex.c
	1126	+ $(XBCC) -o $@ $(SRCDIR_tools)/mkindex.c
1127	1127
1128	1128	$(MKBUILTIN): $(SRCDIR)/mkbuiltin.c
1129	1129	$(XBCC) -o $@ $(SRCDIR)/mkbuiltin.c
1130	1130
1131		-$(MKVERSION): $(SRCDIR.tools)/mkversion.c
1132		- $(XBCC) -o $@ $(SRCDIR.tools)/mkversion.c
	1131	+$(MKVERSION): $(SRCDIR_tools)/mkversion.c
	1132	+ $(XBCC) -o $@ $(SRCDIR_tools)/mkversion.c
1133	1133
1134		-$(CODECHECK1): $(SRCDIR.tools)/codecheck1.c
1135		- $(XBCC) -o $@ $(SRCDIR.tools)/codecheck1.c
	1134	+$(CODECHECK1): $(SRCDIR_tools)/codecheck1.c
	1135	+ $(XBCC) -o $@ $(SRCDIR_tools)/codecheck1.c
1136	1136
1137	1137	# WARNING. DANGER. Running the test suite modifies the repository the
1138	1138	# build is done from, i.e. the checkout belongs to. Do not sync/push
1139	1139	# the repository after running the tests.
1140	1140	test: $(OBJDIR) $(APPNAME)
		@@ -1168,19 +1168,19 @@
1168	1168
1169	1169	# The USE_SEE variable may be undefined, 0 or 1. If undefined or 0,
1170	1170	# in-tree SQLite is used. If 1, then sqlite3-see.c (not part of the
1171	1171	# source tree) is used and extra flags are provided to enable the
1172	1172	# SQLite Encryption Extension.
1173		-SQLITE3_SRC.0 = $(SRCDIR.extsrc)/sqlite3.c
1174		-SQLITE3_SRC.1 = $(SRCDIR.extsrc)/sqlite3-see.c
	1173	+SQLITE3_SRC.0 = $(SRCDIR_extsrc)/sqlite3.c
	1174	+SQLITE3_SRC.1 = $(SRCDIR_extsrc)/sqlite3-see.c
1175	1175	# SQLITE3_SRC.2 is set by top-level configure/makefile process.
1176		-SQLITE3_SRC. = $(SRCDIR.extsrc)/sqlite3.c
	1176	+SQLITE3_SRC. = $(SRCDIR_extsrc)/sqlite3.c
1177	1177	SQLITE3_SRC = $(SRCDIR)/$(SQLITE3_SRC.$(SQLITE3_ORIGIN))
1178		-SQLITE3_SHELL_SRC.0 = $(SRCDIR.extsrc)/shell.c
1179		-SQLITE3_SHELL_SRC.1 = $(SRCDIR.extsrc)/shell-see.c
	1178	+SQLITE3_SHELL_SRC.0 = $(SRCDIR_extsrc)/shell.c
	1179	+SQLITE3_SHELL_SRC.1 = $(SRCDIR_extsrc)/shell-see.c
1180	1180	# SQLITE3_SHELL_SRC.2 comes from the configure process
1181		-SQLITE3_SHELL_SRC. = $(SRCDIR.extsrc)/shell.c
	1181	+SQLITE3_SHELL_SRC. = $(SRCDIR_extsrc)/shell.c
1182	1182	SQLITE3_SHELL_SRC = $(SQLITE3_SHELL_SRC.$(SQLITE3_ORIGIN))
1183	1183	SEE_FLAGS.0 =
1184	1184	SEE_FLAGS.1 = -DSQLITE_HAS_CODEC -DSQLITE_SHELL_DBKEY_PROC=fossil_key
1185	1185	SEE_FLAGS. =
1186	1186	SEE_FLAGS = $(SEE_FLAGS.$(USE_SEE))
		@@ -1268,14 +1268,14 @@
1268	1268	if {[string length $mhargs] > 0} {append mhargs " \\\n\t\t"}
1269	1269	append mhargs "\$(OBJDIR)/${s}_.c:\$(OBJDIR)/$s.h"
1270	1270	set extra_h($s) { }
1271	1271	}
1272	1272	foreach s [lsort $src_ext] {
1273		- append mhargs "\$(SRCDIR.extsrc)/${s}.c:\$(OBJDIR)/$s.h <<<NEXT_LINE>>>"
	1273	+ append mhargs "\$(SRCDIR_extsrc)/${s}.c:\$(OBJDIR)/$s.h <<<NEXT_LINE>>>"
1274	1274	set extra_h($s) { }
1275	1275	}
1276		-append mhargs " \\\n\t\t\$(SRCDIR.extsrc)/sqlite3.h"
	1276	+append mhargs " \\\n\t\t\$(SRCDIR_extsrc)/sqlite3.h"
1277	1277	append mhargs " \\\n\t\t\$(SRCDIR)/th.h"
1278	1278	append mhargs " \\\n\t\t\$(OBJDIR)/VERSION.h"
1279	1279	writeln "\$(OBJDIR)/page_index.h: \$(TRANS_SRC) \$(MKINDEX)"
1280	1280	writeln "\t\$(MKINDEX) \$(TRANS_SRC) >\$@\n"
1281	1281
		@@ -1320,15 +1320,15 @@
1320	1320
1321	1321	writeln "\$(OBJDIR)/sqlite3.o:\t\$(SQLITE3_SRC) \$(SRCDIR)/../win/Makefile.mingw"
1322	1322	writeln "\t\$(XTCC) \$(SQLITE_OPTIONS) \$(SQLITE_CFLAGS) \$(SEE_FLAGS) \\"
1323	1323	writeln "\t\t-c \$(SQLITE3_SRC) -o \$@\n"
1324	1324
1325		-writeln "\$(OBJDIR)/cson_amalgamation.o:\t\$(SRCDIR.extsrc)/cson_amalgamation.c"
1326		-writeln "\t\$(XTCC) -c \$(SRCDIR.extsrc)/cson_amalgamation.c -o \$@\n"
	1325	+writeln "\$(OBJDIR)/cson_amalgamation.o:\t\$(SRCDIR_extsrc)/cson_amalgamation.c"
	1326	+writeln "\t\$(XTCC) -c \$(SRCDIR_extsrc)/cson_amalgamation.c -o \$@\n"
1327	1327	writeln "\$(OBJDIR)/json.o \$(OBJDIR)/json_artifact.o \$(OBJDIR)/json_branch.o \$(OBJDIR)/json_config.o \$(OBJDIR)/json_diff.o \$(OBJDIR)/json_dir.o \$(OBJDIR)/jsos_finfo.o \$(OBJDIR)/json_login.o \$(OBJDIR)/json_query.o \$(OBJDIR)/json_report.o \$(OBJDIR)/json_status.o \$(OBJDIR)/json_tag.o \$(OBJDIR)/json_timeline.o \$(OBJDIR)/json_user.o \$(OBJDIR)/json_wiki.o : \$(SRCDIR)/json_detail.h\n"
1328	1328
1329		-writeln "\$(OBJDIR)/shell.o:\t\$(SQLITE3_SHELL_SRC) \$(SRCDIR.extsrc)/sqlite3.h \$(SRCDIR)/../win/Makefile.mingw"
	1329	+writeln "\$(OBJDIR)/shell.o:\t\$(SQLITE3_SHELL_SRC) \$(SRCDIR_extsrc)/sqlite3.h \$(SRCDIR)/../win/Makefile.mingw"
1330	1330	writeln "\t\$(XTCC) \$(SHELL_OPTIONS) \$(SHELL_CFLAGS) \$(SEE_FLAGS) -c \$(SQLITE3_SHELL_SRC) -o \$@\n"
1331	1331
1332	1332	writeln "\$(OBJDIR)/th.o:\t\$(SRCDIR)/th.c"
1333	1333	writeln "\t\$(XTCC) -c \$(SRCDIR)/th.c -o \$@\n"
1334	1334
		@@ -1336,15 +1336,15 @@
1336	1336	writeln "\t\$(XTCC) -c \$(SRCDIR)/th_lang.c -o \$@\n"
1337	1337
1338	1338	writeln "\$(OBJDIR)/th_tcl.o:\t\$(SRCDIR)/th_tcl.c"
1339	1339	writeln "\t\$(XTCC) -c \$(SRCDIR)/th_tcl.c -o \$@\n"
1340	1340
1341		-writeln "\$(OBJDIR)/miniz.o:\t\$(SRCDIR.extsrc)/miniz.c"
1342		-writeln "\t\$(XTCC) \$(MINIZ_OPTIONS) -c \$(SRCDIR.extsrc)/miniz.c -o \$@\n"
	1341	+writeln "\$(OBJDIR)/miniz.o:\t\$(SRCDIR_extsrc)/miniz.c"
	1342	+writeln "\t\$(XTCC) \$(MINIZ_OPTIONS) -c \$(SRCDIR_extsrc)/miniz.c -o \$@\n"
1343	1343
1344		-writeln "\$(OBJDIR)/pikchr.o:\t\$(SRCDIR.extsrc)/pikchr.c"
1345		-writeln "\t\$(XTCC) -c \$(SRCDIR.extsrc)/pikchr.c -o \$@\n"
	1344	+writeln "\$(OBJDIR)/pikchr.o:\t\$(SRCDIR_extsrc)/pikchr.c"
	1345	+writeln "\t\$(XTCC) -c \$(SRCDIR_extsrc)/pikchr.c -o \$@\n"
1346	1346
1347	1347	close $output_file
1348	1348	#
1349	1349	# End of the win/Makefile.mingw output
1350	1350	##############################################################################
		@@ -1424,41 +1424,41 @@
1424	1424	writeln "\t+echo \$(LIBS) >> \$@"
1425	1425	writeln "\t+echo. >> \$@"
1426	1426	writeln "\t+echo fossil >> \$@"
1427	1427
1428	1428	writeln {
1429		-translate$E: $(SRCDIR.tools)\translate.c
	1429	+translate$E: $(SRCDIR_tools)\translate.c
1430	1430	$(BCC) -o$@ $**
1431	1431
1432		-makeheaders$E: $(SRCDIR.tools)\makeheaders.c
	1432	+makeheaders$E: $(SRCDIR_tools)\makeheaders.c
1433	1433	$(BCC) -o$@ $**
1434	1434
1435		-mkindex$E: $(SRCDIR.tools)\mkindex.c
	1435	+mkindex$E: $(SRCDIR_tools)\mkindex.c
1436	1436	$(BCC) -o$@ $**
1437	1437
1438	1438	mkbuiltin$E: $(SRCDIR)\mkbuiltin.c
1439	1439	$(BCC) -o$@ $**
1440	1440
1441		-mkversion$E: $(SRCDIR.tools)\mkversion.c
	1441	+mkversion$E: $(SRCDIR_tools)\mkversion.c
1442	1442	$(BCC) -o$@ $**
1443	1443
1444		-codecheck1$E: $(SRCDIR.tools)\codecheck1.c
	1444	+codecheck1$E: $(SRCDIR_tools)\codecheck1.c
1445	1445	$(BCC) -o$@ $**
1446	1446
1447		-$(OBJDIR)\shell$O : $(SRCDIR.extsrc)\shell.c
	1447	+$(OBJDIR)\shell$O : $(SRCDIR_extsrc)\shell.c
1448	1448	$(TCC) -o$@ -c $(SHELL_OPTIONS) $(SQLITE_OPTIONS) $(SHELL_CFLAGS) $**
1449	1449
1450		-$(OBJDIR)\sqlite3$O : $(SRCDIR.extsrc)\sqlite3.c
	1450	+$(OBJDIR)\sqlite3$O : $(SRCDIR_extsrc)\sqlite3.c
1451	1451	$(TCC) -o$@ -c $(SQLITE_OPTIONS) $(SQLITE_CFLAGS) $**
1452	1452
1453	1453	$(OBJDIR)\th$O : $(SRCDIR)\th.c
1454	1454	$(TCC) -o$@ -c $**
1455	1455
1456	1456	$(OBJDIR)\th_lang$O : $(SRCDIR)\th_lang.c
1457	1457	$(TCC) -o$@ -c $**
1458	1458
1459		-$(OBJDIR)\cson_amalgamation.h : $(SRCDIR.extsrc)\cson_amalgamation.h
	1459	+$(OBJDIR)\cson_amalgamation.h : $(SRCDIR_extsrc)\cson_amalgamation.h
1460	1460	cp $@ $@
1461	1461
1462	1462	VERSION.h : mkversion$E $B\manifest.uuid $B\manifest $B\VERSION
1463	1463	+$** > $@
1464	1464
		@@ -1501,11 +1501,11 @@
1501	1501
1502	1502	writeln -nonewline "headers: makeheaders\$E page_index.h builtin_data.h VERSION.h\n\t +makeheaders\$E "
1503	1503	foreach s [lsort $src] {
1504	1504	writeln -nonewline "${s}_.c:$s.h "
1505	1505	}
1506		-writeln "\$(SRCDIR.extsrc)\\sqlite3.h \$(SRCDIR)\\th.h VERSION.h \$(SRCDIR.extsrc)\\cson_amalgamation.h"
	1506	+writeln "\$(SRCDIR_extsrc)\\sqlite3.h \$(SRCDIR)\\th.h VERSION.h \$(SRCDIR_extsrc)\\cson_amalgamation.h"
1507	1507	writeln "\t@copy /Y nul: headers"
1508	1508
1509	1509	close $output_file
1510	1510	#
1511	1511	# End of the win/Makefile.dmc output
		@@ -1954,36 +1954,36 @@
1954	1954	writeln "!if \$(FOSSIL_ENABLE_MINIZ)!=0"
1955	1955	writeln "\techo \"\$(OX)\\miniz.obj\" $redir \$@"
1956	1956	writeln "!endif"
1957	1957	writeln "\techo \$(LIBS) $redir \$@"
1958	1958	writeln {
1959		-"$(OBJDIR)\translate$E": "$(SRCDIR.tools)\translate.c"
	1959	+"$(OBJDIR)\translate$E": "$(SRCDIR_tools)\translate.c"
1960	1960	$(BCC) /Fe$@ /Fo$(@D)\ /Fd$(@D)\ $**
1961	1961
1962		-"$(OBJDIR)\makeheaders$E": "$(SRCDIR.tools)\makeheaders.c"
	1962	+"$(OBJDIR)\makeheaders$E": "$(SRCDIR_tools)\makeheaders.c"
1963	1963	$(BCC) /Fe$@ /Fo$(@D)\ /Fd$(@D)\ $**
1964	1964
1965		-"$(OBJDIR)\mkindex$E": "$(SRCDIR.tools)\mkindex.c"
	1965	+"$(OBJDIR)\mkindex$E": "$(SRCDIR_tools)\mkindex.c"
1966	1966	$(BCC) /Fe$@ /Fo$(@D)\ /Fd$(@D)\ $**
1967	1967
1968	1968	"$(OBJDIR)\mkbuiltin$E": "$(SRCDIR)\mkbuiltin.c"
1969	1969	$(BCC) /Fe$@ /Fo$(@D)\ /Fd$(@D)\ $**
1970	1970
1971		-"$(OBJDIR)\mkversion$E": "$(SRCDIR.tools)\mkversion.c"
	1971	+"$(OBJDIR)\mkversion$E": "$(SRCDIR_tools)\mkversion.c"
1972	1972	$(BCC) /Fe$@ /Fo$(@D)\ /Fd$(@D)\ $**
1973	1973
1974		-"$(OBJDIR)\codecheck1$E": "$(SRCDIR.tools)\codecheck1.c"
	1974	+"$(OBJDIR)\codecheck1$E": "$(SRCDIR_tools)\codecheck1.c"
1975	1975	$(BCC) /Fe$@ /Fo$(@D)\ /Fd$(@D)\ $**
1976	1976
1977	1977	!if $(USE_SEE)!=0
1978	1978	SEE_FLAGS = /DSQLITE_HAS_CODEC=1 /DSQLITE_SHELL_DBKEY_PROC=fossil_key
1979	1979	SQLITE3_SHELL_SRC = $(SRCDIR)\shell-see.c
1980		-SQLITE3_SRC = $(SRCDIR.extsrc)\sqlite3-see.c
	1980	+SQLITE3_SRC = $(SRCDIR_extsrc)\sqlite3-see.c
1981	1981	!else
1982	1982	SEE_FLAGS =
1983		-SQLITE3_SHELL_SRC = $(SRCDIR.extsrc)\shell.c
1984		-SQLITE3_SRC = $(SRCDIR.extsrc)\sqlite3.c
	1983	+SQLITE3_SHELL_SRC = $(SRCDIR_extsrc)\shell.c
	1984	+SQLITE3_SRC = $(SRCDIR_extsrc)\sqlite3.c
1985	1985	!endif
1986	1986
1987	1987	"$(OX)\shell$O" : "$(SQLITE3_SHELL_SRC)" "$(B)\win\Makefile.msc"
1988	1988	$(TCC) /Fo$@ /Fd$(@D)\ $(SHELL_OPTIONS) $(SQLITE_OPTIONS) $(SHELL_CFLAGS) $(SEE_FLAGS) -c "$(SQLITE3_SHELL_SRC)"
1989	1989
		@@ -1997,23 +1997,23 @@
1997	1997	$(TCC) /Fo$@ /Fd$(@D)\ -c $**
1998	1998
1999	1999	"$(OX)\th_tcl$O" : "$(SRCDIR)\th_tcl.c"
2000	2000	$(TCC) /Fo$@ /Fd$(@D)\ -c $**
2001	2001
2002		-"$(OX)\miniz$O" : "$(SRCDIR.extsrc)\miniz.c"
	2002	+"$(OX)\miniz$O" : "$(SRCDIR_extsrc)\miniz.c"
2003	2003	$(TCC) /Fo$@ /Fd$(@D)\ -c $(MINIZ_OPTIONS) $**
2004	2004
2005		-"$(OX)\pikchr$O" : "$(SRCDIR.extsrc)" "$(B)\win\Makefile.msc"
	2005	+"$(OX)\pikchr$O" : "$(SRCDIR_extsrc)" "$(B)\win\Makefile.msc"
2006	2006	$(TCC) /Fo$@ /Fd$(@D)\ -c $**
2007	2007
2008	2008	"$(OX)\VERSION.h" : "$(OBJDIR)\mkversion$E" "$(B)\manifest.uuid" "$(B)\manifest" "$(B)\VERSION" "$(B)\phony.h"
2009	2009	"$(OBJDIR)\mkversion$E" "$(B)\manifest.uuid" "$(B)\manifest" "$(B)\VERSION" > $@
2010	2010
2011	2011	"$(B)\phony.h" :
2012	2012	rem Force rebuild of VERSION.h whenever nmake is run
2013	2013
2014		-"$(OX)\cson_amalgamation$O" : "$(SRCDIR.extsrc)\cson_amalgamation.c"
	2014	+"$(OX)\cson_amalgamation$O" : "$(SRCDIR_extsrc)\cson_amalgamation.c"
2015	2015	$(TCC) /Fo$@ /Fd$(@D)\ -c $**
2016	2016
2017	2017	"$(OX)\page_index.h": "$(OBJDIR)\mkindex$E" $(SRC)
2018	2018	$** > $@
2019	2019
		@@ -2096,14 +2096,14 @@
2096	2096	writeln " \\"
2097	2097	writeln -nonewline "\t\t\t"
2098	2098	}
2099	2099	writeln -nonewline "\"\$(OX)\\${s}_.c\":\"\$(OX)\\$s.h\""; incr i
2100	2100	}
2101		-writeln " \\\n\t\t\t\"\$(SRCDIR.extsrc)\\sqlite3.h\" \\"
	2101	+writeln " \\\n\t\t\t\"\$(SRCDIR_extsrc)\\sqlite3.h\" \\"
2102	2102	writeln "\t\t\t\"\$(SRCDIR)\\th.h\" \\"
2103	2103	writeln "\t\t\t\"\$(OX)\\VERSION.h\" \\"
2104		-writeln "\t\t\t\"\$(SRCDIR.extsrc)\\cson_amalgamation.h\""
	2104	+writeln "\t\t\t\"\$(SRCDIR_extsrc)\\cson_amalgamation.h\""
2105	2105	writeln "\t@copy /Y nul: $@"
2106	2106
2107	2107
2108	2108	close $output_file
2109	2109	#
		@@ -2251,11 +2251,11 @@
2251	2251	# compiling standard fossil utils
2252	2252	$(UTILS_OBJ): %.obj: $(SRCDIR)%.c
2253	2253	$(CC) $(CCFLAGS) $(INCLUDE) "$<" -Fo"$@"
2254	2254
2255	2255	# compile special windows utils
2256		-version.obj: $(SRCDIR.tools)mkversion.c
	2256	+version.obj: $(SRCDIR_tools)mkversion.c
2257	2257	$(CC) $(CCFLAGS) $(INCLUDE) "$<" -Fo"$@"
2258	2258
2259	2259	# generate the translated c-source files
2260	2260	$(TRANSLATEDSRC): %_.c: $(SRCDIR)%.c translate.exe
2261	2261	translate.exe $< >$@
2262	2262

	--- tools/makemake.tcl
	+++ tools/makemake.tcl
	@@ -379,27 +379,27 @@
379	$(OBJDIR)/codecheck1 $(TRANS_SRC)
380
381	$(OBJDIR):
382	-mkdir $(OBJDIR)
383
384	$(OBJDIR)/translate: $(SRCDIR.tools)/translate.c
385	$(XBCC) -o $(OBJDIR)/translate $(SRCDIR.tools)/translate.c
386
387	$(OBJDIR)/makeheaders: $(SRCDIR.tools)/makeheaders.c
388	$(XBCC) -o $(OBJDIR)/makeheaders $(SRCDIR.tools)/makeheaders.c
389
390	$(OBJDIR)/mkindex: $(SRCDIR.tools)/mkindex.c
391	$(XBCC) -o $(OBJDIR)/mkindex $(SRCDIR.tools)/mkindex.c
392
393	$(OBJDIR)/mkbuiltin: $(SRCDIR.tools)/mkbuiltin.c
394	$(XBCC) -o $(OBJDIR)/mkbuiltin $(SRCDIR.tools)/mkbuiltin.c
395
396	$(OBJDIR)/mkversion: $(SRCDIR.tools)/mkversion.c
397	$(XBCC) -o $(OBJDIR)/mkversion $(SRCDIR.tools)/mkversion.c
398
399	$(OBJDIR)/codecheck1: $(SRCDIR.tools)/codecheck1.c
400	$(XBCC) -o $(OBJDIR)/codecheck1 $(SRCDIR.tools)/codecheck1.c
401
402	# Run the test suite.
403	# Other flags that can be included in TESTFLAGS are:
404	#
405	# -halt Stop testing after the first failed test
	@@ -463,19 +463,19 @@
463
464	# The USE_SEE variable may be undefined, 0 or 1. If undefined or 0,
465	# in-tree SQLite is used. If 1, then sqlite3-see.c (not part of the
466	# source tree) is used and extra flags are provided to enable the
467	# SQLite Encryption Extension.
468	SQLITE3_SRC.0 = $(SRCDIR.extsrc)/sqlite3.c
469	SQLITE3_SRC.1 = $(SRCDIR.extsrc)/sqlite3-see.c
470	# SQLITE3_SRC.2 is set by top-level configure/makefile process.
471	SQLITE3_SRC. = $(SRCDIR.extsrc)/sqlite3.c
472	SQLITE3_SRC = $(SQLITE3_SRC.$(SQLITE3_ORIGIN))
473	SQLITE3_SHELL_SRC.0 = $(SRCDIR.extsrc)/shell.c
474	SQLITE3_SHELL_SRC.1 = $(SRCDIR.extsrc)/shell-see.c
475	# SQLITE3_SHELL_SRC.2 comes from the configure process
476	SQLITE3_SHELL_SRC. = $(SRCDIR.extsrc)/shell.c
477	SQLITE3_SHELL_SRC = $(SQLITE3_SHELL_SRC.$(SQLITE3_ORIGIN))
478	SEE_FLAGS.0 =
479	SEE_FLAGS.1 = -DSQLITE_HAS_CODEC -DSQLITE_SHELL_DBKEY_PROC=fossil_key
480	SEE_FLAGS. =
481	SEE_FLAGS = $(SEE_FLAGS.$(USE_SEE))
	@@ -514,16 +514,16 @@
514	foreach s [lsort $src] {
515	append mhargs "\$(OBJDIR)/${s}_.c:\$(OBJDIR)/$s.h <<<NEXT_LINE>>>"
516	set extra_h($s) { }
517	}
518	foreach s [lsort $src_ext] {
519	append mhargs "\$(SRCDIR.extsrc)/${s}.c:\$(OBJDIR)/$s.h <<<NEXT_LINE>>>"
520	set extra_h($s) { }
521	}
522	append mhargs "\$(SRCDIR.extsrc)/sqlite3.h <<<NEXT_LINE>>>"
523	append mhargs "\$(SRCDIR)/th.h <<<NEXT_LINE>>>"
524	#append mhargs "\$(SRCDIR.extsrc)/cson_amalgamation.h <<<NEXT_LINE>>>"
525	append mhargs "\$(OBJDIR)/VERSION.h "
526	set mhargs [string map [list <<<NEXT_LINE>>> \\\n\t] $mhargs]
527	writeln "\$(OBJDIR)/page_index.h: \$(TRANS_SRC) \$(OBJDIR)/mkindex"
528	writeln "\t\$(OBJDIR)/mkindex \$(TRANS_SRC) >\$@\n"
529
	@@ -550,15 +550,15 @@
550
551	writeln "\$(OBJDIR)/sqlite3.o:\t\$(SQLITE3_SRC)"
552	writeln "\t\$(XTCC) \$(SQLITE_OPTIONS) \$(SQLITE_CFLAGS) \$(SEE_FLAGS) \\"
553	writeln "\t\t-c \$(SQLITE3_SRC) -o \$@"
554
555	writeln "\$(OBJDIR)/shell.o:\t\$(SQLITE3_SHELL_SRC) \$(SRCDIR.extsrc)/sqlite3.h"
556	writeln "\t\$(XTCC) \$(SHELL_OPTIONS) \$(SHELL_CFLAGS) \$(SEE_FLAGS) \$(LINENOISE_DEF.\$(USE_LINENOISE)) -c \$(SQLITE3_SHELL_SRC) -o \$@\n"
557
558	writeln "\$(OBJDIR)/linenoise.o:\t\$(SRCDIR.extsrc)/linenoise.c \$(SRCDIR.extsrc)/linenoise.h"
559	writeln "\t\$(XTCC) -c \$(SRCDIR.extsrc)/linenoise.c -o \$@\n"
560
561	writeln "\$(OBJDIR)/th.o:\t\$(SRCDIR)/th.c"
562	writeln "\t\$(XTCC) -c \$(SRCDIR)/th.c -o \$@\n"
563
564	writeln "\$(OBJDIR)/th_lang.o:\t\$(SRCDIR)/th_lang.c"
	@@ -566,18 +566,18 @@
566
567	writeln "\$(OBJDIR)/th_tcl.o:\t\$(SRCDIR)/th_tcl.c"
568	writeln "\t\$(XTCC) -c \$(SRCDIR)/th_tcl.c -o \$@\n"
569
570	writeln {
571	$(OBJDIR)/miniz.o: $(SRCDIR.extsrc)/miniz.c
572	$(XTCC) $(MINIZ_OPTIONS) -c $(SRCDIR.extsrc)/miniz.c -o $@
573
574	$(OBJDIR)/pikchr.o: $(SRCDIR.extsrc)/pikchr.c
575	$(XTCC) -c $(SRCDIR.extsrc)/pikchr.c -o $@
576
577	$(OBJDIR)/cson_amalgamation.o: $(SRCDIR.extsrc)/cson_amalgamation.c
578	$(XTCC) -c $(SRCDIR.extsrc)/cson_amalgamation.c -o $@
579
580	#
581	# The list of all the targets that do not correspond to real files. This stops
582	# 'make' from getting confused when someone makes an error in a rule.
583	#
	@@ -1086,16 +1086,16 @@
1086	writeln {
1087	all: $(OBJDIR) $(APPNAME)
1088
1089	$(OBJDIR)/fossil.o: $(SRCDIR)/../win/fossil.rc $(OBJDIR)/VERSION.h
1090	ifdef USE_WINDOWS
1091	$(CAT) $(subst /,\,$(SRCDIR.extsrc)\miniz.c) \| $(GREP) "define MZ_VERSION" > $(subst /,\,$(OBJDIR)\minizver.h)
1092	$(CP) $(subst /,\,$(SRCDIR)\..\win\fossil.rc) $(subst /,\,$(OBJDIR))
1093	$(CP) $(subst /,\,$(SRCDIR)\..\win\fossil.ico) $(subst /,\,$(OBJDIR))
1094	$(CP) $(subst /,\,$(SRCDIR)\..\win\fossil.exe.manifest) $(subst /,\,$(OBJDIR))
1095	else
1096	$(CAT) $(SRCDIR.extsrc)/miniz.c \| $(GREP) "define MZ_VERSION" > $(OBJDIR)/minizver.h
1097	$(CP) $(SRCDIR)/../win/fossil.rc $(OBJDIR)
1098	$(CP) $(SRCDIR)/../win/fossil.ico $(OBJDIR)
1099	$(CP) $(SRCDIR)/../win/fossil.exe.manifest $(OBJDIR)
1100	endif
1101	$(RCC) $(OBJDIR)/fossil.rc -o $(OBJDIR)/fossil.o
	@@ -1114,27 +1114,27 @@
1114	$(MKDIR) $(subst /,\,$(OBJDIR))
1115	else
1116	$(MKDIR) $(OBJDIR)
1117	endif
1118
1119	$(TRANSLATE): $(SRCDIR.tools)/translate.c
1120	$(XBCC) -o $@ $(SRCDIR.tools)/translate.c
1121
1122	$(MAKEHEADERS): $(SRCDIR.tools)/makeheaders.c
1123	$(XBCC) -o $@ $(SRCDIR.tools)/makeheaders.c
1124
1125	$(MKINDEX): $(SRCDIR.tools)/mkindex.c
1126	$(XBCC) -o $@ $(SRCDIR.tools)/mkindex.c
1127
1128	$(MKBUILTIN): $(SRCDIR)/mkbuiltin.c
1129	$(XBCC) -o $@ $(SRCDIR)/mkbuiltin.c
1130
1131	$(MKVERSION): $(SRCDIR.tools)/mkversion.c
1132	$(XBCC) -o $@ $(SRCDIR.tools)/mkversion.c
1133
1134	$(CODECHECK1): $(SRCDIR.tools)/codecheck1.c
1135	$(XBCC) -o $@ $(SRCDIR.tools)/codecheck1.c
1136
1137	# WARNING. DANGER. Running the test suite modifies the repository the
1138	# build is done from, i.e. the checkout belongs to. Do not sync/push
1139	# the repository after running the tests.
1140	test: $(OBJDIR) $(APPNAME)
	@@ -1168,19 +1168,19 @@
1168
1169	# The USE_SEE variable may be undefined, 0 or 1. If undefined or 0,
1170	# in-tree SQLite is used. If 1, then sqlite3-see.c (not part of the
1171	# source tree) is used and extra flags are provided to enable the
1172	# SQLite Encryption Extension.
1173	SQLITE3_SRC.0 = $(SRCDIR.extsrc)/sqlite3.c
1174	SQLITE3_SRC.1 = $(SRCDIR.extsrc)/sqlite3-see.c
1175	# SQLITE3_SRC.2 is set by top-level configure/makefile process.
1176	SQLITE3_SRC. = $(SRCDIR.extsrc)/sqlite3.c
1177	SQLITE3_SRC = $(SRCDIR)/$(SQLITE3_SRC.$(SQLITE3_ORIGIN))
1178	SQLITE3_SHELL_SRC.0 = $(SRCDIR.extsrc)/shell.c
1179	SQLITE3_SHELL_SRC.1 = $(SRCDIR.extsrc)/shell-see.c
1180	# SQLITE3_SHELL_SRC.2 comes from the configure process
1181	SQLITE3_SHELL_SRC. = $(SRCDIR.extsrc)/shell.c
1182	SQLITE3_SHELL_SRC = $(SQLITE3_SHELL_SRC.$(SQLITE3_ORIGIN))
1183	SEE_FLAGS.0 =
1184	SEE_FLAGS.1 = -DSQLITE_HAS_CODEC -DSQLITE_SHELL_DBKEY_PROC=fossil_key
1185	SEE_FLAGS. =
1186	SEE_FLAGS = $(SEE_FLAGS.$(USE_SEE))
	@@ -1268,14 +1268,14 @@
1268	if {[string length $mhargs] > 0} {append mhargs " \\\n\t\t"}
1269	append mhargs "\$(OBJDIR)/${s}_.c:\$(OBJDIR)/$s.h"
1270	set extra_h($s) { }
1271	}
1272	foreach s [lsort $src_ext] {
1273	append mhargs "\$(SRCDIR.extsrc)/${s}.c:\$(OBJDIR)/$s.h <<<NEXT_LINE>>>"
1274	set extra_h($s) { }
1275	}
1276	append mhargs " \\\n\t\t\$(SRCDIR.extsrc)/sqlite3.h"
1277	append mhargs " \\\n\t\t\$(SRCDIR)/th.h"
1278	append mhargs " \\\n\t\t\$(OBJDIR)/VERSION.h"
1279	writeln "\$(OBJDIR)/page_index.h: \$(TRANS_SRC) \$(MKINDEX)"
1280	writeln "\t\$(MKINDEX) \$(TRANS_SRC) >\$@\n"
1281
	@@ -1320,15 +1320,15 @@
1320
1321	writeln "\$(OBJDIR)/sqlite3.o:\t\$(SQLITE3_SRC) \$(SRCDIR)/../win/Makefile.mingw"
1322	writeln "\t\$(XTCC) \$(SQLITE_OPTIONS) \$(SQLITE_CFLAGS) \$(SEE_FLAGS) \\"
1323	writeln "\t\t-c \$(SQLITE3_SRC) -o \$@\n"
1324
1325	writeln "\$(OBJDIR)/cson_amalgamation.o:\t\$(SRCDIR.extsrc)/cson_amalgamation.c"
1326	writeln "\t\$(XTCC) -c \$(SRCDIR.extsrc)/cson_amalgamation.c -o \$@\n"
1327	writeln "\$(OBJDIR)/json.o \$(OBJDIR)/json_artifact.o \$(OBJDIR)/json_branch.o \$(OBJDIR)/json_config.o \$(OBJDIR)/json_diff.o \$(OBJDIR)/json_dir.o \$(OBJDIR)/jsos_finfo.o \$(OBJDIR)/json_login.o \$(OBJDIR)/json_query.o \$(OBJDIR)/json_report.o \$(OBJDIR)/json_status.o \$(OBJDIR)/json_tag.o \$(OBJDIR)/json_timeline.o \$(OBJDIR)/json_user.o \$(OBJDIR)/json_wiki.o : \$(SRCDIR)/json_detail.h\n"
1328
1329	writeln "\$(OBJDIR)/shell.o:\t\$(SQLITE3_SHELL_SRC) \$(SRCDIR.extsrc)/sqlite3.h \$(SRCDIR)/../win/Makefile.mingw"
1330	writeln "\t\$(XTCC) \$(SHELL_OPTIONS) \$(SHELL_CFLAGS) \$(SEE_FLAGS) -c \$(SQLITE3_SHELL_SRC) -o \$@\n"
1331
1332	writeln "\$(OBJDIR)/th.o:\t\$(SRCDIR)/th.c"
1333	writeln "\t\$(XTCC) -c \$(SRCDIR)/th.c -o \$@\n"
1334
	@@ -1336,15 +1336,15 @@
1336	writeln "\t\$(XTCC) -c \$(SRCDIR)/th_lang.c -o \$@\n"
1337
1338	writeln "\$(OBJDIR)/th_tcl.o:\t\$(SRCDIR)/th_tcl.c"
1339	writeln "\t\$(XTCC) -c \$(SRCDIR)/th_tcl.c -o \$@\n"
1340
1341	writeln "\$(OBJDIR)/miniz.o:\t\$(SRCDIR.extsrc)/miniz.c"
1342	writeln "\t\$(XTCC) \$(MINIZ_OPTIONS) -c \$(SRCDIR.extsrc)/miniz.c -o \$@\n"
1343
1344	writeln "\$(OBJDIR)/pikchr.o:\t\$(SRCDIR.extsrc)/pikchr.c"
1345	writeln "\t\$(XTCC) -c \$(SRCDIR.extsrc)/pikchr.c -o \$@\n"
1346
1347	close $output_file
1348	#
1349	# End of the win/Makefile.mingw output
1350	##############################################################################
	@@ -1424,41 +1424,41 @@
1424	writeln "\t+echo \$(LIBS) >> \$@"
1425	writeln "\t+echo. >> \$@"
1426	writeln "\t+echo fossil >> \$@"
1427
1428	writeln {
1429	translate$E: $(SRCDIR.tools)\translate.c
1430	$(BCC) -o$@ $**
1431
1432	makeheaders$E: $(SRCDIR.tools)\makeheaders.c
1433	$(BCC) -o$@ $**
1434
1435	mkindex$E: $(SRCDIR.tools)\mkindex.c
1436	$(BCC) -o$@ $**
1437
1438	mkbuiltin$E: $(SRCDIR)\mkbuiltin.c
1439	$(BCC) -o$@ $**
1440
1441	mkversion$E: $(SRCDIR.tools)\mkversion.c
1442	$(BCC) -o$@ $**
1443
1444	codecheck1$E: $(SRCDIR.tools)\codecheck1.c
1445	$(BCC) -o$@ $**
1446
1447	$(OBJDIR)\shell$O : $(SRCDIR.extsrc)\shell.c
1448	$(TCC) -o$@ -c $(SHELL_OPTIONS) $(SQLITE_OPTIONS) $(SHELL_CFLAGS) $**
1449
1450	$(OBJDIR)\sqlite3$O : $(SRCDIR.extsrc)\sqlite3.c
1451	$(TCC) -o$@ -c $(SQLITE_OPTIONS) $(SQLITE_CFLAGS) $**
1452
1453	$(OBJDIR)\th$O : $(SRCDIR)\th.c
1454	$(TCC) -o$@ -c $**
1455
1456	$(OBJDIR)\th_lang$O : $(SRCDIR)\th_lang.c
1457	$(TCC) -o$@ -c $**
1458
1459	$(OBJDIR)\cson_amalgamation.h : $(SRCDIR.extsrc)\cson_amalgamation.h
1460	cp $@ $@
1461
1462	VERSION.h : mkversion$E $B\manifest.uuid $B\manifest $B\VERSION
1463	+$** > $@
1464
	@@ -1501,11 +1501,11 @@
1501
1502	writeln -nonewline "headers: makeheaders\$E page_index.h builtin_data.h VERSION.h\n\t +makeheaders\$E "
1503	foreach s [lsort $src] {
1504	writeln -nonewline "${s}_.c:$s.h "
1505	}
1506	writeln "\$(SRCDIR.extsrc)\\sqlite3.h \$(SRCDIR)\\th.h VERSION.h \$(SRCDIR.extsrc)\\cson_amalgamation.h"
1507	writeln "\t@copy /Y nul: headers"
1508
1509	close $output_file
1510	#
1511	# End of the win/Makefile.dmc output
	@@ -1954,36 +1954,36 @@
1954	writeln "!if \$(FOSSIL_ENABLE_MINIZ)!=0"
1955	writeln "\techo \"\$(OX)\\miniz.obj\" $redir \$@"
1956	writeln "!endif"
1957	writeln "\techo \$(LIBS) $redir \$@"
1958	writeln {
1959	"$(OBJDIR)\translate$E": "$(SRCDIR.tools)\translate.c"
1960	$(BCC) /Fe$@ /Fo$(@D)\ /Fd$(@D)\ $**
1961
1962	"$(OBJDIR)\makeheaders$E": "$(SRCDIR.tools)\makeheaders.c"
1963	$(BCC) /Fe$@ /Fo$(@D)\ /Fd$(@D)\ $**
1964
1965	"$(OBJDIR)\mkindex$E": "$(SRCDIR.tools)\mkindex.c"
1966	$(BCC) /Fe$@ /Fo$(@D)\ /Fd$(@D)\ $**
1967
1968	"$(OBJDIR)\mkbuiltin$E": "$(SRCDIR)\mkbuiltin.c"
1969	$(BCC) /Fe$@ /Fo$(@D)\ /Fd$(@D)\ $**
1970
1971	"$(OBJDIR)\mkversion$E": "$(SRCDIR.tools)\mkversion.c"
1972	$(BCC) /Fe$@ /Fo$(@D)\ /Fd$(@D)\ $**
1973
1974	"$(OBJDIR)\codecheck1$E": "$(SRCDIR.tools)\codecheck1.c"
1975	$(BCC) /Fe$@ /Fo$(@D)\ /Fd$(@D)\ $**
1976
1977	!if $(USE_SEE)!=0
1978	SEE_FLAGS = /DSQLITE_HAS_CODEC=1 /DSQLITE_SHELL_DBKEY_PROC=fossil_key
1979	SQLITE3_SHELL_SRC = $(SRCDIR)\shell-see.c
1980	SQLITE3_SRC = $(SRCDIR.extsrc)\sqlite3-see.c
1981	!else
1982	SEE_FLAGS =
1983	SQLITE3_SHELL_SRC = $(SRCDIR.extsrc)\shell.c
1984	SQLITE3_SRC = $(SRCDIR.extsrc)\sqlite3.c
1985	!endif
1986
1987	"$(OX)\shell$O" : "$(SQLITE3_SHELL_SRC)" "$(B)\win\Makefile.msc"
1988	$(TCC) /Fo$@ /Fd$(@D)\ $(SHELL_OPTIONS) $(SQLITE_OPTIONS) $(SHELL_CFLAGS) $(SEE_FLAGS) -c "$(SQLITE3_SHELL_SRC)"
1989
	@@ -1997,23 +1997,23 @@
1997	$(TCC) /Fo$@ /Fd$(@D)\ -c $**
1998
1999	"$(OX)\th_tcl$O" : "$(SRCDIR)\th_tcl.c"
2000	$(TCC) /Fo$@ /Fd$(@D)\ -c $**
2001
2002	"$(OX)\miniz$O" : "$(SRCDIR.extsrc)\miniz.c"
2003	$(TCC) /Fo$@ /Fd$(@D)\ -c $(MINIZ_OPTIONS) $**
2004
2005	"$(OX)\pikchr$O" : "$(SRCDIR.extsrc)" "$(B)\win\Makefile.msc"
2006	$(TCC) /Fo$@ /Fd$(@D)\ -c $**
2007
2008	"$(OX)\VERSION.h" : "$(OBJDIR)\mkversion$E" "$(B)\manifest.uuid" "$(B)\manifest" "$(B)\VERSION" "$(B)\phony.h"
2009	"$(OBJDIR)\mkversion$E" "$(B)\manifest.uuid" "$(B)\manifest" "$(B)\VERSION" > $@
2010
2011	"$(B)\phony.h" :
2012	rem Force rebuild of VERSION.h whenever nmake is run
2013
2014	"$(OX)\cson_amalgamation$O" : "$(SRCDIR.extsrc)\cson_amalgamation.c"
2015	$(TCC) /Fo$@ /Fd$(@D)\ -c $**
2016
2017	"$(OX)\page_index.h": "$(OBJDIR)\mkindex$E" $(SRC)
2018	$** > $@
2019
	@@ -2096,14 +2096,14 @@
2096	writeln " \\"
2097	writeln -nonewline "\t\t\t"
2098	}
2099	writeln -nonewline "\"\$(OX)\\${s}_.c\":\"\$(OX)\\$s.h\""; incr i
2100	}
2101	writeln " \\\n\t\t\t\"\$(SRCDIR.extsrc)\\sqlite3.h\" \\"
2102	writeln "\t\t\t\"\$(SRCDIR)\\th.h\" \\"
2103	writeln "\t\t\t\"\$(OX)\\VERSION.h\" \\"
2104	writeln "\t\t\t\"\$(SRCDIR.extsrc)\\cson_amalgamation.h\""
2105	writeln "\t@copy /Y nul: $@"
2106
2107
2108	close $output_file
2109	#
	@@ -2251,11 +2251,11 @@
2251	# compiling standard fossil utils
2252	$(UTILS_OBJ): %.obj: $(SRCDIR)%.c
2253	$(CC) $(CCFLAGS) $(INCLUDE) "$<" -Fo"$@"
2254
2255	# compile special windows utils
2256	version.obj: $(SRCDIR.tools)mkversion.c
2257	$(CC) $(CCFLAGS) $(INCLUDE) "$<" -Fo"$@"
2258
2259	# generate the translated c-source files
2260	$(TRANSLATEDSRC): %_.c: $(SRCDIR)%.c translate.exe
2261	translate.exe $< >$@
2262

	--- tools/makemake.tcl
	+++ tools/makemake.tcl
	@@ -379,27 +379,27 @@
379	$(OBJDIR)/codecheck1 $(TRANS_SRC)
380
381	$(OBJDIR):
382	-mkdir $(OBJDIR)
383
384	$(OBJDIR)/translate: $(SRCDIR_tools)/translate.c
385	$(XBCC) -o $(OBJDIR)/translate $(SRCDIR_tools)/translate.c
386
387	$(OBJDIR)/makeheaders: $(SRCDIR_tools)/makeheaders.c
388	$(XBCC) -o $(OBJDIR)/makeheaders $(SRCDIR_tools)/makeheaders.c
389
390	$(OBJDIR)/mkindex: $(SRCDIR_tools)/mkindex.c
391	$(XBCC) -o $(OBJDIR)/mkindex $(SRCDIR_tools)/mkindex.c
392
393	$(OBJDIR)/mkbuiltin: $(SRCDIR_tools)/mkbuiltin.c
394	$(XBCC) -o $(OBJDIR)/mkbuiltin $(SRCDIR_tools)/mkbuiltin.c
395
396	$(OBJDIR)/mkversion: $(SRCDIR_tools)/mkversion.c
397	$(XBCC) -o $(OBJDIR)/mkversion $(SRCDIR_tools)/mkversion.c
398
399	$(OBJDIR)/codecheck1: $(SRCDIR_tools)/codecheck1.c
400	$(XBCC) -o $(OBJDIR)/codecheck1 $(SRCDIR_tools)/codecheck1.c
401
402	# Run the test suite.
403	# Other flags that can be included in TESTFLAGS are:
404	#
405	# -halt Stop testing after the first failed test
	@@ -463,19 +463,19 @@
463
464	# The USE_SEE variable may be undefined, 0 or 1. If undefined or 0,
465	# in-tree SQLite is used. If 1, then sqlite3-see.c (not part of the
466	# source tree) is used and extra flags are provided to enable the
467	# SQLite Encryption Extension.
468	SQLITE3_SRC.0 = $(SRCDIR_extsrc)/sqlite3.c
469	SQLITE3_SRC.1 = $(SRCDIR_extsrc)/sqlite3-see.c
470	# SQLITE3_SRC.2 is set by top-level configure/makefile process.
471	SQLITE3_SRC. = $(SRCDIR_extsrc)/sqlite3.c
472	SQLITE3_SRC = $(SQLITE3_SRC.$(SQLITE3_ORIGIN))
473	SQLITE3_SHELL_SRC.0 = $(SRCDIR_extsrc)/shell.c
474	SQLITE3_SHELL_SRC.1 = $(SRCDIR_extsrc)/shell-see.c
475	# SQLITE3_SHELL_SRC.2 comes from the configure process
476	SQLITE3_SHELL_SRC. = $(SRCDIR_extsrc)/shell.c
477	SQLITE3_SHELL_SRC = $(SQLITE3_SHELL_SRC.$(SQLITE3_ORIGIN))
478	SEE_FLAGS.0 =
479	SEE_FLAGS.1 = -DSQLITE_HAS_CODEC -DSQLITE_SHELL_DBKEY_PROC=fossil_key
480	SEE_FLAGS. =
481	SEE_FLAGS = $(SEE_FLAGS.$(USE_SEE))
	@@ -514,16 +514,16 @@
514	foreach s [lsort $src] {
515	append mhargs "\$(OBJDIR)/${s}_.c:\$(OBJDIR)/$s.h <<<NEXT_LINE>>>"
516	set extra_h($s) { }
517	}
518	foreach s [lsort $src_ext] {
519	append mhargs "\$(SRCDIR_extsrc)/${s}.c:\$(OBJDIR)/$s.h <<<NEXT_LINE>>>"
520	set extra_h($s) { }
521	}
522	append mhargs "\$(SRCDIR_extsrc)/sqlite3.h <<<NEXT_LINE>>>"
523	append mhargs "\$(SRCDIR)/th.h <<<NEXT_LINE>>>"
524	#append mhargs "\$(SRCDIR_extsrc)/cson_amalgamation.h <<<NEXT_LINE>>>"
525	append mhargs "\$(OBJDIR)/VERSION.h "
526	set mhargs [string map [list <<<NEXT_LINE>>> \\\n\t] $mhargs]
527	writeln "\$(OBJDIR)/page_index.h: \$(TRANS_SRC) \$(OBJDIR)/mkindex"
528	writeln "\t\$(OBJDIR)/mkindex \$(TRANS_SRC) >\$@\n"
529
	@@ -550,15 +550,15 @@
550
551	writeln "\$(OBJDIR)/sqlite3.o:\t\$(SQLITE3_SRC)"
552	writeln "\t\$(XTCC) \$(SQLITE_OPTIONS) \$(SQLITE_CFLAGS) \$(SEE_FLAGS) \\"
553	writeln "\t\t-c \$(SQLITE3_SRC) -o \$@"
554
555	writeln "\$(OBJDIR)/shell.o:\t\$(SQLITE3_SHELL_SRC) \$(SRCDIR_extsrc)/sqlite3.h"
556	writeln "\t\$(XTCC) \$(SHELL_OPTIONS) \$(SHELL_CFLAGS) \$(SEE_FLAGS) \$(LINENOISE_DEF.\$(USE_LINENOISE)) -c \$(SQLITE3_SHELL_SRC) -o \$@\n"
557
558	writeln "\$(OBJDIR)/linenoise.o:\t\$(SRCDIR_extsrc)/linenoise.c \$(SRCDIR_extsrc)/linenoise.h"
559	writeln "\t\$(XTCC) -c \$(SRCDIR_extsrc)/linenoise.c -o \$@\n"
560
561	writeln "\$(OBJDIR)/th.o:\t\$(SRCDIR)/th.c"
562	writeln "\t\$(XTCC) -c \$(SRCDIR)/th.c -o \$@\n"
563
564	writeln "\$(OBJDIR)/th_lang.o:\t\$(SRCDIR)/th_lang.c"
	@@ -566,18 +566,18 @@
566
567	writeln "\$(OBJDIR)/th_tcl.o:\t\$(SRCDIR)/th_tcl.c"
568	writeln "\t\$(XTCC) -c \$(SRCDIR)/th_tcl.c -o \$@\n"
569
570	writeln {
571	$(OBJDIR)/miniz.o: $(SRCDIR_extsrc)/miniz.c
572	$(XTCC) $(MINIZ_OPTIONS) -c $(SRCDIR_extsrc)/miniz.c -o $@
573
574	$(OBJDIR)/pikchr.o: $(SRCDIR_extsrc)/pikchr.c
575	$(XTCC) -c $(SRCDIR_extsrc)/pikchr.c -o $@
576
577	$(OBJDIR)/cson_amalgamation.o: $(SRCDIR_extsrc)/cson_amalgamation.c
578	$(XTCC) -c $(SRCDIR_extsrc)/cson_amalgamation.c -o $@
579
580	#
581	# The list of all the targets that do not correspond to real files. This stops
582	# 'make' from getting confused when someone makes an error in a rule.
583	#
	@@ -1086,16 +1086,16 @@
1086	writeln {
1087	all: $(OBJDIR) $(APPNAME)
1088
1089	$(OBJDIR)/fossil.o: $(SRCDIR)/../win/fossil.rc $(OBJDIR)/VERSION.h
1090	ifdef USE_WINDOWS
1091	$(CAT) $(subst /,\,$(SRCDIR_extsrc)\miniz.c) \| $(GREP) "define MZ_VERSION" > $(subst /,\,$(OBJDIR)\minizver.h)
1092	$(CP) $(subst /,\,$(SRCDIR)\..\win\fossil.rc) $(subst /,\,$(OBJDIR))
1093	$(CP) $(subst /,\,$(SRCDIR)\..\win\fossil.ico) $(subst /,\,$(OBJDIR))
1094	$(CP) $(subst /,\,$(SRCDIR)\..\win\fossil.exe.manifest) $(subst /,\,$(OBJDIR))
1095	else
1096	$(CAT) $(SRCDIR_extsrc)/miniz.c \| $(GREP) "define MZ_VERSION" > $(OBJDIR)/minizver.h
1097	$(CP) $(SRCDIR)/../win/fossil.rc $(OBJDIR)
1098	$(CP) $(SRCDIR)/../win/fossil.ico $(OBJDIR)
1099	$(CP) $(SRCDIR)/../win/fossil.exe.manifest $(OBJDIR)
1100	endif
1101	$(RCC) $(OBJDIR)/fossil.rc -o $(OBJDIR)/fossil.o
	@@ -1114,27 +1114,27 @@
1114	$(MKDIR) $(subst /,\,$(OBJDIR))
1115	else
1116	$(MKDIR) $(OBJDIR)
1117	endif
1118
1119	$(TRANSLATE): $(SRCDIR_tools)/translate.c
1120	$(XBCC) -o $@ $(SRCDIR_tools)/translate.c
1121
1122	$(MAKEHEADERS): $(SRCDIR_tools)/makeheaders.c
1123	$(XBCC) -o $@ $(SRCDIR_tools)/makeheaders.c
1124
1125	$(MKINDEX): $(SRCDIR_tools)/mkindex.c
1126	$(XBCC) -o $@ $(SRCDIR_tools)/mkindex.c
1127
1128	$(MKBUILTIN): $(SRCDIR)/mkbuiltin.c
1129	$(XBCC) -o $@ $(SRCDIR)/mkbuiltin.c
1130
1131	$(MKVERSION): $(SRCDIR_tools)/mkversion.c
1132	$(XBCC) -o $@ $(SRCDIR_tools)/mkversion.c
1133
1134	$(CODECHECK1): $(SRCDIR_tools)/codecheck1.c
1135	$(XBCC) -o $@ $(SRCDIR_tools)/codecheck1.c
1136
1137	# WARNING. DANGER. Running the test suite modifies the repository the
1138	# build is done from, i.e. the checkout belongs to. Do not sync/push
1139	# the repository after running the tests.
1140	test: $(OBJDIR) $(APPNAME)
	@@ -1168,19 +1168,19 @@
1168
1169	# The USE_SEE variable may be undefined, 0 or 1. If undefined or 0,
1170	# in-tree SQLite is used. If 1, then sqlite3-see.c (not part of the
1171	# source tree) is used and extra flags are provided to enable the
1172	# SQLite Encryption Extension.
1173	SQLITE3_SRC.0 = $(SRCDIR_extsrc)/sqlite3.c
1174	SQLITE3_SRC.1 = $(SRCDIR_extsrc)/sqlite3-see.c
1175	# SQLITE3_SRC.2 is set by top-level configure/makefile process.
1176	SQLITE3_SRC. = $(SRCDIR_extsrc)/sqlite3.c
1177	SQLITE3_SRC = $(SRCDIR)/$(SQLITE3_SRC.$(SQLITE3_ORIGIN))
1178	SQLITE3_SHELL_SRC.0 = $(SRCDIR_extsrc)/shell.c
1179	SQLITE3_SHELL_SRC.1 = $(SRCDIR_extsrc)/shell-see.c
1180	# SQLITE3_SHELL_SRC.2 comes from the configure process
1181	SQLITE3_SHELL_SRC. = $(SRCDIR_extsrc)/shell.c
1182	SQLITE3_SHELL_SRC = $(SQLITE3_SHELL_SRC.$(SQLITE3_ORIGIN))
1183	SEE_FLAGS.0 =
1184	SEE_FLAGS.1 = -DSQLITE_HAS_CODEC -DSQLITE_SHELL_DBKEY_PROC=fossil_key
1185	SEE_FLAGS. =
1186	SEE_FLAGS = $(SEE_FLAGS.$(USE_SEE))
	@@ -1268,14 +1268,14 @@
1268	if {[string length $mhargs] > 0} {append mhargs " \\\n\t\t"}
1269	append mhargs "\$(OBJDIR)/${s}_.c:\$(OBJDIR)/$s.h"
1270	set extra_h($s) { }
1271	}
1272	foreach s [lsort $src_ext] {
1273	append mhargs "\$(SRCDIR_extsrc)/${s}.c:\$(OBJDIR)/$s.h <<<NEXT_LINE>>>"
1274	set extra_h($s) { }
1275	}
1276	append mhargs " \\\n\t\t\$(SRCDIR_extsrc)/sqlite3.h"
1277	append mhargs " \\\n\t\t\$(SRCDIR)/th.h"
1278	append mhargs " \\\n\t\t\$(OBJDIR)/VERSION.h"
1279	writeln "\$(OBJDIR)/page_index.h: \$(TRANS_SRC) \$(MKINDEX)"
1280	writeln "\t\$(MKINDEX) \$(TRANS_SRC) >\$@\n"
1281
	@@ -1320,15 +1320,15 @@
1320
1321	writeln "\$(OBJDIR)/sqlite3.o:\t\$(SQLITE3_SRC) \$(SRCDIR)/../win/Makefile.mingw"
1322	writeln "\t\$(XTCC) \$(SQLITE_OPTIONS) \$(SQLITE_CFLAGS) \$(SEE_FLAGS) \\"
1323	writeln "\t\t-c \$(SQLITE3_SRC) -o \$@\n"
1324
1325	writeln "\$(OBJDIR)/cson_amalgamation.o:\t\$(SRCDIR_extsrc)/cson_amalgamation.c"
1326	writeln "\t\$(XTCC) -c \$(SRCDIR_extsrc)/cson_amalgamation.c -o \$@\n"
1327	writeln "\$(OBJDIR)/json.o \$(OBJDIR)/json_artifact.o \$(OBJDIR)/json_branch.o \$(OBJDIR)/json_config.o \$(OBJDIR)/json_diff.o \$(OBJDIR)/json_dir.o \$(OBJDIR)/jsos_finfo.o \$(OBJDIR)/json_login.o \$(OBJDIR)/json_query.o \$(OBJDIR)/json_report.o \$(OBJDIR)/json_status.o \$(OBJDIR)/json_tag.o \$(OBJDIR)/json_timeline.o \$(OBJDIR)/json_user.o \$(OBJDIR)/json_wiki.o : \$(SRCDIR)/json_detail.h\n"
1328
1329	writeln "\$(OBJDIR)/shell.o:\t\$(SQLITE3_SHELL_SRC) \$(SRCDIR_extsrc)/sqlite3.h \$(SRCDIR)/../win/Makefile.mingw"
1330	writeln "\t\$(XTCC) \$(SHELL_OPTIONS) \$(SHELL_CFLAGS) \$(SEE_FLAGS) -c \$(SQLITE3_SHELL_SRC) -o \$@\n"
1331
1332	writeln "\$(OBJDIR)/th.o:\t\$(SRCDIR)/th.c"
1333	writeln "\t\$(XTCC) -c \$(SRCDIR)/th.c -o \$@\n"
1334
	@@ -1336,15 +1336,15 @@
1336	writeln "\t\$(XTCC) -c \$(SRCDIR)/th_lang.c -o \$@\n"
1337
1338	writeln "\$(OBJDIR)/th_tcl.o:\t\$(SRCDIR)/th_tcl.c"
1339	writeln "\t\$(XTCC) -c \$(SRCDIR)/th_tcl.c -o \$@\n"
1340
1341	writeln "\$(OBJDIR)/miniz.o:\t\$(SRCDIR_extsrc)/miniz.c"
1342	writeln "\t\$(XTCC) \$(MINIZ_OPTIONS) -c \$(SRCDIR_extsrc)/miniz.c -o \$@\n"
1343
1344	writeln "\$(OBJDIR)/pikchr.o:\t\$(SRCDIR_extsrc)/pikchr.c"
1345	writeln "\t\$(XTCC) -c \$(SRCDIR_extsrc)/pikchr.c -o \$@\n"
1346
1347	close $output_file
1348	#
1349	# End of the win/Makefile.mingw output
1350	##############################################################################
	@@ -1424,41 +1424,41 @@
1424	writeln "\t+echo \$(LIBS) >> \$@"
1425	writeln "\t+echo. >> \$@"
1426	writeln "\t+echo fossil >> \$@"
1427
1428	writeln {
1429	translate$E: $(SRCDIR_tools)\translate.c
1430	$(BCC) -o$@ $**
1431
1432	makeheaders$E: $(SRCDIR_tools)\makeheaders.c
1433	$(BCC) -o$@ $**
1434
1435	mkindex$E: $(SRCDIR_tools)\mkindex.c
1436	$(BCC) -o$@ $**
1437
1438	mkbuiltin$E: $(SRCDIR)\mkbuiltin.c
1439	$(BCC) -o$@ $**
1440
1441	mkversion$E: $(SRCDIR_tools)\mkversion.c
1442	$(BCC) -o$@ $**
1443
1444	codecheck1$E: $(SRCDIR_tools)\codecheck1.c
1445	$(BCC) -o$@ $**
1446
1447	$(OBJDIR)\shell$O : $(SRCDIR_extsrc)\shell.c
1448	$(TCC) -o$@ -c $(SHELL_OPTIONS) $(SQLITE_OPTIONS) $(SHELL_CFLAGS) $**
1449
1450	$(OBJDIR)\sqlite3$O : $(SRCDIR_extsrc)\sqlite3.c
1451	$(TCC) -o$@ -c $(SQLITE_OPTIONS) $(SQLITE_CFLAGS) $**
1452
1453	$(OBJDIR)\th$O : $(SRCDIR)\th.c
1454	$(TCC) -o$@ -c $**
1455
1456	$(OBJDIR)\th_lang$O : $(SRCDIR)\th_lang.c
1457	$(TCC) -o$@ -c $**
1458
1459	$(OBJDIR)\cson_amalgamation.h : $(SRCDIR_extsrc)\cson_amalgamation.h
1460	cp $@ $@
1461
1462	VERSION.h : mkversion$E $B\manifest.uuid $B\manifest $B\VERSION
1463	+$** > $@
1464
	@@ -1501,11 +1501,11 @@
1501
1502	writeln -nonewline "headers: makeheaders\$E page_index.h builtin_data.h VERSION.h\n\t +makeheaders\$E "
1503	foreach s [lsort $src] {
1504	writeln -nonewline "${s}_.c:$s.h "
1505	}
1506	writeln "\$(SRCDIR_extsrc)\\sqlite3.h \$(SRCDIR)\\th.h VERSION.h \$(SRCDIR_extsrc)\\cson_amalgamation.h"
1507	writeln "\t@copy /Y nul: headers"
1508
1509	close $output_file
1510	#
1511	# End of the win/Makefile.dmc output
	@@ -1954,36 +1954,36 @@
1954	writeln "!if \$(FOSSIL_ENABLE_MINIZ)!=0"
1955	writeln "\techo \"\$(OX)\\miniz.obj\" $redir \$@"
1956	writeln "!endif"
1957	writeln "\techo \$(LIBS) $redir \$@"
1958	writeln {
1959	"$(OBJDIR)\translate$E": "$(SRCDIR_tools)\translate.c"
1960	$(BCC) /Fe$@ /Fo$(@D)\ /Fd$(@D)\ $**
1961
1962	"$(OBJDIR)\makeheaders$E": "$(SRCDIR_tools)\makeheaders.c"
1963	$(BCC) /Fe$@ /Fo$(@D)\ /Fd$(@D)\ $**
1964
1965	"$(OBJDIR)\mkindex$E": "$(SRCDIR_tools)\mkindex.c"
1966	$(BCC) /Fe$@ /Fo$(@D)\ /Fd$(@D)\ $**
1967
1968	"$(OBJDIR)\mkbuiltin$E": "$(SRCDIR)\mkbuiltin.c"
1969	$(BCC) /Fe$@ /Fo$(@D)\ /Fd$(@D)\ $**
1970
1971	"$(OBJDIR)\mkversion$E": "$(SRCDIR_tools)\mkversion.c"
1972	$(BCC) /Fe$@ /Fo$(@D)\ /Fd$(@D)\ $**
1973
1974	"$(OBJDIR)\codecheck1$E": "$(SRCDIR_tools)\codecheck1.c"
1975	$(BCC) /Fe$@ /Fo$(@D)\ /Fd$(@D)\ $**
1976
1977	!if $(USE_SEE)!=0
1978	SEE_FLAGS = /DSQLITE_HAS_CODEC=1 /DSQLITE_SHELL_DBKEY_PROC=fossil_key
1979	SQLITE3_SHELL_SRC = $(SRCDIR)\shell-see.c
1980	SQLITE3_SRC = $(SRCDIR_extsrc)\sqlite3-see.c
1981	!else
1982	SEE_FLAGS =
1983	SQLITE3_SHELL_SRC = $(SRCDIR_extsrc)\shell.c
1984	SQLITE3_SRC = $(SRCDIR_extsrc)\sqlite3.c
1985	!endif
1986
1987	"$(OX)\shell$O" : "$(SQLITE3_SHELL_SRC)" "$(B)\win\Makefile.msc"
1988	$(TCC) /Fo$@ /Fd$(@D)\ $(SHELL_OPTIONS) $(SQLITE_OPTIONS) $(SHELL_CFLAGS) $(SEE_FLAGS) -c "$(SQLITE3_SHELL_SRC)"
1989
	@@ -1997,23 +1997,23 @@
1997	$(TCC) /Fo$@ /Fd$(@D)\ -c $**
1998
1999	"$(OX)\th_tcl$O" : "$(SRCDIR)\th_tcl.c"
2000	$(TCC) /Fo$@ /Fd$(@D)\ -c $**
2001
2002	"$(OX)\miniz$O" : "$(SRCDIR_extsrc)\miniz.c"
2003	$(TCC) /Fo$@ /Fd$(@D)\ -c $(MINIZ_OPTIONS) $**
2004
2005	"$(OX)\pikchr$O" : "$(SRCDIR_extsrc)" "$(B)\win\Makefile.msc"
2006	$(TCC) /Fo$@ /Fd$(@D)\ -c $**
2007
2008	"$(OX)\VERSION.h" : "$(OBJDIR)\mkversion$E" "$(B)\manifest.uuid" "$(B)\manifest" "$(B)\VERSION" "$(B)\phony.h"
2009	"$(OBJDIR)\mkversion$E" "$(B)\manifest.uuid" "$(B)\manifest" "$(B)\VERSION" > $@
2010
2011	"$(B)\phony.h" :
2012	rem Force rebuild of VERSION.h whenever nmake is run
2013
2014	"$(OX)\cson_amalgamation$O" : "$(SRCDIR_extsrc)\cson_amalgamation.c"
2015	$(TCC) /Fo$@ /Fd$(@D)\ -c $**
2016
2017	"$(OX)\page_index.h": "$(OBJDIR)\mkindex$E" $(SRC)
2018	$** > $@
2019
	@@ -2096,14 +2096,14 @@
2096	writeln " \\"
2097	writeln -nonewline "\t\t\t"
2098	}
2099	writeln -nonewline "\"\$(OX)\\${s}_.c\":\"\$(OX)\\$s.h\""; incr i
2100	}
2101	writeln " \\\n\t\t\t\"\$(SRCDIR_extsrc)\\sqlite3.h\" \\"
2102	writeln "\t\t\t\"\$(SRCDIR)\\th.h\" \\"
2103	writeln "\t\t\t\"\$(OX)\\VERSION.h\" \\"
2104	writeln "\t\t\t\"\$(SRCDIR_extsrc)\\cson_amalgamation.h\""
2105	writeln "\t@copy /Y nul: $@"
2106
2107
2108	close $output_file
2109	#
	@@ -2251,11 +2251,11 @@
2251	# compiling standard fossil utils
2252	$(UTILS_OBJ): %.obj: $(SRCDIR)%.c
2253	$(CC) $(CCFLAGS) $(INCLUDE) "$<" -Fo"$@"
2254
2255	# compile special windows utils
2256	version.obj: $(SRCDIR_tools)mkversion.c
2257	$(CC) $(CCFLAGS) $(INCLUDE) "$<" -Fo"$@"
2258
2259	# generate the translated c-source files
2260	$(TRANSLATEDSRC): %_.c: $(SRCDIR)%.c translate.exe
2261	translate.exe $< >$@
2262

M win/Makefile.PellesCGMake

+1 -1

		--- win/Makefile.PellesCGMake
		+++ win/Makefile.PellesCGMake
		@@ -130,11 +130,11 @@
130	130	# compiling standard fossil utils
131	131	$(UTILS_OBJ): %.obj: $(SRCDIR)%.c
132	132	$(CC) $(CCFLAGS) $(INCLUDE) "$<" -Fo"$@"
133	133
134	134	# compile special windows utils
135		-version.obj: $(SRCDIR.tools)mkversion.c
	135	+version.obj: $(SRCDIR_tools)mkversion.c
136	136	$(CC) $(CCFLAGS) $(INCLUDE) "$<" -Fo"$@"
137	137
138	138	# generate the translated c-source files
139	139	$(TRANSLATEDSRC): %_.c: $(SRCDIR)%.c translate.exe
140	140	translate.exe $< >$@
141	141

	--- win/Makefile.PellesCGMake
	+++ win/Makefile.PellesCGMake
	@@ -130,11 +130,11 @@
130	# compiling standard fossil utils
131	$(UTILS_OBJ): %.obj: $(SRCDIR)%.c
132	$(CC) $(CCFLAGS) $(INCLUDE) "$<" -Fo"$@"
133
134	# compile special windows utils
135	version.obj: $(SRCDIR.tools)mkversion.c
136	$(CC) $(CCFLAGS) $(INCLUDE) "$<" -Fo"$@"
137
138	# generate the translated c-source files
139	$(TRANSLATEDSRC): %_.c: $(SRCDIR)%.c translate.exe
140	translate.exe $< >$@
141

	--- win/Makefile.PellesCGMake
	+++ win/Makefile.PellesCGMake
	@@ -130,11 +130,11 @@
130	# compiling standard fossil utils
131	$(UTILS_OBJ): %.obj: $(SRCDIR)%.c
132	$(CC) $(CCFLAGS) $(INCLUDE) "$<" -Fo"$@"
133
134	# compile special windows utils
135	version.obj: $(SRCDIR_tools)mkversion.c
136	$(CC) $(CCFLAGS) $(INCLUDE) "$<" -Fo"$@"
137
138	# generate the translated c-source files
139	$(TRANSLATEDSRC): %_.c: $(SRCDIR)%.c translate.exe
140	translate.exe $< >$@
141

M win/Makefile.dmc

+9 -9

		--- win/Makefile.dmc
		+++ win/Makefile.dmc
		@@ -56,41 +56,41 @@
56	56	+echo fossil >> $@
57	57	+echo $(LIBS) >> $@
58	58	+echo. >> $@
59	59	+echo fossil >> $@
60	60
61		-translate$E: $(SRCDIR.tools)\translate.c
	61	+translate$E: $(SRCDIR_tools)\translate.c
62	62	$(BCC) -o$@ $**
63	63
64		-makeheaders$E: $(SRCDIR.tools)\makeheaders.c
	64	+makeheaders$E: $(SRCDIR_tools)\makeheaders.c
65	65	$(BCC) -o$@ $**
66	66
67		-mkindex$E: $(SRCDIR.tools)\mkindex.c
	67	+mkindex$E: $(SRCDIR_tools)\mkindex.c
68	68	$(BCC) -o$@ $**
69	69
70	70	mkbuiltin$E: $(SRCDIR)\mkbuiltin.c
71	71	$(BCC) -o$@ $**
72	72
73		-mkversion$E: $(SRCDIR.tools)\mkversion.c
	73	+mkversion$E: $(SRCDIR_tools)\mkversion.c
74	74	$(BCC) -o$@ $**
75	75
76		-codecheck1$E: $(SRCDIR.tools)\codecheck1.c
	76	+codecheck1$E: $(SRCDIR_tools)\codecheck1.c
77	77	$(BCC) -o$@ $**
78	78
79		-$(OBJDIR)\shell$O : $(SRCDIR.extsrc)\shell.c
	79	+$(OBJDIR)\shell$O : $(SRCDIR_extsrc)\shell.c
80	80	$(TCC) -o$@ -c $(SHELL_OPTIONS) $(SQLITE_OPTIONS) $(SHELL_CFLAGS) $**
81	81
82		-$(OBJDIR)\sqlite3$O : $(SRCDIR.extsrc)\sqlite3.c
	82	+$(OBJDIR)\sqlite3$O : $(SRCDIR_extsrc)\sqlite3.c
83	83	$(TCC) -o$@ -c $(SQLITE_OPTIONS) $(SQLITE_CFLAGS) $**
84	84
85	85	$(OBJDIR)\th$O : $(SRCDIR)\th.c
86	86	$(TCC) -o$@ -c $**
87	87
88	88	$(OBJDIR)\th_lang$O : $(SRCDIR)\th_lang.c
89	89	$(TCC) -o$@ -c $**
90	90
91		-$(OBJDIR)\cson_amalgamation.h : $(SRCDIR.extsrc)\cson_amalgamation.h
	91	+$(OBJDIR)\cson_amalgamation.h : $(SRCDIR_extsrc)\cson_amalgamation.h
92	92	cp $@ $@
93	93
94	94	VERSION.h : mkversion$E $B\manifest.uuid $B\manifest $B\VERSION
95	95	+$** > $@
96	96
		@@ -1005,7 +1005,7 @@
1005	1005
1006	1006	zip_.c : $(SRCDIR)\zip.c
1007	1007	+translate$E $** > $@
1008	1008
1009	1009	headers: makeheaders$E page_index.h builtin_data.h VERSION.h
1010		- +makeheaders$E add_.c:add.h ajax_.c:ajax.h alerts_.c:alerts.h allrepo_.c:allrepo.h attach_.c:attach.h backlink_.c:backlink.h backoffice_.c:backoffice.h bag_.c:bag.h bisect_.c:bisect.h blob_.c:blob.h branch_.c:branch.h browse_.c:browse.h builtin_.c:builtin.h bundle_.c:bundle.h cache_.c:cache.h capabilities_.c:capabilities.h captcha_.c:captcha.h cgi_.c:cgi.h chat_.c:chat.h checkin_.c:checkin.h checkout_.c:checkout.h clearsign_.c:clearsign.h clone_.c:clone.h color_.c:color.h comformat_.c:comformat.h configure_.c:configure.h content_.c:content.h cookies_.c:cookies.h db_.c:db.h delta_.c:delta.h deltacmd_.c:deltacmd.h deltafunc_.c:deltafunc.h descendants_.c:descendants.h diff_.c:diff.h diffcmd_.c:diffcmd.h dispatch_.c:dispatch.h doc_.c:doc.h encode_.c:encode.h etag_.c:etag.h event_.c:event.h export_.c:export.h extcgi_.c:extcgi.h file_.c:file.h fileedit_.c:fileedit.h finfo_.c:finfo.h foci_.c:foci.h forum_.c:forum.h fshell_.c:fshell.h fusefs_.c:fusefs.h fuzz_.c:fuzz.h glob_.c:glob.h graph_.c:graph.h gzip_.c:gzip.h hname_.c:hname.h hook_.c:hook.h http_.c:http.h http_socket_.c:http_socket.h http_ssl_.c:http_ssl.h http_transport_.c:http_transport.h import_.c:import.h info_.c:info.h interwiki_.c:interwiki.h json_.c:json.h json_artifact_.c:json_artifact.h json_branch_.c:json_branch.h json_config_.c:json_config.h json_diff_.c:json_diff.h json_dir_.c:json_dir.h json_finfo_.c:json_finfo.h json_login_.c:json_login.h json_query_.c:json_query.h json_report_.c:json_report.h json_status_.c:json_status.h json_tag_.c:json_tag.h json_timeline_.c:json_timeline.h json_user_.c:json_user.h json_wiki_.c:json_wiki.h leaf_.c:leaf.h loadctrl_.c:loadctrl.h login_.c:login.h lookslike_.c:lookslike.h main_.c:main.h manifest_.c:manifest.h markdown_.c:markdown.h markdown_html_.c:markdown_html.h md5_.c:md5.h merge_.c:merge.h merge3_.c:merge3.h moderate_.c:moderate.h name_.c:name.h patch_.c:patch.h path_.c:path.h piechart_.c:piechart.h pikchrshow_.c:pikchrshow.h pivot_.c:pivot.h popen_.c:popen.h pqueue_.c:pqueue.h printf_.c:printf.h publish_.c:publish.h purge_.c:purge.h rebuild_.c:rebuild.h regexp_.c:regexp.h repolist_.c:repolist.h report_.c:report.h rss_.c:rss.h schema_.c:schema.h search_.c:search.h security_audit_.c:security_audit.h setup_.c:setup.h setupuser_.c:setupuser.h sha1_.c:sha1.h sha1hard_.c:sha1hard.h sha3_.c:sha3.h shun_.c:shun.h sitemap_.c:sitemap.h skins_.c:skins.h smtp_.c:smtp.h sqlcmd_.c:sqlcmd.h stash_.c:stash.h stat_.c:stat.h statrep_.c:statrep.h style_.c:style.h sync_.c:sync.h tag_.c:tag.h tar_.c:tar.h terminal_.c:terminal.h th_main_.c:th_main.h timeline_.c:timeline.h tkt_.c:tkt.h tktsetup_.c:tktsetup.h undo_.c:undo.h unicode_.c:unicode.h unversioned_.c:unversioned.h update_.c:update.h url_.c:url.h user_.c:user.h utf8_.c:utf8.h util_.c:util.h verify_.c:verify.h vfile_.c:vfile.h wiki_.c:wiki.h wikiformat_.c:wikiformat.h winfile_.c:winfile.h winhttp_.c:winhttp.h xfer_.c:xfer.h xfersetup_.c:xfersetup.h zip_.c:zip.h $(SRCDIR.extsrc)\sqlite3.h $(SRCDIR)\th.h VERSION.h $(SRCDIR.extsrc)\cson_amalgamation.h
	1010	+ +makeheaders$E add_.c:add.h ajax_.c:ajax.h alerts_.c:alerts.h allrepo_.c:allrepo.h attach_.c:attach.h backlink_.c:backlink.h backoffice_.c:backoffice.h bag_.c:bag.h bisect_.c:bisect.h blob_.c:blob.h branch_.c:branch.h browse_.c:browse.h builtin_.c:builtin.h bundle_.c:bundle.h cache_.c:cache.h capabilities_.c:capabilities.h captcha_.c:captcha.h cgi_.c:cgi.h chat_.c:chat.h checkin_.c:checkin.h checkout_.c:checkout.h clearsign_.c:clearsign.h clone_.c:clone.h color_.c:color.h comformat_.c:comformat.h configure_.c:configure.h content_.c:content.h cookies_.c:cookies.h db_.c:db.h delta_.c:delta.h deltacmd_.c:deltacmd.h deltafunc_.c:deltafunc.h descendants_.c:descendants.h diff_.c:diff.h diffcmd_.c:diffcmd.h dispatch_.c:dispatch.h doc_.c:doc.h encode_.c:encode.h etag_.c:etag.h event_.c:event.h export_.c:export.h extcgi_.c:extcgi.h file_.c:file.h fileedit_.c:fileedit.h finfo_.c:finfo.h foci_.c:foci.h forum_.c:forum.h fshell_.c:fshell.h fusefs_.c:fusefs.h fuzz_.c:fuzz.h glob_.c:glob.h graph_.c:graph.h gzip_.c:gzip.h hname_.c:hname.h hook_.c:hook.h http_.c:http.h http_socket_.c:http_socket.h http_ssl_.c:http_ssl.h http_transport_.c:http_transport.h import_.c:import.h info_.c:info.h interwiki_.c:interwiki.h json_.c:json.h json_artifact_.c:json_artifact.h json_branch_.c:json_branch.h json_config_.c:json_config.h json_diff_.c:json_diff.h json_dir_.c:json_dir.h json_finfo_.c:json_finfo.h json_login_.c:json_login.h json_query_.c:json_query.h json_report_.c:json_report.h json_status_.c:json_status.h json_tag_.c:json_tag.h json_timeline_.c:json_timeline.h json_user_.c:json_user.h json_wiki_.c:json_wiki.h leaf_.c:leaf.h loadctrl_.c:loadctrl.h login_.c:login.h lookslike_.c:lookslike.h main_.c:main.h manifest_.c:manifest.h markdown_.c:markdown.h markdown_html_.c:markdown_html.h md5_.c:md5.h merge_.c:merge.h merge3_.c:merge3.h moderate_.c:moderate.h name_.c:name.h patch_.c:patch.h path_.c:path.h piechart_.c:piechart.h pikchrshow_.c:pikchrshow.h pivot_.c:pivot.h popen_.c:popen.h pqueue_.c:pqueue.h printf_.c:printf.h publish_.c:publish.h purge_.c:purge.h rebuild_.c:rebuild.h regexp_.c:regexp.h repolist_.c:repolist.h report_.c:report.h rss_.c:rss.h schema_.c:schema.h search_.c:search.h security_audit_.c:security_audit.h setup_.c:setup.h setupuser_.c:setupuser.h sha1_.c:sha1.h sha1hard_.c:sha1hard.h sha3_.c:sha3.h shun_.c:shun.h sitemap_.c:sitemap.h skins_.c:skins.h smtp_.c:smtp.h sqlcmd_.c:sqlcmd.h stash_.c:stash.h stat_.c:stat.h statrep_.c:statrep.h style_.c:style.h sync_.c:sync.h tag_.c:tag.h tar_.c:tar.h terminal_.c:terminal.h th_main_.c:th_main.h timeline_.c:timeline.h tkt_.c:tkt.h tktsetup_.c:tktsetup.h undo_.c:undo.h unicode_.c:unicode.h unversioned_.c:unversioned.h update_.c:update.h url_.c:url.h user_.c:user.h utf8_.c:utf8.h util_.c:util.h verify_.c:verify.h vfile_.c:vfile.h wiki_.c:wiki.h wikiformat_.c:wikiformat.h winfile_.c:winfile.h winhttp_.c:winhttp.h xfer_.c:xfer.h xfersetup_.c:xfersetup.h zip_.c:zip.h $(SRCDIR_extsrc)\sqlite3.h $(SRCDIR)\th.h VERSION.h $(SRCDIR_extsrc)\cson_amalgamation.h
1011	1011	@copy /Y nul: headers
1012	1012

	--- win/Makefile.dmc
	+++ win/Makefile.dmc
	@@ -56,41 +56,41 @@
56	+echo fossil >> $@
57	+echo $(LIBS) >> $@
58	+echo. >> $@
59	+echo fossil >> $@
60
61	translate$E: $(SRCDIR.tools)\translate.c
62	$(BCC) -o$@ $**
63
64	makeheaders$E: $(SRCDIR.tools)\makeheaders.c
65	$(BCC) -o$@ $**
66
67	mkindex$E: $(SRCDIR.tools)\mkindex.c
68	$(BCC) -o$@ $**
69
70	mkbuiltin$E: $(SRCDIR)\mkbuiltin.c
71	$(BCC) -o$@ $**
72
73	mkversion$E: $(SRCDIR.tools)\mkversion.c
74	$(BCC) -o$@ $**
75
76	codecheck1$E: $(SRCDIR.tools)\codecheck1.c
77	$(BCC) -o$@ $**
78
79	$(OBJDIR)\shell$O : $(SRCDIR.extsrc)\shell.c
80	$(TCC) -o$@ -c $(SHELL_OPTIONS) $(SQLITE_OPTIONS) $(SHELL_CFLAGS) $**
81
82	$(OBJDIR)\sqlite3$O : $(SRCDIR.extsrc)\sqlite3.c
83	$(TCC) -o$@ -c $(SQLITE_OPTIONS) $(SQLITE_CFLAGS) $**
84
85	$(OBJDIR)\th$O : $(SRCDIR)\th.c
86	$(TCC) -o$@ -c $**
87
88	$(OBJDIR)\th_lang$O : $(SRCDIR)\th_lang.c
89	$(TCC) -o$@ -c $**
90
91	$(OBJDIR)\cson_amalgamation.h : $(SRCDIR.extsrc)\cson_amalgamation.h
92	cp $@ $@
93
94	VERSION.h : mkversion$E $B\manifest.uuid $B\manifest $B\VERSION
95	+$** > $@
96
	@@ -1005,7 +1005,7 @@
1005
1006	zip_.c : $(SRCDIR)\zip.c
1007	+translate$E $** > $@
1008
1009	headers: makeheaders$E page_index.h builtin_data.h VERSION.h
1010	+makeheaders$E add_.c:add.h ajax_.c:ajax.h alerts_.c:alerts.h allrepo_.c:allrepo.h attach_.c:attach.h backlink_.c:backlink.h backoffice_.c:backoffice.h bag_.c:bag.h bisect_.c:bisect.h blob_.c:blob.h branch_.c:branch.h browse_.c:browse.h builtin_.c:builtin.h bundle_.c:bundle.h cache_.c:cache.h capabilities_.c:capabilities.h captcha_.c:captcha.h cgi_.c:cgi.h chat_.c:chat.h checkin_.c:checkin.h checkout_.c:checkout.h clearsign_.c:clearsign.h clone_.c:clone.h color_.c:color.h comformat_.c:comformat.h configure_.c:configure.h content_.c:content.h cookies_.c:cookies.h db_.c:db.h delta_.c:delta.h deltacmd_.c:deltacmd.h deltafunc_.c:deltafunc.h descendants_.c:descendants.h diff_.c:diff.h diffcmd_.c:diffcmd.h dispatch_.c:dispatch.h doc_.c:doc.h encode_.c:encode.h etag_.c:etag.h event_.c:event.h export_.c:export.h extcgi_.c:extcgi.h file_.c:file.h fileedit_.c:fileedit.h finfo_.c:finfo.h foci_.c:foci.h forum_.c:forum.h fshell_.c:fshell.h fusefs_.c:fusefs.h fuzz_.c:fuzz.h glob_.c:glob.h graph_.c:graph.h gzip_.c:gzip.h hname_.c:hname.h hook_.c:hook.h http_.c:http.h http_socket_.c:http_socket.h http_ssl_.c:http_ssl.h http_transport_.c:http_transport.h import_.c:import.h info_.c:info.h interwiki_.c:interwiki.h json_.c:json.h json_artifact_.c:json_artifact.h json_branch_.c:json_branch.h json_config_.c:json_config.h json_diff_.c:json_diff.h json_dir_.c:json_dir.h json_finfo_.c:json_finfo.h json_login_.c:json_login.h json_query_.c:json_query.h json_report_.c:json_report.h json_status_.c:json_status.h json_tag_.c:json_tag.h json_timeline_.c:json_timeline.h json_user_.c:json_user.h json_wiki_.c:json_wiki.h leaf_.c:leaf.h loadctrl_.c:loadctrl.h login_.c:login.h lookslike_.c:lookslike.h main_.c:main.h manifest_.c:manifest.h markdown_.c:markdown.h markdown_html_.c:markdown_html.h md5_.c:md5.h merge_.c:merge.h merge3_.c:merge3.h moderate_.c:moderate.h name_.c:name.h patch_.c:patch.h path_.c:path.h piechart_.c:piechart.h pikchrshow_.c:pikchrshow.h pivot_.c:pivot.h popen_.c:popen.h pqueue_.c:pqueue.h printf_.c:printf.h publish_.c:publish.h purge_.c:purge.h rebuild_.c:rebuild.h regexp_.c:regexp.h repolist_.c:repolist.h report_.c:report.h rss_.c:rss.h schema_.c:schema.h search_.c:search.h security_audit_.c:security_audit.h setup_.c:setup.h setupuser_.c:setupuser.h sha1_.c:sha1.h sha1hard_.c:sha1hard.h sha3_.c:sha3.h shun_.c:shun.h sitemap_.c:sitemap.h skins_.c:skins.h smtp_.c:smtp.h sqlcmd_.c:sqlcmd.h stash_.c:stash.h stat_.c:stat.h statrep_.c:statrep.h style_.c:style.h sync_.c:sync.h tag_.c:tag.h tar_.c:tar.h terminal_.c:terminal.h th_main_.c:th_main.h timeline_.c:timeline.h tkt_.c:tkt.h tktsetup_.c:tktsetup.h undo_.c:undo.h unicode_.c:unicode.h unversioned_.c:unversioned.h update_.c:update.h url_.c:url.h user_.c:user.h utf8_.c:utf8.h util_.c:util.h verify_.c:verify.h vfile_.c:vfile.h wiki_.c:wiki.h wikiformat_.c:wikiformat.h winfile_.c:winfile.h winhttp_.c:winhttp.h xfer_.c:xfer.h xfersetup_.c:xfersetup.h zip_.c:zip.h $(SRCDIR.extsrc)\sqlite3.h $(SRCDIR)\th.h VERSION.h $(SRCDIR.extsrc)\cson_amalgamation.h
1011	@copy /Y nul: headers
1012

	--- win/Makefile.dmc
	+++ win/Makefile.dmc
	@@ -56,41 +56,41 @@
56	+echo fossil >> $@
57	+echo $(LIBS) >> $@
58	+echo. >> $@
59	+echo fossil >> $@
60
61	translate$E: $(SRCDIR_tools)\translate.c
62	$(BCC) -o$@ $**
63
64	makeheaders$E: $(SRCDIR_tools)\makeheaders.c
65	$(BCC) -o$@ $**
66
67	mkindex$E: $(SRCDIR_tools)\mkindex.c
68	$(BCC) -o$@ $**
69
70	mkbuiltin$E: $(SRCDIR)\mkbuiltin.c
71	$(BCC) -o$@ $**
72
73	mkversion$E: $(SRCDIR_tools)\mkversion.c
74	$(BCC) -o$@ $**
75
76	codecheck1$E: $(SRCDIR_tools)\codecheck1.c
77	$(BCC) -o$@ $**
78
79	$(OBJDIR)\shell$O : $(SRCDIR_extsrc)\shell.c
80	$(TCC) -o$@ -c $(SHELL_OPTIONS) $(SQLITE_OPTIONS) $(SHELL_CFLAGS) $**
81
82	$(OBJDIR)\sqlite3$O : $(SRCDIR_extsrc)\sqlite3.c
83	$(TCC) -o$@ -c $(SQLITE_OPTIONS) $(SQLITE_CFLAGS) $**
84
85	$(OBJDIR)\th$O : $(SRCDIR)\th.c
86	$(TCC) -o$@ -c $**
87
88	$(OBJDIR)\th_lang$O : $(SRCDIR)\th_lang.c
89	$(TCC) -o$@ -c $**
90
91	$(OBJDIR)\cson_amalgamation.h : $(SRCDIR_extsrc)\cson_amalgamation.h
92	cp $@ $@
93
94	VERSION.h : mkversion$E $B\manifest.uuid $B\manifest $B\VERSION
95	+$** > $@
96
	@@ -1005,7 +1005,7 @@
1005
1006	zip_.c : $(SRCDIR)\zip.c
1007	+translate$E $** > $@
1008
1009	headers: makeheaders$E page_index.h builtin_data.h VERSION.h
1010	+makeheaders$E add_.c:add.h ajax_.c:ajax.h alerts_.c:alerts.h allrepo_.c:allrepo.h attach_.c:attach.h backlink_.c:backlink.h backoffice_.c:backoffice.h bag_.c:bag.h bisect_.c:bisect.h blob_.c:blob.h branch_.c:branch.h browse_.c:browse.h builtin_.c:builtin.h bundle_.c:bundle.h cache_.c:cache.h capabilities_.c:capabilities.h captcha_.c:captcha.h cgi_.c:cgi.h chat_.c:chat.h checkin_.c:checkin.h checkout_.c:checkout.h clearsign_.c:clearsign.h clone_.c:clone.h color_.c:color.h comformat_.c:comformat.h configure_.c:configure.h content_.c:content.h cookies_.c:cookies.h db_.c:db.h delta_.c:delta.h deltacmd_.c:deltacmd.h deltafunc_.c:deltafunc.h descendants_.c:descendants.h diff_.c:diff.h diffcmd_.c:diffcmd.h dispatch_.c:dispatch.h doc_.c:doc.h encode_.c:encode.h etag_.c:etag.h event_.c:event.h export_.c:export.h extcgi_.c:extcgi.h file_.c:file.h fileedit_.c:fileedit.h finfo_.c:finfo.h foci_.c:foci.h forum_.c:forum.h fshell_.c:fshell.h fusefs_.c:fusefs.h fuzz_.c:fuzz.h glob_.c:glob.h graph_.c:graph.h gzip_.c:gzip.h hname_.c:hname.h hook_.c:hook.h http_.c:http.h http_socket_.c:http_socket.h http_ssl_.c:http_ssl.h http_transport_.c:http_transport.h import_.c:import.h info_.c:info.h interwiki_.c:interwiki.h json_.c:json.h json_artifact_.c:json_artifact.h json_branch_.c:json_branch.h json_config_.c:json_config.h json_diff_.c:json_diff.h json_dir_.c:json_dir.h json_finfo_.c:json_finfo.h json_login_.c:json_login.h json_query_.c:json_query.h json_report_.c:json_report.h json_status_.c:json_status.h json_tag_.c:json_tag.h json_timeline_.c:json_timeline.h json_user_.c:json_user.h json_wiki_.c:json_wiki.h leaf_.c:leaf.h loadctrl_.c:loadctrl.h login_.c:login.h lookslike_.c:lookslike.h main_.c:main.h manifest_.c:manifest.h markdown_.c:markdown.h markdown_html_.c:markdown_html.h md5_.c:md5.h merge_.c:merge.h merge3_.c:merge3.h moderate_.c:moderate.h name_.c:name.h patch_.c:patch.h path_.c:path.h piechart_.c:piechart.h pikchrshow_.c:pikchrshow.h pivot_.c:pivot.h popen_.c:popen.h pqueue_.c:pqueue.h printf_.c:printf.h publish_.c:publish.h purge_.c:purge.h rebuild_.c:rebuild.h regexp_.c:regexp.h repolist_.c:repolist.h report_.c:report.h rss_.c:rss.h schema_.c:schema.h search_.c:search.h security_audit_.c:security_audit.h setup_.c:setup.h setupuser_.c:setupuser.h sha1_.c:sha1.h sha1hard_.c:sha1hard.h sha3_.c:sha3.h shun_.c:shun.h sitemap_.c:sitemap.h skins_.c:skins.h smtp_.c:smtp.h sqlcmd_.c:sqlcmd.h stash_.c:stash.h stat_.c:stat.h statrep_.c:statrep.h style_.c:style.h sync_.c:sync.h tag_.c:tag.h tar_.c:tar.h terminal_.c:terminal.h th_main_.c:th_main.h timeline_.c:timeline.h tkt_.c:tkt.h tktsetup_.c:tktsetup.h undo_.c:undo.h unicode_.c:unicode.h unversioned_.c:unversioned.h update_.c:update.h url_.c:url.h user_.c:user.h utf8_.c:utf8.h util_.c:util.h verify_.c:verify.h vfile_.c:vfile.h wiki_.c:wiki.h wikiformat_.c:wikiformat.h winfile_.c:winfile.h winhttp_.c:winhttp.h xfer_.c:xfer.h xfersetup_.c:xfersetup.h zip_.c:zip.h $(SRCDIR_extsrc)\sqlite3.h $(SRCDIR)\th.h VERSION.h $(SRCDIR_extsrc)\cson_amalgamation.h
1011	@copy /Y nul: headers
1012

M win/Makefile.mingw

+29 -29

		--- win/Makefile.mingw
		+++ win/Makefile.mingw
		@@ -1022,16 +1022,16 @@
1022	1022
1023	1023	all: $(OBJDIR) $(APPNAME)
1024	1024
1025	1025	$(OBJDIR)/fossil.o: $(SRCDIR)/../win/fossil.rc $(OBJDIR)/VERSION.h
1026	1026	ifdef USE_WINDOWS
1027		- $(CAT) $(subst /,\,$(SRCDIR.extsrc)\miniz.c) \| $(GREP) "define MZ_VERSION" > $(subst /,\,$(OBJDIR)\minizver.h)
	1027	+ $(CAT) $(subst /,\,$(SRCDIR_extsrc)\miniz.c) \| $(GREP) "define MZ_VERSION" > $(subst /,\,$(OBJDIR)\minizver.h)
1028	1028	$(CP) $(subst /,\,$(SRCDIR)\..\win\fossil.rc) $(subst /,\,$(OBJDIR))
1029	1029	$(CP) $(subst /,\,$(SRCDIR)\..\win\fossil.ico) $(subst /,\,$(OBJDIR))
1030	1030	$(CP) $(subst /,\,$(SRCDIR)\..\win\fossil.exe.manifest) $(subst /,\,$(OBJDIR))
1031	1031	else
1032		- $(CAT) $(SRCDIR.extsrc)/miniz.c \| $(GREP) "define MZ_VERSION" > $(OBJDIR)/minizver.h
	1032	+ $(CAT) $(SRCDIR_extsrc)/miniz.c \| $(GREP) "define MZ_VERSION" > $(OBJDIR)/minizver.h
1033	1033	$(CP) $(SRCDIR)/../win/fossil.rc $(OBJDIR)
1034	1034	$(CP) $(SRCDIR)/../win/fossil.ico $(OBJDIR)
1035	1035	$(CP) $(SRCDIR)/../win/fossil.exe.manifest $(OBJDIR)
1036	1036	endif
1037	1037	$(RCC) $(OBJDIR)/fossil.rc -o $(OBJDIR)/fossil.o
		@@ -1050,27 +1050,27 @@
1050	1050	$(MKDIR) $(subst /,\,$(OBJDIR))
1051	1051	else
1052	1052	$(MKDIR) $(OBJDIR)
1053	1053	endif
1054	1054
1055		-$(TRANSLATE): $(SRCDIR.tools)/translate.c
1056		- $(XBCC) -o $@ $(SRCDIR.tools)/translate.c
1057		-
1058		-$(MAKEHEADERS): $(SRCDIR.tools)/makeheaders.c
1059		- $(XBCC) -o $@ $(SRCDIR.tools)/makeheaders.c
1060		-
1061		-$(MKINDEX): $(SRCDIR.tools)/mkindex.c
1062		- $(XBCC) -o $@ $(SRCDIR.tools)/mkindex.c
	1055	+$(TRANSLATE): $(SRCDIR_tools)/translate.c
	1056	+ $(XBCC) -o $@ $(SRCDIR_tools)/translate.c
	1057	+
	1058	+$(MAKEHEADERS): $(SRCDIR_tools)/makeheaders.c
	1059	+ $(XBCC) -o $@ $(SRCDIR_tools)/makeheaders.c
	1060	+
	1061	+$(MKINDEX): $(SRCDIR_tools)/mkindex.c
	1062	+ $(XBCC) -o $@ $(SRCDIR_tools)/mkindex.c
1063	1063
1064	1064	$(MKBUILTIN): $(SRCDIR)/mkbuiltin.c
1065	1065	$(XBCC) -o $@ $(SRCDIR)/mkbuiltin.c
1066	1066
1067		-$(MKVERSION): $(SRCDIR.tools)/mkversion.c
1068		- $(XBCC) -o $@ $(SRCDIR.tools)/mkversion.c
	1067	+$(MKVERSION): $(SRCDIR_tools)/mkversion.c
	1068	+ $(XBCC) -o $@ $(SRCDIR_tools)/mkversion.c
1069	1069
1070		-$(CODECHECK1): $(SRCDIR.tools)/codecheck1.c
1071		- $(XBCC) -o $@ $(SRCDIR.tools)/codecheck1.c
	1070	+$(CODECHECK1): $(SRCDIR_tools)/codecheck1.c
	1071	+ $(XBCC) -o $@ $(SRCDIR_tools)/codecheck1.c
1072	1072
1073	1073	# WARNING. DANGER. Running the test suite modifies the repository the
1074	1074	# build is done from, i.e. the checkout belongs to. Do not sync/push
1075	1075	# the repository after running the tests.
1076	1076	test: $(OBJDIR) $(APPNAME)
		@@ -1104,19 +1104,19 @@
1104	1104
1105	1105	# The USE_SEE variable may be undefined, 0 or 1. If undefined or 0,
1106	1106	# in-tree SQLite is used. If 1, then sqlite3-see.c (not part of the
1107	1107	# source tree) is used and extra flags are provided to enable the
1108	1108	# SQLite Encryption Extension.
1109		-SQLITE3_SRC.0 = $(SRCDIR.extsrc)/sqlite3.c
1110		-SQLITE3_SRC.1 = $(SRCDIR.extsrc)/sqlite3-see.c
	1109	+SQLITE3_SRC.0 = $(SRCDIR_extsrc)/sqlite3.c
	1110	+SQLITE3_SRC.1 = $(SRCDIR_extsrc)/sqlite3-see.c
1111	1111	# SQLITE3_SRC.2 is set by top-level configure/makefile process.
1112		-SQLITE3_SRC. = $(SRCDIR.extsrc)/sqlite3.c
	1112	+SQLITE3_SRC. = $(SRCDIR_extsrc)/sqlite3.c
1113	1113	SQLITE3_SRC = $(SRCDIR)/$(SQLITE3_SRC.$(SQLITE3_ORIGIN))
1114		-SQLITE3_SHELL_SRC.0 = $(SRCDIR.extsrc)/shell.c
1115		-SQLITE3_SHELL_SRC.1 = $(SRCDIR.extsrc)/shell-see.c
	1114	+SQLITE3_SHELL_SRC.0 = $(SRCDIR_extsrc)/shell.c
	1115	+SQLITE3_SHELL_SRC.1 = $(SRCDIR_extsrc)/shell-see.c
1116	1116	# SQLITE3_SHELL_SRC.2 comes from the configure process
1117		-SQLITE3_SHELL_SRC. = $(SRCDIR.extsrc)/shell.c
	1117	+SQLITE3_SHELL_SRC. = $(SRCDIR_extsrc)/shell.c
1118	1118	SQLITE3_SHELL_SRC = $(SQLITE3_SHELL_SRC.$(SQLITE3_ORIGIN))
1119	1119	SEE_FLAGS.0 =
1120	1120	SEE_FLAGS.1 = -DSQLITE_HAS_CODEC -DSQLITE_SHELL_DBKEY_PROC=fossil_key
1121	1121	SEE_FLAGS. =
1122	1122	SEE_FLAGS = $(SEE_FLAGS.$(USE_SEE))
		@@ -1347,12 +1347,12 @@
1347	1347	$(OBJDIR)/wikiformat_.c:$(OBJDIR)/wikiformat.h \
1348	1348	$(OBJDIR)/winfile_.c:$(OBJDIR)/winfile.h \
1349	1349	$(OBJDIR)/winhttp_.c:$(OBJDIR)/winhttp.h \
1350	1350	$(OBJDIR)/xfer_.c:$(OBJDIR)/xfer.h \
1351	1351	$(OBJDIR)/xfersetup_.c:$(OBJDIR)/xfersetup.h \
1352		- $(OBJDIR)/zip_.c:$(OBJDIR)/zip.h$(SRCDIR.extsrc)/miniz.c:$(OBJDIR)/miniz.h <<<NEXT_LINE>>>$(SRCDIR.extsrc)/pikchr.c:$(OBJDIR)/pikchr.h <<<NEXT_LINE>>> \
1353		- $(SRCDIR.extsrc)/sqlite3.h \
	1352	+ $(OBJDIR)/zip_.c:$(OBJDIR)/zip.h$(SRCDIR_extsrc)/miniz.c:$(OBJDIR)/miniz.h <<<NEXT_LINE>>>$(SRCDIR_extsrc)/pikchr.c:$(OBJDIR)/pikchr.h <<<NEXT_LINE>>> \
	1353	+ $(SRCDIR_extsrc)/sqlite3.h \
1354	1354	$(SRCDIR)/th.h \
1355	1355	$(OBJDIR)/VERSION.h
1356	1356	echo Done >$(OBJDIR)/headers
1357	1357
1358	1358	$(OBJDIR)/headers: Makefile
		@@ -2609,16 +2609,16 @@
2609	2609
2610	2610	$(OBJDIR)/sqlite3.o: $(SQLITE3_SRC) $(SRCDIR)/../win/Makefile.mingw
2611	2611	$(XTCC) $(SQLITE_OPTIONS) $(SQLITE_CFLAGS) $(SEE_FLAGS) \
2612	2612	-c $(SQLITE3_SRC) -o $@
2613	2613
2614		-$(OBJDIR)/cson_amalgamation.o: $(SRCDIR.extsrc)/cson_amalgamation.c
2615		- $(XTCC) -c $(SRCDIR.extsrc)/cson_amalgamation.c -o $@
	2614	+$(OBJDIR)/cson_amalgamation.o: $(SRCDIR_extsrc)/cson_amalgamation.c
	2615	+ $(XTCC) -c $(SRCDIR_extsrc)/cson_amalgamation.c -o $@
2616	2616
2617	2617	$(OBJDIR)/json.o $(OBJDIR)/json_artifact.o $(OBJDIR)/json_branch.o $(OBJDIR)/json_config.o $(OBJDIR)/json_diff.o $(OBJDIR)/json_dir.o $(OBJDIR)/jsos_finfo.o $(OBJDIR)/json_login.o $(OBJDIR)/json_query.o $(OBJDIR)/json_report.o $(OBJDIR)/json_status.o $(OBJDIR)/json_tag.o $(OBJDIR)/json_timeline.o $(OBJDIR)/json_user.o $(OBJDIR)/json_wiki.o : $(SRCDIR)/json_detail.h
2618	2618
2619		-$(OBJDIR)/shell.o: $(SQLITE3_SHELL_SRC) $(SRCDIR.extsrc)/sqlite3.h $(SRCDIR)/../win/Makefile.mingw
	2619	+$(OBJDIR)/shell.o: $(SQLITE3_SHELL_SRC) $(SRCDIR_extsrc)/sqlite3.h $(SRCDIR)/../win/Makefile.mingw
2620	2620	$(XTCC) $(SHELL_OPTIONS) $(SHELL_CFLAGS) $(SEE_FLAGS) -c $(SQLITE3_SHELL_SRC) -o $@
2621	2621
2622	2622	$(OBJDIR)/th.o: $(SRCDIR)/th.c
2623	2623	$(XTCC) -c $(SRCDIR)/th.c -o $@
2624	2624
		@@ -2626,11 +2626,11 @@
2626	2626	$(XTCC) -c $(SRCDIR)/th_lang.c -o $@
2627	2627
2628	2628	$(OBJDIR)/th_tcl.o: $(SRCDIR)/th_tcl.c
2629	2629	$(XTCC) -c $(SRCDIR)/th_tcl.c -o $@
2630	2630
2631		-$(OBJDIR)/miniz.o: $(SRCDIR.extsrc)/miniz.c
2632		- $(XTCC) $(MINIZ_OPTIONS) -c $(SRCDIR.extsrc)/miniz.c -o $@
	2631	+$(OBJDIR)/miniz.o: $(SRCDIR_extsrc)/miniz.c
	2632	+ $(XTCC) $(MINIZ_OPTIONS) -c $(SRCDIR_extsrc)/miniz.c -o $@
2633	2633
2634		-$(OBJDIR)/pikchr.o: $(SRCDIR.extsrc)/pikchr.c
2635		- $(XTCC) -c $(SRCDIR.extsrc)/pikchr.c -o $@
	2634	+$(OBJDIR)/pikchr.o: $(SRCDIR_extsrc)/pikchr.c
	2635	+ $(XTCC) -c $(SRCDIR_extsrc)/pikchr.c -o $@
2636	2636
2637	2637

	--- win/Makefile.mingw
	+++ win/Makefile.mingw
	@@ -1022,16 +1022,16 @@
1022
1023	all: $(OBJDIR) $(APPNAME)
1024
1025	$(OBJDIR)/fossil.o: $(SRCDIR)/../win/fossil.rc $(OBJDIR)/VERSION.h
1026	ifdef USE_WINDOWS
1027	$(CAT) $(subst /,\,$(SRCDIR.extsrc)\miniz.c) \| $(GREP) "define MZ_VERSION" > $(subst /,\,$(OBJDIR)\minizver.h)
1028	$(CP) $(subst /,\,$(SRCDIR)\..\win\fossil.rc) $(subst /,\,$(OBJDIR))
1029	$(CP) $(subst /,\,$(SRCDIR)\..\win\fossil.ico) $(subst /,\,$(OBJDIR))
1030	$(CP) $(subst /,\,$(SRCDIR)\..\win\fossil.exe.manifest) $(subst /,\,$(OBJDIR))
1031	else
1032	$(CAT) $(SRCDIR.extsrc)/miniz.c \| $(GREP) "define MZ_VERSION" > $(OBJDIR)/minizver.h
1033	$(CP) $(SRCDIR)/../win/fossil.rc $(OBJDIR)
1034	$(CP) $(SRCDIR)/../win/fossil.ico $(OBJDIR)
1035	$(CP) $(SRCDIR)/../win/fossil.exe.manifest $(OBJDIR)
1036	endif
1037	$(RCC) $(OBJDIR)/fossil.rc -o $(OBJDIR)/fossil.o
	@@ -1050,27 +1050,27 @@
1050	$(MKDIR) $(subst /,\,$(OBJDIR))
1051	else
1052	$(MKDIR) $(OBJDIR)
1053	endif
1054
1055	$(TRANSLATE): $(SRCDIR.tools)/translate.c
1056	$(XBCC) -o $@ $(SRCDIR.tools)/translate.c
1057
1058	$(MAKEHEADERS): $(SRCDIR.tools)/makeheaders.c
1059	$(XBCC) -o $@ $(SRCDIR.tools)/makeheaders.c
1060
1061	$(MKINDEX): $(SRCDIR.tools)/mkindex.c
1062	$(XBCC) -o $@ $(SRCDIR.tools)/mkindex.c
1063
1064	$(MKBUILTIN): $(SRCDIR)/mkbuiltin.c
1065	$(XBCC) -o $@ $(SRCDIR)/mkbuiltin.c
1066
1067	$(MKVERSION): $(SRCDIR.tools)/mkversion.c
1068	$(XBCC) -o $@ $(SRCDIR.tools)/mkversion.c
1069
1070	$(CODECHECK1): $(SRCDIR.tools)/codecheck1.c
1071	$(XBCC) -o $@ $(SRCDIR.tools)/codecheck1.c
1072
1073	# WARNING. DANGER. Running the test suite modifies the repository the
1074	# build is done from, i.e. the checkout belongs to. Do not sync/push
1075	# the repository after running the tests.
1076	test: $(OBJDIR) $(APPNAME)
	@@ -1104,19 +1104,19 @@
1104
1105	# The USE_SEE variable may be undefined, 0 or 1. If undefined or 0,
1106	# in-tree SQLite is used. If 1, then sqlite3-see.c (not part of the
1107	# source tree) is used and extra flags are provided to enable the
1108	# SQLite Encryption Extension.
1109	SQLITE3_SRC.0 = $(SRCDIR.extsrc)/sqlite3.c
1110	SQLITE3_SRC.1 = $(SRCDIR.extsrc)/sqlite3-see.c
1111	# SQLITE3_SRC.2 is set by top-level configure/makefile process.
1112	SQLITE3_SRC. = $(SRCDIR.extsrc)/sqlite3.c
1113	SQLITE3_SRC = $(SRCDIR)/$(SQLITE3_SRC.$(SQLITE3_ORIGIN))
1114	SQLITE3_SHELL_SRC.0 = $(SRCDIR.extsrc)/shell.c
1115	SQLITE3_SHELL_SRC.1 = $(SRCDIR.extsrc)/shell-see.c
1116	# SQLITE3_SHELL_SRC.2 comes from the configure process
1117	SQLITE3_SHELL_SRC. = $(SRCDIR.extsrc)/shell.c
1118	SQLITE3_SHELL_SRC = $(SQLITE3_SHELL_SRC.$(SQLITE3_ORIGIN))
1119	SEE_FLAGS.0 =
1120	SEE_FLAGS.1 = -DSQLITE_HAS_CODEC -DSQLITE_SHELL_DBKEY_PROC=fossil_key
1121	SEE_FLAGS. =
1122	SEE_FLAGS = $(SEE_FLAGS.$(USE_SEE))
	@@ -1347,12 +1347,12 @@
1347	$(OBJDIR)/wikiformat_.c:$(OBJDIR)/wikiformat.h \
1348	$(OBJDIR)/winfile_.c:$(OBJDIR)/winfile.h \
1349	$(OBJDIR)/winhttp_.c:$(OBJDIR)/winhttp.h \
1350	$(OBJDIR)/xfer_.c:$(OBJDIR)/xfer.h \
1351	$(OBJDIR)/xfersetup_.c:$(OBJDIR)/xfersetup.h \
1352	$(OBJDIR)/zip_.c:$(OBJDIR)/zip.h$(SRCDIR.extsrc)/miniz.c:$(OBJDIR)/miniz.h <<<NEXT_LINE>>>$(SRCDIR.extsrc)/pikchr.c:$(OBJDIR)/pikchr.h <<<NEXT_LINE>>> \
1353	$(SRCDIR.extsrc)/sqlite3.h \
1354	$(SRCDIR)/th.h \
1355	$(OBJDIR)/VERSION.h
1356	echo Done >$(OBJDIR)/headers
1357
1358	$(OBJDIR)/headers: Makefile
	@@ -2609,16 +2609,16 @@
2609
2610	$(OBJDIR)/sqlite3.o: $(SQLITE3_SRC) $(SRCDIR)/../win/Makefile.mingw
2611	$(XTCC) $(SQLITE_OPTIONS) $(SQLITE_CFLAGS) $(SEE_FLAGS) \
2612	-c $(SQLITE3_SRC) -o $@
2613
2614	$(OBJDIR)/cson_amalgamation.o: $(SRCDIR.extsrc)/cson_amalgamation.c
2615	$(XTCC) -c $(SRCDIR.extsrc)/cson_amalgamation.c -o $@
2616
2617	$(OBJDIR)/json.o $(OBJDIR)/json_artifact.o $(OBJDIR)/json_branch.o $(OBJDIR)/json_config.o $(OBJDIR)/json_diff.o $(OBJDIR)/json_dir.o $(OBJDIR)/jsos_finfo.o $(OBJDIR)/json_login.o $(OBJDIR)/json_query.o $(OBJDIR)/json_report.o $(OBJDIR)/json_status.o $(OBJDIR)/json_tag.o $(OBJDIR)/json_timeline.o $(OBJDIR)/json_user.o $(OBJDIR)/json_wiki.o : $(SRCDIR)/json_detail.h
2618
2619	$(OBJDIR)/shell.o: $(SQLITE3_SHELL_SRC) $(SRCDIR.extsrc)/sqlite3.h $(SRCDIR)/../win/Makefile.mingw
2620	$(XTCC) $(SHELL_OPTIONS) $(SHELL_CFLAGS) $(SEE_FLAGS) -c $(SQLITE3_SHELL_SRC) -o $@
2621
2622	$(OBJDIR)/th.o: $(SRCDIR)/th.c
2623	$(XTCC) -c $(SRCDIR)/th.c -o $@
2624
	@@ -2626,11 +2626,11 @@
2626	$(XTCC) -c $(SRCDIR)/th_lang.c -o $@
2627
2628	$(OBJDIR)/th_tcl.o: $(SRCDIR)/th_tcl.c
2629	$(XTCC) -c $(SRCDIR)/th_tcl.c -o $@
2630
2631	$(OBJDIR)/miniz.o: $(SRCDIR.extsrc)/miniz.c
2632	$(XTCC) $(MINIZ_OPTIONS) -c $(SRCDIR.extsrc)/miniz.c -o $@
2633
2634	$(OBJDIR)/pikchr.o: $(SRCDIR.extsrc)/pikchr.c
2635	$(XTCC) -c $(SRCDIR.extsrc)/pikchr.c -o $@
2636
2637

	--- win/Makefile.mingw
	+++ win/Makefile.mingw
	@@ -1022,16 +1022,16 @@
1022
1023	all: $(OBJDIR) $(APPNAME)
1024
1025	$(OBJDIR)/fossil.o: $(SRCDIR)/../win/fossil.rc $(OBJDIR)/VERSION.h
1026	ifdef USE_WINDOWS
1027	$(CAT) $(subst /,\,$(SRCDIR_extsrc)\miniz.c) \| $(GREP) "define MZ_VERSION" > $(subst /,\,$(OBJDIR)\minizver.h)
1028	$(CP) $(subst /,\,$(SRCDIR)\..\win\fossil.rc) $(subst /,\,$(OBJDIR))
1029	$(CP) $(subst /,\,$(SRCDIR)\..\win\fossil.ico) $(subst /,\,$(OBJDIR))
1030	$(CP) $(subst /,\,$(SRCDIR)\..\win\fossil.exe.manifest) $(subst /,\,$(OBJDIR))
1031	else
1032	$(CAT) $(SRCDIR_extsrc)/miniz.c \| $(GREP) "define MZ_VERSION" > $(OBJDIR)/minizver.h
1033	$(CP) $(SRCDIR)/../win/fossil.rc $(OBJDIR)
1034	$(CP) $(SRCDIR)/../win/fossil.ico $(OBJDIR)
1035	$(CP) $(SRCDIR)/../win/fossil.exe.manifest $(OBJDIR)
1036	endif
1037	$(RCC) $(OBJDIR)/fossil.rc -o $(OBJDIR)/fossil.o
	@@ -1050,27 +1050,27 @@
1050	$(MKDIR) $(subst /,\,$(OBJDIR))
1051	else
1052	$(MKDIR) $(OBJDIR)
1053	endif
1054
1055	$(TRANSLATE): $(SRCDIR_tools)/translate.c
1056	$(XBCC) -o $@ $(SRCDIR_tools)/translate.c
1057
1058	$(MAKEHEADERS): $(SRCDIR_tools)/makeheaders.c
1059	$(XBCC) -o $@ $(SRCDIR_tools)/makeheaders.c
1060
1061	$(MKINDEX): $(SRCDIR_tools)/mkindex.c
1062	$(XBCC) -o $@ $(SRCDIR_tools)/mkindex.c
1063
1064	$(MKBUILTIN): $(SRCDIR)/mkbuiltin.c
1065	$(XBCC) -o $@ $(SRCDIR)/mkbuiltin.c
1066
1067	$(MKVERSION): $(SRCDIR_tools)/mkversion.c
1068	$(XBCC) -o $@ $(SRCDIR_tools)/mkversion.c
1069
1070	$(CODECHECK1): $(SRCDIR_tools)/codecheck1.c
1071	$(XBCC) -o $@ $(SRCDIR_tools)/codecheck1.c
1072
1073	# WARNING. DANGER. Running the test suite modifies the repository the
1074	# build is done from, i.e. the checkout belongs to. Do not sync/push
1075	# the repository after running the tests.
1076	test: $(OBJDIR) $(APPNAME)
	@@ -1104,19 +1104,19 @@
1104
1105	# The USE_SEE variable may be undefined, 0 or 1. If undefined or 0,
1106	# in-tree SQLite is used. If 1, then sqlite3-see.c (not part of the
1107	# source tree) is used and extra flags are provided to enable the
1108	# SQLite Encryption Extension.
1109	SQLITE3_SRC.0 = $(SRCDIR_extsrc)/sqlite3.c
1110	SQLITE3_SRC.1 = $(SRCDIR_extsrc)/sqlite3-see.c
1111	# SQLITE3_SRC.2 is set by top-level configure/makefile process.
1112	SQLITE3_SRC. = $(SRCDIR_extsrc)/sqlite3.c
1113	SQLITE3_SRC = $(SRCDIR)/$(SQLITE3_SRC.$(SQLITE3_ORIGIN))
1114	SQLITE3_SHELL_SRC.0 = $(SRCDIR_extsrc)/shell.c
1115	SQLITE3_SHELL_SRC.1 = $(SRCDIR_extsrc)/shell-see.c
1116	# SQLITE3_SHELL_SRC.2 comes from the configure process
1117	SQLITE3_SHELL_SRC. = $(SRCDIR_extsrc)/shell.c
1118	SQLITE3_SHELL_SRC = $(SQLITE3_SHELL_SRC.$(SQLITE3_ORIGIN))
1119	SEE_FLAGS.0 =
1120	SEE_FLAGS.1 = -DSQLITE_HAS_CODEC -DSQLITE_SHELL_DBKEY_PROC=fossil_key
1121	SEE_FLAGS. =
1122	SEE_FLAGS = $(SEE_FLAGS.$(USE_SEE))
	@@ -1347,12 +1347,12 @@
1347	$(OBJDIR)/wikiformat_.c:$(OBJDIR)/wikiformat.h \
1348	$(OBJDIR)/winfile_.c:$(OBJDIR)/winfile.h \
1349	$(OBJDIR)/winhttp_.c:$(OBJDIR)/winhttp.h \
1350	$(OBJDIR)/xfer_.c:$(OBJDIR)/xfer.h \
1351	$(OBJDIR)/xfersetup_.c:$(OBJDIR)/xfersetup.h \
1352	$(OBJDIR)/zip_.c:$(OBJDIR)/zip.h$(SRCDIR_extsrc)/miniz.c:$(OBJDIR)/miniz.h <<<NEXT_LINE>>>$(SRCDIR_extsrc)/pikchr.c:$(OBJDIR)/pikchr.h <<<NEXT_LINE>>> \
1353	$(SRCDIR_extsrc)/sqlite3.h \
1354	$(SRCDIR)/th.h \
1355	$(OBJDIR)/VERSION.h
1356	echo Done >$(OBJDIR)/headers
1357
1358	$(OBJDIR)/headers: Makefile
	@@ -2609,16 +2609,16 @@
2609
2610	$(OBJDIR)/sqlite3.o: $(SQLITE3_SRC) $(SRCDIR)/../win/Makefile.mingw
2611	$(XTCC) $(SQLITE_OPTIONS) $(SQLITE_CFLAGS) $(SEE_FLAGS) \
2612	-c $(SQLITE3_SRC) -o $@
2613
2614	$(OBJDIR)/cson_amalgamation.o: $(SRCDIR_extsrc)/cson_amalgamation.c
2615	$(XTCC) -c $(SRCDIR_extsrc)/cson_amalgamation.c -o $@
2616
2617	$(OBJDIR)/json.o $(OBJDIR)/json_artifact.o $(OBJDIR)/json_branch.o $(OBJDIR)/json_config.o $(OBJDIR)/json_diff.o $(OBJDIR)/json_dir.o $(OBJDIR)/jsos_finfo.o $(OBJDIR)/json_login.o $(OBJDIR)/json_query.o $(OBJDIR)/json_report.o $(OBJDIR)/json_status.o $(OBJDIR)/json_tag.o $(OBJDIR)/json_timeline.o $(OBJDIR)/json_user.o $(OBJDIR)/json_wiki.o : $(SRCDIR)/json_detail.h
2618
2619	$(OBJDIR)/shell.o: $(SQLITE3_SHELL_SRC) $(SRCDIR_extsrc)/sqlite3.h $(SRCDIR)/../win/Makefile.mingw
2620	$(XTCC) $(SHELL_OPTIONS) $(SHELL_CFLAGS) $(SEE_FLAGS) -c $(SQLITE3_SHELL_SRC) -o $@
2621
2622	$(OBJDIR)/th.o: $(SRCDIR)/th.c
2623	$(XTCC) -c $(SRCDIR)/th.c -o $@
2624
	@@ -2626,11 +2626,11 @@
2626	$(XTCC) -c $(SRCDIR)/th_lang.c -o $@
2627
2628	$(OBJDIR)/th_tcl.o: $(SRCDIR)/th_tcl.c
2629	$(XTCC) -c $(SRCDIR)/th_tcl.c -o $@
2630
2631	$(OBJDIR)/miniz.o: $(SRCDIR_extsrc)/miniz.c
2632	$(XTCC) $(MINIZ_OPTIONS) -c $(SRCDIR_extsrc)/miniz.c -o $@
2633
2634	$(OBJDIR)/pikchr.o: $(SRCDIR_extsrc)/pikchr.c
2635	$(XTCC) -c $(SRCDIR_extsrc)/pikchr.c -o $@
2636
2637

M win/Makefile.msc

+13 -13

		--- win/Makefile.msc
		+++ win/Makefile.msc
		@@ -1013,36 +1013,36 @@
1013	1013	!if $(FOSSIL_ENABLE_MINIZ)!=0
1014	1014	echo "$(OX)\miniz.obj" >> $@
1015	1015	!endif
1016	1016	echo $(LIBS) >> $@
1017	1017
1018		-"$(OBJDIR)\translate$E": "$(SRCDIR.tools)\translate.c"
	1018	+"$(OBJDIR)\translate$E": "$(SRCDIR_tools)\translate.c"
1019	1019	$(BCC) /Fe$@ /Fo$(@D)\ /Fd$(@D)\ $**
1020	1020
1021		-"$(OBJDIR)\makeheaders$E": "$(SRCDIR.tools)\makeheaders.c"
	1021	+"$(OBJDIR)\makeheaders$E": "$(SRCDIR_tools)\makeheaders.c"
1022	1022	$(BCC) /Fe$@ /Fo$(@D)\ /Fd$(@D)\ $**
1023	1023
1024		-"$(OBJDIR)\mkindex$E": "$(SRCDIR.tools)\mkindex.c"
	1024	+"$(OBJDIR)\mkindex$E": "$(SRCDIR_tools)\mkindex.c"
1025	1025	$(BCC) /Fe$@ /Fo$(@D)\ /Fd$(@D)\ $**
1026	1026
1027	1027	"$(OBJDIR)\mkbuiltin$E": "$(SRCDIR)\mkbuiltin.c"
1028	1028	$(BCC) /Fe$@ /Fo$(@D)\ /Fd$(@D)\ $**
1029	1029
1030		-"$(OBJDIR)\mkversion$E": "$(SRCDIR.tools)\mkversion.c"
	1030	+"$(OBJDIR)\mkversion$E": "$(SRCDIR_tools)\mkversion.c"
1031	1031	$(BCC) /Fe$@ /Fo$(@D)\ /Fd$(@D)\ $**
1032	1032
1033		-"$(OBJDIR)\codecheck1$E": "$(SRCDIR.tools)\codecheck1.c"
	1033	+"$(OBJDIR)\codecheck1$E": "$(SRCDIR_tools)\codecheck1.c"
1034	1034	$(BCC) /Fe$@ /Fo$(@D)\ /Fd$(@D)\ $**
1035	1035
1036	1036	!if $(USE_SEE)!=0
1037	1037	SEE_FLAGS = /DSQLITE_HAS_CODEC=1 /DSQLITE_SHELL_DBKEY_PROC=fossil_key
1038	1038	SQLITE3_SHELL_SRC = $(SRCDIR)\shell-see.c
1039		-SQLITE3_SRC = $(SRCDIR.extsrc)\sqlite3-see.c
	1039	+SQLITE3_SRC = $(SRCDIR_extsrc)\sqlite3-see.c
1040	1040	!else
1041	1041	SEE_FLAGS =
1042		-SQLITE3_SHELL_SRC = $(SRCDIR.extsrc)\shell.c
1043		-SQLITE3_SRC = $(SRCDIR.extsrc)\sqlite3.c
	1042	+SQLITE3_SHELL_SRC = $(SRCDIR_extsrc)\shell.c
	1043	+SQLITE3_SRC = $(SRCDIR_extsrc)\sqlite3.c
1044	1044	!endif
1045	1045
1046	1046	"$(OX)\shell$O" : "$(SQLITE3_SHELL_SRC)" "$(B)\win\Makefile.msc"
1047	1047	$(TCC) /Fo$@ /Fd$(@D)\ $(SHELL_OPTIONS) $(SQLITE_OPTIONS) $(SHELL_CFLAGS) $(SEE_FLAGS) -c "$(SQLITE3_SHELL_SRC)"
1048	1048
		@@ -1056,23 +1056,23 @@
1056	1056	$(TCC) /Fo$@ /Fd$(@D)\ -c $**
1057	1057
1058	1058	"$(OX)\th_tcl$O" : "$(SRCDIR)\th_tcl.c"
1059	1059	$(TCC) /Fo$@ /Fd$(@D)\ -c $**
1060	1060
1061		-"$(OX)\miniz$O" : "$(SRCDIR.extsrc)\miniz.c"
	1061	+"$(OX)\miniz$O" : "$(SRCDIR_extsrc)\miniz.c"
1062	1062	$(TCC) /Fo$@ /Fd$(@D)\ -c $(MINIZ_OPTIONS) $**
1063	1063
1064		-"$(OX)\pikchr$O" : "$(SRCDIR.extsrc)" "$(B)\win\Makefile.msc"
	1064	+"$(OX)\pikchr$O" : "$(SRCDIR_extsrc)" "$(B)\win\Makefile.msc"
1065	1065	$(TCC) /Fo$@ /Fd$(@D)\ -c $**
1066	1066
1067	1067	"$(OX)\VERSION.h" : "$(OBJDIR)\mkversion$E" "$(B)\manifest.uuid" "$(B)\manifest" "$(B)\VERSION" "$(B)\phony.h"
1068	1068	"$(OBJDIR)\mkversion$E" "$(B)\manifest.uuid" "$(B)\manifest" "$(B)\VERSION" > $@
1069	1069
1070	1070	"$(B)\phony.h" :
1071	1071	rem Force rebuild of VERSION.h whenever nmake is run
1072	1072
1073		-"$(OX)\cson_amalgamation$O" : "$(SRCDIR.extsrc)\cson_amalgamation.c"
	1073	+"$(OX)\cson_amalgamation$O" : "$(SRCDIR_extsrc)\cson_amalgamation.c"
1074	1074	$(TCC) /Fo$@ /Fd$(@D)\ -c $**
1075	1075
1076	1076	"$(OX)\page_index.h": "$(OBJDIR)\mkindex$E" $(SRC)
1077	1077	$** > $@
1078	1078
		@@ -2268,10 +2268,10 @@
2268	2268	"$(OX)\winfile_.c":"$(OX)\winfile.h" \
2269	2269	"$(OX)\winhttp_.c":"$(OX)\winhttp.h" \
2270	2270	"$(OX)\xfer_.c":"$(OX)\xfer.h" \
2271	2271	"$(OX)\xfersetup_.c":"$(OX)\xfersetup.h" \
2272	2272	"$(OX)\zip_.c":"$(OX)\zip.h" \
2273		- "$(SRCDIR.extsrc)\sqlite3.h" \
	2273	+ "$(SRCDIR_extsrc)\sqlite3.h" \
2274	2274	"$(SRCDIR)\th.h" \
2275	2275	"$(OX)\VERSION.h" \
2276		- "$(SRCDIR.extsrc)\cson_amalgamation.h"
	2276	+ "$(SRCDIR_extsrc)\cson_amalgamation.h"
2277	2277	@copy /Y nul: $@
2278	2278

	--- win/Makefile.msc
	+++ win/Makefile.msc
	@@ -1013,36 +1013,36 @@
1013	!if $(FOSSIL_ENABLE_MINIZ)!=0
1014	echo "$(OX)\miniz.obj" >> $@
1015	!endif
1016	echo $(LIBS) >> $@
1017
1018	"$(OBJDIR)\translate$E": "$(SRCDIR.tools)\translate.c"
1019	$(BCC) /Fe$@ /Fo$(@D)\ /Fd$(@D)\ $**
1020
1021	"$(OBJDIR)\makeheaders$E": "$(SRCDIR.tools)\makeheaders.c"
1022	$(BCC) /Fe$@ /Fo$(@D)\ /Fd$(@D)\ $**
1023
1024	"$(OBJDIR)\mkindex$E": "$(SRCDIR.tools)\mkindex.c"
1025	$(BCC) /Fe$@ /Fo$(@D)\ /Fd$(@D)\ $**
1026
1027	"$(OBJDIR)\mkbuiltin$E": "$(SRCDIR)\mkbuiltin.c"
1028	$(BCC) /Fe$@ /Fo$(@D)\ /Fd$(@D)\ $**
1029
1030	"$(OBJDIR)\mkversion$E": "$(SRCDIR.tools)\mkversion.c"
1031	$(BCC) /Fe$@ /Fo$(@D)\ /Fd$(@D)\ $**
1032
1033	"$(OBJDIR)\codecheck1$E": "$(SRCDIR.tools)\codecheck1.c"
1034	$(BCC) /Fe$@ /Fo$(@D)\ /Fd$(@D)\ $**
1035
1036	!if $(USE_SEE)!=0
1037	SEE_FLAGS = /DSQLITE_HAS_CODEC=1 /DSQLITE_SHELL_DBKEY_PROC=fossil_key
1038	SQLITE3_SHELL_SRC = $(SRCDIR)\shell-see.c
1039	SQLITE3_SRC = $(SRCDIR.extsrc)\sqlite3-see.c
1040	!else
1041	SEE_FLAGS =
1042	SQLITE3_SHELL_SRC = $(SRCDIR.extsrc)\shell.c
1043	SQLITE3_SRC = $(SRCDIR.extsrc)\sqlite3.c
1044	!endif
1045
1046	"$(OX)\shell$O" : "$(SQLITE3_SHELL_SRC)" "$(B)\win\Makefile.msc"
1047	$(TCC) /Fo$@ /Fd$(@D)\ $(SHELL_OPTIONS) $(SQLITE_OPTIONS) $(SHELL_CFLAGS) $(SEE_FLAGS) -c "$(SQLITE3_SHELL_SRC)"
1048
	@@ -1056,23 +1056,23 @@
1056	$(TCC) /Fo$@ /Fd$(@D)\ -c $**
1057
1058	"$(OX)\th_tcl$O" : "$(SRCDIR)\th_tcl.c"
1059	$(TCC) /Fo$@ /Fd$(@D)\ -c $**
1060
1061	"$(OX)\miniz$O" : "$(SRCDIR.extsrc)\miniz.c"
1062	$(TCC) /Fo$@ /Fd$(@D)\ -c $(MINIZ_OPTIONS) $**
1063
1064	"$(OX)\pikchr$O" : "$(SRCDIR.extsrc)" "$(B)\win\Makefile.msc"
1065	$(TCC) /Fo$@ /Fd$(@D)\ -c $**
1066
1067	"$(OX)\VERSION.h" : "$(OBJDIR)\mkversion$E" "$(B)\manifest.uuid" "$(B)\manifest" "$(B)\VERSION" "$(B)\phony.h"
1068	"$(OBJDIR)\mkversion$E" "$(B)\manifest.uuid" "$(B)\manifest" "$(B)\VERSION" > $@
1069
1070	"$(B)\phony.h" :
1071	rem Force rebuild of VERSION.h whenever nmake is run
1072
1073	"$(OX)\cson_amalgamation$O" : "$(SRCDIR.extsrc)\cson_amalgamation.c"
1074	$(TCC) /Fo$@ /Fd$(@D)\ -c $**
1075
1076	"$(OX)\page_index.h": "$(OBJDIR)\mkindex$E" $(SRC)
1077	$** > $@
1078
	@@ -2268,10 +2268,10 @@
2268	"$(OX)\winfile_.c":"$(OX)\winfile.h" \
2269	"$(OX)\winhttp_.c":"$(OX)\winhttp.h" \
2270	"$(OX)\xfer_.c":"$(OX)\xfer.h" \
2271	"$(OX)\xfersetup_.c":"$(OX)\xfersetup.h" \
2272	"$(OX)\zip_.c":"$(OX)\zip.h" \
2273	"$(SRCDIR.extsrc)\sqlite3.h" \
2274	"$(SRCDIR)\th.h" \
2275	"$(OX)\VERSION.h" \
2276	"$(SRCDIR.extsrc)\cson_amalgamation.h"
2277	@copy /Y nul: $@
2278

	--- win/Makefile.msc
	+++ win/Makefile.msc
	@@ -1013,36 +1013,36 @@
1013	!if $(FOSSIL_ENABLE_MINIZ)!=0
1014	echo "$(OX)\miniz.obj" >> $@
1015	!endif
1016	echo $(LIBS) >> $@
1017
1018	"$(OBJDIR)\translate$E": "$(SRCDIR_tools)\translate.c"
1019	$(BCC) /Fe$@ /Fo$(@D)\ /Fd$(@D)\ $**
1020
1021	"$(OBJDIR)\makeheaders$E": "$(SRCDIR_tools)\makeheaders.c"
1022	$(BCC) /Fe$@ /Fo$(@D)\ /Fd$(@D)\ $**
1023
1024	"$(OBJDIR)\mkindex$E": "$(SRCDIR_tools)\mkindex.c"
1025	$(BCC) /Fe$@ /Fo$(@D)\ /Fd$(@D)\ $**
1026
1027	"$(OBJDIR)\mkbuiltin$E": "$(SRCDIR)\mkbuiltin.c"
1028	$(BCC) /Fe$@ /Fo$(@D)\ /Fd$(@D)\ $**
1029
1030	"$(OBJDIR)\mkversion$E": "$(SRCDIR_tools)\mkversion.c"
1031	$(BCC) /Fe$@ /Fo$(@D)\ /Fd$(@D)\ $**
1032
1033	"$(OBJDIR)\codecheck1$E": "$(SRCDIR_tools)\codecheck1.c"
1034	$(BCC) /Fe$@ /Fo$(@D)\ /Fd$(@D)\ $**
1035
1036	!if $(USE_SEE)!=0
1037	SEE_FLAGS = /DSQLITE_HAS_CODEC=1 /DSQLITE_SHELL_DBKEY_PROC=fossil_key
1038	SQLITE3_SHELL_SRC = $(SRCDIR)\shell-see.c
1039	SQLITE3_SRC = $(SRCDIR_extsrc)\sqlite3-see.c
1040	!else
1041	SEE_FLAGS =
1042	SQLITE3_SHELL_SRC = $(SRCDIR_extsrc)\shell.c
1043	SQLITE3_SRC = $(SRCDIR_extsrc)\sqlite3.c
1044	!endif
1045
1046	"$(OX)\shell$O" : "$(SQLITE3_SHELL_SRC)" "$(B)\win\Makefile.msc"
1047	$(TCC) /Fo$@ /Fd$(@D)\ $(SHELL_OPTIONS) $(SQLITE_OPTIONS) $(SHELL_CFLAGS) $(SEE_FLAGS) -c "$(SQLITE3_SHELL_SRC)"
1048
	@@ -1056,23 +1056,23 @@
1056	$(TCC) /Fo$@ /Fd$(@D)\ -c $**
1057
1058	"$(OX)\th_tcl$O" : "$(SRCDIR)\th_tcl.c"
1059	$(TCC) /Fo$@ /Fd$(@D)\ -c $**
1060
1061	"$(OX)\miniz$O" : "$(SRCDIR_extsrc)\miniz.c"
1062	$(TCC) /Fo$@ /Fd$(@D)\ -c $(MINIZ_OPTIONS) $**
1063
1064	"$(OX)\pikchr$O" : "$(SRCDIR_extsrc)" "$(B)\win\Makefile.msc"
1065	$(TCC) /Fo$@ /Fd$(@D)\ -c $**
1066
1067	"$(OX)\VERSION.h" : "$(OBJDIR)\mkversion$E" "$(B)\manifest.uuid" "$(B)\manifest" "$(B)\VERSION" "$(B)\phony.h"
1068	"$(OBJDIR)\mkversion$E" "$(B)\manifest.uuid" "$(B)\manifest" "$(B)\VERSION" > $@
1069
1070	"$(B)\phony.h" :
1071	rem Force rebuild of VERSION.h whenever nmake is run
1072
1073	"$(OX)\cson_amalgamation$O" : "$(SRCDIR_extsrc)\cson_amalgamation.c"
1074	$(TCC) /Fo$@ /Fd$(@D)\ -c $**
1075
1076	"$(OX)\page_index.h": "$(OBJDIR)\mkindex$E" $(SRC)
1077	$** > $@
1078
	@@ -2268,10 +2268,10 @@
2268	"$(OX)\winfile_.c":"$(OX)\winfile.h" \
2269	"$(OX)\winhttp_.c":"$(OX)\winhttp.h" \
2270	"$(OX)\xfer_.c":"$(OX)\xfer.h" \
2271	"$(OX)\xfersetup_.c":"$(OX)\xfersetup.h" \
2272	"$(OX)\zip_.c":"$(OX)\zip.h" \
2273	"$(SRCDIR_extsrc)\sqlite3.h" \
2274	"$(SRCDIR)\th.h" \
2275	"$(OX)\VERSION.h" \
2276	"$(SRCDIR_extsrc)\cson_amalgamation.h"
2277	@copy /Y nul: $@
2278

Fossil SCM

Keyboard Shortcuts