Fossil SCM

Fixes to MinGW build (still not quite working). Remove final remnants of miniz.

mistachkin 2021-12-29 15:56 trunk
Commit a015ab64cac586460649f8583926726fd0fa7f0b70436d72155cd8188ecee8bf
Parent a094e654e5bcb31…
6 files changed -1 +22 -13 +1 -1 +160 -153 +201 -246 -14
~ Makefile.osx-jaguar ~ tools/makemake.tcl ~ win/Makefile.dmc ~ win/Makefile.mingw ~ win/Makefile.mingw.mistachkin ~ win/fossil.rc
M Makefile.osx-jaguar
-1
--- Makefile.osx-jaguar
+++ Makefile.osx-jaguar
@@ -62,11 +62,10 @@
6262
 INSTALLDIR = $(DESTDIR)/usr/local/bin
6363
 USE_SYSTEM_SQLITE =
6464
 USE_LINENOISE = 1
6565
 # FOSSIL_ENABLE_TCL = @FOSSIL_ENABLE_TCL@
6666
 FOSSIL_ENABLE_TCL = 0
67
-FOSSIL_ENABLE_MINIZ = 0
6867
6968
 include $(SRCDIR)/main.mk
7069
7170
 distclean: clean
7271
 rm -f autoconfig.h config.log Makefile
7372
--- Makefile.osx-jaguar
+++ Makefile.osx-jaguar
@@ -62,11 +62,10 @@
62 INSTALLDIR = $(DESTDIR)/usr/local/bin
63 USE_SYSTEM_SQLITE =
64 USE_LINENOISE = 1
65 # FOSSIL_ENABLE_TCL = @FOSSIL_ENABLE_TCL@
66 FOSSIL_ENABLE_TCL = 0
67 FOSSIL_ENABLE_MINIZ = 0
68
69 include $(SRCDIR)/main.mk
70
71 distclean: clean
72 rm -f autoconfig.h config.log Makefile
73
--- Makefile.osx-jaguar
+++ Makefile.osx-jaguar
@@ -62,11 +62,10 @@
62 INSTALLDIR = $(DESTDIR)/usr/local/bin
63 USE_SYSTEM_SQLITE =
64 USE_LINENOISE = 1
65 # FOSSIL_ENABLE_TCL = @FOSSIL_ENABLE_TCL@
66 FOSSIL_ENABLE_TCL = 0
 
67
68 include $(SRCDIR)/main.mk
69
70 distclean: clean
71 rm -f autoconfig.h config.log Makefile
72
M tools/makemake.tcl
+22 -13
--- tools/makemake.tcl
+++ tools/makemake.tcl
@@ -356,11 +356,12 @@
356356
 writeln -nonewline " \\\n \$(OBJDIR)/$s.o"
357357
 }
358358
359359
 writeln [string map [list \
360360
 <<<SQLITE_OPTIONS>>> [join $SQLITE_OPTIONS " \\\n "] \
361
- <<<SHELL_OPTIONS>>> [join $SHELL_OPTIONS " \\\n "]] {
361
+ <<<SHELL_OPTIONS>>> [join $SHELL_OPTIONS " \\\n "] \
362
+ <<<NEXT_LINE>>> \\] {
362363
 all: $(OBJDIR) $(APPNAME)
363364
364365
 install: all
365366
 mkdir -p $(INSTALLDIR)
366367
 cp $(APPNAME) $(INSTALLDIR)
@@ -404,12 +405,12 @@
404405
 #
405406
 test: $(OBJDIR) $(APPNAME)
406407
 $(TCLSH) $(SRCDIR)/../test/tester.tcl $(APPNAME) $(TESTFLAGS)
407408
408409
 $(OBJDIR)/VERSION.h: $(SRCDIR)/../manifest.uuid $(SRCDIR)/../manifest $(SRCDIR)/../VERSION $(OBJDIR)/mkversion $(OBJDIR)/phony.h
409
- $(OBJDIR)/mkversion $(SRCDIR)/../manifest.uuid \
410
- $(SRCDIR)/../manifest \
410
+ $(OBJDIR)/mkversion $(SRCDIR)/../manifest.uuid <<<NEXT_LINE>>>
411
+ $(SRCDIR)/../manifest <<<NEXT_LINE>>>
411412
 $(SRCDIR)/../VERSION >$(OBJDIR)/VERSION.h
412413
413414
 $(OBJDIR)/phony.h:
414415
 # Force rebuild of VERSION.h every time we run "make"
415416
@@ -604,11 +605,11 @@
604605
 # in a directory that is separate from the source tree. Just change
605606
 # the following to point from the build directory to the src/ folder.
606607
 #
607608
 SRCDIR = src
608609
 SRCDIR_extsrc = extsrc
609
-SCRDIR_tools = tools
610
+SRCDIR_tools = tools
610611
611612
 #### The directory into which object code files should be written.
612613
 #
613614
 OBJDIR = wbld
614615
@@ -713,12 +714,16 @@
713714
 # used, taking into account whether zlib is actually enabled and the target
714715
 # processor architecture.
715716
 #
716717
 ifndef X64
717718
 SSLCONFIG = mingw
719
+ZLIBCONFIG = LOC="-DASMV -DASMINF" OBJA="inffas86.o match.o"
720
+ZLIBTARGETS = $(ZLIBDIR)/inffas86.o $(ZLIBDIR)/match.o
718721
 else
719722
 SSLCONFIG = mingw64
723
+ZLIBCONFIG =
724
+ZLIBTARGETS =
720725
 endif
721726
722727
 #### Disable creation of the OpenSSL shared libraries. Also, disable support
723728
 # for SSLv3 (i.e. thereby forcing the use of TLS).
724729
 #
@@ -785,10 +790,11 @@
785790
 # as BCC, unless you are cross-compiling. This C compiler builds
786791
 # the finished binary for fossil. The BCC compiler above is used
787792
 # for building intermediate code-generator tools.
788793
 #
789794
 TCC = $(PREFIX)$(TCCEXE) -Wall -Wdeclaration-after-statement
795
+TCC += -I$(SRCDIR_extsrc)
790796
791797
 #### Add the necessary command line options to build with debugging
792798
 # symbols, if enabled.
793799
 #
794800
 ifdef FOSSIL_ENABLE_SYMBOLS
@@ -801,10 +807,11 @@
801807
802808
 #### Compile resources for use in building executables that will run
803809
 # on the target platform.
804810
 #
805811
 RCC = $(PREFIX)windres -I$(SRCDIR) -I$(ZINCDIR)
812
+RCC += -I$(SRCDIR_extsrc)
806813
807814
 # With HTTPS support
808815
 ifdef FOSSIL_ENABLE_SSL
809816
 TCC += -L$(OPENSSLLIBDIR) -I$(OPENSSLINCDIR)
810817
 RCC += -I$(OPENSSLINCDIR)
@@ -1068,12 +1075,12 @@
10681075
 $(XBCC) -o $@ $(SRCDIR_tools)/makeheaders.c
10691076
10701077
 $(MKINDEX): $(SRCDIR_tools)/mkindex.c
10711078
 $(XBCC) -o $@ $(SRCDIR_tools)/mkindex.c
10721079
1073
-$(MKBUILTIN): $(SRCDIR)/mkbuiltin.c
1074
- $(XBCC) -o $@ $(SRCDIR)/mkbuiltin.c
1080
+$(MKBUILTIN): $(SRCDIR_tools)/mkbuiltin.c
1081
+ $(XBCC) -o $@ $(SRCDIR_tools)/mkbuiltin.c
10751082
10761083
 $(MKVERSION): $(SRCDIR_tools)/mkversion.c
10771084
 $(XBCC) -o $@ $(SRCDIR_tools)/mkversion.c
10781085
10791086
 $(CODECHECK1): $(SRCDIR_tools)/codecheck1.c
@@ -1140,11 +1147,11 @@
11401147
11411148
 $(ZLIBDIR)/match.o:
11421149
 $(TCC) -c -o $@ -DASMV $(ZLIBDIR)/contrib/asm686/match.S
11431150
11441151
 zlib: $(ZLIBTARGETS)
1145
- $(MAKE) -C $(ZLIBDIR) PREFIX=$(PREFIX) CC=$(PREFIX)$(TCCEXE) -f win32/Makefile.gcc libz.a
1152
+ $(MAKE) -C $(ZLIBDIR) PREFIX=$(PREFIX) CC=$(PREFIX)$(TCCEXE) $(ZLIBCONFIG) -f win32/Makefile.gcc libz.a
11461153
11471154
 clean-zlib:
11481155
 $(MAKE) -C $(ZLIBDIR) PREFIX=$(PREFIX) CC=$(PREFIX)$(TCCEXE) -f win32/Makefile.gcc clean
11491156
11501157
 BLDTARGETS = zlib
@@ -1196,21 +1203,23 @@
11961203
 $(INNOSETUP) ./setup/fossil.iss -DAppVersion=$(shell $(CAT) ./VERSION)
11971204
 }
11981205
11991206
 set mhargs {}
12001207
 foreach s [lsort $src] {
1201
- if {[string length $mhargs] > 0} {append mhargs " \\\n\t\t"}
1208
+ if {[string length $mhargs] > 0} {append mhargs " <<<NEXT_LINE>>>"}
12021209
 append mhargs "\$(OBJDIR)/${s}_.c:\$(OBJDIR)/$s.h"
12031210
 set extra_h($s) { }
12041211
 }
12051212
 foreach s [lsort $src_ext] {
1206
- append mhargs "\$(SRCDIR_extsrc)/${s}.c:\$(OBJDIR)/$s.h <<<NEXT_LINE>>>"
1213
+ if {[string length $mhargs] > 0} {append mhargs " <<<NEXT_LINE>>>"}
1214
+ append mhargs "\$(SRCDIR_extsrc)/${s}.c:\$(OBJDIR)/$s.h"
12071215
 set extra_h($s) { }
12081216
 }
1209
-append mhargs " \\\n\t\t\$(SRCDIR_extsrc)/sqlite3.h"
1210
-append mhargs " \\\n\t\t\$(SRCDIR)/th.h"
1211
-append mhargs " \\\n\t\t\$(OBJDIR)/VERSION.h"
1217
+append mhargs " <<<NEXT_LINE>>>\$(SRCDIR_extsrc)/sqlite3.h"
1218
+append mhargs " <<<NEXT_LINE>>>\$(SRCDIR)/th.h"
1219
+append mhargs " <<<NEXT_LINE>>>\$(OBJDIR)/VERSION.h"
1220
+set mhargs [string map [list <<<NEXT_LINE>>> \\\n\t] $mhargs]
12121221
 writeln "\$(OBJDIR)/page_index.h: \$(TRANS_SRC) \$(MKINDEX)"
12131222
 writeln "\t\$(MKINDEX) \$(TRANS_SRC) >\$@\n"
12141223
12151224
 writeln "\$(OBJDIR)/builtin_data.h:\t\$(MKBUILTIN) \$(EXTRA_FILES)"
12161225
 writeln "\t\$(MKBUILTIN) --prefix \$(SRCDIR)/ \$(EXTRA_FILES) >\$@\n"
@@ -1361,11 +1370,11 @@
13611370
 $(BCC) -o$@ $**
13621371
13631372
 mkindex$E: $(SRCDIR_tools)\mkindex.c
13641373
 $(BCC) -o$@ $**
13651374
1366
-mkbuiltin$E: $(SRCDIR)\mkbuiltin.c
1375
+mkbuiltin$E: $(SRCDIR_tools)\mkbuiltin.c
13671376
 $(BCC) -o$@ $**
13681377
13691378
 mkversion$E: $(SRCDIR_tools)\mkversion.c
13701379
 $(BCC) -o$@ $**
13711380
13721381
--- tools/makemake.tcl
+++ tools/makemake.tcl
@@ -356,11 +356,12 @@
356 writeln -nonewline " \\\n \$(OBJDIR)/$s.o"
357 }
358
359 writeln [string map [list \
360 <<<SQLITE_OPTIONS>>> [join $SQLITE_OPTIONS " \\\n "] \
361 <<<SHELL_OPTIONS>>> [join $SHELL_OPTIONS " \\\n "]] {
 
362 all: $(OBJDIR) $(APPNAME)
363
364 install: all
365 mkdir -p $(INSTALLDIR)
366 cp $(APPNAME) $(INSTALLDIR)
@@ -404,12 +405,12 @@
404 #
405 test: $(OBJDIR) $(APPNAME)
406 $(TCLSH) $(SRCDIR)/../test/tester.tcl $(APPNAME) $(TESTFLAGS)
407
408 $(OBJDIR)/VERSION.h: $(SRCDIR)/../manifest.uuid $(SRCDIR)/../manifest $(SRCDIR)/../VERSION $(OBJDIR)/mkversion $(OBJDIR)/phony.h
409 $(OBJDIR)/mkversion $(SRCDIR)/../manifest.uuid \
410 $(SRCDIR)/../manifest \
411 $(SRCDIR)/../VERSION >$(OBJDIR)/VERSION.h
412
413 $(OBJDIR)/phony.h:
414 # Force rebuild of VERSION.h every time we run "make"
415
@@ -604,11 +605,11 @@
604 # in a directory that is separate from the source tree. Just change
605 # the following to point from the build directory to the src/ folder.
606 #
607 SRCDIR = src
608 SRCDIR_extsrc = extsrc
609 SCRDIR_tools = tools
610
611 #### The directory into which object code files should be written.
612 #
613 OBJDIR = wbld
614
@@ -713,12 +714,16 @@
713 # used, taking into account whether zlib is actually enabled and the target
714 # processor architecture.
715 #
716 ifndef X64
717 SSLCONFIG = mingw
 
 
718 else
719 SSLCONFIG = mingw64
 
 
720 endif
721
722 #### Disable creation of the OpenSSL shared libraries. Also, disable support
723 # for SSLv3 (i.e. thereby forcing the use of TLS).
724 #
@@ -785,10 +790,11 @@
785 # as BCC, unless you are cross-compiling. This C compiler builds
786 # the finished binary for fossil. The BCC compiler above is used
787 # for building intermediate code-generator tools.
788 #
789 TCC = $(PREFIX)$(TCCEXE) -Wall -Wdeclaration-after-statement
 
790
791 #### Add the necessary command line options to build with debugging
792 # symbols, if enabled.
793 #
794 ifdef FOSSIL_ENABLE_SYMBOLS
@@ -801,10 +807,11 @@
801
802 #### Compile resources for use in building executables that will run
803 # on the target platform.
804 #
805 RCC = $(PREFIX)windres -I$(SRCDIR) -I$(ZINCDIR)
 
806
807 # With HTTPS support
808 ifdef FOSSIL_ENABLE_SSL
809 TCC += -L$(OPENSSLLIBDIR) -I$(OPENSSLINCDIR)
810 RCC += -I$(OPENSSLINCDIR)
@@ -1068,12 +1075,12 @@
1068 $(XBCC) -o $@ $(SRCDIR_tools)/makeheaders.c
1069
1070 $(MKINDEX): $(SRCDIR_tools)/mkindex.c
1071 $(XBCC) -o $@ $(SRCDIR_tools)/mkindex.c
1072
1073 $(MKBUILTIN): $(SRCDIR)/mkbuiltin.c
1074 $(XBCC) -o $@ $(SRCDIR)/mkbuiltin.c
1075
1076 $(MKVERSION): $(SRCDIR_tools)/mkversion.c
1077 $(XBCC) -o $@ $(SRCDIR_tools)/mkversion.c
1078
1079 $(CODECHECK1): $(SRCDIR_tools)/codecheck1.c
@@ -1140,11 +1147,11 @@
1140
1141 $(ZLIBDIR)/match.o:
1142 $(TCC) -c -o $@ -DASMV $(ZLIBDIR)/contrib/asm686/match.S
1143
1144 zlib: $(ZLIBTARGETS)
1145 $(MAKE) -C $(ZLIBDIR) PREFIX=$(PREFIX) CC=$(PREFIX)$(TCCEXE) -f win32/Makefile.gcc libz.a
1146
1147 clean-zlib:
1148 $(MAKE) -C $(ZLIBDIR) PREFIX=$(PREFIX) CC=$(PREFIX)$(TCCEXE) -f win32/Makefile.gcc clean
1149
1150 BLDTARGETS = zlib
@@ -1196,21 +1203,23 @@
1196 $(INNOSETUP) ./setup/fossil.iss -DAppVersion=$(shell $(CAT) ./VERSION)
1197 }
1198
1199 set mhargs {}
1200 foreach s [lsort $src] {
1201 if {[string length $mhargs] > 0} {append mhargs " \\\n\t\t"}
1202 append mhargs "\$(OBJDIR)/${s}_.c:\$(OBJDIR)/$s.h"
1203 set extra_h($s) { }
1204 }
1205 foreach s [lsort $src_ext] {
1206 append mhargs "\$(SRCDIR_extsrc)/${s}.c:\$(OBJDIR)/$s.h <<<NEXT_LINE>>>"
 
1207 set extra_h($s) { }
1208 }
1209 append mhargs " \\\n\t\t\$(SRCDIR_extsrc)/sqlite3.h"
1210 append mhargs " \\\n\t\t\$(SRCDIR)/th.h"
1211 append mhargs " \\\n\t\t\$(OBJDIR)/VERSION.h"
 
1212 writeln "\$(OBJDIR)/page_index.h: \$(TRANS_SRC) \$(MKINDEX)"
1213 writeln "\t\$(MKINDEX) \$(TRANS_SRC) >\$@\n"
1214
1215 writeln "\$(OBJDIR)/builtin_data.h:\t\$(MKBUILTIN) \$(EXTRA_FILES)"
1216 writeln "\t\$(MKBUILTIN) --prefix \$(SRCDIR)/ \$(EXTRA_FILES) >\$@\n"
@@ -1361,11 +1370,11 @@
1361 $(BCC) -o$@ $**
1362
1363 mkindex$E: $(SRCDIR_tools)\mkindex.c
1364 $(BCC) -o$@ $**
1365
1366 mkbuiltin$E: $(SRCDIR)\mkbuiltin.c
1367 $(BCC) -o$@ $**
1368
1369 mkversion$E: $(SRCDIR_tools)\mkversion.c
1370 $(BCC) -o$@ $**
1371
1372
--- tools/makemake.tcl
+++ tools/makemake.tcl
@@ -356,11 +356,12 @@
356 writeln -nonewline " \\\n \$(OBJDIR)/$s.o"
357 }
358
359 writeln [string map [list \
360 <<<SQLITE_OPTIONS>>> [join $SQLITE_OPTIONS " \\\n "] \
361 <<<SHELL_OPTIONS>>> [join $SHELL_OPTIONS " \\\n "] \
362 <<<NEXT_LINE>>> \\] {
363 all: $(OBJDIR) $(APPNAME)
364
365 install: all
366 mkdir -p $(INSTALLDIR)
367 cp $(APPNAME) $(INSTALLDIR)
@@ -404,12 +405,12 @@
405 #
406 test: $(OBJDIR) $(APPNAME)
407 $(TCLSH) $(SRCDIR)/../test/tester.tcl $(APPNAME) $(TESTFLAGS)
408
409 $(OBJDIR)/VERSION.h: $(SRCDIR)/../manifest.uuid $(SRCDIR)/../manifest $(SRCDIR)/../VERSION $(OBJDIR)/mkversion $(OBJDIR)/phony.h
410 $(OBJDIR)/mkversion $(SRCDIR)/../manifest.uuid <<<NEXT_LINE>>>
411 $(SRCDIR)/../manifest <<<NEXT_LINE>>>
412 $(SRCDIR)/../VERSION >$(OBJDIR)/VERSION.h
413
414 $(OBJDIR)/phony.h:
415 # Force rebuild of VERSION.h every time we run "make"
416
@@ -604,11 +605,11 @@
605 # in a directory that is separate from the source tree. Just change
606 # the following to point from the build directory to the src/ folder.
607 #
608 SRCDIR = src
609 SRCDIR_extsrc = extsrc
610 SRCDIR_tools = tools
611
612 #### The directory into which object code files should be written.
613 #
614 OBJDIR = wbld
615
@@ -713,12 +714,16 @@
714 # used, taking into account whether zlib is actually enabled and the target
715 # processor architecture.
716 #
717 ifndef X64
718 SSLCONFIG = mingw
719 ZLIBCONFIG = LOC="-DASMV -DASMINF" OBJA="inffas86.o match.o"
720 ZLIBTARGETS = $(ZLIBDIR)/inffas86.o $(ZLIBDIR)/match.o
721 else
722 SSLCONFIG = mingw64
723 ZLIBCONFIG =
724 ZLIBTARGETS =
725 endif
726
727 #### Disable creation of the OpenSSL shared libraries. Also, disable support
728 # for SSLv3 (i.e. thereby forcing the use of TLS).
729 #
@@ -785,10 +790,11 @@
790 # as BCC, unless you are cross-compiling. This C compiler builds
791 # the finished binary for fossil. The BCC compiler above is used
792 # for building intermediate code-generator tools.
793 #
794 TCC = $(PREFIX)$(TCCEXE) -Wall -Wdeclaration-after-statement
795 TCC += -I$(SRCDIR_extsrc)
796
797 #### Add the necessary command line options to build with debugging
798 # symbols, if enabled.
799 #
800 ifdef FOSSIL_ENABLE_SYMBOLS
@@ -801,10 +807,11 @@
807
808 #### Compile resources for use in building executables that will run
809 # on the target platform.
810 #
811 RCC = $(PREFIX)windres -I$(SRCDIR) -I$(ZINCDIR)
812 RCC += -I$(SRCDIR_extsrc)
813
814 # With HTTPS support
815 ifdef FOSSIL_ENABLE_SSL
816 TCC += -L$(OPENSSLLIBDIR) -I$(OPENSSLINCDIR)
817 RCC += -I$(OPENSSLINCDIR)
@@ -1068,12 +1075,12 @@
1075 $(XBCC) -o $@ $(SRCDIR_tools)/makeheaders.c
1076
1077 $(MKINDEX): $(SRCDIR_tools)/mkindex.c
1078 $(XBCC) -o $@ $(SRCDIR_tools)/mkindex.c
1079
1080 $(MKBUILTIN): $(SRCDIR_tools)/mkbuiltin.c
1081 $(XBCC) -o $@ $(SRCDIR_tools)/mkbuiltin.c
1082
1083 $(MKVERSION): $(SRCDIR_tools)/mkversion.c
1084 $(XBCC) -o $@ $(SRCDIR_tools)/mkversion.c
1085
1086 $(CODECHECK1): $(SRCDIR_tools)/codecheck1.c
@@ -1140,11 +1147,11 @@
1147
1148 $(ZLIBDIR)/match.o:
1149 $(TCC) -c -o $@ -DASMV $(ZLIBDIR)/contrib/asm686/match.S
1150
1151 zlib: $(ZLIBTARGETS)
1152 $(MAKE) -C $(ZLIBDIR) PREFIX=$(PREFIX) CC=$(PREFIX)$(TCCEXE) $(ZLIBCONFIG) -f win32/Makefile.gcc libz.a
1153
1154 clean-zlib:
1155 $(MAKE) -C $(ZLIBDIR) PREFIX=$(PREFIX) CC=$(PREFIX)$(TCCEXE) -f win32/Makefile.gcc clean
1156
1157 BLDTARGETS = zlib
@@ -1196,21 +1203,23 @@
1203 $(INNOSETUP) ./setup/fossil.iss -DAppVersion=$(shell $(CAT) ./VERSION)
1204 }
1205
1206 set mhargs {}
1207 foreach s [lsort $src] {
1208 if {[string length $mhargs] > 0} {append mhargs " <<<NEXT_LINE>>>"}
1209 append mhargs "\$(OBJDIR)/${s}_.c:\$(OBJDIR)/$s.h"
1210 set extra_h($s) { }
1211 }
1212 foreach s [lsort $src_ext] {
1213 if {[string length $mhargs] > 0} {append mhargs " <<<NEXT_LINE>>>"}
1214 append mhargs "\$(SRCDIR_extsrc)/${s}.c:\$(OBJDIR)/$s.h"
1215 set extra_h($s) { }
1216 }
1217 append mhargs " <<<NEXT_LINE>>>\$(SRCDIR_extsrc)/sqlite3.h"
1218 append mhargs " <<<NEXT_LINE>>>\$(SRCDIR)/th.h"
1219 append mhargs " <<<NEXT_LINE>>>\$(OBJDIR)/VERSION.h"
1220 set mhargs [string map [list <<<NEXT_LINE>>> \\\n\t] $mhargs]
1221 writeln "\$(OBJDIR)/page_index.h: \$(TRANS_SRC) \$(MKINDEX)"
1222 writeln "\t\$(MKINDEX) \$(TRANS_SRC) >\$@\n"
1223
1224 writeln "\$(OBJDIR)/builtin_data.h:\t\$(MKBUILTIN) \$(EXTRA_FILES)"
1225 writeln "\t\$(MKBUILTIN) --prefix \$(SRCDIR)/ \$(EXTRA_FILES) >\$@\n"
@@ -1361,11 +1370,11 @@
1370 $(BCC) -o$@ $**
1371
1372 mkindex$E: $(SRCDIR_tools)\mkindex.c
1373 $(BCC) -o$@ $**
1374
1375 mkbuiltin$E: $(SRCDIR_tools)\mkbuiltin.c
1376 $(BCC) -o$@ $**
1377
1378 mkversion$E: $(SRCDIR_tools)\mkversion.c
1379 $(BCC) -o$@ $**
1380
1381
M win/Makefile.dmc
+1 -1
--- win/Makefile.dmc
+++ win/Makefile.dmc
@@ -67,11 +67,11 @@
6767
 $(BCC) -o$@ $**
6868
6969
 mkindex$E: $(SRCDIR_tools)\mkindex.c
7070
 $(BCC) -o$@ $**
7171
72
-mkbuiltin$E: $(SRCDIR)\mkbuiltin.c
72
+mkbuiltin$E: $(SRCDIR_tools)\mkbuiltin.c
7373
 $(BCC) -o$@ $**
7474
7575
 mkversion$E: $(SRCDIR_tools)\mkversion.c
7676
 $(BCC) -o$@ $**
7777
7878
--- win/Makefile.dmc
+++ win/Makefile.dmc
@@ -67,11 +67,11 @@
67 $(BCC) -o$@ $**
68
69 mkindex$E: $(SRCDIR_tools)\mkindex.c
70 $(BCC) -o$@ $**
71
72 mkbuiltin$E: $(SRCDIR)\mkbuiltin.c
73 $(BCC) -o$@ $**
74
75 mkversion$E: $(SRCDIR_tools)\mkversion.c
76 $(BCC) -o$@ $**
77
78
--- win/Makefile.dmc
+++ win/Makefile.dmc
@@ -67,11 +67,11 @@
67 $(BCC) -o$@ $**
68
69 mkindex$E: $(SRCDIR_tools)\mkindex.c
70 $(BCC) -o$@ $**
71
72 mkbuiltin$E: $(SRCDIR_tools)\mkbuiltin.c
73 $(BCC) -o$@ $**
74
75 mkversion$E: $(SRCDIR_tools)\mkversion.c
76 $(BCC) -o$@ $**
77
78
M win/Makefile.mingw
+160 -153
--- win/Makefile.mingw
+++ win/Makefile.mingw
@@ -29,11 +29,11 @@
2929
 # in a directory that is separate from the source tree. Just change
3030
 # the following to point from the build directory to the src/ folder.
3131
 #
3232
 SRCDIR = src
3333
 SRCDIR_extsrc = extsrc
34
-SCRDIR_tools = tools
34
+SRCDIR_tools = tools
3535
3636
 #### The directory into which object code files should be written.
3737
 #
3838
 OBJDIR = wbld
3939
@@ -138,12 +138,16 @@
138138
 # used, taking into account whether zlib is actually enabled and the target
139139
 # processor architecture.
140140
 #
141141
 ifndef X64
142142
 SSLCONFIG = mingw
143
+ZLIBCONFIG = LOC="-DASMV -DASMINF" OBJA="inffas86.o match.o"
144
+ZLIBTARGETS = $(ZLIBDIR)/inffas86.o $(ZLIBDIR)/match.o
143145
 else
144146
 SSLCONFIG = mingw64
147
+ZLIBCONFIG =
148
+ZLIBTARGETS =
145149
 endif
146150
147151
 #### Disable creation of the OpenSSL shared libraries. Also, disable support
148152
 # for SSLv3 (i.e. thereby forcing the use of TLS).
149153
 #
@@ -210,10 +214,11 @@
210214
 # as BCC, unless you are cross-compiling. This C compiler builds
211215
 # the finished binary for fossil. The BCC compiler above is used
212216
 # for building intermediate code-generator tools.
213217
 #
214218
 TCC = $(PREFIX)$(TCCEXE) -Wall -Wdeclaration-after-statement
219
+TCC += -I$(SRCDIR_extsrc)
215220
216221
 #### Add the necessary command line options to build with debugging
217222
 # symbols, if enabled.
218223
 #
219224
 ifdef FOSSIL_ENABLE_SYMBOLS
@@ -226,10 +231,11 @@
226231
227232
 #### Compile resources for use in building executables that will run
228233
 # on the target platform.
229234
 #
230235
 RCC = $(PREFIX)windres -I$(SRCDIR) -I$(ZINCDIR)
236
+RCC += -I$(SRCDIR_extsrc)
231237
232238
 # With HTTPS support
233239
 ifdef FOSSIL_ENABLE_SSL
234240
 TCC += -L$(OPENSSLLIBDIR) -I$(OPENSSLINCDIR)
235241
 RCC += -I$(OPENSSLINCDIR)
@@ -1028,12 +1034,12 @@
10281034
 $(XBCC) -o $@ $(SRCDIR_tools)/makeheaders.c
10291035
10301036
 $(MKINDEX): $(SRCDIR_tools)/mkindex.c
10311037
 $(XBCC) -o $@ $(SRCDIR_tools)/mkindex.c
10321038
1033
-$(MKBUILTIN): $(SRCDIR)/mkbuiltin.c
1034
- $(XBCC) -o $@ $(SRCDIR)/mkbuiltin.c
1039
+$(MKBUILTIN): $(SRCDIR_tools)/mkbuiltin.c
1040
+ $(XBCC) -o $@ $(SRCDIR_tools)/mkbuiltin.c
10351041
10361042
 $(MKVERSION): $(SRCDIR_tools)/mkversion.c
10371043
 $(XBCC) -o $@ $(SRCDIR_tools)/mkversion.c
10381044
10391045
 $(CODECHECK1): $(SRCDIR_tools)/codecheck1.c
@@ -1098,11 +1104,11 @@
10981104
10991105
 $(ZLIBDIR)/match.o:
11001106
 $(TCC) -c -o $@ -DASMV $(ZLIBDIR)/contrib/asm686/match.S
11011107
11021108
 zlib: $(ZLIBTARGETS)
1103
- $(MAKE) -C $(ZLIBDIR) PREFIX=$(PREFIX) CC=$(PREFIX)$(TCCEXE) -f win32/Makefile.gcc libz.a
1109
+ $(MAKE) -C $(ZLIBDIR) PREFIX=$(PREFIX) CC=$(PREFIX)$(TCCEXE) $(ZLIBCONFIG) -f win32/Makefile.gcc libz.a
11041110
11051111
 clean-zlib:
11061112
 $(MAKE) -C $(ZLIBDIR) PREFIX=$(PREFIX) CC=$(PREFIX)$(TCCEXE) -f win32/Makefile.gcc clean
11071113
11081114
 BLDTARGETS = zlib
@@ -1159,159 +1165,160 @@
11591165
 $(OBJDIR)/builtin_data.h: $(MKBUILTIN) $(EXTRA_FILES)
11601166
 $(MKBUILTIN) --prefix $(SRCDIR)/ $(EXTRA_FILES) >$@
11611167
11621168
 $(OBJDIR)/headers: $(OBJDIR)/page_index.h $(OBJDIR)/builtin_data.h $(MAKEHEADERS) $(OBJDIR)/VERSION.h
11631169
 $(MAKEHEADERS) $(OBJDIR)/add_.c:$(OBJDIR)/add.h \
1164
- $(OBJDIR)/ajax_.c:$(OBJDIR)/ajax.h \
1165
- $(OBJDIR)/alerts_.c:$(OBJDIR)/alerts.h \
1166
- $(OBJDIR)/allrepo_.c:$(OBJDIR)/allrepo.h \
1167
- $(OBJDIR)/attach_.c:$(OBJDIR)/attach.h \
1168
- $(OBJDIR)/backlink_.c:$(OBJDIR)/backlink.h \
1169
- $(OBJDIR)/backoffice_.c:$(OBJDIR)/backoffice.h \
1170
- $(OBJDIR)/bag_.c:$(OBJDIR)/bag.h \
1171
- $(OBJDIR)/bisect_.c:$(OBJDIR)/bisect.h \
1172
- $(OBJDIR)/blob_.c:$(OBJDIR)/blob.h \
1173
- $(OBJDIR)/branch_.c:$(OBJDIR)/branch.h \
1174
- $(OBJDIR)/browse_.c:$(OBJDIR)/browse.h \
1175
- $(OBJDIR)/builtin_.c:$(OBJDIR)/builtin.h \
1176
- $(OBJDIR)/bundle_.c:$(OBJDIR)/bundle.h \
1177
- $(OBJDIR)/cache_.c:$(OBJDIR)/cache.h \
1178
- $(OBJDIR)/capabilities_.c:$(OBJDIR)/capabilities.h \
1179
- $(OBJDIR)/captcha_.c:$(OBJDIR)/captcha.h \
1180
- $(OBJDIR)/cgi_.c:$(OBJDIR)/cgi.h \
1181
- $(OBJDIR)/chat_.c:$(OBJDIR)/chat.h \
1182
- $(OBJDIR)/checkin_.c:$(OBJDIR)/checkin.h \
1183
- $(OBJDIR)/checkout_.c:$(OBJDIR)/checkout.h \
1184
- $(OBJDIR)/clearsign_.c:$(OBJDIR)/clearsign.h \
1185
- $(OBJDIR)/clone_.c:$(OBJDIR)/clone.h \
1186
- $(OBJDIR)/color_.c:$(OBJDIR)/color.h \
1187
- $(OBJDIR)/comformat_.c:$(OBJDIR)/comformat.h \
1188
- $(OBJDIR)/configure_.c:$(OBJDIR)/configure.h \
1189
- $(OBJDIR)/content_.c:$(OBJDIR)/content.h \
1190
- $(OBJDIR)/cookies_.c:$(OBJDIR)/cookies.h \
1191
- $(OBJDIR)/db_.c:$(OBJDIR)/db.h \
1192
- $(OBJDIR)/delta_.c:$(OBJDIR)/delta.h \
1193
- $(OBJDIR)/deltacmd_.c:$(OBJDIR)/deltacmd.h \
1194
- $(OBJDIR)/deltafunc_.c:$(OBJDIR)/deltafunc.h \
1195
- $(OBJDIR)/descendants_.c:$(OBJDIR)/descendants.h \
1196
- $(OBJDIR)/diff_.c:$(OBJDIR)/diff.h \
1197
- $(OBJDIR)/diffcmd_.c:$(OBJDIR)/diffcmd.h \
1198
- $(OBJDIR)/dispatch_.c:$(OBJDIR)/dispatch.h \
1199
- $(OBJDIR)/doc_.c:$(OBJDIR)/doc.h \
1200
- $(OBJDIR)/encode_.c:$(OBJDIR)/encode.h \
1201
- $(OBJDIR)/etag_.c:$(OBJDIR)/etag.h \
1202
- $(OBJDIR)/event_.c:$(OBJDIR)/event.h \
1203
- $(OBJDIR)/export_.c:$(OBJDIR)/export.h \
1204
- $(OBJDIR)/extcgi_.c:$(OBJDIR)/extcgi.h \
1205
- $(OBJDIR)/file_.c:$(OBJDIR)/file.h \
1206
- $(OBJDIR)/fileedit_.c:$(OBJDIR)/fileedit.h \
1207
- $(OBJDIR)/finfo_.c:$(OBJDIR)/finfo.h \
1208
- $(OBJDIR)/foci_.c:$(OBJDIR)/foci.h \
1209
- $(OBJDIR)/forum_.c:$(OBJDIR)/forum.h \
1210
- $(OBJDIR)/fshell_.c:$(OBJDIR)/fshell.h \
1211
- $(OBJDIR)/fusefs_.c:$(OBJDIR)/fusefs.h \
1212
- $(OBJDIR)/fuzz_.c:$(OBJDIR)/fuzz.h \
1213
- $(OBJDIR)/glob_.c:$(OBJDIR)/glob.h \
1214
- $(OBJDIR)/graph_.c:$(OBJDIR)/graph.h \
1215
- $(OBJDIR)/gzip_.c:$(OBJDIR)/gzip.h \
1216
- $(OBJDIR)/hname_.c:$(OBJDIR)/hname.h \
1217
- $(OBJDIR)/hook_.c:$(OBJDIR)/hook.h \
1218
- $(OBJDIR)/http_.c:$(OBJDIR)/http.h \
1219
- $(OBJDIR)/http_socket_.c:$(OBJDIR)/http_socket.h \
1220
- $(OBJDIR)/http_ssl_.c:$(OBJDIR)/http_ssl.h \
1221
- $(OBJDIR)/http_transport_.c:$(OBJDIR)/http_transport.h \
1222
- $(OBJDIR)/import_.c:$(OBJDIR)/import.h \
1223
- $(OBJDIR)/info_.c:$(OBJDIR)/info.h \
1224
- $(OBJDIR)/interwiki_.c:$(OBJDIR)/interwiki.h \
1225
- $(OBJDIR)/json_.c:$(OBJDIR)/json.h \
1226
- $(OBJDIR)/json_artifact_.c:$(OBJDIR)/json_artifact.h \
1227
- $(OBJDIR)/json_branch_.c:$(OBJDIR)/json_branch.h \
1228
- $(OBJDIR)/json_config_.c:$(OBJDIR)/json_config.h \
1229
- $(OBJDIR)/json_diff_.c:$(OBJDIR)/json_diff.h \
1230
- $(OBJDIR)/json_dir_.c:$(OBJDIR)/json_dir.h \
1231
- $(OBJDIR)/json_finfo_.c:$(OBJDIR)/json_finfo.h \
1232
- $(OBJDIR)/json_login_.c:$(OBJDIR)/json_login.h \
1233
- $(OBJDIR)/json_query_.c:$(OBJDIR)/json_query.h \
1234
- $(OBJDIR)/json_report_.c:$(OBJDIR)/json_report.h \
1235
- $(OBJDIR)/json_status_.c:$(OBJDIR)/json_status.h \
1236
- $(OBJDIR)/json_tag_.c:$(OBJDIR)/json_tag.h \
1237
- $(OBJDIR)/json_timeline_.c:$(OBJDIR)/json_timeline.h \
1238
- $(OBJDIR)/json_user_.c:$(OBJDIR)/json_user.h \
1239
- $(OBJDIR)/json_wiki_.c:$(OBJDIR)/json_wiki.h \
1240
- $(OBJDIR)/leaf_.c:$(OBJDIR)/leaf.h \
1241
- $(OBJDIR)/loadctrl_.c:$(OBJDIR)/loadctrl.h \
1242
- $(OBJDIR)/login_.c:$(OBJDIR)/login.h \
1243
- $(OBJDIR)/lookslike_.c:$(OBJDIR)/lookslike.h \
1244
- $(OBJDIR)/main_.c:$(OBJDIR)/main.h \
1245
- $(OBJDIR)/manifest_.c:$(OBJDIR)/manifest.h \
1246
- $(OBJDIR)/markdown_.c:$(OBJDIR)/markdown.h \
1247
- $(OBJDIR)/markdown_html_.c:$(OBJDIR)/markdown_html.h \
1248
- $(OBJDIR)/md5_.c:$(OBJDIR)/md5.h \
1249
- $(OBJDIR)/merge_.c:$(OBJDIR)/merge.h \
1250
- $(OBJDIR)/merge3_.c:$(OBJDIR)/merge3.h \
1251
- $(OBJDIR)/moderate_.c:$(OBJDIR)/moderate.h \
1252
- $(OBJDIR)/name_.c:$(OBJDIR)/name.h \
1253
- $(OBJDIR)/patch_.c:$(OBJDIR)/patch.h \
1254
- $(OBJDIR)/path_.c:$(OBJDIR)/path.h \
1255
- $(OBJDIR)/piechart_.c:$(OBJDIR)/piechart.h \
1256
- $(OBJDIR)/pikchrshow_.c:$(OBJDIR)/pikchrshow.h \
1257
- $(OBJDIR)/pivot_.c:$(OBJDIR)/pivot.h \
1258
- $(OBJDIR)/popen_.c:$(OBJDIR)/popen.h \
1259
- $(OBJDIR)/pqueue_.c:$(OBJDIR)/pqueue.h \
1260
- $(OBJDIR)/printf_.c:$(OBJDIR)/printf.h \
1261
- $(OBJDIR)/publish_.c:$(OBJDIR)/publish.h \
1262
- $(OBJDIR)/purge_.c:$(OBJDIR)/purge.h \
1263
- $(OBJDIR)/rebuild_.c:$(OBJDIR)/rebuild.h \
1264
- $(OBJDIR)/regexp_.c:$(OBJDIR)/regexp.h \
1265
- $(OBJDIR)/repolist_.c:$(OBJDIR)/repolist.h \
1266
- $(OBJDIR)/report_.c:$(OBJDIR)/report.h \
1267
- $(OBJDIR)/rss_.c:$(OBJDIR)/rss.h \
1268
- $(OBJDIR)/schema_.c:$(OBJDIR)/schema.h \
1269
- $(OBJDIR)/search_.c:$(OBJDIR)/search.h \
1270
- $(OBJDIR)/security_audit_.c:$(OBJDIR)/security_audit.h \
1271
- $(OBJDIR)/setup_.c:$(OBJDIR)/setup.h \
1272
- $(OBJDIR)/setupuser_.c:$(OBJDIR)/setupuser.h \
1273
- $(OBJDIR)/sha1_.c:$(OBJDIR)/sha1.h \
1274
- $(OBJDIR)/sha1hard_.c:$(OBJDIR)/sha1hard.h \
1275
- $(OBJDIR)/sha3_.c:$(OBJDIR)/sha3.h \
1276
- $(OBJDIR)/shun_.c:$(OBJDIR)/shun.h \
1277
- $(OBJDIR)/sitemap_.c:$(OBJDIR)/sitemap.h \
1278
- $(OBJDIR)/skins_.c:$(OBJDIR)/skins.h \
1279
- $(OBJDIR)/smtp_.c:$(OBJDIR)/smtp.h \
1280
- $(OBJDIR)/sqlcmd_.c:$(OBJDIR)/sqlcmd.h \
1281
- $(OBJDIR)/stash_.c:$(OBJDIR)/stash.h \
1282
- $(OBJDIR)/stat_.c:$(OBJDIR)/stat.h \
1283
- $(OBJDIR)/statrep_.c:$(OBJDIR)/statrep.h \
1284
- $(OBJDIR)/style_.c:$(OBJDIR)/style.h \
1285
- $(OBJDIR)/sync_.c:$(OBJDIR)/sync.h \
1286
- $(OBJDIR)/tag_.c:$(OBJDIR)/tag.h \
1287
- $(OBJDIR)/tar_.c:$(OBJDIR)/tar.h \
1288
- $(OBJDIR)/terminal_.c:$(OBJDIR)/terminal.h \
1289
- $(OBJDIR)/th_main_.c:$(OBJDIR)/th_main.h \
1290
- $(OBJDIR)/timeline_.c:$(OBJDIR)/timeline.h \
1291
- $(OBJDIR)/tkt_.c:$(OBJDIR)/tkt.h \
1292
- $(OBJDIR)/tktsetup_.c:$(OBJDIR)/tktsetup.h \
1293
- $(OBJDIR)/undo_.c:$(OBJDIR)/undo.h \
1294
- $(OBJDIR)/unicode_.c:$(OBJDIR)/unicode.h \
1295
- $(OBJDIR)/unversioned_.c:$(OBJDIR)/unversioned.h \
1296
- $(OBJDIR)/update_.c:$(OBJDIR)/update.h \
1297
- $(OBJDIR)/url_.c:$(OBJDIR)/url.h \
1298
- $(OBJDIR)/user_.c:$(OBJDIR)/user.h \
1299
- $(OBJDIR)/utf8_.c:$(OBJDIR)/utf8.h \
1300
- $(OBJDIR)/util_.c:$(OBJDIR)/util.h \
1301
- $(OBJDIR)/verify_.c:$(OBJDIR)/verify.h \
1302
- $(OBJDIR)/vfile_.c:$(OBJDIR)/vfile.h \
1303
- $(OBJDIR)/wiki_.c:$(OBJDIR)/wiki.h \
1304
- $(OBJDIR)/wikiformat_.c:$(OBJDIR)/wikiformat.h \
1305
- $(OBJDIR)/winfile_.c:$(OBJDIR)/winfile.h \
1306
- $(OBJDIR)/winhttp_.c:$(OBJDIR)/winhttp.h \
1307
- $(OBJDIR)/xfer_.c:$(OBJDIR)/xfer.h \
1308
- $(OBJDIR)/xfersetup_.c:$(OBJDIR)/xfersetup.h \
1309
- $(OBJDIR)/zip_.c:$(OBJDIR)/zip.h$(SRCDIR_extsrc)/pikchr.c:$(OBJDIR)/pikchr.h <<<NEXT_LINE>>> \
1310
- $(SRCDIR_extsrc)/sqlite3.h \
1311
- $(SRCDIR)/th.h \
1312
- $(OBJDIR)/VERSION.h
1170
+ $(OBJDIR)/ajax_.c:$(OBJDIR)/ajax.h \
1171
+ $(OBJDIR)/alerts_.c:$(OBJDIR)/alerts.h \
1172
+ $(OBJDIR)/allrepo_.c:$(OBJDIR)/allrepo.h \
1173
+ $(OBJDIR)/attach_.c:$(OBJDIR)/attach.h \
1174
+ $(OBJDIR)/backlink_.c:$(OBJDIR)/backlink.h \
1175
+ $(OBJDIR)/backoffice_.c:$(OBJDIR)/backoffice.h \
1176
+ $(OBJDIR)/bag_.c:$(OBJDIR)/bag.h \
1177
+ $(OBJDIR)/bisect_.c:$(OBJDIR)/bisect.h \
1178
+ $(OBJDIR)/blob_.c:$(OBJDIR)/blob.h \
1179
+ $(OBJDIR)/branch_.c:$(OBJDIR)/branch.h \
1180
+ $(OBJDIR)/browse_.c:$(OBJDIR)/browse.h \
1181
+ $(OBJDIR)/builtin_.c:$(OBJDIR)/builtin.h \
1182
+ $(OBJDIR)/bundle_.c:$(OBJDIR)/bundle.h \
1183
+ $(OBJDIR)/cache_.c:$(OBJDIR)/cache.h \
1184
+ $(OBJDIR)/capabilities_.c:$(OBJDIR)/capabilities.h \
1185
+ $(OBJDIR)/captcha_.c:$(OBJDIR)/captcha.h \
1186
+ $(OBJDIR)/cgi_.c:$(OBJDIR)/cgi.h \
1187
+ $(OBJDIR)/chat_.c:$(OBJDIR)/chat.h \
1188
+ $(OBJDIR)/checkin_.c:$(OBJDIR)/checkin.h \
1189
+ $(OBJDIR)/checkout_.c:$(OBJDIR)/checkout.h \
1190
+ $(OBJDIR)/clearsign_.c:$(OBJDIR)/clearsign.h \
1191
+ $(OBJDIR)/clone_.c:$(OBJDIR)/clone.h \
1192
+ $(OBJDIR)/color_.c:$(OBJDIR)/color.h \
1193
+ $(OBJDIR)/comformat_.c:$(OBJDIR)/comformat.h \
1194
+ $(OBJDIR)/configure_.c:$(OBJDIR)/configure.h \
1195
+ $(OBJDIR)/content_.c:$(OBJDIR)/content.h \
1196
+ $(OBJDIR)/cookies_.c:$(OBJDIR)/cookies.h \
1197
+ $(OBJDIR)/db_.c:$(OBJDIR)/db.h \
1198
+ $(OBJDIR)/delta_.c:$(OBJDIR)/delta.h \
1199
+ $(OBJDIR)/deltacmd_.c:$(OBJDIR)/deltacmd.h \
1200
+ $(OBJDIR)/deltafunc_.c:$(OBJDIR)/deltafunc.h \
1201
+ $(OBJDIR)/descendants_.c:$(OBJDIR)/descendants.h \
1202
+ $(OBJDIR)/diff_.c:$(OBJDIR)/diff.h \
1203
+ $(OBJDIR)/diffcmd_.c:$(OBJDIR)/diffcmd.h \
1204
+ $(OBJDIR)/dispatch_.c:$(OBJDIR)/dispatch.h \
1205
+ $(OBJDIR)/doc_.c:$(OBJDIR)/doc.h \
1206
+ $(OBJDIR)/encode_.c:$(OBJDIR)/encode.h \
1207
+ $(OBJDIR)/etag_.c:$(OBJDIR)/etag.h \
1208
+ $(OBJDIR)/event_.c:$(OBJDIR)/event.h \
1209
+ $(OBJDIR)/export_.c:$(OBJDIR)/export.h \
1210
+ $(OBJDIR)/extcgi_.c:$(OBJDIR)/extcgi.h \
1211
+ $(OBJDIR)/file_.c:$(OBJDIR)/file.h \
1212
+ $(OBJDIR)/fileedit_.c:$(OBJDIR)/fileedit.h \
1213
+ $(OBJDIR)/finfo_.c:$(OBJDIR)/finfo.h \
1214
+ $(OBJDIR)/foci_.c:$(OBJDIR)/foci.h \
1215
+ $(OBJDIR)/forum_.c:$(OBJDIR)/forum.h \
1216
+ $(OBJDIR)/fshell_.c:$(OBJDIR)/fshell.h \
1217
+ $(OBJDIR)/fusefs_.c:$(OBJDIR)/fusefs.h \
1218
+ $(OBJDIR)/fuzz_.c:$(OBJDIR)/fuzz.h \
1219
+ $(OBJDIR)/glob_.c:$(OBJDIR)/glob.h \
1220
+ $(OBJDIR)/graph_.c:$(OBJDIR)/graph.h \
1221
+ $(OBJDIR)/gzip_.c:$(OBJDIR)/gzip.h \
1222
+ $(OBJDIR)/hname_.c:$(OBJDIR)/hname.h \
1223
+ $(OBJDIR)/hook_.c:$(OBJDIR)/hook.h \
1224
+ $(OBJDIR)/http_.c:$(OBJDIR)/http.h \
1225
+ $(OBJDIR)/http_socket_.c:$(OBJDIR)/http_socket.h \
1226
+ $(OBJDIR)/http_ssl_.c:$(OBJDIR)/http_ssl.h \
1227
+ $(OBJDIR)/http_transport_.c:$(OBJDIR)/http_transport.h \
1228
+ $(OBJDIR)/import_.c:$(OBJDIR)/import.h \
1229
+ $(OBJDIR)/info_.c:$(OBJDIR)/info.h \
1230
+ $(OBJDIR)/interwiki_.c:$(OBJDIR)/interwiki.h \
1231
+ $(OBJDIR)/json_.c:$(OBJDIR)/json.h \
1232
+ $(OBJDIR)/json_artifact_.c:$(OBJDIR)/json_artifact.h \
1233
+ $(OBJDIR)/json_branch_.c:$(OBJDIR)/json_branch.h \
1234
+ $(OBJDIR)/json_config_.c:$(OBJDIR)/json_config.h \
1235
+ $(OBJDIR)/json_diff_.c:$(OBJDIR)/json_diff.h \
1236
+ $(OBJDIR)/json_dir_.c:$(OBJDIR)/json_dir.h \
1237
+ $(OBJDIR)/json_finfo_.c:$(OBJDIR)/json_finfo.h \
1238
+ $(OBJDIR)/json_login_.c:$(OBJDIR)/json_login.h \
1239
+ $(OBJDIR)/json_query_.c:$(OBJDIR)/json_query.h \
1240
+ $(OBJDIR)/json_report_.c:$(OBJDIR)/json_report.h \
1241
+ $(OBJDIR)/json_status_.c:$(OBJDIR)/json_status.h \
1242
+ $(OBJDIR)/json_tag_.c:$(OBJDIR)/json_tag.h \
1243
+ $(OBJDIR)/json_timeline_.c:$(OBJDIR)/json_timeline.h \
1244
+ $(OBJDIR)/json_user_.c:$(OBJDIR)/json_user.h \
1245
+ $(OBJDIR)/json_wiki_.c:$(OBJDIR)/json_wiki.h \
1246
+ $(OBJDIR)/leaf_.c:$(OBJDIR)/leaf.h \
1247
+ $(OBJDIR)/loadctrl_.c:$(OBJDIR)/loadctrl.h \
1248
+ $(OBJDIR)/login_.c:$(OBJDIR)/login.h \
1249
+ $(OBJDIR)/lookslike_.c:$(OBJDIR)/lookslike.h \
1250
+ $(OBJDIR)/main_.c:$(OBJDIR)/main.h \
1251
+ $(OBJDIR)/manifest_.c:$(OBJDIR)/manifest.h \
1252
+ $(OBJDIR)/markdown_.c:$(OBJDIR)/markdown.h \
1253
+ $(OBJDIR)/markdown_html_.c:$(OBJDIR)/markdown_html.h \
1254
+ $(OBJDIR)/md5_.c:$(OBJDIR)/md5.h \
1255
+ $(OBJDIR)/merge_.c:$(OBJDIR)/merge.h \
1256
+ $(OBJDIR)/merge3_.c:$(OBJDIR)/merge3.h \
1257
+ $(OBJDIR)/moderate_.c:$(OBJDIR)/moderate.h \
1258
+ $(OBJDIR)/name_.c:$(OBJDIR)/name.h \
1259
+ $(OBJDIR)/patch_.c:$(OBJDIR)/patch.h \
1260
+ $(OBJDIR)/path_.c:$(OBJDIR)/path.h \
1261
+ $(OBJDIR)/piechart_.c:$(OBJDIR)/piechart.h \
1262
+ $(OBJDIR)/pikchrshow_.c:$(OBJDIR)/pikchrshow.h \
1263
+ $(OBJDIR)/pivot_.c:$(OBJDIR)/pivot.h \
1264
+ $(OBJDIR)/popen_.c:$(OBJDIR)/popen.h \
1265
+ $(OBJDIR)/pqueue_.c:$(OBJDIR)/pqueue.h \
1266
+ $(OBJDIR)/printf_.c:$(OBJDIR)/printf.h \
1267
+ $(OBJDIR)/publish_.c:$(OBJDIR)/publish.h \
1268
+ $(OBJDIR)/purge_.c:$(OBJDIR)/purge.h \
1269
+ $(OBJDIR)/rebuild_.c:$(OBJDIR)/rebuild.h \
1270
+ $(OBJDIR)/regexp_.c:$(OBJDIR)/regexp.h \
1271
+ $(OBJDIR)/repolist_.c:$(OBJDIR)/repolist.h \
1272
+ $(OBJDIR)/report_.c:$(OBJDIR)/report.h \
1273
+ $(OBJDIR)/rss_.c:$(OBJDIR)/rss.h \
1274
+ $(OBJDIR)/schema_.c:$(OBJDIR)/schema.h \
1275
+ $(OBJDIR)/search_.c:$(OBJDIR)/search.h \
1276
+ $(OBJDIR)/security_audit_.c:$(OBJDIR)/security_audit.h \
1277
+ $(OBJDIR)/setup_.c:$(OBJDIR)/setup.h \
1278
+ $(OBJDIR)/setupuser_.c:$(OBJDIR)/setupuser.h \
1279
+ $(OBJDIR)/sha1_.c:$(OBJDIR)/sha1.h \
1280
+ $(OBJDIR)/sha1hard_.c:$(OBJDIR)/sha1hard.h \
1281
+ $(OBJDIR)/sha3_.c:$(OBJDIR)/sha3.h \
1282
+ $(OBJDIR)/shun_.c:$(OBJDIR)/shun.h \
1283
+ $(OBJDIR)/sitemap_.c:$(OBJDIR)/sitemap.h \
1284
+ $(OBJDIR)/skins_.c:$(OBJDIR)/skins.h \
1285
+ $(OBJDIR)/smtp_.c:$(OBJDIR)/smtp.h \
1286
+ $(OBJDIR)/sqlcmd_.c:$(OBJDIR)/sqlcmd.h \
1287
+ $(OBJDIR)/stash_.c:$(OBJDIR)/stash.h \
1288
+ $(OBJDIR)/stat_.c:$(OBJDIR)/stat.h \
1289
+ $(OBJDIR)/statrep_.c:$(OBJDIR)/statrep.h \
1290
+ $(OBJDIR)/style_.c:$(OBJDIR)/style.h \
1291
+ $(OBJDIR)/sync_.c:$(OBJDIR)/sync.h \
1292
+ $(OBJDIR)/tag_.c:$(OBJDIR)/tag.h \
1293
+ $(OBJDIR)/tar_.c:$(OBJDIR)/tar.h \
1294
+ $(OBJDIR)/terminal_.c:$(OBJDIR)/terminal.h \
1295
+ $(OBJDIR)/th_main_.c:$(OBJDIR)/th_main.h \
1296
+ $(OBJDIR)/timeline_.c:$(OBJDIR)/timeline.h \
1297
+ $(OBJDIR)/tkt_.c:$(OBJDIR)/tkt.h \
1298
+ $(OBJDIR)/tktsetup_.c:$(OBJDIR)/tktsetup.h \
1299
+ $(OBJDIR)/undo_.c:$(OBJDIR)/undo.h \
1300
+ $(OBJDIR)/unicode_.c:$(OBJDIR)/unicode.h \
1301
+ $(OBJDIR)/unversioned_.c:$(OBJDIR)/unversioned.h \
1302
+ $(OBJDIR)/update_.c:$(OBJDIR)/update.h \
1303
+ $(OBJDIR)/url_.c:$(OBJDIR)/url.h \
1304
+ $(OBJDIR)/user_.c:$(OBJDIR)/user.h \
1305
+ $(OBJDIR)/utf8_.c:$(OBJDIR)/utf8.h \
1306
+ $(OBJDIR)/util_.c:$(OBJDIR)/util.h \
1307
+ $(OBJDIR)/verify_.c:$(OBJDIR)/verify.h \
1308
+ $(OBJDIR)/vfile_.c:$(OBJDIR)/vfile.h \
1309
+ $(OBJDIR)/wiki_.c:$(OBJDIR)/wiki.h \
1310
+ $(OBJDIR)/wikiformat_.c:$(OBJDIR)/wikiformat.h \
1311
+ $(OBJDIR)/winfile_.c:$(OBJDIR)/winfile.h \
1312
+ $(OBJDIR)/winhttp_.c:$(OBJDIR)/winhttp.h \
1313
+ $(OBJDIR)/xfer_.c:$(OBJDIR)/xfer.h \
1314
+ $(OBJDIR)/xfersetup_.c:$(OBJDIR)/xfersetup.h \
1315
+ $(OBJDIR)/zip_.c:$(OBJDIR)/zip.h \
1316
+ $(SRCDIR_extsrc)/pikchr.c:$(OBJDIR)/pikchr.h \
1317
+ $(SRCDIR_extsrc)/sqlite3.h \
1318
+ $(SRCDIR)/th.h \
1319
+ $(OBJDIR)/VERSION.h
13131320
 echo Done >$(OBJDIR)/headers
13141321
13151322
 $(OBJDIR)/headers: Makefile
13161323
13171324
 Makefile:
13181325
--- win/Makefile.mingw
+++ win/Makefile.mingw
@@ -29,11 +29,11 @@
29 # in a directory that is separate from the source tree. Just change
30 # the following to point from the build directory to the src/ folder.
31 #
32 SRCDIR = src
33 SRCDIR_extsrc = extsrc
34 SCRDIR_tools = tools
35
36 #### The directory into which object code files should be written.
37 #
38 OBJDIR = wbld
39
@@ -138,12 +138,16 @@
138 # used, taking into account whether zlib is actually enabled and the target
139 # processor architecture.
140 #
141 ifndef X64
142 SSLCONFIG = mingw
 
 
143 else
144 SSLCONFIG = mingw64
 
 
145 endif
146
147 #### Disable creation of the OpenSSL shared libraries. Also, disable support
148 # for SSLv3 (i.e. thereby forcing the use of TLS).
149 #
@@ -210,10 +214,11 @@
210 # as BCC, unless you are cross-compiling. This C compiler builds
211 # the finished binary for fossil. The BCC compiler above is used
212 # for building intermediate code-generator tools.
213 #
214 TCC = $(PREFIX)$(TCCEXE) -Wall -Wdeclaration-after-statement
 
215
216 #### Add the necessary command line options to build with debugging
217 # symbols, if enabled.
218 #
219 ifdef FOSSIL_ENABLE_SYMBOLS
@@ -226,10 +231,11 @@
226
227 #### Compile resources for use in building executables that will run
228 # on the target platform.
229 #
230 RCC = $(PREFIX)windres -I$(SRCDIR) -I$(ZINCDIR)
 
231
232 # With HTTPS support
233 ifdef FOSSIL_ENABLE_SSL
234 TCC += -L$(OPENSSLLIBDIR) -I$(OPENSSLINCDIR)
235 RCC += -I$(OPENSSLINCDIR)
@@ -1028,12 +1034,12 @@
1028 $(XBCC) -o $@ $(SRCDIR_tools)/makeheaders.c
1029
1030 $(MKINDEX): $(SRCDIR_tools)/mkindex.c
1031 $(XBCC) -o $@ $(SRCDIR_tools)/mkindex.c
1032
1033 $(MKBUILTIN): $(SRCDIR)/mkbuiltin.c
1034 $(XBCC) -o $@ $(SRCDIR)/mkbuiltin.c
1035
1036 $(MKVERSION): $(SRCDIR_tools)/mkversion.c
1037 $(XBCC) -o $@ $(SRCDIR_tools)/mkversion.c
1038
1039 $(CODECHECK1): $(SRCDIR_tools)/codecheck1.c
@@ -1098,11 +1104,11 @@
1098
1099 $(ZLIBDIR)/match.o:
1100 $(TCC) -c -o $@ -DASMV $(ZLIBDIR)/contrib/asm686/match.S
1101
1102 zlib: $(ZLIBTARGETS)
1103 $(MAKE) -C $(ZLIBDIR) PREFIX=$(PREFIX) CC=$(PREFIX)$(TCCEXE) -f win32/Makefile.gcc libz.a
1104
1105 clean-zlib:
1106 $(MAKE) -C $(ZLIBDIR) PREFIX=$(PREFIX) CC=$(PREFIX)$(TCCEXE) -f win32/Makefile.gcc clean
1107
1108 BLDTARGETS = zlib
@@ -1159,159 +1165,160 @@
1159 $(OBJDIR)/builtin_data.h: $(MKBUILTIN) $(EXTRA_FILES)
1160 $(MKBUILTIN) --prefix $(SRCDIR)/ $(EXTRA_FILES) >$@
1161
1162 $(OBJDIR)/headers: $(OBJDIR)/page_index.h $(OBJDIR)/builtin_data.h $(MAKEHEADERS) $(OBJDIR)/VERSION.h
1163 $(MAKEHEADERS) $(OBJDIR)/add_.c:$(OBJDIR)/add.h \
1164 $(OBJDIR)/ajax_.c:$(OBJDIR)/ajax.h \
1165 $(OBJDIR)/alerts_.c:$(OBJDIR)/alerts.h \
1166 $(OBJDIR)/allrepo_.c:$(OBJDIR)/allrepo.h \
1167 $(OBJDIR)/attach_.c:$(OBJDIR)/attach.h \
1168 $(OBJDIR)/backlink_.c:$(OBJDIR)/backlink.h \
1169 $(OBJDIR)/backoffice_.c:$(OBJDIR)/backoffice.h \
1170 $(OBJDIR)/bag_.c:$(OBJDIR)/bag.h \
1171 $(OBJDIR)/bisect_.c:$(OBJDIR)/bisect.h \
1172 $(OBJDIR)/blob_.c:$(OBJDIR)/blob.h \
1173 $(OBJDIR)/branch_.c:$(OBJDIR)/branch.h \
1174 $(OBJDIR)/browse_.c:$(OBJDIR)/browse.h \
1175 $(OBJDIR)/builtin_.c:$(OBJDIR)/builtin.h \
1176 $(OBJDIR)/bundle_.c:$(OBJDIR)/bundle.h \
1177 $(OBJDIR)/cache_.c:$(OBJDIR)/cache.h \
1178 $(OBJDIR)/capabilities_.c:$(OBJDIR)/capabilities.h \
1179 $(OBJDIR)/captcha_.c:$(OBJDIR)/captcha.h \
1180 $(OBJDIR)/cgi_.c:$(OBJDIR)/cgi.h \
1181 $(OBJDIR)/chat_.c:$(OBJDIR)/chat.h \
1182 $(OBJDIR)/checkin_.c:$(OBJDIR)/checkin.h \
1183 $(OBJDIR)/checkout_.c:$(OBJDIR)/checkout.h \
1184 $(OBJDIR)/clearsign_.c:$(OBJDIR)/clearsign.h \
1185 $(OBJDIR)/clone_.c:$(OBJDIR)/clone.h \
1186 $(OBJDIR)/color_.c:$(OBJDIR)/color.h \
1187 $(OBJDIR)/comformat_.c:$(OBJDIR)/comformat.h \
1188 $(OBJDIR)/configure_.c:$(OBJDIR)/configure.h \
1189 $(OBJDIR)/content_.c:$(OBJDIR)/content.h \
1190 $(OBJDIR)/cookies_.c:$(OBJDIR)/cookies.h \
1191 $(OBJDIR)/db_.c:$(OBJDIR)/db.h \
1192 $(OBJDIR)/delta_.c:$(OBJDIR)/delta.h \
1193 $(OBJDIR)/deltacmd_.c:$(OBJDIR)/deltacmd.h \
1194 $(OBJDIR)/deltafunc_.c:$(OBJDIR)/deltafunc.h \
1195 $(OBJDIR)/descendants_.c:$(OBJDIR)/descendants.h \
1196 $(OBJDIR)/diff_.c:$(OBJDIR)/diff.h \
1197 $(OBJDIR)/diffcmd_.c:$(OBJDIR)/diffcmd.h \
1198 $(OBJDIR)/dispatch_.c:$(OBJDIR)/dispatch.h \
1199 $(OBJDIR)/doc_.c:$(OBJDIR)/doc.h \
1200 $(OBJDIR)/encode_.c:$(OBJDIR)/encode.h \
1201 $(OBJDIR)/etag_.c:$(OBJDIR)/etag.h \
1202 $(OBJDIR)/event_.c:$(OBJDIR)/event.h \
1203 $(OBJDIR)/export_.c:$(OBJDIR)/export.h \
1204 $(OBJDIR)/extcgi_.c:$(OBJDIR)/extcgi.h \
1205 $(OBJDIR)/file_.c:$(OBJDIR)/file.h \
1206 $(OBJDIR)/fileedit_.c:$(OBJDIR)/fileedit.h \
1207 $(OBJDIR)/finfo_.c:$(OBJDIR)/finfo.h \
1208 $(OBJDIR)/foci_.c:$(OBJDIR)/foci.h \
1209 $(OBJDIR)/forum_.c:$(OBJDIR)/forum.h \
1210 $(OBJDIR)/fshell_.c:$(OBJDIR)/fshell.h \
1211 $(OBJDIR)/fusefs_.c:$(OBJDIR)/fusefs.h \
1212 $(OBJDIR)/fuzz_.c:$(OBJDIR)/fuzz.h \
1213 $(OBJDIR)/glob_.c:$(OBJDIR)/glob.h \
1214 $(OBJDIR)/graph_.c:$(OBJDIR)/graph.h \
1215 $(OBJDIR)/gzip_.c:$(OBJDIR)/gzip.h \
1216 $(OBJDIR)/hname_.c:$(OBJDIR)/hname.h \
1217 $(OBJDIR)/hook_.c:$(OBJDIR)/hook.h \
1218 $(OBJDIR)/http_.c:$(OBJDIR)/http.h \
1219 $(OBJDIR)/http_socket_.c:$(OBJDIR)/http_socket.h \
1220 $(OBJDIR)/http_ssl_.c:$(OBJDIR)/http_ssl.h \
1221 $(OBJDIR)/http_transport_.c:$(OBJDIR)/http_transport.h \
1222 $(OBJDIR)/import_.c:$(OBJDIR)/import.h \
1223 $(OBJDIR)/info_.c:$(OBJDIR)/info.h \
1224 $(OBJDIR)/interwiki_.c:$(OBJDIR)/interwiki.h \
1225 $(OBJDIR)/json_.c:$(OBJDIR)/json.h \
1226 $(OBJDIR)/json_artifact_.c:$(OBJDIR)/json_artifact.h \
1227 $(OBJDIR)/json_branch_.c:$(OBJDIR)/json_branch.h \
1228 $(OBJDIR)/json_config_.c:$(OBJDIR)/json_config.h \
1229 $(OBJDIR)/json_diff_.c:$(OBJDIR)/json_diff.h \
1230 $(OBJDIR)/json_dir_.c:$(OBJDIR)/json_dir.h \
1231 $(OBJDIR)/json_finfo_.c:$(OBJDIR)/json_finfo.h \
1232 $(OBJDIR)/json_login_.c:$(OBJDIR)/json_login.h \
1233 $(OBJDIR)/json_query_.c:$(OBJDIR)/json_query.h \
1234 $(OBJDIR)/json_report_.c:$(OBJDIR)/json_report.h \
1235 $(OBJDIR)/json_status_.c:$(OBJDIR)/json_status.h \
1236 $(OBJDIR)/json_tag_.c:$(OBJDIR)/json_tag.h \
1237 $(OBJDIR)/json_timeline_.c:$(OBJDIR)/json_timeline.h \
1238 $(OBJDIR)/json_user_.c:$(OBJDIR)/json_user.h \
1239 $(OBJDIR)/json_wiki_.c:$(OBJDIR)/json_wiki.h \
1240 $(OBJDIR)/leaf_.c:$(OBJDIR)/leaf.h \
1241 $(OBJDIR)/loadctrl_.c:$(OBJDIR)/loadctrl.h \
1242 $(OBJDIR)/login_.c:$(OBJDIR)/login.h \
1243 $(OBJDIR)/lookslike_.c:$(OBJDIR)/lookslike.h \
1244 $(OBJDIR)/main_.c:$(OBJDIR)/main.h \
1245 $(OBJDIR)/manifest_.c:$(OBJDIR)/manifest.h \
1246 $(OBJDIR)/markdown_.c:$(OBJDIR)/markdown.h \
1247 $(OBJDIR)/markdown_html_.c:$(OBJDIR)/markdown_html.h \
1248 $(OBJDIR)/md5_.c:$(OBJDIR)/md5.h \
1249 $(OBJDIR)/merge_.c:$(OBJDIR)/merge.h \
1250 $(OBJDIR)/merge3_.c:$(OBJDIR)/merge3.h \
1251 $(OBJDIR)/moderate_.c:$(OBJDIR)/moderate.h \
1252 $(OBJDIR)/name_.c:$(OBJDIR)/name.h \
1253 $(OBJDIR)/patch_.c:$(OBJDIR)/patch.h \
1254 $(OBJDIR)/path_.c:$(OBJDIR)/path.h \
1255 $(OBJDIR)/piechart_.c:$(OBJDIR)/piechart.h \
1256 $(OBJDIR)/pikchrshow_.c:$(OBJDIR)/pikchrshow.h \
1257 $(OBJDIR)/pivot_.c:$(OBJDIR)/pivot.h \
1258 $(OBJDIR)/popen_.c:$(OBJDIR)/popen.h \
1259 $(OBJDIR)/pqueue_.c:$(OBJDIR)/pqueue.h \
1260 $(OBJDIR)/printf_.c:$(OBJDIR)/printf.h \
1261 $(OBJDIR)/publish_.c:$(OBJDIR)/publish.h \
1262 $(OBJDIR)/purge_.c:$(OBJDIR)/purge.h \
1263 $(OBJDIR)/rebuild_.c:$(OBJDIR)/rebuild.h \
1264 $(OBJDIR)/regexp_.c:$(OBJDIR)/regexp.h \
1265 $(OBJDIR)/repolist_.c:$(OBJDIR)/repolist.h \
1266 $(OBJDIR)/report_.c:$(OBJDIR)/report.h \
1267 $(OBJDIR)/rss_.c:$(OBJDIR)/rss.h \
1268 $(OBJDIR)/schema_.c:$(OBJDIR)/schema.h \
1269 $(OBJDIR)/search_.c:$(OBJDIR)/search.h \
1270 $(OBJDIR)/security_audit_.c:$(OBJDIR)/security_audit.h \
1271 $(OBJDIR)/setup_.c:$(OBJDIR)/setup.h \
1272 $(OBJDIR)/setupuser_.c:$(OBJDIR)/setupuser.h \
1273 $(OBJDIR)/sha1_.c:$(OBJDIR)/sha1.h \
1274 $(OBJDIR)/sha1hard_.c:$(OBJDIR)/sha1hard.h \
1275 $(OBJDIR)/sha3_.c:$(OBJDIR)/sha3.h \
1276 $(OBJDIR)/shun_.c:$(OBJDIR)/shun.h \
1277 $(OBJDIR)/sitemap_.c:$(OBJDIR)/sitemap.h \
1278 $(OBJDIR)/skins_.c:$(OBJDIR)/skins.h \
1279 $(OBJDIR)/smtp_.c:$(OBJDIR)/smtp.h \
1280 $(OBJDIR)/sqlcmd_.c:$(OBJDIR)/sqlcmd.h \
1281 $(OBJDIR)/stash_.c:$(OBJDIR)/stash.h \
1282 $(OBJDIR)/stat_.c:$(OBJDIR)/stat.h \
1283 $(OBJDIR)/statrep_.c:$(OBJDIR)/statrep.h \
1284 $(OBJDIR)/style_.c:$(OBJDIR)/style.h \
1285 $(OBJDIR)/sync_.c:$(OBJDIR)/sync.h \
1286 $(OBJDIR)/tag_.c:$(OBJDIR)/tag.h \
1287 $(OBJDIR)/tar_.c:$(OBJDIR)/tar.h \
1288 $(OBJDIR)/terminal_.c:$(OBJDIR)/terminal.h \
1289 $(OBJDIR)/th_main_.c:$(OBJDIR)/th_main.h \
1290 $(OBJDIR)/timeline_.c:$(OBJDIR)/timeline.h \
1291 $(OBJDIR)/tkt_.c:$(OBJDIR)/tkt.h \
1292 $(OBJDIR)/tktsetup_.c:$(OBJDIR)/tktsetup.h \
1293 $(OBJDIR)/undo_.c:$(OBJDIR)/undo.h \
1294 $(OBJDIR)/unicode_.c:$(OBJDIR)/unicode.h \
1295 $(OBJDIR)/unversioned_.c:$(OBJDIR)/unversioned.h \
1296 $(OBJDIR)/update_.c:$(OBJDIR)/update.h \
1297 $(OBJDIR)/url_.c:$(OBJDIR)/url.h \
1298 $(OBJDIR)/user_.c:$(OBJDIR)/user.h \
1299 $(OBJDIR)/utf8_.c:$(OBJDIR)/utf8.h \
1300 $(OBJDIR)/util_.c:$(OBJDIR)/util.h \
1301 $(OBJDIR)/verify_.c:$(OBJDIR)/verify.h \
1302 $(OBJDIR)/vfile_.c:$(OBJDIR)/vfile.h \
1303 $(OBJDIR)/wiki_.c:$(OBJDIR)/wiki.h \
1304 $(OBJDIR)/wikiformat_.c:$(OBJDIR)/wikiformat.h \
1305 $(OBJDIR)/winfile_.c:$(OBJDIR)/winfile.h \
1306 $(OBJDIR)/winhttp_.c:$(OBJDIR)/winhttp.h \
1307 $(OBJDIR)/xfer_.c:$(OBJDIR)/xfer.h \
1308 $(OBJDIR)/xfersetup_.c:$(OBJDIR)/xfersetup.h \
1309 $(OBJDIR)/zip_.c:$(OBJDIR)/zip.h$(SRCDIR_extsrc)/pikchr.c:$(OBJDIR)/pikchr.h <<<NEXT_LINE>>> \
1310 $(SRCDIR_extsrc)/sqlite3.h \
1311 $(SRCDIR)/th.h \
1312 $(OBJDIR)/VERSION.h
 
1313 echo Done >$(OBJDIR)/headers
1314
1315 $(OBJDIR)/headers: Makefile
1316
1317 Makefile:
1318
--- win/Makefile.mingw
+++ win/Makefile.mingw
@@ -29,11 +29,11 @@
29 # in a directory that is separate from the source tree. Just change
30 # the following to point from the build directory to the src/ folder.
31 #
32 SRCDIR = src
33 SRCDIR_extsrc = extsrc
34 SRCDIR_tools = tools
35
36 #### The directory into which object code files should be written.
37 #
38 OBJDIR = wbld
39
@@ -138,12 +138,16 @@
138 # used, taking into account whether zlib is actually enabled and the target
139 # processor architecture.
140 #
141 ifndef X64
142 SSLCONFIG = mingw
143 ZLIBCONFIG = LOC="-DASMV -DASMINF" OBJA="inffas86.o match.o"
144 ZLIBTARGETS = $(ZLIBDIR)/inffas86.o $(ZLIBDIR)/match.o
145 else
146 SSLCONFIG = mingw64
147 ZLIBCONFIG =
148 ZLIBTARGETS =
149 endif
150
151 #### Disable creation of the OpenSSL shared libraries. Also, disable support
152 # for SSLv3 (i.e. thereby forcing the use of TLS).
153 #
@@ -210,10 +214,11 @@
214 # as BCC, unless you are cross-compiling. This C compiler builds
215 # the finished binary for fossil. The BCC compiler above is used
216 # for building intermediate code-generator tools.
217 #
218 TCC = $(PREFIX)$(TCCEXE) -Wall -Wdeclaration-after-statement
219 TCC += -I$(SRCDIR_extsrc)
220
221 #### Add the necessary command line options to build with debugging
222 # symbols, if enabled.
223 #
224 ifdef FOSSIL_ENABLE_SYMBOLS
@@ -226,10 +231,11 @@
231
232 #### Compile resources for use in building executables that will run
233 # on the target platform.
234 #
235 RCC = $(PREFIX)windres -I$(SRCDIR) -I$(ZINCDIR)
236 RCC += -I$(SRCDIR_extsrc)
237
238 # With HTTPS support
239 ifdef FOSSIL_ENABLE_SSL
240 TCC += -L$(OPENSSLLIBDIR) -I$(OPENSSLINCDIR)
241 RCC += -I$(OPENSSLINCDIR)
@@ -1028,12 +1034,12 @@
1034 $(XBCC) -o $@ $(SRCDIR_tools)/makeheaders.c
1035
1036 $(MKINDEX): $(SRCDIR_tools)/mkindex.c
1037 $(XBCC) -o $@ $(SRCDIR_tools)/mkindex.c
1038
1039 $(MKBUILTIN): $(SRCDIR_tools)/mkbuiltin.c
1040 $(XBCC) -o $@ $(SRCDIR_tools)/mkbuiltin.c
1041
1042 $(MKVERSION): $(SRCDIR_tools)/mkversion.c
1043 $(XBCC) -o $@ $(SRCDIR_tools)/mkversion.c
1044
1045 $(CODECHECK1): $(SRCDIR_tools)/codecheck1.c
@@ -1098,11 +1104,11 @@
1104
1105 $(ZLIBDIR)/match.o:
1106 $(TCC) -c -o $@ -DASMV $(ZLIBDIR)/contrib/asm686/match.S
1107
1108 zlib: $(ZLIBTARGETS)
1109 $(MAKE) -C $(ZLIBDIR) PREFIX=$(PREFIX) CC=$(PREFIX)$(TCCEXE) $(ZLIBCONFIG) -f win32/Makefile.gcc libz.a
1110
1111 clean-zlib:
1112 $(MAKE) -C $(ZLIBDIR) PREFIX=$(PREFIX) CC=$(PREFIX)$(TCCEXE) -f win32/Makefile.gcc clean
1113
1114 BLDTARGETS = zlib
@@ -1159,159 +1165,160 @@
1165 $(OBJDIR)/builtin_data.h: $(MKBUILTIN) $(EXTRA_FILES)
1166 $(MKBUILTIN) --prefix $(SRCDIR)/ $(EXTRA_FILES) >$@
1167
1168 $(OBJDIR)/headers: $(OBJDIR)/page_index.h $(OBJDIR)/builtin_data.h $(MAKEHEADERS) $(OBJDIR)/VERSION.h
1169 $(MAKEHEADERS) $(OBJDIR)/add_.c:$(OBJDIR)/add.h \
1170 $(OBJDIR)/ajax_.c:$(OBJDIR)/ajax.h \
1171 $(OBJDIR)/alerts_.c:$(OBJDIR)/alerts.h \
1172 $(OBJDIR)/allrepo_.c:$(OBJDIR)/allrepo.h \
1173 $(OBJDIR)/attach_.c:$(OBJDIR)/attach.h \
1174 $(OBJDIR)/backlink_.c:$(OBJDIR)/backlink.h \
1175 $(OBJDIR)/backoffice_.c:$(OBJDIR)/backoffice.h \
1176 $(OBJDIR)/bag_.c:$(OBJDIR)/bag.h \
1177 $(OBJDIR)/bisect_.c:$(OBJDIR)/bisect.h \
1178 $(OBJDIR)/blob_.c:$(OBJDIR)/blob.h \
1179 $(OBJDIR)/branch_.c:$(OBJDIR)/branch.h \
1180 $(OBJDIR)/browse_.c:$(OBJDIR)/browse.h \
1181 $(OBJDIR)/builtin_.c:$(OBJDIR)/builtin.h \
1182 $(OBJDIR)/bundle_.c:$(OBJDIR)/bundle.h \
1183 $(OBJDIR)/cache_.c:$(OBJDIR)/cache.h \
1184 $(OBJDIR)/capabilities_.c:$(OBJDIR)/capabilities.h \
1185 $(OBJDIR)/captcha_.c:$(OBJDIR)/captcha.h \
1186 $(OBJDIR)/cgi_.c:$(OBJDIR)/cgi.h \
1187 $(OBJDIR)/chat_.c:$(OBJDIR)/chat.h \
1188 $(OBJDIR)/checkin_.c:$(OBJDIR)/checkin.h \
1189 $(OBJDIR)/checkout_.c:$(OBJDIR)/checkout.h \
1190 $(OBJDIR)/clearsign_.c:$(OBJDIR)/clearsign.h \
1191 $(OBJDIR)/clone_.c:$(OBJDIR)/clone.h \
1192 $(OBJDIR)/color_.c:$(OBJDIR)/color.h \
1193 $(OBJDIR)/comformat_.c:$(OBJDIR)/comformat.h \
1194 $(OBJDIR)/configure_.c:$(OBJDIR)/configure.h \
1195 $(OBJDIR)/content_.c:$(OBJDIR)/content.h \
1196 $(OBJDIR)/cookies_.c:$(OBJDIR)/cookies.h \
1197 $(OBJDIR)/db_.c:$(OBJDIR)/db.h \
1198 $(OBJDIR)/delta_.c:$(OBJDIR)/delta.h \
1199 $(OBJDIR)/deltacmd_.c:$(OBJDIR)/deltacmd.h \
1200 $(OBJDIR)/deltafunc_.c:$(OBJDIR)/deltafunc.h \
1201 $(OBJDIR)/descendants_.c:$(OBJDIR)/descendants.h \
1202 $(OBJDIR)/diff_.c:$(OBJDIR)/diff.h \
1203 $(OBJDIR)/diffcmd_.c:$(OBJDIR)/diffcmd.h \
1204 $(OBJDIR)/dispatch_.c:$(OBJDIR)/dispatch.h \
1205 $(OBJDIR)/doc_.c:$(OBJDIR)/doc.h \
1206 $(OBJDIR)/encode_.c:$(OBJDIR)/encode.h \
1207 $(OBJDIR)/etag_.c:$(OBJDIR)/etag.h \
1208 $(OBJDIR)/event_.c:$(OBJDIR)/event.h \
1209 $(OBJDIR)/export_.c:$(OBJDIR)/export.h \
1210 $(OBJDIR)/extcgi_.c:$(OBJDIR)/extcgi.h \
1211 $(OBJDIR)/file_.c:$(OBJDIR)/file.h \
1212 $(OBJDIR)/fileedit_.c:$(OBJDIR)/fileedit.h \
1213 $(OBJDIR)/finfo_.c:$(OBJDIR)/finfo.h \
1214 $(OBJDIR)/foci_.c:$(OBJDIR)/foci.h \
1215 $(OBJDIR)/forum_.c:$(OBJDIR)/forum.h \
1216 $(OBJDIR)/fshell_.c:$(OBJDIR)/fshell.h \
1217 $(OBJDIR)/fusefs_.c:$(OBJDIR)/fusefs.h \
1218 $(OBJDIR)/fuzz_.c:$(OBJDIR)/fuzz.h \
1219 $(OBJDIR)/glob_.c:$(OBJDIR)/glob.h \
1220 $(OBJDIR)/graph_.c:$(OBJDIR)/graph.h \
1221 $(OBJDIR)/gzip_.c:$(OBJDIR)/gzip.h \
1222 $(OBJDIR)/hname_.c:$(OBJDIR)/hname.h \
1223 $(OBJDIR)/hook_.c:$(OBJDIR)/hook.h \
1224 $(OBJDIR)/http_.c:$(OBJDIR)/http.h \
1225 $(OBJDIR)/http_socket_.c:$(OBJDIR)/http_socket.h \
1226 $(OBJDIR)/http_ssl_.c:$(OBJDIR)/http_ssl.h \
1227 $(OBJDIR)/http_transport_.c:$(OBJDIR)/http_transport.h \
1228 $(OBJDIR)/import_.c:$(OBJDIR)/import.h \
1229 $(OBJDIR)/info_.c:$(OBJDIR)/info.h \
1230 $(OBJDIR)/interwiki_.c:$(OBJDIR)/interwiki.h \
1231 $(OBJDIR)/json_.c:$(OBJDIR)/json.h \
1232 $(OBJDIR)/json_artifact_.c:$(OBJDIR)/json_artifact.h \
1233 $(OBJDIR)/json_branch_.c:$(OBJDIR)/json_branch.h \
1234 $(OBJDIR)/json_config_.c:$(OBJDIR)/json_config.h \
1235 $(OBJDIR)/json_diff_.c:$(OBJDIR)/json_diff.h \
1236 $(OBJDIR)/json_dir_.c:$(OBJDIR)/json_dir.h \
1237 $(OBJDIR)/json_finfo_.c:$(OBJDIR)/json_finfo.h \
1238 $(OBJDIR)/json_login_.c:$(OBJDIR)/json_login.h \
1239 $(OBJDIR)/json_query_.c:$(OBJDIR)/json_query.h \
1240 $(OBJDIR)/json_report_.c:$(OBJDIR)/json_report.h \
1241 $(OBJDIR)/json_status_.c:$(OBJDIR)/json_status.h \
1242 $(OBJDIR)/json_tag_.c:$(OBJDIR)/json_tag.h \
1243 $(OBJDIR)/json_timeline_.c:$(OBJDIR)/json_timeline.h \
1244 $(OBJDIR)/json_user_.c:$(OBJDIR)/json_user.h \
1245 $(OBJDIR)/json_wiki_.c:$(OBJDIR)/json_wiki.h \
1246 $(OBJDIR)/leaf_.c:$(OBJDIR)/leaf.h \
1247 $(OBJDIR)/loadctrl_.c:$(OBJDIR)/loadctrl.h \
1248 $(OBJDIR)/login_.c:$(OBJDIR)/login.h \
1249 $(OBJDIR)/lookslike_.c:$(OBJDIR)/lookslike.h \
1250 $(OBJDIR)/main_.c:$(OBJDIR)/main.h \
1251 $(OBJDIR)/manifest_.c:$(OBJDIR)/manifest.h \
1252 $(OBJDIR)/markdown_.c:$(OBJDIR)/markdown.h \
1253 $(OBJDIR)/markdown_html_.c:$(OBJDIR)/markdown_html.h \
1254 $(OBJDIR)/md5_.c:$(OBJDIR)/md5.h \
1255 $(OBJDIR)/merge_.c:$(OBJDIR)/merge.h \
1256 $(OBJDIR)/merge3_.c:$(OBJDIR)/merge3.h \
1257 $(OBJDIR)/moderate_.c:$(OBJDIR)/moderate.h \
1258 $(OBJDIR)/name_.c:$(OBJDIR)/name.h \
1259 $(OBJDIR)/patch_.c:$(OBJDIR)/patch.h \
1260 $(OBJDIR)/path_.c:$(OBJDIR)/path.h \
1261 $(OBJDIR)/piechart_.c:$(OBJDIR)/piechart.h \
1262 $(OBJDIR)/pikchrshow_.c:$(OBJDIR)/pikchrshow.h \
1263 $(OBJDIR)/pivot_.c:$(OBJDIR)/pivot.h \
1264 $(OBJDIR)/popen_.c:$(OBJDIR)/popen.h \
1265 $(OBJDIR)/pqueue_.c:$(OBJDIR)/pqueue.h \
1266 $(OBJDIR)/printf_.c:$(OBJDIR)/printf.h \
1267 $(OBJDIR)/publish_.c:$(OBJDIR)/publish.h \
1268 $(OBJDIR)/purge_.c:$(OBJDIR)/purge.h \
1269 $(OBJDIR)/rebuild_.c:$(OBJDIR)/rebuild.h \
1270 $(OBJDIR)/regexp_.c:$(OBJDIR)/regexp.h \
1271 $(OBJDIR)/repolist_.c:$(OBJDIR)/repolist.h \
1272 $(OBJDIR)/report_.c:$(OBJDIR)/report.h \
1273 $(OBJDIR)/rss_.c:$(OBJDIR)/rss.h \
1274 $(OBJDIR)/schema_.c:$(OBJDIR)/schema.h \
1275 $(OBJDIR)/search_.c:$(OBJDIR)/search.h \
1276 $(OBJDIR)/security_audit_.c:$(OBJDIR)/security_audit.h \
1277 $(OBJDIR)/setup_.c:$(OBJDIR)/setup.h \
1278 $(OBJDIR)/setupuser_.c:$(OBJDIR)/setupuser.h \
1279 $(OBJDIR)/sha1_.c:$(OBJDIR)/sha1.h \
1280 $(OBJDIR)/sha1hard_.c:$(OBJDIR)/sha1hard.h \
1281 $(OBJDIR)/sha3_.c:$(OBJDIR)/sha3.h \
1282 $(OBJDIR)/shun_.c:$(OBJDIR)/shun.h \
1283 $(OBJDIR)/sitemap_.c:$(OBJDIR)/sitemap.h \
1284 $(OBJDIR)/skins_.c:$(OBJDIR)/skins.h \
1285 $(OBJDIR)/smtp_.c:$(OBJDIR)/smtp.h \
1286 $(OBJDIR)/sqlcmd_.c:$(OBJDIR)/sqlcmd.h \
1287 $(OBJDIR)/stash_.c:$(OBJDIR)/stash.h \
1288 $(OBJDIR)/stat_.c:$(OBJDIR)/stat.h \
1289 $(OBJDIR)/statrep_.c:$(OBJDIR)/statrep.h \
1290 $(OBJDIR)/style_.c:$(OBJDIR)/style.h \
1291 $(OBJDIR)/sync_.c:$(OBJDIR)/sync.h \
1292 $(OBJDIR)/tag_.c:$(OBJDIR)/tag.h \
1293 $(OBJDIR)/tar_.c:$(OBJDIR)/tar.h \
1294 $(OBJDIR)/terminal_.c:$(OBJDIR)/terminal.h \
1295 $(OBJDIR)/th_main_.c:$(OBJDIR)/th_main.h \
1296 $(OBJDIR)/timeline_.c:$(OBJDIR)/timeline.h \
1297 $(OBJDIR)/tkt_.c:$(OBJDIR)/tkt.h \
1298 $(OBJDIR)/tktsetup_.c:$(OBJDIR)/tktsetup.h \
1299 $(OBJDIR)/undo_.c:$(OBJDIR)/undo.h \
1300 $(OBJDIR)/unicode_.c:$(OBJDIR)/unicode.h \
1301 $(OBJDIR)/unversioned_.c:$(OBJDIR)/unversioned.h \
1302 $(OBJDIR)/update_.c:$(OBJDIR)/update.h \
1303 $(OBJDIR)/url_.c:$(OBJDIR)/url.h \
1304 $(OBJDIR)/user_.c:$(OBJDIR)/user.h \
1305 $(OBJDIR)/utf8_.c:$(OBJDIR)/utf8.h \
1306 $(OBJDIR)/util_.c:$(OBJDIR)/util.h \
1307 $(OBJDIR)/verify_.c:$(OBJDIR)/verify.h \
1308 $(OBJDIR)/vfile_.c:$(OBJDIR)/vfile.h \
1309 $(OBJDIR)/wiki_.c:$(OBJDIR)/wiki.h \
1310 $(OBJDIR)/wikiformat_.c:$(OBJDIR)/wikiformat.h \
1311 $(OBJDIR)/winfile_.c:$(OBJDIR)/winfile.h \
1312 $(OBJDIR)/winhttp_.c:$(OBJDIR)/winhttp.h \
1313 $(OBJDIR)/xfer_.c:$(OBJDIR)/xfer.h \
1314 $(OBJDIR)/xfersetup_.c:$(OBJDIR)/xfersetup.h \
1315 $(OBJDIR)/zip_.c:$(OBJDIR)/zip.h \
1316 $(SRCDIR_extsrc)/pikchr.c:$(OBJDIR)/pikchr.h \
1317 $(SRCDIR_extsrc)/sqlite3.h \
1318 $(SRCDIR)/th.h \
1319 $(OBJDIR)/VERSION.h
1320 echo Done >$(OBJDIR)/headers
1321
1322 $(OBJDIR)/headers: Makefile
1323
1324 Makefile:
1325
M win/Makefile.mingw.mistachkin
+201 -246
--- win/Makefile.mingw.mistachkin
+++ win/Makefile.mingw.mistachkin
@@ -1,9 +1,9 @@
11
 #!/usr/bin/make
22
 #
33
 ##############################################################################
4
-# WARNING: DO NOT EDIT, AUTOMATICALLY GENERATED FILE (SEE "src/makemake.tcl")
4
+# WARNING: DO NOT EDIT, AUTOMATICALLY GENERATED FILE (SEE "tools/makemake.tcl")
55
 ##############################################################################
66
 #
77
 # This file is automatically generated. Instead of editing this
88
 # file, edit "makemake.tcl" then run "tclsh makemake.tcl"
99
 # to regenerate this file.
@@ -28,10 +28,12 @@
2828
 #### The toplevel directory of the source tree. Fossil can be built
2929
 # in a directory that is separate from the source tree. Just change
3030
 # the following to point from the build directory to the src/ folder.
3131
 #
3232
 SRCDIR = src
33
+SRCDIR_extsrc = extsrc
34
+SRCDIR_tools = tools
3335
3436
 #### The directory into which object code files should be written.
3537
 #
3638
 OBJDIR = wbld
3739
@@ -101,14 +103,10 @@
101103
102104
 #### Use the SQLite Encryption Extension
103105
 #
104106
 # USE_SEE = 1
105107
106
-#### Use the miniz compression library
107
-#
108
-# FOSSIL_ENABLE_MINIZ = 1
109
-
110108
 #### Use the Tcl source directory instead of the install directory?
111109
 # This is useful when Tcl has been compiled statically with MinGW.
112110
 #
113111
 FOSSIL_TCL_SOURCE = 1
114112
@@ -140,18 +138,13 @@
140138
 # used, taking into account whether zlib is actually enabled and the target
141139
 # processor architecture.
142140
 #
143141
 ifndef X64
144142
 SSLCONFIG = mingw
145
-ifndef FOSSIL_ENABLE_MINIZ
146143
 ZLIBCONFIG = LOC="-DASMV -DASMINF" OBJA="inffas86.o match.o"
147144
 ZLIBTARGETS = $(ZLIBDIR)/inffas86.o $(ZLIBDIR)/match.o
148145
 else
149
-ZLIBCONFIG =
150
-ZLIBTARGETS =
151
-endif
152
-else
153146
 SSLCONFIG = mingw64
154147
 ZLIBCONFIG =
155148
 ZLIBTARGETS =
156149
 endif
157150
@@ -161,13 +154,11 @@
161154
 SSLCONFIG += no-ssl3 no-weak-ssl-ciphers no-shared
162155
163156
 #### When using zlib, make sure that OpenSSL is configured to use the zlib
164157
 # that Fossil knows about (i.e. the one within the source tree).
165158
 #
166
-ifndef FOSSIL_ENABLE_MINIZ
167159
 SSLCONFIG += --with-zlib-lib=$(PWD)/$(ZLIBDIR) --with-zlib-include=$(PWD)/$(ZLIBDIR) zlib
168
-endif
169160
170161
 #### The directories where the OpenSSL include and library files are located.
171162
 #
172163
 OPENSSLDIR = $(SRCDIR)/../compat/openssl
173164
 OPENSSLINCDIR = $(OPENSSLDIR)/include
@@ -223,10 +214,11 @@
223214
 # as BCC, unless you are cross-compiling. This C compiler builds
224215
 # the finished binary for fossil. The BCC compiler above is used
225216
 # for building intermediate code-generator tools.
226217
 #
227218
 TCC = $(PREFIX)$(TCCEXE) -Wall -Wdeclaration-after-statement
219
+TCC += -I$(SRCDIR_extsrc)
228220
229221
 #### Add the necessary command line options to build with debugging
230222
 # symbols, if enabled.
231223
 #
232224
 ifdef FOSSIL_ENABLE_SYMBOLS
@@ -233,24 +225,17 @@
233225
 TCC += -g
234226
 else
235227
 TCC += -Os
236228
 endif
237229
238
-#### When not using the miniz compression library, zlib is required.
239
-#
240
-ifndef FOSSIL_ENABLE_MINIZ
241230
 TCC += -L$(ZLIBDIR) -I$(ZINCDIR)
242
-endif
243231
244232
 #### Compile resources for use in building executables that will run
245233
 # on the target platform.
246234
 #
247
-RCC = $(PREFIX)windres -I$(SRCDIR)
248
-
249
-ifndef FOSSIL_ENABLE_MINIZ
250
-RCC += -I$(ZINCDIR)
251
-endif
235
+RCC = $(PREFIX)windres -I$(SRCDIR) -I$(ZINCDIR)
236
+RCC += -I$(SRCDIR_extsrc)
252237
253238
 # With HTTPS support
254239
 ifdef FOSSIL_ENABLE_SSL
255240
 TCC += -L$(OPENSSLLIBDIR) -I$(OPENSSLINCDIR)
256241
 RCC += -I$(OPENSSLINCDIR)
@@ -265,16 +250,10 @@
265250
 TCC += -L$(TCLLIBDIR) -I$(TCLINCDIR)
266251
 RCC += -I$(TCLINCDIR)
267252
 endif
268253
 endif
269254
270
-# With miniz (i.e. instead of zlib)
271
-ifdef FOSSIL_ENABLE_MINIZ
272
-TCC += -DFOSSIL_ENABLE_MINIZ=1
273
-RCC += -DFOSSIL_ENABLE_MINIZ=1
274
-endif
275
-
276255
 # With MinGW command line handling workaround
277256
 ifdef MINGW_IS_32BIT_ONLY
278257
 TCC += -DBROKEN_MINGW_CMDLINE=1
279258
 RCC += -DBROKEN_MINGW_CMDLINE=1
280259
 endif
@@ -376,15 +355,13 @@
376355
 # to link against the Z-Lib compression library. There are no
377356
 # other mandatory dependencies.
378357
 #
379358
 LIB += -lmingwex
380359
381
-#### When not using the miniz compression library, zlib is required.
360
+#### zlib is required.
382361
 #
383
-ifndef FOSSIL_ENABLE_MINIZ
384362
 LIB += -lz
385
-endif
386363
387364
 #### These libraries MUST appear in the same order as they do for Tcl
388365
 # or linking with it will not work (exact reason unknown).
389366
 #
390367
 ifdef FOSSIL_ENABLE_TCL
@@ -516,11 +493,10 @@
516493
 $(SRCDIR)/moderate.c \
517494
 $(SRCDIR)/name.c \
518495
 $(SRCDIR)/patch.c \
519496
 $(SRCDIR)/path.c \
520497
 $(SRCDIR)/piechart.c \
521
- $(SRCDIR)/pikchr.c \
522498
 $(SRCDIR)/pikchrshow.c \
523499
 $(SRCDIR)/pivot.c \
524500
 $(SRCDIR)/popen.c \
525501
 $(SRCDIR)/pqueue.c \
526502
 $(SRCDIR)/printf.c \
@@ -775,11 +751,10 @@
775751
 $(OBJDIR)/moderate_.c \
776752
 $(OBJDIR)/name_.c \
777753
 $(OBJDIR)/patch_.c \
778754
 $(OBJDIR)/path_.c \
779755
 $(OBJDIR)/piechart_.c \
780
- $(OBJDIR)/pikchr_.c \
781756
 $(OBJDIR)/pikchrshow_.c \
782757
 $(OBJDIR)/pivot_.c \
783758
 $(OBJDIR)/popen_.c \
784759
 $(OBJDIR)/pqueue_.c \
785760
 $(OBJDIR)/printf_.c \
@@ -925,11 +900,10 @@
925900
 $(OBJDIR)/moderate.o \
926901
 $(OBJDIR)/name.o \
927902
 $(OBJDIR)/patch.o \
928903
 $(OBJDIR)/path.o \
929904
 $(OBJDIR)/piechart.o \
930
- $(OBJDIR)/pikchr.o \
931905
 $(OBJDIR)/pikchrshow.o \
932906
 $(OBJDIR)/pivot.o \
933907
 $(OBJDIR)/popen.o \
934908
 $(OBJDIR)/pqueue.o \
935909
 $(OBJDIR)/printf.o \
@@ -1025,16 +999,14 @@
1025999
10261000
 all: $(OBJDIR) $(APPNAME)
10271001
10281002
 $(OBJDIR)/fossil.o: $(SRCDIR)/../win/fossil.rc $(OBJDIR)/VERSION.h
10291003
 ifdef USE_WINDOWS
1030
- $(CAT) $(subst /,\,$(SRCDIR)\miniz.c) | $(GREP) "define MZ_VERSION" > $(subst /,\,$(OBJDIR)\minizver.h)
10311004
 $(CP) $(subst /,\,$(SRCDIR)\..\win\fossil.rc) $(subst /,\,$(OBJDIR))
10321005
 $(CP) $(subst /,\,$(SRCDIR)\..\win\fossil.ico) $(subst /,\,$(OBJDIR))
10331006
 $(CP) $(subst /,\,$(SRCDIR)\..\win\fossil.exe.manifest) $(subst /,\,$(OBJDIR))
10341007
 else
1035
- $(CAT) $(SRCDIR)/miniz.c | $(GREP) "define MZ_VERSION" > $(OBJDIR)/minizver.h
10361008
 $(CP) $(SRCDIR)/../win/fossil.rc $(OBJDIR)
10371009
 $(CP) $(SRCDIR)/../win/fossil.ico $(OBJDIR)
10381010
 $(CP) $(SRCDIR)/../win/fossil.exe.manifest $(OBJDIR)
10391011
 endif
10401012
 $(RCC) $(OBJDIR)/fossil.rc -o $(OBJDIR)/fossil.o
@@ -1053,27 +1025,27 @@
10531025
 $(MKDIR) $(subst /,\,$(OBJDIR))
10541026
 else
10551027
 $(MKDIR) $(OBJDIR)
10561028
 endif
10571029
1058
-$(TRANSLATE): $(SRCDIR)/translate.c
1059
- $(XBCC) -o $@ $(SRCDIR)/translate.c
1060
-
1061
-$(MAKEHEADERS): $(SRCDIR)/makeheaders.c
1062
- $(XBCC) -o $@ $(SRCDIR)/makeheaders.c
1063
-
1064
-$(MKINDEX): $(SRCDIR)/mkindex.c
1065
- $(XBCC) -o $@ $(SRCDIR)/mkindex.c
1066
-
1067
-$(MKBUILTIN): $(SRCDIR)/mkbuiltin.c
1068
- $(XBCC) -o $@ $(SRCDIR)/mkbuiltin.c
1069
-
1070
-$(MKVERSION): $(SRCDIR)/mkversion.c
1071
- $(XBCC) -o $@ $(SRCDIR)/mkversion.c
1072
-
1073
-$(CODECHECK1): $(SRCDIR)/codecheck1.c
1074
- $(XBCC) -o $@ $(SRCDIR)/codecheck1.c
1030
+$(TRANSLATE): $(SRCDIR_tools)/translate.c
1031
+ $(XBCC) -o $@ $(SRCDIR_tools)/translate.c
1032
+
1033
+$(MAKEHEADERS): $(SRCDIR_tools)/makeheaders.c
1034
+ $(XBCC) -o $@ $(SRCDIR_tools)/makeheaders.c
1035
+
1036
+$(MKINDEX): $(SRCDIR_tools)/mkindex.c
1037
+ $(XBCC) -o $@ $(SRCDIR_tools)/mkindex.c
1038
+
1039
+$(MKBUILTIN): $(SRCDIR_tools)/mkbuiltin.c
1040
+ $(XBCC) -o $@ $(SRCDIR_tools)/mkbuiltin.c
1041
+
1042
+$(MKVERSION): $(SRCDIR_tools)/mkversion.c
1043
+ $(XBCC) -o $@ $(SRCDIR_tools)/mkversion.c
1044
+
1045
+$(CODECHECK1): $(SRCDIR_tools)/codecheck1.c
1046
+ $(XBCC) -o $@ $(SRCDIR_tools)/codecheck1.c
10751047
10761048
 # WARNING. DANGER. Running the test suite modifies the repository the
10771049
 # build is done from, i.e. the checkout belongs to. Do not sync/push
10781050
 # the repository after running the tests.
10791051
 test: $(OBJDIR) $(APPNAME)
@@ -1083,46 +1055,45 @@
10831055
 $(MKVERSION) $(SRCDIR)/../manifest.uuid $(SRCDIR)/../manifest $(SRCDIR)/../VERSION >$@
10841056
10851057
 $(OBJDIR)/phony.h:
10861058
 # Force rebuild of VERSION.h every time "make" is run
10871059
1088
-# The USE_SYSTEM_SQLITE variable may be undefined, set to 0, or set
1089
-# to 1. If it is set to 1, then there is no need to build or link
1060
+# The USE_SYSTEM_SQLITE variable may be undefined, set to 0 or 1.
1061
+# If it is set to 1, then there is no need to build or link
10901062
 # the sqlite3.o object. Instead, the system SQLite will be linked
10911063
 # using -lsqlite3.
1064
+#
1065
+# Closely related is SQLITE3_ORIGIN, with the same 0/1 mapping,
1066
+# plus a value of 2 means that we are building a client-provided
1067
+# sqlite3.c.
10921068
 SQLITE3_OBJ.0 = $(OBJDIR)/sqlite3.o
10931069
 SQLITE3_OBJ.1 =
1070
+# SQLITE3_OBJ.2 is set by the configure process
10941071
 SQLITE3_OBJ. = $(SQLITE3_OBJ.0)
10951072
1096
-# The FOSSIL_ENABLE_MINIZ variable may be undefined, set to 0, or
1097
-# set to 1. If it is set to 1, the miniz library included in the
1098
-# source tree should be used; otherwise, it should not.
1099
-MINIZ_OBJ.0 =
1100
-MINIZ_OBJ.1 = $(OBJDIR)/miniz.o
1101
-MINIZ_OBJ. = $(MINIZ_OBJ.0)
1102
-
1103
-# The USE_SEE variable may be undefined, 0 or 1. If undefined or
1104
-# 0, ordinary SQLite is used. If 1, then sqlite3-see.c (not part of
1105
-# the source tree) is used and extra flags are provided to enable
1106
-# the SQLite Encryption Extension.
1107
-SQLITE3_SRC.0 = sqlite3.c
1108
-SQLITE3_SRC.1 = sqlite3-see.c
1109
-SQLITE3_SRC. = sqlite3.c
1110
-SQLITE3_SRC = $(SRCDIR)/$(SQLITE3_SRC.$(USE_SEE))
1111
-SQLITE3_SHELL_SRC.0 = shell.c
1112
-SQLITE3_SHELL_SRC.1 = shell-see.c
1113
-SQLITE3_SHELL_SRC. = shell.c
1114
-SQLITE3_SHELL_SRC = $(SRCDIR)/$(SQLITE3_SHELL_SRC.$(USE_SEE))
1073
+# The USE_SEE variable may be undefined, 0 or 1. If undefined or 0,
1074
+# in-tree SQLite is used. If 1, then sqlite3-see.c (not part of the
1075
+# source tree) is used and extra flags are provided to enable the
1076
+# SQLite Encryption Extension.
1077
+SQLITE3_SRC.0 = $(SRCDIR_extsrc)/sqlite3.c
1078
+SQLITE3_SRC.1 = $(SRCDIR_extsrc)/sqlite3-see.c
1079
+# SQLITE3_SRC.2 is set by top-level configure/makefile process.
1080
+SQLITE3_SRC. = $(SRCDIR_extsrc)/sqlite3.c
1081
+SQLITE3_SRC = $(SQLITE3_SRC.$(SQLITE3_ORIGIN))
1082
+SQLITE3_SHELL_SRC.0 = $(SRCDIR_extsrc)/shell.c
1083
+SQLITE3_SHELL_SRC.1 = $(SRCDIR_extsrc)/shell-see.c
1084
+# SQLITE3_SHELL_SRC.2 comes from the configure process
1085
+SQLITE3_SHELL_SRC. = $(SRCDIR_extsrc)/shell.c
1086
+SQLITE3_SHELL_SRC = $(SQLITE3_SHELL_SRC.$(SQLITE3_ORIGIN))
11151087
 SEE_FLAGS.0 =
11161088
 SEE_FLAGS.1 = -DSQLITE_HAS_CODEC -DSQLITE_SHELL_DBKEY_PROC=fossil_key
11171089
 SEE_FLAGS. =
11181090
 SEE_FLAGS = $(SEE_FLAGS.$(USE_SEE))
11191091
11201092
11211093
 EXTRAOBJ = \
1122
- $(SQLITE3_OBJ.$(USE_SYSTEM_SQLITE)) \
1123
- $(MINIZ_OBJ.$(FOSSIL_ENABLE_MINIZ)) \
1094
+ $(SQLITE3_OBJ.$(SQLITE3_ORIGIN)) \
11241095
 $(OBJDIR)/shell.o \
11251096
 $(OBJDIR)/th.o \
11261097
 $(OBJDIR)/th_lang.o \
11271098
 $(OBJDIR)/th_tcl.o \
11281099
 $(OBJDIR)/cson_amalgamation.o
@@ -1138,15 +1109,11 @@
11381109
 $(MAKE) -C $(ZLIBDIR) PREFIX=$(PREFIX) CC=$(PREFIX)$(TCCEXE) $(ZLIBCONFIG) -f win32/Makefile.gcc libz.a
11391110
11401111
 clean-zlib:
11411112
 $(MAKE) -C $(ZLIBDIR) PREFIX=$(PREFIX) CC=$(PREFIX)$(TCCEXE) -f win32/Makefile.gcc clean
11421113
1143
-ifdef FOSSIL_ENABLE_MINIZ
1144
-BLDTARGETS =
1145
-else
11461114
 BLDTARGETS = zlib
1147
-endif
11481115
11491116
 openssl: $(BLDTARGETS)
11501117
 cd $(OPENSSLLIBDIR);./Configure --cross-compile-prefix=$(PREFIX) $(SSLCONFIG)
11511118
 sed -i -e 's/^PERL=C:\\.*$$/PERL=perl.exe/i' $(OPENSSLLIBDIR)/Makefile
11521119
 $(MAKE) -C $(OPENSSLLIBDIR) PREFIX=$(PREFIX) CC=$(PREFIX)$(TCCEXE) build_libs
@@ -1198,160 +1165,160 @@
11981165
 $(OBJDIR)/builtin_data.h: $(MKBUILTIN) $(EXTRA_FILES)
11991166
 $(MKBUILTIN) --prefix $(SRCDIR)/ $(EXTRA_FILES) >$@
12001167
12011168
 $(OBJDIR)/headers: $(OBJDIR)/page_index.h $(OBJDIR)/builtin_data.h $(MAKEHEADERS) $(OBJDIR)/VERSION.h
12021169
 $(MAKEHEADERS) $(OBJDIR)/add_.c:$(OBJDIR)/add.h \
1203
- $(OBJDIR)/ajax_.c:$(OBJDIR)/ajax.h \
1204
- $(OBJDIR)/alerts_.c:$(OBJDIR)/alerts.h \
1205
- $(OBJDIR)/allrepo_.c:$(OBJDIR)/allrepo.h \
1206
- $(OBJDIR)/attach_.c:$(OBJDIR)/attach.h \
1207
- $(OBJDIR)/backlink_.c:$(OBJDIR)/backlink.h \
1208
- $(OBJDIR)/backoffice_.c:$(OBJDIR)/backoffice.h \
1209
- $(OBJDIR)/bag_.c:$(OBJDIR)/bag.h \
1210
- $(OBJDIR)/bisect_.c:$(OBJDIR)/bisect.h \
1211
- $(OBJDIR)/blob_.c:$(OBJDIR)/blob.h \
1212
- $(OBJDIR)/branch_.c:$(OBJDIR)/branch.h \
1213
- $(OBJDIR)/browse_.c:$(OBJDIR)/browse.h \
1214
- $(OBJDIR)/builtin_.c:$(OBJDIR)/builtin.h \
1215
- $(OBJDIR)/bundle_.c:$(OBJDIR)/bundle.h \
1216
- $(OBJDIR)/cache_.c:$(OBJDIR)/cache.h \
1217
- $(OBJDIR)/capabilities_.c:$(OBJDIR)/capabilities.h \
1218
- $(OBJDIR)/captcha_.c:$(OBJDIR)/captcha.h \
1219
- $(OBJDIR)/cgi_.c:$(OBJDIR)/cgi.h \
1220
- $(OBJDIR)/chat_.c:$(OBJDIR)/chat.h \
1221
- $(OBJDIR)/checkin_.c:$(OBJDIR)/checkin.h \
1222
- $(OBJDIR)/checkout_.c:$(OBJDIR)/checkout.h \
1223
- $(OBJDIR)/clearsign_.c:$(OBJDIR)/clearsign.h \
1224
- $(OBJDIR)/clone_.c:$(OBJDIR)/clone.h \
1225
- $(OBJDIR)/color_.c:$(OBJDIR)/color.h \
1226
- $(OBJDIR)/comformat_.c:$(OBJDIR)/comformat.h \
1227
- $(OBJDIR)/configure_.c:$(OBJDIR)/configure.h \
1228
- $(OBJDIR)/content_.c:$(OBJDIR)/content.h \
1229
- $(OBJDIR)/cookies_.c:$(OBJDIR)/cookies.h \
1230
- $(OBJDIR)/db_.c:$(OBJDIR)/db.h \
1231
- $(OBJDIR)/delta_.c:$(OBJDIR)/delta.h \
1232
- $(OBJDIR)/deltacmd_.c:$(OBJDIR)/deltacmd.h \
1233
- $(OBJDIR)/deltafunc_.c:$(OBJDIR)/deltafunc.h \
1234
- $(OBJDIR)/descendants_.c:$(OBJDIR)/descendants.h \
1235
- $(OBJDIR)/diff_.c:$(OBJDIR)/diff.h \
1236
- $(OBJDIR)/diffcmd_.c:$(OBJDIR)/diffcmd.h \
1237
- $(OBJDIR)/dispatch_.c:$(OBJDIR)/dispatch.h \
1238
- $(OBJDIR)/doc_.c:$(OBJDIR)/doc.h \
1239
- $(OBJDIR)/encode_.c:$(OBJDIR)/encode.h \
1240
- $(OBJDIR)/etag_.c:$(OBJDIR)/etag.h \
1241
- $(OBJDIR)/event_.c:$(OBJDIR)/event.h \
1242
- $(OBJDIR)/export_.c:$(OBJDIR)/export.h \
1243
- $(OBJDIR)/extcgi_.c:$(OBJDIR)/extcgi.h \
1244
- $(OBJDIR)/file_.c:$(OBJDIR)/file.h \
1245
- $(OBJDIR)/fileedit_.c:$(OBJDIR)/fileedit.h \
1246
- $(OBJDIR)/finfo_.c:$(OBJDIR)/finfo.h \
1247
- $(OBJDIR)/foci_.c:$(OBJDIR)/foci.h \
1248
- $(OBJDIR)/forum_.c:$(OBJDIR)/forum.h \
1249
- $(OBJDIR)/fshell_.c:$(OBJDIR)/fshell.h \
1250
- $(OBJDIR)/fusefs_.c:$(OBJDIR)/fusefs.h \
1251
- $(OBJDIR)/fuzz_.c:$(OBJDIR)/fuzz.h \
1252
- $(OBJDIR)/glob_.c:$(OBJDIR)/glob.h \
1253
- $(OBJDIR)/graph_.c:$(OBJDIR)/graph.h \
1254
- $(OBJDIR)/gzip_.c:$(OBJDIR)/gzip.h \
1255
- $(OBJDIR)/hname_.c:$(OBJDIR)/hname.h \
1256
- $(OBJDIR)/hook_.c:$(OBJDIR)/hook.h \
1257
- $(OBJDIR)/http_.c:$(OBJDIR)/http.h \
1258
- $(OBJDIR)/http_socket_.c:$(OBJDIR)/http_socket.h \
1259
- $(OBJDIR)/http_ssl_.c:$(OBJDIR)/http_ssl.h \
1260
- $(OBJDIR)/http_transport_.c:$(OBJDIR)/http_transport.h \
1261
- $(OBJDIR)/import_.c:$(OBJDIR)/import.h \
1262
- $(OBJDIR)/info_.c:$(OBJDIR)/info.h \
1263
- $(OBJDIR)/interwiki_.c:$(OBJDIR)/interwiki.h \
1264
- $(OBJDIR)/json_.c:$(OBJDIR)/json.h \
1265
- $(OBJDIR)/json_artifact_.c:$(OBJDIR)/json_artifact.h \
1266
- $(OBJDIR)/json_branch_.c:$(OBJDIR)/json_branch.h \
1267
- $(OBJDIR)/json_config_.c:$(OBJDIR)/json_config.h \
1268
- $(OBJDIR)/json_diff_.c:$(OBJDIR)/json_diff.h \
1269
- $(OBJDIR)/json_dir_.c:$(OBJDIR)/json_dir.h \
1270
- $(OBJDIR)/json_finfo_.c:$(OBJDIR)/json_finfo.h \
1271
- $(OBJDIR)/json_login_.c:$(OBJDIR)/json_login.h \
1272
- $(OBJDIR)/json_query_.c:$(OBJDIR)/json_query.h \
1273
- $(OBJDIR)/json_report_.c:$(OBJDIR)/json_report.h \
1274
- $(OBJDIR)/json_status_.c:$(OBJDIR)/json_status.h \
1275
- $(OBJDIR)/json_tag_.c:$(OBJDIR)/json_tag.h \
1276
- $(OBJDIR)/json_timeline_.c:$(OBJDIR)/json_timeline.h \
1277
- $(OBJDIR)/json_user_.c:$(OBJDIR)/json_user.h \
1278
- $(OBJDIR)/json_wiki_.c:$(OBJDIR)/json_wiki.h \
1279
- $(OBJDIR)/leaf_.c:$(OBJDIR)/leaf.h \
1280
- $(OBJDIR)/loadctrl_.c:$(OBJDIR)/loadctrl.h \
1281
- $(OBJDIR)/login_.c:$(OBJDIR)/login.h \
1282
- $(OBJDIR)/lookslike_.c:$(OBJDIR)/lookslike.h \
1283
- $(OBJDIR)/main_.c:$(OBJDIR)/main.h \
1284
- $(OBJDIR)/manifest_.c:$(OBJDIR)/manifest.h \
1285
- $(OBJDIR)/markdown_.c:$(OBJDIR)/markdown.h \
1286
- $(OBJDIR)/markdown_html_.c:$(OBJDIR)/markdown_html.h \
1287
- $(OBJDIR)/md5_.c:$(OBJDIR)/md5.h \
1288
- $(OBJDIR)/merge_.c:$(OBJDIR)/merge.h \
1289
- $(OBJDIR)/merge3_.c:$(OBJDIR)/merge3.h \
1290
- $(OBJDIR)/moderate_.c:$(OBJDIR)/moderate.h \
1291
- $(OBJDIR)/name_.c:$(OBJDIR)/name.h \
1292
- $(OBJDIR)/patch_.c:$(OBJDIR)/patch.h \
1293
- $(OBJDIR)/path_.c:$(OBJDIR)/path.h \
1294
- $(OBJDIR)/piechart_.c:$(OBJDIR)/piechart.h \
1295
- $(OBJDIR)/pikchr_.c:$(OBJDIR)/pikchr.h \
1296
- $(OBJDIR)/pikchrshow_.c:$(OBJDIR)/pikchrshow.h \
1297
- $(OBJDIR)/pivot_.c:$(OBJDIR)/pivot.h \
1298
- $(OBJDIR)/popen_.c:$(OBJDIR)/popen.h \
1299
- $(OBJDIR)/pqueue_.c:$(OBJDIR)/pqueue.h \
1300
- $(OBJDIR)/printf_.c:$(OBJDIR)/printf.h \
1301
- $(OBJDIR)/publish_.c:$(OBJDIR)/publish.h \
1302
- $(OBJDIR)/purge_.c:$(OBJDIR)/purge.h \
1303
- $(OBJDIR)/rebuild_.c:$(OBJDIR)/rebuild.h \
1304
- $(OBJDIR)/regexp_.c:$(OBJDIR)/regexp.h \
1305
- $(OBJDIR)/repolist_.c:$(OBJDIR)/repolist.h \
1306
- $(OBJDIR)/report_.c:$(OBJDIR)/report.h \
1307
- $(OBJDIR)/rss_.c:$(OBJDIR)/rss.h \
1308
- $(OBJDIR)/schema_.c:$(OBJDIR)/schema.h \
1309
- $(OBJDIR)/search_.c:$(OBJDIR)/search.h \
1310
- $(OBJDIR)/security_audit_.c:$(OBJDIR)/security_audit.h \
1311
- $(OBJDIR)/setup_.c:$(OBJDIR)/setup.h \
1312
- $(OBJDIR)/setupuser_.c:$(OBJDIR)/setupuser.h \
1313
- $(OBJDIR)/sha1_.c:$(OBJDIR)/sha1.h \
1314
- $(OBJDIR)/sha1hard_.c:$(OBJDIR)/sha1hard.h \
1315
- $(OBJDIR)/sha3_.c:$(OBJDIR)/sha3.h \
1316
- $(OBJDIR)/shun_.c:$(OBJDIR)/shun.h \
1317
- $(OBJDIR)/sitemap_.c:$(OBJDIR)/sitemap.h \
1318
- $(OBJDIR)/skins_.c:$(OBJDIR)/skins.h \
1319
- $(OBJDIR)/smtp_.c:$(OBJDIR)/smtp.h \
1320
- $(OBJDIR)/sqlcmd_.c:$(OBJDIR)/sqlcmd.h \
1321
- $(OBJDIR)/stash_.c:$(OBJDIR)/stash.h \
1322
- $(OBJDIR)/stat_.c:$(OBJDIR)/stat.h \
1323
- $(OBJDIR)/statrep_.c:$(OBJDIR)/statrep.h \
1324
- $(OBJDIR)/style_.c:$(OBJDIR)/style.h \
1325
- $(OBJDIR)/sync_.c:$(OBJDIR)/sync.h \
1326
- $(OBJDIR)/tag_.c:$(OBJDIR)/tag.h \
1327
- $(OBJDIR)/tar_.c:$(OBJDIR)/tar.h \
1328
- $(OBJDIR)/terminal_.c:$(OBJDIR)/terminal.h \
1329
- $(OBJDIR)/th_main_.c:$(OBJDIR)/th_main.h \
1330
- $(OBJDIR)/timeline_.c:$(OBJDIR)/timeline.h \
1331
- $(OBJDIR)/tkt_.c:$(OBJDIR)/tkt.h \
1332
- $(OBJDIR)/tktsetup_.c:$(OBJDIR)/tktsetup.h \
1333
- $(OBJDIR)/undo_.c:$(OBJDIR)/undo.h \
1334
- $(OBJDIR)/unicode_.c:$(OBJDIR)/unicode.h \
1335
- $(OBJDIR)/unversioned_.c:$(OBJDIR)/unversioned.h \
1336
- $(OBJDIR)/update_.c:$(OBJDIR)/update.h \
1337
- $(OBJDIR)/url_.c:$(OBJDIR)/url.h \
1338
- $(OBJDIR)/user_.c:$(OBJDIR)/user.h \
1339
- $(OBJDIR)/utf8_.c:$(OBJDIR)/utf8.h \
1340
- $(OBJDIR)/util_.c:$(OBJDIR)/util.h \
1341
- $(OBJDIR)/verify_.c:$(OBJDIR)/verify.h \
1342
- $(OBJDIR)/vfile_.c:$(OBJDIR)/vfile.h \
1343
- $(OBJDIR)/wiki_.c:$(OBJDIR)/wiki.h \
1344
- $(OBJDIR)/wikiformat_.c:$(OBJDIR)/wikiformat.h \
1345
- $(OBJDIR)/winfile_.c:$(OBJDIR)/winfile.h \
1346
- $(OBJDIR)/winhttp_.c:$(OBJDIR)/winhttp.h \
1347
- $(OBJDIR)/xfer_.c:$(OBJDIR)/xfer.h \
1348
- $(OBJDIR)/xfersetup_.c:$(OBJDIR)/xfersetup.h \
1349
- $(OBJDIR)/zip_.c:$(OBJDIR)/zip.h \
1350
- $(SRCDIR)/sqlite3.h \
1351
- $(SRCDIR)/th.h \
1352
- $(OBJDIR)/VERSION.h
1170
+ $(OBJDIR)/ajax_.c:$(OBJDIR)/ajax.h \
1171
+ $(OBJDIR)/alerts_.c:$(OBJDIR)/alerts.h \
1172
+ $(OBJDIR)/allrepo_.c:$(OBJDIR)/allrepo.h \
1173
+ $(OBJDIR)/attach_.c:$(OBJDIR)/attach.h \
1174
+ $(OBJDIR)/backlink_.c:$(OBJDIR)/backlink.h \
1175
+ $(OBJDIR)/backoffice_.c:$(OBJDIR)/backoffice.h \
1176
+ $(OBJDIR)/bag_.c:$(OBJDIR)/bag.h \
1177
+ $(OBJDIR)/bisect_.c:$(OBJDIR)/bisect.h \
1178
+ $(OBJDIR)/blob_.c:$(OBJDIR)/blob.h \
1179
+ $(OBJDIR)/branch_.c:$(OBJDIR)/branch.h \
1180
+ $(OBJDIR)/browse_.c:$(OBJDIR)/browse.h \
1181
+ $(OBJDIR)/builtin_.c:$(OBJDIR)/builtin.h \
1182
+ $(OBJDIR)/bundle_.c:$(OBJDIR)/bundle.h \
1183
+ $(OBJDIR)/cache_.c:$(OBJDIR)/cache.h \
1184
+ $(OBJDIR)/capabilities_.c:$(OBJDIR)/capabilities.h \
1185
+ $(OBJDIR)/captcha_.c:$(OBJDIR)/captcha.h \
1186
+ $(OBJDIR)/cgi_.c:$(OBJDIR)/cgi.h \
1187
+ $(OBJDIR)/chat_.c:$(OBJDIR)/chat.h \
1188
+ $(OBJDIR)/checkin_.c:$(OBJDIR)/checkin.h \
1189
+ $(OBJDIR)/checkout_.c:$(OBJDIR)/checkout.h \
1190
+ $(OBJDIR)/clearsign_.c:$(OBJDIR)/clearsign.h \
1191
+ $(OBJDIR)/clone_.c:$(OBJDIR)/clone.h \
1192
+ $(OBJDIR)/color_.c:$(OBJDIR)/color.h \
1193
+ $(OBJDIR)/comformat_.c:$(OBJDIR)/comformat.h \
1194
+ $(OBJDIR)/configure_.c:$(OBJDIR)/configure.h \
1195
+ $(OBJDIR)/content_.c:$(OBJDIR)/content.h \
1196
+ $(OBJDIR)/cookies_.c:$(OBJDIR)/cookies.h \
1197
+ $(OBJDIR)/db_.c:$(OBJDIR)/db.h \
1198
+ $(OBJDIR)/delta_.c:$(OBJDIR)/delta.h \
1199
+ $(OBJDIR)/deltacmd_.c:$(OBJDIR)/deltacmd.h \
1200
+ $(OBJDIR)/deltafunc_.c:$(OBJDIR)/deltafunc.h \
1201
+ $(OBJDIR)/descendants_.c:$(OBJDIR)/descendants.h \
1202
+ $(OBJDIR)/diff_.c:$(OBJDIR)/diff.h \
1203
+ $(OBJDIR)/diffcmd_.c:$(OBJDIR)/diffcmd.h \
1204
+ $(OBJDIR)/dispatch_.c:$(OBJDIR)/dispatch.h \
1205
+ $(OBJDIR)/doc_.c:$(OBJDIR)/doc.h \
1206
+ $(OBJDIR)/encode_.c:$(OBJDIR)/encode.h \
1207
+ $(OBJDIR)/etag_.c:$(OBJDIR)/etag.h \
1208
+ $(OBJDIR)/event_.c:$(OBJDIR)/event.h \
1209
+ $(OBJDIR)/export_.c:$(OBJDIR)/export.h \
1210
+ $(OBJDIR)/extcgi_.c:$(OBJDIR)/extcgi.h \
1211
+ $(OBJDIR)/file_.c:$(OBJDIR)/file.h \
1212
+ $(OBJDIR)/fileedit_.c:$(OBJDIR)/fileedit.h \
1213
+ $(OBJDIR)/finfo_.c:$(OBJDIR)/finfo.h \
1214
+ $(OBJDIR)/foci_.c:$(OBJDIR)/foci.h \
1215
+ $(OBJDIR)/forum_.c:$(OBJDIR)/forum.h \
1216
+ $(OBJDIR)/fshell_.c:$(OBJDIR)/fshell.h \
1217
+ $(OBJDIR)/fusefs_.c:$(OBJDIR)/fusefs.h \
1218
+ $(OBJDIR)/fuzz_.c:$(OBJDIR)/fuzz.h \
1219
+ $(OBJDIR)/glob_.c:$(OBJDIR)/glob.h \
1220
+ $(OBJDIR)/graph_.c:$(OBJDIR)/graph.h \
1221
+ $(OBJDIR)/gzip_.c:$(OBJDIR)/gzip.h \
1222
+ $(OBJDIR)/hname_.c:$(OBJDIR)/hname.h \
1223
+ $(OBJDIR)/hook_.c:$(OBJDIR)/hook.h \
1224
+ $(OBJDIR)/http_.c:$(OBJDIR)/http.h \
1225
+ $(OBJDIR)/http_socket_.c:$(OBJDIR)/http_socket.h \
1226
+ $(OBJDIR)/http_ssl_.c:$(OBJDIR)/http_ssl.h \
1227
+ $(OBJDIR)/http_transport_.c:$(OBJDIR)/http_transport.h \
1228
+ $(OBJDIR)/import_.c:$(OBJDIR)/import.h \
1229
+ $(OBJDIR)/info_.c:$(OBJDIR)/info.h \
1230
+ $(OBJDIR)/interwiki_.c:$(OBJDIR)/interwiki.h \
1231
+ $(OBJDIR)/json_.c:$(OBJDIR)/json.h \
1232
+ $(OBJDIR)/json_artifact_.c:$(OBJDIR)/json_artifact.h \
1233
+ $(OBJDIR)/json_branch_.c:$(OBJDIR)/json_branch.h \
1234
+ $(OBJDIR)/json_config_.c:$(OBJDIR)/json_config.h \
1235
+ $(OBJDIR)/json_diff_.c:$(OBJDIR)/json_diff.h \
1236
+ $(OBJDIR)/json_dir_.c:$(OBJDIR)/json_dir.h \
1237
+ $(OBJDIR)/json_finfo_.c:$(OBJDIR)/json_finfo.h \
1238
+ $(OBJDIR)/json_login_.c:$(OBJDIR)/json_login.h \
1239
+ $(OBJDIR)/json_query_.c:$(OBJDIR)/json_query.h \
1240
+ $(OBJDIR)/json_report_.c:$(OBJDIR)/json_report.h \
1241
+ $(OBJDIR)/json_status_.c:$(OBJDIR)/json_status.h \
1242
+ $(OBJDIR)/json_tag_.c:$(OBJDIR)/json_tag.h \
1243
+ $(OBJDIR)/json_timeline_.c:$(OBJDIR)/json_timeline.h \
1244
+ $(OBJDIR)/json_user_.c:$(OBJDIR)/json_user.h \
1245
+ $(OBJDIR)/json_wiki_.c:$(OBJDIR)/json_wiki.h \
1246
+ $(OBJDIR)/leaf_.c:$(OBJDIR)/leaf.h \
1247
+ $(OBJDIR)/loadctrl_.c:$(OBJDIR)/loadctrl.h \
1248
+ $(OBJDIR)/login_.c:$(OBJDIR)/login.h \
1249
+ $(OBJDIR)/lookslike_.c:$(OBJDIR)/lookslike.h \
1250
+ $(OBJDIR)/main_.c:$(OBJDIR)/main.h \
1251
+ $(OBJDIR)/manifest_.c:$(OBJDIR)/manifest.h \
1252
+ $(OBJDIR)/markdown_.c:$(OBJDIR)/markdown.h \
1253
+ $(OBJDIR)/markdown_html_.c:$(OBJDIR)/markdown_html.h \
1254
+ $(OBJDIR)/md5_.c:$(OBJDIR)/md5.h \
1255
+ $(OBJDIR)/merge_.c:$(OBJDIR)/merge.h \
1256
+ $(OBJDIR)/merge3_.c:$(OBJDIR)/merge3.h \
1257
+ $(OBJDIR)/moderate_.c:$(OBJDIR)/moderate.h \
1258
+ $(OBJDIR)/name_.c:$(OBJDIR)/name.h \
1259
+ $(OBJDIR)/patch_.c:$(OBJDIR)/patch.h \
1260
+ $(OBJDIR)/path_.c:$(OBJDIR)/path.h \
1261
+ $(OBJDIR)/piechart_.c:$(OBJDIR)/piechart.h \
1262
+ $(OBJDIR)/pikchrshow_.c:$(OBJDIR)/pikchrshow.h \
1263
+ $(OBJDIR)/pivot_.c:$(OBJDIR)/pivot.h \
1264
+ $(OBJDIR)/popen_.c:$(OBJDIR)/popen.h \
1265
+ $(OBJDIR)/pqueue_.c:$(OBJDIR)/pqueue.h \
1266
+ $(OBJDIR)/printf_.c:$(OBJDIR)/printf.h \
1267
+ $(OBJDIR)/publish_.c:$(OBJDIR)/publish.h \
1268
+ $(OBJDIR)/purge_.c:$(OBJDIR)/purge.h \
1269
+ $(OBJDIR)/rebuild_.c:$(OBJDIR)/rebuild.h \
1270
+ $(OBJDIR)/regexp_.c:$(OBJDIR)/regexp.h \
1271
+ $(OBJDIR)/repolist_.c:$(OBJDIR)/repolist.h \
1272
+ $(OBJDIR)/report_.c:$(OBJDIR)/report.h \
1273
+ $(OBJDIR)/rss_.c:$(OBJDIR)/rss.h \
1274
+ $(OBJDIR)/schema_.c:$(OBJDIR)/schema.h \
1275
+ $(OBJDIR)/search_.c:$(OBJDIR)/search.h \
1276
+ $(OBJDIR)/security_audit_.c:$(OBJDIR)/security_audit.h \
1277
+ $(OBJDIR)/setup_.c:$(OBJDIR)/setup.h \
1278
+ $(OBJDIR)/setupuser_.c:$(OBJDIR)/setupuser.h \
1279
+ $(OBJDIR)/sha1_.c:$(OBJDIR)/sha1.h \
1280
+ $(OBJDIR)/sha1hard_.c:$(OBJDIR)/sha1hard.h \
1281
+ $(OBJDIR)/sha3_.c:$(OBJDIR)/sha3.h \
1282
+ $(OBJDIR)/shun_.c:$(OBJDIR)/shun.h \
1283
+ $(OBJDIR)/sitemap_.c:$(OBJDIR)/sitemap.h \
1284
+ $(OBJDIR)/skins_.c:$(OBJDIR)/skins.h \
1285
+ $(OBJDIR)/smtp_.c:$(OBJDIR)/smtp.h \
1286
+ $(OBJDIR)/sqlcmd_.c:$(OBJDIR)/sqlcmd.h \
1287
+ $(OBJDIR)/stash_.c:$(OBJDIR)/stash.h \
1288
+ $(OBJDIR)/stat_.c:$(OBJDIR)/stat.h \
1289
+ $(OBJDIR)/statrep_.c:$(OBJDIR)/statrep.h \
1290
+ $(OBJDIR)/style_.c:$(OBJDIR)/style.h \
1291
+ $(OBJDIR)/sync_.c:$(OBJDIR)/sync.h \
1292
+ $(OBJDIR)/tag_.c:$(OBJDIR)/tag.h \
1293
+ $(OBJDIR)/tar_.c:$(OBJDIR)/tar.h \
1294
+ $(OBJDIR)/terminal_.c:$(OBJDIR)/terminal.h \
1295
+ $(OBJDIR)/th_main_.c:$(OBJDIR)/th_main.h \
1296
+ $(OBJDIR)/timeline_.c:$(OBJDIR)/timeline.h \
1297
+ $(OBJDIR)/tkt_.c:$(OBJDIR)/tkt.h \
1298
+ $(OBJDIR)/tktsetup_.c:$(OBJDIR)/tktsetup.h \
1299
+ $(OBJDIR)/undo_.c:$(OBJDIR)/undo.h \
1300
+ $(OBJDIR)/unicode_.c:$(OBJDIR)/unicode.h \
1301
+ $(OBJDIR)/unversioned_.c:$(OBJDIR)/unversioned.h \
1302
+ $(OBJDIR)/update_.c:$(OBJDIR)/update.h \
1303
+ $(OBJDIR)/url_.c:$(OBJDIR)/url.h \
1304
+ $(OBJDIR)/user_.c:$(OBJDIR)/user.h \
1305
+ $(OBJDIR)/utf8_.c:$(OBJDIR)/utf8.h \
1306
+ $(OBJDIR)/util_.c:$(OBJDIR)/util.h \
1307
+ $(OBJDIR)/verify_.c:$(OBJDIR)/verify.h \
1308
+ $(OBJDIR)/vfile_.c:$(OBJDIR)/vfile.h \
1309
+ $(OBJDIR)/wiki_.c:$(OBJDIR)/wiki.h \
1310
+ $(OBJDIR)/wikiformat_.c:$(OBJDIR)/wikiformat.h \
1311
+ $(OBJDIR)/winfile_.c:$(OBJDIR)/winfile.h \
1312
+ $(OBJDIR)/winhttp_.c:$(OBJDIR)/winhttp.h \
1313
+ $(OBJDIR)/xfer_.c:$(OBJDIR)/xfer.h \
1314
+ $(OBJDIR)/xfersetup_.c:$(OBJDIR)/xfersetup.h \
1315
+ $(OBJDIR)/zip_.c:$(OBJDIR)/zip.h \
1316
+ $(SRCDIR_extsrc)/pikchr.c:$(OBJDIR)/pikchr.h \
1317
+ $(SRCDIR_extsrc)/sqlite3.h \
1318
+ $(SRCDIR)/th.h \
1319
+ $(OBJDIR)/VERSION.h
13531320
 echo Done >$(OBJDIR)/headers
13541321
13551322
 $(OBJDIR)/headers: Makefile
13561323
13571324
 Makefile:
@@ -2098,18 +2065,10 @@
20982065
 $(OBJDIR)/piechart.o: $(OBJDIR)/piechart_.c $(OBJDIR)/piechart.h $(SRCDIR)/config.h
20992066
 $(XTCC) -o $(OBJDIR)/piechart.o -c $(OBJDIR)/piechart_.c
21002067
21012068
 $(OBJDIR)/piechart.h: $(OBJDIR)/headers
21022069
2103
-$(OBJDIR)/pikchr_.c: $(SRCDIR)/pikchr.c $(TRANSLATE)
2104
- $(TRANSLATE) $(SRCDIR)/pikchr.c >$@
2105
-
2106
-$(OBJDIR)/pikchr.o: $(OBJDIR)/pikchr_.c $(OBJDIR)/pikchr.h $(SRCDIR)/config.h
2107
- $(XTCC) -o $(OBJDIR)/pikchr.o -c $(OBJDIR)/pikchr_.c
2108
-
2109
-$(OBJDIR)/pikchr.h: $(OBJDIR)/headers
2110
-
21112070
 $(OBJDIR)/pikchrshow_.c: $(SRCDIR)/pikchrshow.c $(TRANSLATE)
21122071
 $(TRANSLATE) $(SRCDIR)/pikchrshow.c >$@
21132072
21142073
 $(OBJDIR)/pikchrshow.o: $(OBJDIR)/pikchrshow_.c $(OBJDIR)/pikchrshow.h $(SRCDIR)/config.h
21152074
 $(XTCC) -o $(OBJDIR)/pikchrshow.o -c $(OBJDIR)/pikchrshow_.c
@@ -2606,24 +2565,20 @@
26062565
 -Daccess=file_access \
26072566
 -Dsystem=fossil_system \
26082567
 -Dgetenv=fossil_getenv \
26092568
 -Dfopen=fossil_fopen
26102569
2611
-MINIZ_OPTIONS = -DMINIZ_NO_STDIO \
2612
- -DMINIZ_NO_TIME \
2613
- -DMINIZ_NO_ARCHIVE_APIS
2614
-
26152570
 $(OBJDIR)/sqlite3.o: $(SQLITE3_SRC) $(SRCDIR)/../win/Makefile.mingw.mistachkin
26162571
 $(XTCC) $(SQLITE_OPTIONS) $(SQLITE_CFLAGS) $(SEE_FLAGS) \
26172572
 -c $(SQLITE3_SRC) -o $@
26182573
2619
-$(OBJDIR)/cson_amalgamation.o: $(SRCDIR)/cson_amalgamation.c
2620
- $(XTCC) -c $(SRCDIR)/cson_amalgamation.c -o $@
2574
+$(OBJDIR)/cson_amalgamation.o: $(SRCDIR_extsrc)/cson_amalgamation.c
2575
+ $(XTCC) -c $(SRCDIR_extsrc)/cson_amalgamation.c -o $@
26212576
26222577
 $(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
26232578
2624
-$(OBJDIR)/shell.o: $(SQLITE3_SHELL_SRC) $(SRCDIR)/sqlite3.h $(SRCDIR)/../win/Makefile.mingw.mistachkin
2579
+$(OBJDIR)/shell.o: $(SQLITE3_SHELL_SRC) $(SRCDIR_extsrc)/sqlite3.h $(SRCDIR)/../win/Makefile.mingw.mistachkin
26252580
 $(XTCC) $(SHELL_OPTIONS) $(SHELL_CFLAGS) $(SEE_FLAGS) -c $(SQLITE3_SHELL_SRC) -o $@
26262581
26272582
 $(OBJDIR)/th.o: $(SRCDIR)/th.c
26282583
 $(XTCC) -c $(SRCDIR)/th.c -o $@
26292584
@@ -2631,8 +2586,8 @@
26312586
 $(XTCC) -c $(SRCDIR)/th_lang.c -o $@
26322587
26332588
 $(OBJDIR)/th_tcl.o: $(SRCDIR)/th_tcl.c
26342589
 $(XTCC) -c $(SRCDIR)/th_tcl.c -o $@
26352590
2636
-$(OBJDIR)/miniz.o: $(SRCDIR)/miniz.c
2637
- $(XTCC) $(MINIZ_OPTIONS) -c $(SRCDIR)/miniz.c -o $@
2591
+$(OBJDIR)/pikchr.o: $(SRCDIR_extsrc)/pikchr.c
2592
+ $(XTCC) -c $(SRCDIR_extsrc)/pikchr.c -o $@
26382593
26392594
--- win/Makefile.mingw.mistachkin
+++ win/Makefile.mingw.mistachkin
@@ -1,9 +1,9 @@
1 #!/usr/bin/make
2 #
3 ##############################################################################
4 # WARNING: DO NOT EDIT, AUTOMATICALLY GENERATED FILE (SEE "src/makemake.tcl")
5 ##############################################################################
6 #
7 # This file is automatically generated. Instead of editing this
8 # file, edit "makemake.tcl" then run "tclsh makemake.tcl"
9 # to regenerate this file.
@@ -28,10 +28,12 @@
28 #### The toplevel directory of the source tree. Fossil can be built
29 # in a directory that is separate from the source tree. Just change
30 # the following to point from the build directory to the src/ folder.
31 #
32 SRCDIR = src
 
 
33
34 #### The directory into which object code files should be written.
35 #
36 OBJDIR = wbld
37
@@ -101,14 +103,10 @@
101
102 #### Use the SQLite Encryption Extension
103 #
104 # USE_SEE = 1
105
106 #### Use the miniz compression library
107 #
108 # FOSSIL_ENABLE_MINIZ = 1
109
110 #### Use the Tcl source directory instead of the install directory?
111 # This is useful when Tcl has been compiled statically with MinGW.
112 #
113 FOSSIL_TCL_SOURCE = 1
114
@@ -140,18 +138,13 @@
140 # used, taking into account whether zlib is actually enabled and the target
141 # processor architecture.
142 #
143 ifndef X64
144 SSLCONFIG = mingw
145 ifndef FOSSIL_ENABLE_MINIZ
146 ZLIBCONFIG = LOC="-DASMV -DASMINF" OBJA="inffas86.o match.o"
147 ZLIBTARGETS = $(ZLIBDIR)/inffas86.o $(ZLIBDIR)/match.o
148 else
149 ZLIBCONFIG =
150 ZLIBTARGETS =
151 endif
152 else
153 SSLCONFIG = mingw64
154 ZLIBCONFIG =
155 ZLIBTARGETS =
156 endif
157
@@ -161,13 +154,11 @@
161 SSLCONFIG += no-ssl3 no-weak-ssl-ciphers no-shared
162
163 #### When using zlib, make sure that OpenSSL is configured to use the zlib
164 # that Fossil knows about (i.e. the one within the source tree).
165 #
166 ifndef FOSSIL_ENABLE_MINIZ
167 SSLCONFIG += --with-zlib-lib=$(PWD)/$(ZLIBDIR) --with-zlib-include=$(PWD)/$(ZLIBDIR) zlib
168 endif
169
170 #### The directories where the OpenSSL include and library files are located.
171 #
172 OPENSSLDIR = $(SRCDIR)/../compat/openssl
173 OPENSSLINCDIR = $(OPENSSLDIR)/include
@@ -223,10 +214,11 @@
223 # as BCC, unless you are cross-compiling. This C compiler builds
224 # the finished binary for fossil. The BCC compiler above is used
225 # for building intermediate code-generator tools.
226 #
227 TCC = $(PREFIX)$(TCCEXE) -Wall -Wdeclaration-after-statement
 
228
229 #### Add the necessary command line options to build with debugging
230 # symbols, if enabled.
231 #
232 ifdef FOSSIL_ENABLE_SYMBOLS
@@ -233,24 +225,17 @@
233 TCC += -g
234 else
235 TCC += -Os
236 endif
237
238 #### When not using the miniz compression library, zlib is required.
239 #
240 ifndef FOSSIL_ENABLE_MINIZ
241 TCC += -L$(ZLIBDIR) -I$(ZINCDIR)
242 endif
243
244 #### Compile resources for use in building executables that will run
245 # on the target platform.
246 #
247 RCC = $(PREFIX)windres -I$(SRCDIR)
248
249 ifndef FOSSIL_ENABLE_MINIZ
250 RCC += -I$(ZINCDIR)
251 endif
252
253 # With HTTPS support
254 ifdef FOSSIL_ENABLE_SSL
255 TCC += -L$(OPENSSLLIBDIR) -I$(OPENSSLINCDIR)
256 RCC += -I$(OPENSSLINCDIR)
@@ -265,16 +250,10 @@
265 TCC += -L$(TCLLIBDIR) -I$(TCLINCDIR)
266 RCC += -I$(TCLINCDIR)
267 endif
268 endif
269
270 # With miniz (i.e. instead of zlib)
271 ifdef FOSSIL_ENABLE_MINIZ
272 TCC += -DFOSSIL_ENABLE_MINIZ=1
273 RCC += -DFOSSIL_ENABLE_MINIZ=1
274 endif
275
276 # With MinGW command line handling workaround
277 ifdef MINGW_IS_32BIT_ONLY
278 TCC += -DBROKEN_MINGW_CMDLINE=1
279 RCC += -DBROKEN_MINGW_CMDLINE=1
280 endif
@@ -376,15 +355,13 @@
376 # to link against the Z-Lib compression library. There are no
377 # other mandatory dependencies.
378 #
379 LIB += -lmingwex
380
381 #### When not using the miniz compression library, zlib is required.
382 #
383 ifndef FOSSIL_ENABLE_MINIZ
384 LIB += -lz
385 endif
386
387 #### These libraries MUST appear in the same order as they do for Tcl
388 # or linking with it will not work (exact reason unknown).
389 #
390 ifdef FOSSIL_ENABLE_TCL
@@ -516,11 +493,10 @@
516 $(SRCDIR)/moderate.c \
517 $(SRCDIR)/name.c \
518 $(SRCDIR)/patch.c \
519 $(SRCDIR)/path.c \
520 $(SRCDIR)/piechart.c \
521 $(SRCDIR)/pikchr.c \
522 $(SRCDIR)/pikchrshow.c \
523 $(SRCDIR)/pivot.c \
524 $(SRCDIR)/popen.c \
525 $(SRCDIR)/pqueue.c \
526 $(SRCDIR)/printf.c \
@@ -775,11 +751,10 @@
775 $(OBJDIR)/moderate_.c \
776 $(OBJDIR)/name_.c \
777 $(OBJDIR)/patch_.c \
778 $(OBJDIR)/path_.c \
779 $(OBJDIR)/piechart_.c \
780 $(OBJDIR)/pikchr_.c \
781 $(OBJDIR)/pikchrshow_.c \
782 $(OBJDIR)/pivot_.c \
783 $(OBJDIR)/popen_.c \
784 $(OBJDIR)/pqueue_.c \
785 $(OBJDIR)/printf_.c \
@@ -925,11 +900,10 @@
925 $(OBJDIR)/moderate.o \
926 $(OBJDIR)/name.o \
927 $(OBJDIR)/patch.o \
928 $(OBJDIR)/path.o \
929 $(OBJDIR)/piechart.o \
930 $(OBJDIR)/pikchr.o \
931 $(OBJDIR)/pikchrshow.o \
932 $(OBJDIR)/pivot.o \
933 $(OBJDIR)/popen.o \
934 $(OBJDIR)/pqueue.o \
935 $(OBJDIR)/printf.o \
@@ -1025,16 +999,14 @@
1025
1026 all: $(OBJDIR) $(APPNAME)
1027
1028 $(OBJDIR)/fossil.o: $(SRCDIR)/../win/fossil.rc $(OBJDIR)/VERSION.h
1029 ifdef USE_WINDOWS
1030 $(CAT) $(subst /,\,$(SRCDIR)\miniz.c) | $(GREP) "define MZ_VERSION" > $(subst /,\,$(OBJDIR)\minizver.h)
1031 $(CP) $(subst /,\,$(SRCDIR)\..\win\fossil.rc) $(subst /,\,$(OBJDIR))
1032 $(CP) $(subst /,\,$(SRCDIR)\..\win\fossil.ico) $(subst /,\,$(OBJDIR))
1033 $(CP) $(subst /,\,$(SRCDIR)\..\win\fossil.exe.manifest) $(subst /,\,$(OBJDIR))
1034 else
1035 $(CAT) $(SRCDIR)/miniz.c | $(GREP) "define MZ_VERSION" > $(OBJDIR)/minizver.h
1036 $(CP) $(SRCDIR)/../win/fossil.rc $(OBJDIR)
1037 $(CP) $(SRCDIR)/../win/fossil.ico $(OBJDIR)
1038 $(CP) $(SRCDIR)/../win/fossil.exe.manifest $(OBJDIR)
1039 endif
1040 $(RCC) $(OBJDIR)/fossil.rc -o $(OBJDIR)/fossil.o
@@ -1053,27 +1025,27 @@
1053 $(MKDIR) $(subst /,\,$(OBJDIR))
1054 else
1055 $(MKDIR) $(OBJDIR)
1056 endif
1057
1058 $(TRANSLATE): $(SRCDIR)/translate.c
1059 $(XBCC) -o $@ $(SRCDIR)/translate.c
1060
1061 $(MAKEHEADERS): $(SRCDIR)/makeheaders.c
1062 $(XBCC) -o $@ $(SRCDIR)/makeheaders.c
1063
1064 $(MKINDEX): $(SRCDIR)/mkindex.c
1065 $(XBCC) -o $@ $(SRCDIR)/mkindex.c
1066
1067 $(MKBUILTIN): $(SRCDIR)/mkbuiltin.c
1068 $(XBCC) -o $@ $(SRCDIR)/mkbuiltin.c
1069
1070 $(MKVERSION): $(SRCDIR)/mkversion.c
1071 $(XBCC) -o $@ $(SRCDIR)/mkversion.c
1072
1073 $(CODECHECK1): $(SRCDIR)/codecheck1.c
1074 $(XBCC) -o $@ $(SRCDIR)/codecheck1.c
1075
1076 # WARNING. DANGER. Running the test suite modifies the repository the
1077 # build is done from, i.e. the checkout belongs to. Do not sync/push
1078 # the repository after running the tests.
1079 test: $(OBJDIR) $(APPNAME)
@@ -1083,46 +1055,45 @@
1083 $(MKVERSION) $(SRCDIR)/../manifest.uuid $(SRCDIR)/../manifest $(SRCDIR)/../VERSION >$@
1084
1085 $(OBJDIR)/phony.h:
1086 # Force rebuild of VERSION.h every time "make" is run
1087
1088 # The USE_SYSTEM_SQLITE variable may be undefined, set to 0, or set
1089 # to 1. If it is set to 1, then there is no need to build or link
1090 # the sqlite3.o object. Instead, the system SQLite will be linked
1091 # using -lsqlite3.
 
 
 
 
1092 SQLITE3_OBJ.0 = $(OBJDIR)/sqlite3.o
1093 SQLITE3_OBJ.1 =
 
1094 SQLITE3_OBJ. = $(SQLITE3_OBJ.0)
1095
1096 # The FOSSIL_ENABLE_MINIZ variable may be undefined, set to 0, or
1097 # set to 1. If it is set to 1, the miniz library included in the
1098 # source tree should be used; otherwise, it should not.
1099 MINIZ_OBJ.0 =
1100 MINIZ_OBJ.1 = $(OBJDIR)/miniz.o
1101 MINIZ_OBJ. = $(MINIZ_OBJ.0)
1102
1103 # The USE_SEE variable may be undefined, 0 or 1. If undefined or
1104 # 0, ordinary SQLite is used. If 1, then sqlite3-see.c (not part of
1105 # the source tree) is used and extra flags are provided to enable
1106 # the SQLite Encryption Extension.
1107 SQLITE3_SRC.0 = sqlite3.c
1108 SQLITE3_SRC.1 = sqlite3-see.c
1109 SQLITE3_SRC. = sqlite3.c
1110 SQLITE3_SRC = $(SRCDIR)/$(SQLITE3_SRC.$(USE_SEE))
1111 SQLITE3_SHELL_SRC.0 = shell.c
1112 SQLITE3_SHELL_SRC.1 = shell-see.c
1113 SQLITE3_SHELL_SRC. = shell.c
1114 SQLITE3_SHELL_SRC = $(SRCDIR)/$(SQLITE3_SHELL_SRC.$(USE_SEE))
1115 SEE_FLAGS.0 =
1116 SEE_FLAGS.1 = -DSQLITE_HAS_CODEC -DSQLITE_SHELL_DBKEY_PROC=fossil_key
1117 SEE_FLAGS. =
1118 SEE_FLAGS = $(SEE_FLAGS.$(USE_SEE))
1119
1120
1121 EXTRAOBJ = \
1122 $(SQLITE3_OBJ.$(USE_SYSTEM_SQLITE)) \
1123 $(MINIZ_OBJ.$(FOSSIL_ENABLE_MINIZ)) \
1124 $(OBJDIR)/shell.o \
1125 $(OBJDIR)/th.o \
1126 $(OBJDIR)/th_lang.o \
1127 $(OBJDIR)/th_tcl.o \
1128 $(OBJDIR)/cson_amalgamation.o
@@ -1138,15 +1109,11 @@
1138 $(MAKE) -C $(ZLIBDIR) PREFIX=$(PREFIX) CC=$(PREFIX)$(TCCEXE) $(ZLIBCONFIG) -f win32/Makefile.gcc libz.a
1139
1140 clean-zlib:
1141 $(MAKE) -C $(ZLIBDIR) PREFIX=$(PREFIX) CC=$(PREFIX)$(TCCEXE) -f win32/Makefile.gcc clean
1142
1143 ifdef FOSSIL_ENABLE_MINIZ
1144 BLDTARGETS =
1145 else
1146 BLDTARGETS = zlib
1147 endif
1148
1149 openssl: $(BLDTARGETS)
1150 cd $(OPENSSLLIBDIR);./Configure --cross-compile-prefix=$(PREFIX) $(SSLCONFIG)
1151 sed -i -e 's/^PERL=C:\\.*$$/PERL=perl.exe/i' $(OPENSSLLIBDIR)/Makefile
1152 $(MAKE) -C $(OPENSSLLIBDIR) PREFIX=$(PREFIX) CC=$(PREFIX)$(TCCEXE) build_libs
@@ -1198,160 +1165,160 @@
1198 $(OBJDIR)/builtin_data.h: $(MKBUILTIN) $(EXTRA_FILES)
1199 $(MKBUILTIN) --prefix $(SRCDIR)/ $(EXTRA_FILES) >$@
1200
1201 $(OBJDIR)/headers: $(OBJDIR)/page_index.h $(OBJDIR)/builtin_data.h $(MAKEHEADERS) $(OBJDIR)/VERSION.h
1202 $(MAKEHEADERS) $(OBJDIR)/add_.c:$(OBJDIR)/add.h \
1203 $(OBJDIR)/ajax_.c:$(OBJDIR)/ajax.h \
1204 $(OBJDIR)/alerts_.c:$(OBJDIR)/alerts.h \
1205 $(OBJDIR)/allrepo_.c:$(OBJDIR)/allrepo.h \
1206 $(OBJDIR)/attach_.c:$(OBJDIR)/attach.h \
1207 $(OBJDIR)/backlink_.c:$(OBJDIR)/backlink.h \
1208 $(OBJDIR)/backoffice_.c:$(OBJDIR)/backoffice.h \
1209 $(OBJDIR)/bag_.c:$(OBJDIR)/bag.h \
1210 $(OBJDIR)/bisect_.c:$(OBJDIR)/bisect.h \
1211 $(OBJDIR)/blob_.c:$(OBJDIR)/blob.h \
1212 $(OBJDIR)/branch_.c:$(OBJDIR)/branch.h \
1213 $(OBJDIR)/browse_.c:$(OBJDIR)/browse.h \
1214 $(OBJDIR)/builtin_.c:$(OBJDIR)/builtin.h \
1215 $(OBJDIR)/bundle_.c:$(OBJDIR)/bundle.h \
1216 $(OBJDIR)/cache_.c:$(OBJDIR)/cache.h \
1217 $(OBJDIR)/capabilities_.c:$(OBJDIR)/capabilities.h \
1218 $(OBJDIR)/captcha_.c:$(OBJDIR)/captcha.h \
1219 $(OBJDIR)/cgi_.c:$(OBJDIR)/cgi.h \
1220 $(OBJDIR)/chat_.c:$(OBJDIR)/chat.h \
1221 $(OBJDIR)/checkin_.c:$(OBJDIR)/checkin.h \
1222 $(OBJDIR)/checkout_.c:$(OBJDIR)/checkout.h \
1223 $(OBJDIR)/clearsign_.c:$(OBJDIR)/clearsign.h \
1224 $(OBJDIR)/clone_.c:$(OBJDIR)/clone.h \
1225 $(OBJDIR)/color_.c:$(OBJDIR)/color.h \
1226 $(OBJDIR)/comformat_.c:$(OBJDIR)/comformat.h \
1227 $(OBJDIR)/configure_.c:$(OBJDIR)/configure.h \
1228 $(OBJDIR)/content_.c:$(OBJDIR)/content.h \
1229 $(OBJDIR)/cookies_.c:$(OBJDIR)/cookies.h \
1230 $(OBJDIR)/db_.c:$(OBJDIR)/db.h \
1231 $(OBJDIR)/delta_.c:$(OBJDIR)/delta.h \
1232 $(OBJDIR)/deltacmd_.c:$(OBJDIR)/deltacmd.h \
1233 $(OBJDIR)/deltafunc_.c:$(OBJDIR)/deltafunc.h \
1234 $(OBJDIR)/descendants_.c:$(OBJDIR)/descendants.h \
1235 $(OBJDIR)/diff_.c:$(OBJDIR)/diff.h \
1236 $(OBJDIR)/diffcmd_.c:$(OBJDIR)/diffcmd.h \
1237 $(OBJDIR)/dispatch_.c:$(OBJDIR)/dispatch.h \
1238 $(OBJDIR)/doc_.c:$(OBJDIR)/doc.h \
1239 $(OBJDIR)/encode_.c:$(OBJDIR)/encode.h \
1240 $(OBJDIR)/etag_.c:$(OBJDIR)/etag.h \
1241 $(OBJDIR)/event_.c:$(OBJDIR)/event.h \
1242 $(OBJDIR)/export_.c:$(OBJDIR)/export.h \
1243 $(OBJDIR)/extcgi_.c:$(OBJDIR)/extcgi.h \
1244 $(OBJDIR)/file_.c:$(OBJDIR)/file.h \
1245 $(OBJDIR)/fileedit_.c:$(OBJDIR)/fileedit.h \
1246 $(OBJDIR)/finfo_.c:$(OBJDIR)/finfo.h \
1247 $(OBJDIR)/foci_.c:$(OBJDIR)/foci.h \
1248 $(OBJDIR)/forum_.c:$(OBJDIR)/forum.h \
1249 $(OBJDIR)/fshell_.c:$(OBJDIR)/fshell.h \
1250 $(OBJDIR)/fusefs_.c:$(OBJDIR)/fusefs.h \
1251 $(OBJDIR)/fuzz_.c:$(OBJDIR)/fuzz.h \
1252 $(OBJDIR)/glob_.c:$(OBJDIR)/glob.h \
1253 $(OBJDIR)/graph_.c:$(OBJDIR)/graph.h \
1254 $(OBJDIR)/gzip_.c:$(OBJDIR)/gzip.h \
1255 $(OBJDIR)/hname_.c:$(OBJDIR)/hname.h \
1256 $(OBJDIR)/hook_.c:$(OBJDIR)/hook.h \
1257 $(OBJDIR)/http_.c:$(OBJDIR)/http.h \
1258 $(OBJDIR)/http_socket_.c:$(OBJDIR)/http_socket.h \
1259 $(OBJDIR)/http_ssl_.c:$(OBJDIR)/http_ssl.h \
1260 $(OBJDIR)/http_transport_.c:$(OBJDIR)/http_transport.h \
1261 $(OBJDIR)/import_.c:$(OBJDIR)/import.h \
1262 $(OBJDIR)/info_.c:$(OBJDIR)/info.h \
1263 $(OBJDIR)/interwiki_.c:$(OBJDIR)/interwiki.h \
1264 $(OBJDIR)/json_.c:$(OBJDIR)/json.h \
1265 $(OBJDIR)/json_artifact_.c:$(OBJDIR)/json_artifact.h \
1266 $(OBJDIR)/json_branch_.c:$(OBJDIR)/json_branch.h \
1267 $(OBJDIR)/json_config_.c:$(OBJDIR)/json_config.h \
1268 $(OBJDIR)/json_diff_.c:$(OBJDIR)/json_diff.h \
1269 $(OBJDIR)/json_dir_.c:$(OBJDIR)/json_dir.h \
1270 $(OBJDIR)/json_finfo_.c:$(OBJDIR)/json_finfo.h \
1271 $(OBJDIR)/json_login_.c:$(OBJDIR)/json_login.h \
1272 $(OBJDIR)/json_query_.c:$(OBJDIR)/json_query.h \
1273 $(OBJDIR)/json_report_.c:$(OBJDIR)/json_report.h \
1274 $(OBJDIR)/json_status_.c:$(OBJDIR)/json_status.h \
1275 $(OBJDIR)/json_tag_.c:$(OBJDIR)/json_tag.h \
1276 $(OBJDIR)/json_timeline_.c:$(OBJDIR)/json_timeline.h \
1277 $(OBJDIR)/json_user_.c:$(OBJDIR)/json_user.h \
1278 $(OBJDIR)/json_wiki_.c:$(OBJDIR)/json_wiki.h \
1279 $(OBJDIR)/leaf_.c:$(OBJDIR)/leaf.h \
1280 $(OBJDIR)/loadctrl_.c:$(OBJDIR)/loadctrl.h \
1281 $(OBJDIR)/login_.c:$(OBJDIR)/login.h \
1282 $(OBJDIR)/lookslike_.c:$(OBJDIR)/lookslike.h \
1283 $(OBJDIR)/main_.c:$(OBJDIR)/main.h \
1284 $(OBJDIR)/manifest_.c:$(OBJDIR)/manifest.h \
1285 $(OBJDIR)/markdown_.c:$(OBJDIR)/markdown.h \
1286 $(OBJDIR)/markdown_html_.c:$(OBJDIR)/markdown_html.h \
1287 $(OBJDIR)/md5_.c:$(OBJDIR)/md5.h \
1288 $(OBJDIR)/merge_.c:$(OBJDIR)/merge.h \
1289 $(OBJDIR)/merge3_.c:$(OBJDIR)/merge3.h \
1290 $(OBJDIR)/moderate_.c:$(OBJDIR)/moderate.h \
1291 $(OBJDIR)/name_.c:$(OBJDIR)/name.h \
1292 $(OBJDIR)/patch_.c:$(OBJDIR)/patch.h \
1293 $(OBJDIR)/path_.c:$(OBJDIR)/path.h \
1294 $(OBJDIR)/piechart_.c:$(OBJDIR)/piechart.h \
1295 $(OBJDIR)/pikchr_.c:$(OBJDIR)/pikchr.h \
1296 $(OBJDIR)/pikchrshow_.c:$(OBJDIR)/pikchrshow.h \
1297 $(OBJDIR)/pivot_.c:$(OBJDIR)/pivot.h \
1298 $(OBJDIR)/popen_.c:$(OBJDIR)/popen.h \
1299 $(OBJDIR)/pqueue_.c:$(OBJDIR)/pqueue.h \
1300 $(OBJDIR)/printf_.c:$(OBJDIR)/printf.h \
1301 $(OBJDIR)/publish_.c:$(OBJDIR)/publish.h \
1302 $(OBJDIR)/purge_.c:$(OBJDIR)/purge.h \
1303 $(OBJDIR)/rebuild_.c:$(OBJDIR)/rebuild.h \
1304 $(OBJDIR)/regexp_.c:$(OBJDIR)/regexp.h \
1305 $(OBJDIR)/repolist_.c:$(OBJDIR)/repolist.h \
1306 $(OBJDIR)/report_.c:$(OBJDIR)/report.h \
1307 $(OBJDIR)/rss_.c:$(OBJDIR)/rss.h \
1308 $(OBJDIR)/schema_.c:$(OBJDIR)/schema.h \
1309 $(OBJDIR)/search_.c:$(OBJDIR)/search.h \
1310 $(OBJDIR)/security_audit_.c:$(OBJDIR)/security_audit.h \
1311 $(OBJDIR)/setup_.c:$(OBJDIR)/setup.h \
1312 $(OBJDIR)/setupuser_.c:$(OBJDIR)/setupuser.h \
1313 $(OBJDIR)/sha1_.c:$(OBJDIR)/sha1.h \
1314 $(OBJDIR)/sha1hard_.c:$(OBJDIR)/sha1hard.h \
1315 $(OBJDIR)/sha3_.c:$(OBJDIR)/sha3.h \
1316 $(OBJDIR)/shun_.c:$(OBJDIR)/shun.h \
1317 $(OBJDIR)/sitemap_.c:$(OBJDIR)/sitemap.h \
1318 $(OBJDIR)/skins_.c:$(OBJDIR)/skins.h \
1319 $(OBJDIR)/smtp_.c:$(OBJDIR)/smtp.h \
1320 $(OBJDIR)/sqlcmd_.c:$(OBJDIR)/sqlcmd.h \
1321 $(OBJDIR)/stash_.c:$(OBJDIR)/stash.h \
1322 $(OBJDIR)/stat_.c:$(OBJDIR)/stat.h \
1323 $(OBJDIR)/statrep_.c:$(OBJDIR)/statrep.h \
1324 $(OBJDIR)/style_.c:$(OBJDIR)/style.h \
1325 $(OBJDIR)/sync_.c:$(OBJDIR)/sync.h \
1326 $(OBJDIR)/tag_.c:$(OBJDIR)/tag.h \
1327 $(OBJDIR)/tar_.c:$(OBJDIR)/tar.h \
1328 $(OBJDIR)/terminal_.c:$(OBJDIR)/terminal.h \
1329 $(OBJDIR)/th_main_.c:$(OBJDIR)/th_main.h \
1330 $(OBJDIR)/timeline_.c:$(OBJDIR)/timeline.h \
1331 $(OBJDIR)/tkt_.c:$(OBJDIR)/tkt.h \
1332 $(OBJDIR)/tktsetup_.c:$(OBJDIR)/tktsetup.h \
1333 $(OBJDIR)/undo_.c:$(OBJDIR)/undo.h \
1334 $(OBJDIR)/unicode_.c:$(OBJDIR)/unicode.h \
1335 $(OBJDIR)/unversioned_.c:$(OBJDIR)/unversioned.h \
1336 $(OBJDIR)/update_.c:$(OBJDIR)/update.h \
1337 $(OBJDIR)/url_.c:$(OBJDIR)/url.h \
1338 $(OBJDIR)/user_.c:$(OBJDIR)/user.h \
1339 $(OBJDIR)/utf8_.c:$(OBJDIR)/utf8.h \
1340 $(OBJDIR)/util_.c:$(OBJDIR)/util.h \
1341 $(OBJDIR)/verify_.c:$(OBJDIR)/verify.h \
1342 $(OBJDIR)/vfile_.c:$(OBJDIR)/vfile.h \
1343 $(OBJDIR)/wiki_.c:$(OBJDIR)/wiki.h \
1344 $(OBJDIR)/wikiformat_.c:$(OBJDIR)/wikiformat.h \
1345 $(OBJDIR)/winfile_.c:$(OBJDIR)/winfile.h \
1346 $(OBJDIR)/winhttp_.c:$(OBJDIR)/winhttp.h \
1347 $(OBJDIR)/xfer_.c:$(OBJDIR)/xfer.h \
1348 $(OBJDIR)/xfersetup_.c:$(OBJDIR)/xfersetup.h \
1349 $(OBJDIR)/zip_.c:$(OBJDIR)/zip.h \
1350 $(SRCDIR)/sqlite3.h \
1351 $(SRCDIR)/th.h \
1352 $(OBJDIR)/VERSION.h
1353 echo Done >$(OBJDIR)/headers
1354
1355 $(OBJDIR)/headers: Makefile
1356
1357 Makefile:
@@ -2098,18 +2065,10 @@
2098 $(OBJDIR)/piechart.o: $(OBJDIR)/piechart_.c $(OBJDIR)/piechart.h $(SRCDIR)/config.h
2099 $(XTCC) -o $(OBJDIR)/piechart.o -c $(OBJDIR)/piechart_.c
2100
2101 $(OBJDIR)/piechart.h: $(OBJDIR)/headers
2102
2103 $(OBJDIR)/pikchr_.c: $(SRCDIR)/pikchr.c $(TRANSLATE)
2104 $(TRANSLATE) $(SRCDIR)/pikchr.c >$@
2105
2106 $(OBJDIR)/pikchr.o: $(OBJDIR)/pikchr_.c $(OBJDIR)/pikchr.h $(SRCDIR)/config.h
2107 $(XTCC) -o $(OBJDIR)/pikchr.o -c $(OBJDIR)/pikchr_.c
2108
2109 $(OBJDIR)/pikchr.h: $(OBJDIR)/headers
2110
2111 $(OBJDIR)/pikchrshow_.c: $(SRCDIR)/pikchrshow.c $(TRANSLATE)
2112 $(TRANSLATE) $(SRCDIR)/pikchrshow.c >$@
2113
2114 $(OBJDIR)/pikchrshow.o: $(OBJDIR)/pikchrshow_.c $(OBJDIR)/pikchrshow.h $(SRCDIR)/config.h
2115 $(XTCC) -o $(OBJDIR)/pikchrshow.o -c $(OBJDIR)/pikchrshow_.c
@@ -2606,24 +2565,20 @@
2606 -Daccess=file_access \
2607 -Dsystem=fossil_system \
2608 -Dgetenv=fossil_getenv \
2609 -Dfopen=fossil_fopen
2610
2611 MINIZ_OPTIONS = -DMINIZ_NO_STDIO \
2612 -DMINIZ_NO_TIME \
2613 -DMINIZ_NO_ARCHIVE_APIS
2614
2615 $(OBJDIR)/sqlite3.o: $(SQLITE3_SRC) $(SRCDIR)/../win/Makefile.mingw.mistachkin
2616 $(XTCC) $(SQLITE_OPTIONS) $(SQLITE_CFLAGS) $(SEE_FLAGS) \
2617 -c $(SQLITE3_SRC) -o $@
2618
2619 $(OBJDIR)/cson_amalgamation.o: $(SRCDIR)/cson_amalgamation.c
2620 $(XTCC) -c $(SRCDIR)/cson_amalgamation.c -o $@
2621
2622 $(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
2623
2624 $(OBJDIR)/shell.o: $(SQLITE3_SHELL_SRC) $(SRCDIR)/sqlite3.h $(SRCDIR)/../win/Makefile.mingw.mistachkin
2625 $(XTCC) $(SHELL_OPTIONS) $(SHELL_CFLAGS) $(SEE_FLAGS) -c $(SQLITE3_SHELL_SRC) -o $@
2626
2627 $(OBJDIR)/th.o: $(SRCDIR)/th.c
2628 $(XTCC) -c $(SRCDIR)/th.c -o $@
2629
@@ -2631,8 +2586,8 @@
2631 $(XTCC) -c $(SRCDIR)/th_lang.c -o $@
2632
2633 $(OBJDIR)/th_tcl.o: $(SRCDIR)/th_tcl.c
2634 $(XTCC) -c $(SRCDIR)/th_tcl.c -o $@
2635
2636 $(OBJDIR)/miniz.o: $(SRCDIR)/miniz.c
2637 $(XTCC) $(MINIZ_OPTIONS) -c $(SRCDIR)/miniz.c -o $@
2638
2639
--- win/Makefile.mingw.mistachkin
+++ win/Makefile.mingw.mistachkin
@@ -1,9 +1,9 @@
1 #!/usr/bin/make
2 #
3 ##############################################################################
4 # WARNING: DO NOT EDIT, AUTOMATICALLY GENERATED FILE (SEE "tools/makemake.tcl")
5 ##############################################################################
6 #
7 # This file is automatically generated. Instead of editing this
8 # file, edit "makemake.tcl" then run "tclsh makemake.tcl"
9 # to regenerate this file.
@@ -28,10 +28,12 @@
28 #### The toplevel directory of the source tree. Fossil can be built
29 # in a directory that is separate from the source tree. Just change
30 # the following to point from the build directory to the src/ folder.
31 #
32 SRCDIR = src
33 SRCDIR_extsrc = extsrc
34 SRCDIR_tools = tools
35
36 #### The directory into which object code files should be written.
37 #
38 OBJDIR = wbld
39
@@ -101,14 +103,10 @@
103
104 #### Use the SQLite Encryption Extension
105 #
106 # USE_SEE = 1
107
 
 
 
 
108 #### Use the Tcl source directory instead of the install directory?
109 # This is useful when Tcl has been compiled statically with MinGW.
110 #
111 FOSSIL_TCL_SOURCE = 1
112
@@ -140,18 +138,13 @@
138 # used, taking into account whether zlib is actually enabled and the target
139 # processor architecture.
140 #
141 ifndef X64
142 SSLCONFIG = mingw
 
143 ZLIBCONFIG = LOC="-DASMV -DASMINF" OBJA="inffas86.o match.o"
144 ZLIBTARGETS = $(ZLIBDIR)/inffas86.o $(ZLIBDIR)/match.o
145 else
 
 
 
 
146 SSLCONFIG = mingw64
147 ZLIBCONFIG =
148 ZLIBTARGETS =
149 endif
150
@@ -161,13 +154,11 @@
154 SSLCONFIG += no-ssl3 no-weak-ssl-ciphers no-shared
155
156 #### When using zlib, make sure that OpenSSL is configured to use the zlib
157 # that Fossil knows about (i.e. the one within the source tree).
158 #
 
159 SSLCONFIG += --with-zlib-lib=$(PWD)/$(ZLIBDIR) --with-zlib-include=$(PWD)/$(ZLIBDIR) zlib
 
160
161 #### The directories where the OpenSSL include and library files are located.
162 #
163 OPENSSLDIR = $(SRCDIR)/../compat/openssl
164 OPENSSLINCDIR = $(OPENSSLDIR)/include
@@ -223,10 +214,11 @@
214 # as BCC, unless you are cross-compiling. This C compiler builds
215 # the finished binary for fossil. The BCC compiler above is used
216 # for building intermediate code-generator tools.
217 #
218 TCC = $(PREFIX)$(TCCEXE) -Wall -Wdeclaration-after-statement
219 TCC += -I$(SRCDIR_extsrc)
220
221 #### Add the necessary command line options to build with debugging
222 # symbols, if enabled.
223 #
224 ifdef FOSSIL_ENABLE_SYMBOLS
@@ -233,24 +225,17 @@
225 TCC += -g
226 else
227 TCC += -Os
228 endif
229
 
 
 
230 TCC += -L$(ZLIBDIR) -I$(ZINCDIR)
 
231
232 #### Compile resources for use in building executables that will run
233 # on the target platform.
234 #
235 RCC = $(PREFIX)windres -I$(SRCDIR) -I$(ZINCDIR)
236 RCC += -I$(SRCDIR_extsrc)
 
 
 
237
238 # With HTTPS support
239 ifdef FOSSIL_ENABLE_SSL
240 TCC += -L$(OPENSSLLIBDIR) -I$(OPENSSLINCDIR)
241 RCC += -I$(OPENSSLINCDIR)
@@ -265,16 +250,10 @@
250 TCC += -L$(TCLLIBDIR) -I$(TCLINCDIR)
251 RCC += -I$(TCLINCDIR)
252 endif
253 endif
254
 
 
 
 
 
 
255 # With MinGW command line handling workaround
256 ifdef MINGW_IS_32BIT_ONLY
257 TCC += -DBROKEN_MINGW_CMDLINE=1
258 RCC += -DBROKEN_MINGW_CMDLINE=1
259 endif
@@ -376,15 +355,13 @@
355 # to link against the Z-Lib compression library. There are no
356 # other mandatory dependencies.
357 #
358 LIB += -lmingwex
359
360 #### zlib is required.
361 #
 
362 LIB += -lz
 
363
364 #### These libraries MUST appear in the same order as they do for Tcl
365 # or linking with it will not work (exact reason unknown).
366 #
367 ifdef FOSSIL_ENABLE_TCL
@@ -516,11 +493,10 @@
493 $(SRCDIR)/moderate.c \
494 $(SRCDIR)/name.c \
495 $(SRCDIR)/patch.c \
496 $(SRCDIR)/path.c \
497 $(SRCDIR)/piechart.c \
 
498 $(SRCDIR)/pikchrshow.c \
499 $(SRCDIR)/pivot.c \
500 $(SRCDIR)/popen.c \
501 $(SRCDIR)/pqueue.c \
502 $(SRCDIR)/printf.c \
@@ -775,11 +751,10 @@
751 $(OBJDIR)/moderate_.c \
752 $(OBJDIR)/name_.c \
753 $(OBJDIR)/patch_.c \
754 $(OBJDIR)/path_.c \
755 $(OBJDIR)/piechart_.c \
 
756 $(OBJDIR)/pikchrshow_.c \
757 $(OBJDIR)/pivot_.c \
758 $(OBJDIR)/popen_.c \
759 $(OBJDIR)/pqueue_.c \
760 $(OBJDIR)/printf_.c \
@@ -925,11 +900,10 @@
900 $(OBJDIR)/moderate.o \
901 $(OBJDIR)/name.o \
902 $(OBJDIR)/patch.o \
903 $(OBJDIR)/path.o \
904 $(OBJDIR)/piechart.o \
 
905 $(OBJDIR)/pikchrshow.o \
906 $(OBJDIR)/pivot.o \
907 $(OBJDIR)/popen.o \
908 $(OBJDIR)/pqueue.o \
909 $(OBJDIR)/printf.o \
@@ -1025,16 +999,14 @@
999
1000 all: $(OBJDIR) $(APPNAME)
1001
1002 $(OBJDIR)/fossil.o: $(SRCDIR)/../win/fossil.rc $(OBJDIR)/VERSION.h
1003 ifdef USE_WINDOWS
 
1004 $(CP) $(subst /,\,$(SRCDIR)\..\win\fossil.rc) $(subst /,\,$(OBJDIR))
1005 $(CP) $(subst /,\,$(SRCDIR)\..\win\fossil.ico) $(subst /,\,$(OBJDIR))
1006 $(CP) $(subst /,\,$(SRCDIR)\..\win\fossil.exe.manifest) $(subst /,\,$(OBJDIR))
1007 else
 
1008 $(CP) $(SRCDIR)/../win/fossil.rc $(OBJDIR)
1009 $(CP) $(SRCDIR)/../win/fossil.ico $(OBJDIR)
1010 $(CP) $(SRCDIR)/../win/fossil.exe.manifest $(OBJDIR)
1011 endif
1012 $(RCC) $(OBJDIR)/fossil.rc -o $(OBJDIR)/fossil.o
@@ -1053,27 +1025,27 @@
1025 $(MKDIR) $(subst /,\,$(OBJDIR))
1026 else
1027 $(MKDIR) $(OBJDIR)
1028 endif
1029
1030 $(TRANSLATE): $(SRCDIR_tools)/translate.c
1031 $(XBCC) -o $@ $(SRCDIR_tools)/translate.c
1032
1033 $(MAKEHEADERS): $(SRCDIR_tools)/makeheaders.c
1034 $(XBCC) -o $@ $(SRCDIR_tools)/makeheaders.c
1035
1036 $(MKINDEX): $(SRCDIR_tools)/mkindex.c
1037 $(XBCC) -o $@ $(SRCDIR_tools)/mkindex.c
1038
1039 $(MKBUILTIN): $(SRCDIR_tools)/mkbuiltin.c
1040 $(XBCC) -o $@ $(SRCDIR_tools)/mkbuiltin.c
1041
1042 $(MKVERSION): $(SRCDIR_tools)/mkversion.c
1043 $(XBCC) -o $@ $(SRCDIR_tools)/mkversion.c
1044
1045 $(CODECHECK1): $(SRCDIR_tools)/codecheck1.c
1046 $(XBCC) -o $@ $(SRCDIR_tools)/codecheck1.c
1047
1048 # WARNING. DANGER. Running the test suite modifies the repository the
1049 # build is done from, i.e. the checkout belongs to. Do not sync/push
1050 # the repository after running the tests.
1051 test: $(OBJDIR) $(APPNAME)
@@ -1083,46 +1055,45 @@
1055 $(MKVERSION) $(SRCDIR)/../manifest.uuid $(SRCDIR)/../manifest $(SRCDIR)/../VERSION >$@
1056
1057 $(OBJDIR)/phony.h:
1058 # Force rebuild of VERSION.h every time "make" is run
1059
1060 # The USE_SYSTEM_SQLITE variable may be undefined, set to 0 or 1.
1061 # If it is set to 1, then there is no need to build or link
1062 # the sqlite3.o object. Instead, the system SQLite will be linked
1063 # using -lsqlite3.
1064 #
1065 # Closely related is SQLITE3_ORIGIN, with the same 0/1 mapping,
1066 # plus a value of 2 means that we are building a client-provided
1067 # sqlite3.c.
1068 SQLITE3_OBJ.0 = $(OBJDIR)/sqlite3.o
1069 SQLITE3_OBJ.1 =
1070 # SQLITE3_OBJ.2 is set by the configure process
1071 SQLITE3_OBJ. = $(SQLITE3_OBJ.0)
1072
1073 # The USE_SEE variable may be undefined, 0 or 1. If undefined or 0,
1074 # in-tree SQLite is used. If 1, then sqlite3-see.c (not part of the
1075 # source tree) is used and extra flags are provided to enable the
1076 # SQLite Encryption Extension.
1077 SQLITE3_SRC.0 = $(SRCDIR_extsrc)/sqlite3.c
1078 SQLITE3_SRC.1 = $(SRCDIR_extsrc)/sqlite3-see.c
1079 # SQLITE3_SRC.2 is set by top-level configure/makefile process.
1080 SQLITE3_SRC. = $(SRCDIR_extsrc)/sqlite3.c
1081 SQLITE3_SRC = $(SQLITE3_SRC.$(SQLITE3_ORIGIN))
1082 SQLITE3_SHELL_SRC.0 = $(SRCDIR_extsrc)/shell.c
1083 SQLITE3_SHELL_SRC.1 = $(SRCDIR_extsrc)/shell-see.c
1084 # SQLITE3_SHELL_SRC.2 comes from the configure process
1085 SQLITE3_SHELL_SRC. = $(SRCDIR_extsrc)/shell.c
1086 SQLITE3_SHELL_SRC = $(SQLITE3_SHELL_SRC.$(SQLITE3_ORIGIN))
 
 
 
 
 
1087 SEE_FLAGS.0 =
1088 SEE_FLAGS.1 = -DSQLITE_HAS_CODEC -DSQLITE_SHELL_DBKEY_PROC=fossil_key
1089 SEE_FLAGS. =
1090 SEE_FLAGS = $(SEE_FLAGS.$(USE_SEE))
1091
1092
1093 EXTRAOBJ = \
1094 $(SQLITE3_OBJ.$(SQLITE3_ORIGIN)) \
 
1095 $(OBJDIR)/shell.o \
1096 $(OBJDIR)/th.o \
1097 $(OBJDIR)/th_lang.o \
1098 $(OBJDIR)/th_tcl.o \
1099 $(OBJDIR)/cson_amalgamation.o
@@ -1138,15 +1109,11 @@
1109 $(MAKE) -C $(ZLIBDIR) PREFIX=$(PREFIX) CC=$(PREFIX)$(TCCEXE) $(ZLIBCONFIG) -f win32/Makefile.gcc libz.a
1110
1111 clean-zlib:
1112 $(MAKE) -C $(ZLIBDIR) PREFIX=$(PREFIX) CC=$(PREFIX)$(TCCEXE) -f win32/Makefile.gcc clean
1113
 
 
 
1114 BLDTARGETS = zlib
 
1115
1116 openssl: $(BLDTARGETS)
1117 cd $(OPENSSLLIBDIR);./Configure --cross-compile-prefix=$(PREFIX) $(SSLCONFIG)
1118 sed -i -e 's/^PERL=C:\\.*$$/PERL=perl.exe/i' $(OPENSSLLIBDIR)/Makefile
1119 $(MAKE) -C $(OPENSSLLIBDIR) PREFIX=$(PREFIX) CC=$(PREFIX)$(TCCEXE) build_libs
@@ -1198,160 +1165,160 @@
1165 $(OBJDIR)/builtin_data.h: $(MKBUILTIN) $(EXTRA_FILES)
1166 $(MKBUILTIN) --prefix $(SRCDIR)/ $(EXTRA_FILES) >$@
1167
1168 $(OBJDIR)/headers: $(OBJDIR)/page_index.h $(OBJDIR)/builtin_data.h $(MAKEHEADERS) $(OBJDIR)/VERSION.h
1169 $(MAKEHEADERS) $(OBJDIR)/add_.c:$(OBJDIR)/add.h \
1170 $(OBJDIR)/ajax_.c:$(OBJDIR)/ajax.h \
1171 $(OBJDIR)/alerts_.c:$(OBJDIR)/alerts.h \
1172 $(OBJDIR)/allrepo_.c:$(OBJDIR)/allrepo.h \
1173 $(OBJDIR)/attach_.c:$(OBJDIR)/attach.h \
1174 $(OBJDIR)/backlink_.c:$(OBJDIR)/backlink.h \
1175 $(OBJDIR)/backoffice_.c:$(OBJDIR)/backoffice.h \
1176 $(OBJDIR)/bag_.c:$(OBJDIR)/bag.h \
1177 $(OBJDIR)/bisect_.c:$(OBJDIR)/bisect.h \
1178 $(OBJDIR)/blob_.c:$(OBJDIR)/blob.h \
1179 $(OBJDIR)/branch_.c:$(OBJDIR)/branch.h \
1180 $(OBJDIR)/browse_.c:$(OBJDIR)/browse.h \
1181 $(OBJDIR)/builtin_.c:$(OBJDIR)/builtin.h \
1182 $(OBJDIR)/bundle_.c:$(OBJDIR)/bundle.h \
1183 $(OBJDIR)/cache_.c:$(OBJDIR)/cache.h \
1184 $(OBJDIR)/capabilities_.c:$(OBJDIR)/capabilities.h \
1185 $(OBJDIR)/captcha_.c:$(OBJDIR)/captcha.h \
1186 $(OBJDIR)/cgi_.c:$(OBJDIR)/cgi.h \
1187 $(OBJDIR)/chat_.c:$(OBJDIR)/chat.h \
1188 $(OBJDIR)/checkin_.c:$(OBJDIR)/checkin.h \
1189 $(OBJDIR)/checkout_.c:$(OBJDIR)/checkout.h \
1190 $(OBJDIR)/clearsign_.c:$(OBJDIR)/clearsign.h \
1191 $(OBJDIR)/clone_.c:$(OBJDIR)/clone.h \
1192 $(OBJDIR)/color_.c:$(OBJDIR)/color.h \
1193 $(OBJDIR)/comformat_.c:$(OBJDIR)/comformat.h \
1194 $(OBJDIR)/configure_.c:$(OBJDIR)/configure.h \
1195 $(OBJDIR)/content_.c:$(OBJDIR)/content.h \
1196 $(OBJDIR)/cookies_.c:$(OBJDIR)/cookies.h \
1197 $(OBJDIR)/db_.c:$(OBJDIR)/db.h \
1198 $(OBJDIR)/delta_.c:$(OBJDIR)/delta.h \
1199 $(OBJDIR)/deltacmd_.c:$(OBJDIR)/deltacmd.h \
1200 $(OBJDIR)/deltafunc_.c:$(OBJDIR)/deltafunc.h \
1201 $(OBJDIR)/descendants_.c:$(OBJDIR)/descendants.h \
1202 $(OBJDIR)/diff_.c:$(OBJDIR)/diff.h \
1203 $(OBJDIR)/diffcmd_.c:$(OBJDIR)/diffcmd.h \
1204 $(OBJDIR)/dispatch_.c:$(OBJDIR)/dispatch.h \
1205 $(OBJDIR)/doc_.c:$(OBJDIR)/doc.h \
1206 $(OBJDIR)/encode_.c:$(OBJDIR)/encode.h \
1207 $(OBJDIR)/etag_.c:$(OBJDIR)/etag.h \
1208 $(OBJDIR)/event_.c:$(OBJDIR)/event.h \
1209 $(OBJDIR)/export_.c:$(OBJDIR)/export.h \
1210 $(OBJDIR)/extcgi_.c:$(OBJDIR)/extcgi.h \
1211 $(OBJDIR)/file_.c:$(OBJDIR)/file.h \
1212 $(OBJDIR)/fileedit_.c:$(OBJDIR)/fileedit.h \
1213 $(OBJDIR)/finfo_.c:$(OBJDIR)/finfo.h \
1214 $(OBJDIR)/foci_.c:$(OBJDIR)/foci.h \
1215 $(OBJDIR)/forum_.c:$(OBJDIR)/forum.h \
1216 $(OBJDIR)/fshell_.c:$(OBJDIR)/fshell.h \
1217 $(OBJDIR)/fusefs_.c:$(OBJDIR)/fusefs.h \
1218 $(OBJDIR)/fuzz_.c:$(OBJDIR)/fuzz.h \
1219 $(OBJDIR)/glob_.c:$(OBJDIR)/glob.h \
1220 $(OBJDIR)/graph_.c:$(OBJDIR)/graph.h \
1221 $(OBJDIR)/gzip_.c:$(OBJDIR)/gzip.h \
1222 $(OBJDIR)/hname_.c:$(OBJDIR)/hname.h \
1223 $(OBJDIR)/hook_.c:$(OBJDIR)/hook.h \
1224 $(OBJDIR)/http_.c:$(OBJDIR)/http.h \
1225 $(OBJDIR)/http_socket_.c:$(OBJDIR)/http_socket.h \
1226 $(OBJDIR)/http_ssl_.c:$(OBJDIR)/http_ssl.h \
1227 $(OBJDIR)/http_transport_.c:$(OBJDIR)/http_transport.h \
1228 $(OBJDIR)/import_.c:$(OBJDIR)/import.h \
1229 $(OBJDIR)/info_.c:$(OBJDIR)/info.h \
1230 $(OBJDIR)/interwiki_.c:$(OBJDIR)/interwiki.h \
1231 $(OBJDIR)/json_.c:$(OBJDIR)/json.h \
1232 $(OBJDIR)/json_artifact_.c:$(OBJDIR)/json_artifact.h \
1233 $(OBJDIR)/json_branch_.c:$(OBJDIR)/json_branch.h \
1234 $(OBJDIR)/json_config_.c:$(OBJDIR)/json_config.h \
1235 $(OBJDIR)/json_diff_.c:$(OBJDIR)/json_diff.h \
1236 $(OBJDIR)/json_dir_.c:$(OBJDIR)/json_dir.h \
1237 $(OBJDIR)/json_finfo_.c:$(OBJDIR)/json_finfo.h \
1238 $(OBJDIR)/json_login_.c:$(OBJDIR)/json_login.h \
1239 $(OBJDIR)/json_query_.c:$(OBJDIR)/json_query.h \
1240 $(OBJDIR)/json_report_.c:$(OBJDIR)/json_report.h \
1241 $(OBJDIR)/json_status_.c:$(OBJDIR)/json_status.h \
1242 $(OBJDIR)/json_tag_.c:$(OBJDIR)/json_tag.h \
1243 $(OBJDIR)/json_timeline_.c:$(OBJDIR)/json_timeline.h \
1244 $(OBJDIR)/json_user_.c:$(OBJDIR)/json_user.h \
1245 $(OBJDIR)/json_wiki_.c:$(OBJDIR)/json_wiki.h \
1246 $(OBJDIR)/leaf_.c:$(OBJDIR)/leaf.h \
1247 $(OBJDIR)/loadctrl_.c:$(OBJDIR)/loadctrl.h \
1248 $(OBJDIR)/login_.c:$(OBJDIR)/login.h \
1249 $(OBJDIR)/lookslike_.c:$(OBJDIR)/lookslike.h \
1250 $(OBJDIR)/main_.c:$(OBJDIR)/main.h \
1251 $(OBJDIR)/manifest_.c:$(OBJDIR)/manifest.h \
1252 $(OBJDIR)/markdown_.c:$(OBJDIR)/markdown.h \
1253 $(OBJDIR)/markdown_html_.c:$(OBJDIR)/markdown_html.h \
1254 $(OBJDIR)/md5_.c:$(OBJDIR)/md5.h \
1255 $(OBJDIR)/merge_.c:$(OBJDIR)/merge.h \
1256 $(OBJDIR)/merge3_.c:$(OBJDIR)/merge3.h \
1257 $(OBJDIR)/moderate_.c:$(OBJDIR)/moderate.h \
1258 $(OBJDIR)/name_.c:$(OBJDIR)/name.h \
1259 $(OBJDIR)/patch_.c:$(OBJDIR)/patch.h \
1260 $(OBJDIR)/path_.c:$(OBJDIR)/path.h \
1261 $(OBJDIR)/piechart_.c:$(OBJDIR)/piechart.h \
1262 $(OBJDIR)/pikchrshow_.c:$(OBJDIR)/pikchrshow.h \
1263 $(OBJDIR)/pivot_.c:$(OBJDIR)/pivot.h \
1264 $(OBJDIR)/popen_.c:$(OBJDIR)/popen.h \
1265 $(OBJDIR)/pqueue_.c:$(OBJDIR)/pqueue.h \
1266 $(OBJDIR)/printf_.c:$(OBJDIR)/printf.h \
1267 $(OBJDIR)/publish_.c:$(OBJDIR)/publish.h \
1268 $(OBJDIR)/purge_.c:$(OBJDIR)/purge.h \
1269 $(OBJDIR)/rebuild_.c:$(OBJDIR)/rebuild.h \
1270 $(OBJDIR)/regexp_.c:$(OBJDIR)/regexp.h \
1271 $(OBJDIR)/repolist_.c:$(OBJDIR)/repolist.h \
1272 $(OBJDIR)/report_.c:$(OBJDIR)/report.h \
1273 $(OBJDIR)/rss_.c:$(OBJDIR)/rss.h \
1274 $(OBJDIR)/schema_.c:$(OBJDIR)/schema.h \
1275 $(OBJDIR)/search_.c:$(OBJDIR)/search.h \
1276 $(OBJDIR)/security_audit_.c:$(OBJDIR)/security_audit.h \
1277 $(OBJDIR)/setup_.c:$(OBJDIR)/setup.h \
1278 $(OBJDIR)/setupuser_.c:$(OBJDIR)/setupuser.h \
1279 $(OBJDIR)/sha1_.c:$(OBJDIR)/sha1.h \
1280 $(OBJDIR)/sha1hard_.c:$(OBJDIR)/sha1hard.h \
1281 $(OBJDIR)/sha3_.c:$(OBJDIR)/sha3.h \
1282 $(OBJDIR)/shun_.c:$(OBJDIR)/shun.h \
1283 $(OBJDIR)/sitemap_.c:$(OBJDIR)/sitemap.h \
1284 $(OBJDIR)/skins_.c:$(OBJDIR)/skins.h \
1285 $(OBJDIR)/smtp_.c:$(OBJDIR)/smtp.h \
1286 $(OBJDIR)/sqlcmd_.c:$(OBJDIR)/sqlcmd.h \
1287 $(OBJDIR)/stash_.c:$(OBJDIR)/stash.h \
1288 $(OBJDIR)/stat_.c:$(OBJDIR)/stat.h \
1289 $(OBJDIR)/statrep_.c:$(OBJDIR)/statrep.h \
1290 $(OBJDIR)/style_.c:$(OBJDIR)/style.h \
1291 $(OBJDIR)/sync_.c:$(OBJDIR)/sync.h \
1292 $(OBJDIR)/tag_.c:$(OBJDIR)/tag.h \
1293 $(OBJDIR)/tar_.c:$(OBJDIR)/tar.h \
1294 $(OBJDIR)/terminal_.c:$(OBJDIR)/terminal.h \
1295 $(OBJDIR)/th_main_.c:$(OBJDIR)/th_main.h \
1296 $(OBJDIR)/timeline_.c:$(OBJDIR)/timeline.h \
1297 $(OBJDIR)/tkt_.c:$(OBJDIR)/tkt.h \
1298 $(OBJDIR)/tktsetup_.c:$(OBJDIR)/tktsetup.h \
1299 $(OBJDIR)/undo_.c:$(OBJDIR)/undo.h \
1300 $(OBJDIR)/unicode_.c:$(OBJDIR)/unicode.h \
1301 $(OBJDIR)/unversioned_.c:$(OBJDIR)/unversioned.h \
1302 $(OBJDIR)/update_.c:$(OBJDIR)/update.h \
1303 $(OBJDIR)/url_.c:$(OBJDIR)/url.h \
1304 $(OBJDIR)/user_.c:$(OBJDIR)/user.h \
1305 $(OBJDIR)/utf8_.c:$(OBJDIR)/utf8.h \
1306 $(OBJDIR)/util_.c:$(OBJDIR)/util.h \
1307 $(OBJDIR)/verify_.c:$(OBJDIR)/verify.h \
1308 $(OBJDIR)/vfile_.c:$(OBJDIR)/vfile.h \
1309 $(OBJDIR)/wiki_.c:$(OBJDIR)/wiki.h \
1310 $(OBJDIR)/wikiformat_.c:$(OBJDIR)/wikiformat.h \
1311 $(OBJDIR)/winfile_.c:$(OBJDIR)/winfile.h \
1312 $(OBJDIR)/winhttp_.c:$(OBJDIR)/winhttp.h \
1313 $(OBJDIR)/xfer_.c:$(OBJDIR)/xfer.h \
1314 $(OBJDIR)/xfersetup_.c:$(OBJDIR)/xfersetup.h \
1315 $(OBJDIR)/zip_.c:$(OBJDIR)/zip.h \
1316 $(SRCDIR_extsrc)/pikchr.c:$(OBJDIR)/pikchr.h \
1317 $(SRCDIR_extsrc)/sqlite3.h \
1318 $(SRCDIR)/th.h \
1319 $(OBJDIR)/VERSION.h
1320 echo Done >$(OBJDIR)/headers
1321
1322 $(OBJDIR)/headers: Makefile
1323
1324 Makefile:
@@ -2098,18 +2065,10 @@
2065 $(OBJDIR)/piechart.o: $(OBJDIR)/piechart_.c $(OBJDIR)/piechart.h $(SRCDIR)/config.h
2066 $(XTCC) -o $(OBJDIR)/piechart.o -c $(OBJDIR)/piechart_.c
2067
2068 $(OBJDIR)/piechart.h: $(OBJDIR)/headers
2069
 
 
 
 
 
 
 
 
2070 $(OBJDIR)/pikchrshow_.c: $(SRCDIR)/pikchrshow.c $(TRANSLATE)
2071 $(TRANSLATE) $(SRCDIR)/pikchrshow.c >$@
2072
2073 $(OBJDIR)/pikchrshow.o: $(OBJDIR)/pikchrshow_.c $(OBJDIR)/pikchrshow.h $(SRCDIR)/config.h
2074 $(XTCC) -o $(OBJDIR)/pikchrshow.o -c $(OBJDIR)/pikchrshow_.c
@@ -2606,24 +2565,20 @@
2565 -Daccess=file_access \
2566 -Dsystem=fossil_system \
2567 -Dgetenv=fossil_getenv \
2568 -Dfopen=fossil_fopen
2569
 
 
 
 
2570 $(OBJDIR)/sqlite3.o: $(SQLITE3_SRC) $(SRCDIR)/../win/Makefile.mingw.mistachkin
2571 $(XTCC) $(SQLITE_OPTIONS) $(SQLITE_CFLAGS) $(SEE_FLAGS) \
2572 -c $(SQLITE3_SRC) -o $@
2573
2574 $(OBJDIR)/cson_amalgamation.o: $(SRCDIR_extsrc)/cson_amalgamation.c
2575 $(XTCC) -c $(SRCDIR_extsrc)/cson_amalgamation.c -o $@
2576
2577 $(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
2578
2579 $(OBJDIR)/shell.o: $(SQLITE3_SHELL_SRC) $(SRCDIR_extsrc)/sqlite3.h $(SRCDIR)/../win/Makefile.mingw.mistachkin
2580 $(XTCC) $(SHELL_OPTIONS) $(SHELL_CFLAGS) $(SEE_FLAGS) -c $(SQLITE3_SHELL_SRC) -o $@
2581
2582 $(OBJDIR)/th.o: $(SRCDIR)/th.c
2583 $(XTCC) -c $(SRCDIR)/th.c -o $@
2584
@@ -2631,8 +2586,8 @@
2586 $(XTCC) -c $(SRCDIR)/th_lang.c -o $@
2587
2588 $(OBJDIR)/th_tcl.o: $(SRCDIR)/th_tcl.c
2589 $(XTCC) -c $(SRCDIR)/th_tcl.c -o $@
2590
2591 $(OBJDIR)/pikchr.o: $(SRCDIR_extsrc)/pikchr.c
2592 $(XTCC) -c $(SRCDIR_extsrc)/pikchr.c -o $@
2593
2594
M win/fossil.rc
-14
--- win/fossil.rc
+++ win/fossil.rc
@@ -30,21 +30,11 @@
3030
3131
 #include "VERSION.h"
3232
 #define _RC_COMPILE_
3333
 #include "config.h"
3434
 #include "sqlite3.h"
35
-
36
-#if defined(FOSSIL_ENABLE_MINIZ)
37
-#if defined(__MINGW32__)
38
-#include "minizver.h"
39
-#else
40
-#define MINIZ_HEADER_FILE_ONLY
41
-#include "miniz.c"
42
-#endif /* defined(__MINGW32__) */
43
-#else
4435
 #include "zlib.h"
45
-#endif /* defined(FOSSIL_ENABLE_MINIZ) */
4636
4737
 #if defined(FOSSIL_ENABLE_SSL)
4838
 #include "openssl/opensslv.h"
4939
 #endif /* defined(FOSSIL_ENABLE_SSL) */
5040
@@ -107,15 +97,11 @@
10797
 #if defined(FOSSIL_DYNAMIC_BUILD)
10898
 VALUE "DynamicBuild", "Yes\0"
10999
 #else
110100
 VALUE "DynamicBuild", "No\0"
111101
 #endif
112
-#if defined(FOSSIL_ENABLE_MINIZ)
113
- VALUE "MinizVersion", "miniz " MZ_VERSION "\0"
114
-#else
115102
 VALUE "ZlibVersion", "zlib " ZLIB_VERSION "\0"
116
-#endif /* defined(FOSSIL_ENABLE_MINIZ) */
117103
 #if defined(BROKEN_MINGW_CMDLINE)
118104
 VALUE "CommandLineIsUnicode", "No\0"
119105
 #else
120106
 VALUE "CommandLineIsUnicode", "Yes\0"
121107
 #endif /* defined(BROKEN_MINGW_CMDLINE) */
122108
--- win/fossil.rc
+++ win/fossil.rc
@@ -30,21 +30,11 @@
30
31 #include "VERSION.h"
32 #define _RC_COMPILE_
33 #include "config.h"
34 #include "sqlite3.h"
35
36 #if defined(FOSSIL_ENABLE_MINIZ)
37 #if defined(__MINGW32__)
38 #include "minizver.h"
39 #else
40 #define MINIZ_HEADER_FILE_ONLY
41 #include "miniz.c"
42 #endif /* defined(__MINGW32__) */
43 #else
44 #include "zlib.h"
45 #endif /* defined(FOSSIL_ENABLE_MINIZ) */
46
47 #if defined(FOSSIL_ENABLE_SSL)
48 #include "openssl/opensslv.h"
49 #endif /* defined(FOSSIL_ENABLE_SSL) */
50
@@ -107,15 +97,11 @@
107 #if defined(FOSSIL_DYNAMIC_BUILD)
108 VALUE "DynamicBuild", "Yes\0"
109 #else
110 VALUE "DynamicBuild", "No\0"
111 #endif
112 #if defined(FOSSIL_ENABLE_MINIZ)
113 VALUE "MinizVersion", "miniz " MZ_VERSION "\0"
114 #else
115 VALUE "ZlibVersion", "zlib " ZLIB_VERSION "\0"
116 #endif /* defined(FOSSIL_ENABLE_MINIZ) */
117 #if defined(BROKEN_MINGW_CMDLINE)
118 VALUE "CommandLineIsUnicode", "No\0"
119 #else
120 VALUE "CommandLineIsUnicode", "Yes\0"
121 #endif /* defined(BROKEN_MINGW_CMDLINE) */
122
--- win/fossil.rc
+++ win/fossil.rc
@@ -30,21 +30,11 @@
30
31 #include "VERSION.h"
32 #define _RC_COMPILE_
33 #include "config.h"
34 #include "sqlite3.h"
 
 
 
 
 
 
 
 
 
35 #include "zlib.h"
 
36
37 #if defined(FOSSIL_ENABLE_SSL)
38 #include "openssl/opensslv.h"
39 #endif /* defined(FOSSIL_ENABLE_SSL) */
40
@@ -107,15 +97,11 @@
97 #if defined(FOSSIL_DYNAMIC_BUILD)
98 VALUE "DynamicBuild", "Yes\0"
99 #else
100 VALUE "DynamicBuild", "No\0"
101 #endif
 
 
 
102 VALUE "ZlibVersion", "zlib " ZLIB_VERSION "\0"
 
103 #if defined(BROKEN_MINGW_CMDLINE)
104 VALUE "CommandLineIsUnicode", "No\0"
105 #else
106 VALUE "CommandLineIsUnicode", "Yes\0"
107 #endif /* defined(BROKEN_MINGW_CMDLINE) */
108

Keyboard Shortcuts

Open search /
Next entry (timeline) j
Previous entry (timeline) k
Open focused entry Enter
Show this help ?
Toggle theme Top nav button