Fossil SCM

Merge updates from trunk.

mistachkin 2012-01-18 07:21 UTC pushScript merge
Commit df8c5e2ea0840319aa1355b7b6f8887c250368cc
Parent 73566db5c2ccb75…
4 files changed +18 -12 +18 -12 +118 -3 +118 -3
~ win/Makefile.mingw ~ win/Makefile.mingw ~ win/Makefile.mingw.mistachkin ~ win/Makefile.mingw.mistachkin
M win/Makefile.mingw
+18 -12
--- win/Makefile.mingw
+++ win/Makefile.mingw
@@ -8,11 +8,10 @@
88
 #
99
 SRCDIR = src
1010
1111
 #### The directory into which object code files should be written.
1212
 #
13
-#
1413
 OBJDIR = wbld
1514
1615
 #### C Compiler and options for use in building executables that
1716
 # will run on the platform that is doing the build. This is used
1817
 # to compile code-generator programs as part of the build process.
@@ -27,35 +26,41 @@
2726
 #### The directory in which the zlib compression library is installed.
2827
 #
2928
 #
3029
 ZLIBDIR = /programs/gnuwin32
3130
32
-#### C Compile and options for use in building executables that
31
+#### C Compile and options for use in building executables that
3332
 # will run on the target platform. This is usually the same
3433
 # as BCC, unless you are cross-compiling. This C compiler builds
3534
 # the finished binary for fossil. The BCC compiler above is used
3635
 # for building intermediate code-generator tools.
3736
 #
3837
 TCC = gcc -Os -Wall -L$(ZLIBDIR)/lib -I$(ZLIBDIR)/include
3938
4039
 # With HTTPS support
4140
 ifdef FOSSIL_ENABLE_SSL
42
-TCC += -static -DFOSSIL_ENABLE_SSL=1
41
+TCC += -DFOSSIL_ENABLE_SSL=1
4342
 endif
4443
4544
 #### Extra arguments for linking the finished binary. Fossil needs
4645
 # to link against the Z-Lib compression library. There are no
47
-# other dependencies. We sometimes add the -static option here
46
+# other mandatory dependencies. We add the -static option here
4847
 # so that we can build a static executable that will run in a
4948
 # chroot jail.
5049
 #
51
-#LIB = -lz -lws2_32
52
-# OpenSSL:
50
+LIB = -static
51
+LIB += -lmingwex -lz
52
+
53
+# OpenSSL: Add the necessary libaries required.
5354
 ifdef FOSSIL_ENABLE_SSL
5455
 LIB += -lssl -lcrypto -lgdi32
5556
 endif
56
-LIB += -lmingwex -lz -lws2_32
57
+
58
+#### These libraries MUST appear in the same order as they do for Tcl
59
+# or linking with it will not work (exact reason unknown).
60
+#
61
+LIB += -lnetapi32 -lkernel32 -luser32 -ladvapi32 -lws2_32
5762
5863
 #### Tcl shell for use in running the fossil testsuite. This is only
5964
 # used for testing. If you do not run
6065
 #
6166
 TCLSH = tclsh
@@ -393,12 +398,12 @@
393398
 $(BCC) -o $(OBJDIR)/version $(SRCDIR)/mkversion.c
394399
395400
 # WARNING. DANGER. Running the testsuite modifies the repository the
396401
 # build is done from, i.e. the checkout belongs to. Do not sync/push
397402
 # the repository after running the tests.
398
-test: $(APPNAME)
399
- $(TCLSH) test/tester.tcl $(APPNAME)
403
+test: $(OBJDIR) $(APPNAME)
404
+ $(TCLSH) $(SRCDIR)/../test/tester.tcl $(APPNAME)
400405
401406
 $(OBJDIR)/VERSION.h: $(SRCDIR)/../manifest.uuid $(SRCDIR)/../manifest $(VERSION)
402407
 $(VERSION) $(SRCDIR)/../manifest.uuid $(SRCDIR)/../manifest $(SRCDIR)/../VERSION >$(OBJDIR)/VERSION.h
403408
404409
 EXTRAOBJ = $(OBJDIR)/sqlite3.o $(OBJDIR)/shell.o $(OBJDIR)/th.o $(OBJDIR)/th_lang.o $(OBJDIR)/cson_amalgamation.o
@@ -407,18 +412,18 @@
407412
 $(TCC) -o $(APPNAME) $(OBJ) $(EXTRAOBJ) $(LIB) $(OBJDIR)/icon.o
408413
409414
 # This rule prevents make from using its default rules to try build
410415
 # an executable named "manifest" out of the file named "manifest.c"
411416
 #
412
-$(SRCDIR)/../manifest:
417
+$(SRCDIR)/../manifest:
413418
 # noop
414419
415420
 # Requires msys to be installed in addition to the mingw, for the "rm"
416421
 # command. "del" will not work here because it is not a separate command
417422
 # but a MSDOS-shell builtin.
418423
 #
419
-clean:
424
+clean:
420425
 rm -rf $(OBJDIR) $(APPNAME)
421426
422427
 setup: $(OBJDIR) $(APPNAME)
423428
 $(MAKENSIS) ./fossil.nsi
424429
@@ -1093,15 +1098,16 @@
10931098
 $(XTCC) -DSQLITE_OMIT_LOAD_EXTENSION=1 -DSQLITE_THREADSAFE=0 -DSQLITE_DEFAULT_FILE_FORMAT=4 -DSQLITE_ENABLE_STAT3 -Dlocaltime=fossil_localtime -DSQLITE_ENABLE_LOCKING_STYLE=0 -c $(SRCDIR)/sqlite3.c -o $(OBJDIR)/sqlite3.o
10941099
10951100
 $(OBJDIR)/cson_amalgamation.o: $(SRCDIR)/cson_amalgamation.c
10961101
 $(XTCC) -c $(SRCDIR)/cson_amalgamation.c -o $(OBJDIR)/cson_amalgamation.o -DCSON_FOSSIL_MODE
10971102
1098
-$(OBJDIR)/json.o $(OBJDIR)/json_artifact.o $(OBJDIR)/json_branch.o $(OBJDIR)/json_diff.o $(OBJDIR)/json_login.o $(OBJDIR)/json_query.o $(OBJDIR)/json_report.o $(OBJDIR)/json_tag.o $(OBJDIR)/json_timeline.o $(OBJDIR)/json_user.o $(OBJDIR)/json_wiki.o : $(SRCDIR)/json_detail.h
1103
+$(OBJDIR)/json.o $(OBJDIR)/json_artifact.o $(OBJDIR)/json_branch.o $(OBJDIR)/json_diff.o $(OBJDIR)/json_login.o $(OBJDIR)/json_query.o $(OBJDIR)/json_report.o $(OBJDIR)/json_tag.o $(OBJDIR)/json_timeline.o $(OBJDIR)/json_user.o $(OBJDIR)/json_wiki.o: $(SRCDIR)/json_detail.h
1104
+
10991105
 $(OBJDIR)/shell.o: $(SRCDIR)/shell.c $(SRCDIR)/sqlite3.h
11001106
 $(XTCC) -Dmain=sqlite3_shell -DSQLITE_OMIT_LOAD_EXTENSION=1 -c $(SRCDIR)/shell.c -o $(OBJDIR)/shell.o
11011107
11021108
 $(OBJDIR)/th.o: $(SRCDIR)/th.c
11031109
 $(XTCC) -I$(SRCDIR) -c $(SRCDIR)/th.c -o $(OBJDIR)/th.o
11041110
11051111
 $(OBJDIR)/th_lang.o: $(SRCDIR)/th_lang.c
11061112
 $(XTCC) -I$(SRCDIR) -c $(SRCDIR)/th_lang.c -o $(OBJDIR)/th_lang.o
11071113
11081114
--- win/Makefile.mingw
+++ win/Makefile.mingw
@@ -8,11 +8,10 @@
8 #
9 SRCDIR = src
10
11 #### The directory into which object code files should be written.
12 #
13 #
14 OBJDIR = wbld
15
16 #### C Compiler and options for use in building executables that
17 # will run on the platform that is doing the build. This is used
18 # to compile code-generator programs as part of the build process.
@@ -27,35 +26,41 @@
27 #### The directory in which the zlib compression library is installed.
28 #
29 #
30 ZLIBDIR = /programs/gnuwin32
31
32 #### C Compile and options for use in building executables that
33 # will run on the target platform. This is usually the same
34 # as BCC, unless you are cross-compiling. This C compiler builds
35 # the finished binary for fossil. The BCC compiler above is used
36 # for building intermediate code-generator tools.
37 #
38 TCC = gcc -Os -Wall -L$(ZLIBDIR)/lib -I$(ZLIBDIR)/include
39
40 # With HTTPS support
41 ifdef FOSSIL_ENABLE_SSL
42 TCC += -static -DFOSSIL_ENABLE_SSL=1
43 endif
44
45 #### Extra arguments for linking the finished binary. Fossil needs
46 # to link against the Z-Lib compression library. There are no
47 # other dependencies. We sometimes add the -static option here
48 # so that we can build a static executable that will run in a
49 # chroot jail.
50 #
51 #LIB = -lz -lws2_32
52 # OpenSSL:
 
 
53 ifdef FOSSIL_ENABLE_SSL
54 LIB += -lssl -lcrypto -lgdi32
55 endif
56 LIB += -lmingwex -lz -lws2_32
 
 
 
 
57
58 #### Tcl shell for use in running the fossil testsuite. This is only
59 # used for testing. If you do not run
60 #
61 TCLSH = tclsh
@@ -393,12 +398,12 @@
393 $(BCC) -o $(OBJDIR)/version $(SRCDIR)/mkversion.c
394
395 # WARNING. DANGER. Running the testsuite modifies the repository the
396 # build is done from, i.e. the checkout belongs to. Do not sync/push
397 # the repository after running the tests.
398 test: $(APPNAME)
399 $(TCLSH) test/tester.tcl $(APPNAME)
400
401 $(OBJDIR)/VERSION.h: $(SRCDIR)/../manifest.uuid $(SRCDIR)/../manifest $(VERSION)
402 $(VERSION) $(SRCDIR)/../manifest.uuid $(SRCDIR)/../manifest $(SRCDIR)/../VERSION >$(OBJDIR)/VERSION.h
403
404 EXTRAOBJ = $(OBJDIR)/sqlite3.o $(OBJDIR)/shell.o $(OBJDIR)/th.o $(OBJDIR)/th_lang.o $(OBJDIR)/cson_amalgamation.o
@@ -407,18 +412,18 @@
407 $(TCC) -o $(APPNAME) $(OBJ) $(EXTRAOBJ) $(LIB) $(OBJDIR)/icon.o
408
409 # This rule prevents make from using its default rules to try build
410 # an executable named "manifest" out of the file named "manifest.c"
411 #
412 $(SRCDIR)/../manifest:
413 # noop
414
415 # Requires msys to be installed in addition to the mingw, for the "rm"
416 # command. "del" will not work here because it is not a separate command
417 # but a MSDOS-shell builtin.
418 #
419 clean:
420 rm -rf $(OBJDIR) $(APPNAME)
421
422 setup: $(OBJDIR) $(APPNAME)
423 $(MAKENSIS) ./fossil.nsi
424
@@ -1093,15 +1098,16 @@
1093 $(XTCC) -DSQLITE_OMIT_LOAD_EXTENSION=1 -DSQLITE_THREADSAFE=0 -DSQLITE_DEFAULT_FILE_FORMAT=4 -DSQLITE_ENABLE_STAT3 -Dlocaltime=fossil_localtime -DSQLITE_ENABLE_LOCKING_STYLE=0 -c $(SRCDIR)/sqlite3.c -o $(OBJDIR)/sqlite3.o
1094
1095 $(OBJDIR)/cson_amalgamation.o: $(SRCDIR)/cson_amalgamation.c
1096 $(XTCC) -c $(SRCDIR)/cson_amalgamation.c -o $(OBJDIR)/cson_amalgamation.o -DCSON_FOSSIL_MODE
1097
1098 $(OBJDIR)/json.o $(OBJDIR)/json_artifact.o $(OBJDIR)/json_branch.o $(OBJDIR)/json_diff.o $(OBJDIR)/json_login.o $(OBJDIR)/json_query.o $(OBJDIR)/json_report.o $(OBJDIR)/json_tag.o $(OBJDIR)/json_timeline.o $(OBJDIR)/json_user.o $(OBJDIR)/json_wiki.o : $(SRCDIR)/json_detail.h
 
1099 $(OBJDIR)/shell.o: $(SRCDIR)/shell.c $(SRCDIR)/sqlite3.h
1100 $(XTCC) -Dmain=sqlite3_shell -DSQLITE_OMIT_LOAD_EXTENSION=1 -c $(SRCDIR)/shell.c -o $(OBJDIR)/shell.o
1101
1102 $(OBJDIR)/th.o: $(SRCDIR)/th.c
1103 $(XTCC) -I$(SRCDIR) -c $(SRCDIR)/th.c -o $(OBJDIR)/th.o
1104
1105 $(OBJDIR)/th_lang.o: $(SRCDIR)/th_lang.c
1106 $(XTCC) -I$(SRCDIR) -c $(SRCDIR)/th_lang.c -o $(OBJDIR)/th_lang.o
1107
1108
--- win/Makefile.mingw
+++ win/Makefile.mingw
@@ -8,11 +8,10 @@
8 #
9 SRCDIR = src
10
11 #### The directory into which object code files should be written.
12 #
 
13 OBJDIR = wbld
14
15 #### C Compiler and options for use in building executables that
16 # will run on the platform that is doing the build. This is used
17 # to compile code-generator programs as part of the build process.
@@ -27,35 +26,41 @@
26 #### The directory in which the zlib compression library is installed.
27 #
28 #
29 ZLIBDIR = /programs/gnuwin32
30
31 #### C Compile and options for use in building executables that
32 # will run on the target platform. This is usually the same
33 # as BCC, unless you are cross-compiling. This C compiler builds
34 # the finished binary for fossil. The BCC compiler above is used
35 # for building intermediate code-generator tools.
36 #
37 TCC = gcc -Os -Wall -L$(ZLIBDIR)/lib -I$(ZLIBDIR)/include
38
39 # With HTTPS support
40 ifdef FOSSIL_ENABLE_SSL
41 TCC += -DFOSSIL_ENABLE_SSL=1
42 endif
43
44 #### Extra arguments for linking the finished binary. Fossil needs
45 # to link against the Z-Lib compression library. There are no
46 # other mandatory dependencies. We add the -static option here
47 # so that we can build a static executable that will run in a
48 # chroot jail.
49 #
50 LIB = -static
51 LIB += -lmingwex -lz
52
53 # OpenSSL: Add the necessary libaries required.
54 ifdef FOSSIL_ENABLE_SSL
55 LIB += -lssl -lcrypto -lgdi32
56 endif
57
58 #### These libraries MUST appear in the same order as they do for Tcl
59 # or linking with it will not work (exact reason unknown).
60 #
61 LIB += -lnetapi32 -lkernel32 -luser32 -ladvapi32 -lws2_32
62
63 #### Tcl shell for use in running the fossil testsuite. This is only
64 # used for testing. If you do not run
65 #
66 TCLSH = tclsh
@@ -393,12 +398,12 @@
398 $(BCC) -o $(OBJDIR)/version $(SRCDIR)/mkversion.c
399
400 # WARNING. DANGER. Running the testsuite modifies the repository the
401 # build is done from, i.e. the checkout belongs to. Do not sync/push
402 # the repository after running the tests.
403 test: $(OBJDIR) $(APPNAME)
404 $(TCLSH) $(SRCDIR)/../test/tester.tcl $(APPNAME)
405
406 $(OBJDIR)/VERSION.h: $(SRCDIR)/../manifest.uuid $(SRCDIR)/../manifest $(VERSION)
407 $(VERSION) $(SRCDIR)/../manifest.uuid $(SRCDIR)/../manifest $(SRCDIR)/../VERSION >$(OBJDIR)/VERSION.h
408
409 EXTRAOBJ = $(OBJDIR)/sqlite3.o $(OBJDIR)/shell.o $(OBJDIR)/th.o $(OBJDIR)/th_lang.o $(OBJDIR)/cson_amalgamation.o
@@ -407,18 +412,18 @@
412 $(TCC) -o $(APPNAME) $(OBJ) $(EXTRAOBJ) $(LIB) $(OBJDIR)/icon.o
413
414 # This rule prevents make from using its default rules to try build
415 # an executable named "manifest" out of the file named "manifest.c"
416 #
417 $(SRCDIR)/../manifest:
418 # noop
419
420 # Requires msys to be installed in addition to the mingw, for the "rm"
421 # command. "del" will not work here because it is not a separate command
422 # but a MSDOS-shell builtin.
423 #
424 clean:
425 rm -rf $(OBJDIR) $(APPNAME)
426
427 setup: $(OBJDIR) $(APPNAME)
428 $(MAKENSIS) ./fossil.nsi
429
@@ -1093,15 +1098,16 @@
1098 $(XTCC) -DSQLITE_OMIT_LOAD_EXTENSION=1 -DSQLITE_THREADSAFE=0 -DSQLITE_DEFAULT_FILE_FORMAT=4 -DSQLITE_ENABLE_STAT3 -Dlocaltime=fossil_localtime -DSQLITE_ENABLE_LOCKING_STYLE=0 -c $(SRCDIR)/sqlite3.c -o $(OBJDIR)/sqlite3.o
1099
1100 $(OBJDIR)/cson_amalgamation.o: $(SRCDIR)/cson_amalgamation.c
1101 $(XTCC) -c $(SRCDIR)/cson_amalgamation.c -o $(OBJDIR)/cson_amalgamation.o -DCSON_FOSSIL_MODE
1102
1103 $(OBJDIR)/json.o $(OBJDIR)/json_artifact.o $(OBJDIR)/json_branch.o $(OBJDIR)/json_diff.o $(OBJDIR)/json_login.o $(OBJDIR)/json_query.o $(OBJDIR)/json_report.o $(OBJDIR)/json_tag.o $(OBJDIR)/json_timeline.o $(OBJDIR)/json_user.o $(OBJDIR)/json_wiki.o: $(SRCDIR)/json_detail.h
1104
1105 $(OBJDIR)/shell.o: $(SRCDIR)/shell.c $(SRCDIR)/sqlite3.h
1106 $(XTCC) -Dmain=sqlite3_shell -DSQLITE_OMIT_LOAD_EXTENSION=1 -c $(SRCDIR)/shell.c -o $(OBJDIR)/shell.o
1107
1108 $(OBJDIR)/th.o: $(SRCDIR)/th.c
1109 $(XTCC) -I$(SRCDIR) -c $(SRCDIR)/th.c -o $(OBJDIR)/th.o
1110
1111 $(OBJDIR)/th_lang.o: $(SRCDIR)/th_lang.c
1112 $(XTCC) -I$(SRCDIR) -c $(SRCDIR)/th_lang.c -o $(OBJDIR)/th_lang.o
1113
1114
M win/Makefile.mingw
+18 -12
--- win/Makefile.mingw
+++ win/Makefile.mingw
@@ -8,11 +8,10 @@
88
 #
99
 SRCDIR = src
1010
1111
 #### The directory into which object code files should be written.
1212
 #
13
-#
1413
 OBJDIR = wbld
1514
1615
 #### C Compiler and options for use in building executables that
1716
 # will run on the platform that is doing the build. This is used
1817
 # to compile code-generator programs as part of the build process.
@@ -27,35 +26,41 @@
2726
 #### The directory in which the zlib compression library is installed.
2827
 #
2928
 #
3029
 ZLIBDIR = /programs/gnuwin32
3130
32
-#### C Compile and options for use in building executables that
31
+#### C Compile and options for use in building executables that
3332
 # will run on the target platform. This is usually the same
3433
 # as BCC, unless you are cross-compiling. This C compiler builds
3534
 # the finished binary for fossil. The BCC compiler above is used
3635
 # for building intermediate code-generator tools.
3736
 #
3837
 TCC = gcc -Os -Wall -L$(ZLIBDIR)/lib -I$(ZLIBDIR)/include
3938
4039
 # With HTTPS support
4140
 ifdef FOSSIL_ENABLE_SSL
42
-TCC += -static -DFOSSIL_ENABLE_SSL=1
41
+TCC += -DFOSSIL_ENABLE_SSL=1
4342
 endif
4443
4544
 #### Extra arguments for linking the finished binary. Fossil needs
4645
 # to link against the Z-Lib compression library. There are no
47
-# other dependencies. We sometimes add the -static option here
46
+# other mandatory dependencies. We add the -static option here
4847
 # so that we can build a static executable that will run in a
4948
 # chroot jail.
5049
 #
51
-#LIB = -lz -lws2_32
52
-# OpenSSL:
50
+LIB = -static
51
+LIB += -lmingwex -lz
52
+
53
+# OpenSSL: Add the necessary libaries required.
5354
 ifdef FOSSIL_ENABLE_SSL
5455
 LIB += -lssl -lcrypto -lgdi32
5556
 endif
56
-LIB += -lmingwex -lz -lws2_32
57
+
58
+#### These libraries MUST appear in the same order as they do for Tcl
59
+# or linking with it will not work (exact reason unknown).
60
+#
61
+LIB += -lnetapi32 -lkernel32 -luser32 -ladvapi32 -lws2_32
5762
5863
 #### Tcl shell for use in running the fossil testsuite. This is only
5964
 # used for testing. If you do not run
6065
 #
6166
 TCLSH = tclsh
@@ -393,12 +398,12 @@
393398
 $(BCC) -o $(OBJDIR)/version $(SRCDIR)/mkversion.c
394399
395400
 # WARNING. DANGER. Running the testsuite modifies the repository the
396401
 # build is done from, i.e. the checkout belongs to. Do not sync/push
397402
 # the repository after running the tests.
398
-test: $(APPNAME)
399
- $(TCLSH) test/tester.tcl $(APPNAME)
403
+test: $(OBJDIR) $(APPNAME)
404
+ $(TCLSH) $(SRCDIR)/../test/tester.tcl $(APPNAME)
400405
401406
 $(OBJDIR)/VERSION.h: $(SRCDIR)/../manifest.uuid $(SRCDIR)/../manifest $(VERSION)
402407
 $(VERSION) $(SRCDIR)/../manifest.uuid $(SRCDIR)/../manifest $(SRCDIR)/../VERSION >$(OBJDIR)/VERSION.h
403408
404409
 EXTRAOBJ = $(OBJDIR)/sqlite3.o $(OBJDIR)/shell.o $(OBJDIR)/th.o $(OBJDIR)/th_lang.o $(OBJDIR)/cson_amalgamation.o
@@ -407,18 +412,18 @@
407412
 $(TCC) -o $(APPNAME) $(OBJ) $(EXTRAOBJ) $(LIB) $(OBJDIR)/icon.o
408413
409414
 # This rule prevents make from using its default rules to try build
410415
 # an executable named "manifest" out of the file named "manifest.c"
411416
 #
412
-$(SRCDIR)/../manifest:
417
+$(SRCDIR)/../manifest:
413418
 # noop
414419
415420
 # Requires msys to be installed in addition to the mingw, for the "rm"
416421
 # command. "del" will not work here because it is not a separate command
417422
 # but a MSDOS-shell builtin.
418423
 #
419
-clean:
424
+clean:
420425
 rm -rf $(OBJDIR) $(APPNAME)
421426
422427
 setup: $(OBJDIR) $(APPNAME)
423428
 $(MAKENSIS) ./fossil.nsi
424429
@@ -1093,15 +1098,16 @@
10931098
 $(XTCC) -DSQLITE_OMIT_LOAD_EXTENSION=1 -DSQLITE_THREADSAFE=0 -DSQLITE_DEFAULT_FILE_FORMAT=4 -DSQLITE_ENABLE_STAT3 -Dlocaltime=fossil_localtime -DSQLITE_ENABLE_LOCKING_STYLE=0 -c $(SRCDIR)/sqlite3.c -o $(OBJDIR)/sqlite3.o
10941099
10951100
 $(OBJDIR)/cson_amalgamation.o: $(SRCDIR)/cson_amalgamation.c
10961101
 $(XTCC) -c $(SRCDIR)/cson_amalgamation.c -o $(OBJDIR)/cson_amalgamation.o -DCSON_FOSSIL_MODE
10971102
1098
-$(OBJDIR)/json.o $(OBJDIR)/json_artifact.o $(OBJDIR)/json_branch.o $(OBJDIR)/json_diff.o $(OBJDIR)/json_login.o $(OBJDIR)/json_query.o $(OBJDIR)/json_report.o $(OBJDIR)/json_tag.o $(OBJDIR)/json_timeline.o $(OBJDIR)/json_user.o $(OBJDIR)/json_wiki.o : $(SRCDIR)/json_detail.h
1103
+$(OBJDIR)/json.o $(OBJDIR)/json_artifact.o $(OBJDIR)/json_branch.o $(OBJDIR)/json_diff.o $(OBJDIR)/json_login.o $(OBJDIR)/json_query.o $(OBJDIR)/json_report.o $(OBJDIR)/json_tag.o $(OBJDIR)/json_timeline.o $(OBJDIR)/json_user.o $(OBJDIR)/json_wiki.o: $(SRCDIR)/json_detail.h
1104
+
10991105
 $(OBJDIR)/shell.o: $(SRCDIR)/shell.c $(SRCDIR)/sqlite3.h
11001106
 $(XTCC) -Dmain=sqlite3_shell -DSQLITE_OMIT_LOAD_EXTENSION=1 -c $(SRCDIR)/shell.c -o $(OBJDIR)/shell.o
11011107
11021108
 $(OBJDIR)/th.o: $(SRCDIR)/th.c
11031109
 $(XTCC) -I$(SRCDIR) -c $(SRCDIR)/th.c -o $(OBJDIR)/th.o
11041110
11051111
 $(OBJDIR)/th_lang.o: $(SRCDIR)/th_lang.c
11061112
 $(XTCC) -I$(SRCDIR) -c $(SRCDIR)/th_lang.c -o $(OBJDIR)/th_lang.o
11071113
11081114
--- win/Makefile.mingw
+++ win/Makefile.mingw
@@ -8,11 +8,10 @@
8 #
9 SRCDIR = src
10
11 #### The directory into which object code files should be written.
12 #
13 #
14 OBJDIR = wbld
15
16 #### C Compiler and options for use in building executables that
17 # will run on the platform that is doing the build. This is used
18 # to compile code-generator programs as part of the build process.
@@ -27,35 +26,41 @@
27 #### The directory in which the zlib compression library is installed.
28 #
29 #
30 ZLIBDIR = /programs/gnuwin32
31
32 #### C Compile and options for use in building executables that
33 # will run on the target platform. This is usually the same
34 # as BCC, unless you are cross-compiling. This C compiler builds
35 # the finished binary for fossil. The BCC compiler above is used
36 # for building intermediate code-generator tools.
37 #
38 TCC = gcc -Os -Wall -L$(ZLIBDIR)/lib -I$(ZLIBDIR)/include
39
40 # With HTTPS support
41 ifdef FOSSIL_ENABLE_SSL
42 TCC += -static -DFOSSIL_ENABLE_SSL=1
43 endif
44
45 #### Extra arguments for linking the finished binary. Fossil needs
46 # to link against the Z-Lib compression library. There are no
47 # other dependencies. We sometimes add the -static option here
48 # so that we can build a static executable that will run in a
49 # chroot jail.
50 #
51 #LIB = -lz -lws2_32
52 # OpenSSL:
 
 
53 ifdef FOSSIL_ENABLE_SSL
54 LIB += -lssl -lcrypto -lgdi32
55 endif
56 LIB += -lmingwex -lz -lws2_32
 
 
 
 
57
58 #### Tcl shell for use in running the fossil testsuite. This is only
59 # used for testing. If you do not run
60 #
61 TCLSH = tclsh
@@ -393,12 +398,12 @@
393 $(BCC) -o $(OBJDIR)/version $(SRCDIR)/mkversion.c
394
395 # WARNING. DANGER. Running the testsuite modifies the repository the
396 # build is done from, i.e. the checkout belongs to. Do not sync/push
397 # the repository after running the tests.
398 test: $(APPNAME)
399 $(TCLSH) test/tester.tcl $(APPNAME)
400
401 $(OBJDIR)/VERSION.h: $(SRCDIR)/../manifest.uuid $(SRCDIR)/../manifest $(VERSION)
402 $(VERSION) $(SRCDIR)/../manifest.uuid $(SRCDIR)/../manifest $(SRCDIR)/../VERSION >$(OBJDIR)/VERSION.h
403
404 EXTRAOBJ = $(OBJDIR)/sqlite3.o $(OBJDIR)/shell.o $(OBJDIR)/th.o $(OBJDIR)/th_lang.o $(OBJDIR)/cson_amalgamation.o
@@ -407,18 +412,18 @@
407 $(TCC) -o $(APPNAME) $(OBJ) $(EXTRAOBJ) $(LIB) $(OBJDIR)/icon.o
408
409 # This rule prevents make from using its default rules to try build
410 # an executable named "manifest" out of the file named "manifest.c"
411 #
412 $(SRCDIR)/../manifest:
413 # noop
414
415 # Requires msys to be installed in addition to the mingw, for the "rm"
416 # command. "del" will not work here because it is not a separate command
417 # but a MSDOS-shell builtin.
418 #
419 clean:
420 rm -rf $(OBJDIR) $(APPNAME)
421
422 setup: $(OBJDIR) $(APPNAME)
423 $(MAKENSIS) ./fossil.nsi
424
@@ -1093,15 +1098,16 @@
1093 $(XTCC) -DSQLITE_OMIT_LOAD_EXTENSION=1 -DSQLITE_THREADSAFE=0 -DSQLITE_DEFAULT_FILE_FORMAT=4 -DSQLITE_ENABLE_STAT3 -Dlocaltime=fossil_localtime -DSQLITE_ENABLE_LOCKING_STYLE=0 -c $(SRCDIR)/sqlite3.c -o $(OBJDIR)/sqlite3.o
1094
1095 $(OBJDIR)/cson_amalgamation.o: $(SRCDIR)/cson_amalgamation.c
1096 $(XTCC) -c $(SRCDIR)/cson_amalgamation.c -o $(OBJDIR)/cson_amalgamation.o -DCSON_FOSSIL_MODE
1097
1098 $(OBJDIR)/json.o $(OBJDIR)/json_artifact.o $(OBJDIR)/json_branch.o $(OBJDIR)/json_diff.o $(OBJDIR)/json_login.o $(OBJDIR)/json_query.o $(OBJDIR)/json_report.o $(OBJDIR)/json_tag.o $(OBJDIR)/json_timeline.o $(OBJDIR)/json_user.o $(OBJDIR)/json_wiki.o : $(SRCDIR)/json_detail.h
 
1099 $(OBJDIR)/shell.o: $(SRCDIR)/shell.c $(SRCDIR)/sqlite3.h
1100 $(XTCC) -Dmain=sqlite3_shell -DSQLITE_OMIT_LOAD_EXTENSION=1 -c $(SRCDIR)/shell.c -o $(OBJDIR)/shell.o
1101
1102 $(OBJDIR)/th.o: $(SRCDIR)/th.c
1103 $(XTCC) -I$(SRCDIR) -c $(SRCDIR)/th.c -o $(OBJDIR)/th.o
1104
1105 $(OBJDIR)/th_lang.o: $(SRCDIR)/th_lang.c
1106 $(XTCC) -I$(SRCDIR) -c $(SRCDIR)/th_lang.c -o $(OBJDIR)/th_lang.o
1107
1108
--- win/Makefile.mingw
+++ win/Makefile.mingw
@@ -8,11 +8,10 @@
8 #
9 SRCDIR = src
10
11 #### The directory into which object code files should be written.
12 #
 
13 OBJDIR = wbld
14
15 #### C Compiler and options for use in building executables that
16 # will run on the platform that is doing the build. This is used
17 # to compile code-generator programs as part of the build process.
@@ -27,35 +26,41 @@
26 #### The directory in which the zlib compression library is installed.
27 #
28 #
29 ZLIBDIR = /programs/gnuwin32
30
31 #### C Compile and options for use in building executables that
32 # will run on the target platform. This is usually the same
33 # as BCC, unless you are cross-compiling. This C compiler builds
34 # the finished binary for fossil. The BCC compiler above is used
35 # for building intermediate code-generator tools.
36 #
37 TCC = gcc -Os -Wall -L$(ZLIBDIR)/lib -I$(ZLIBDIR)/include
38
39 # With HTTPS support
40 ifdef FOSSIL_ENABLE_SSL
41 TCC += -DFOSSIL_ENABLE_SSL=1
42 endif
43
44 #### Extra arguments for linking the finished binary. Fossil needs
45 # to link against the Z-Lib compression library. There are no
46 # other mandatory dependencies. We add the -static option here
47 # so that we can build a static executable that will run in a
48 # chroot jail.
49 #
50 LIB = -static
51 LIB += -lmingwex -lz
52
53 # OpenSSL: Add the necessary libaries required.
54 ifdef FOSSIL_ENABLE_SSL
55 LIB += -lssl -lcrypto -lgdi32
56 endif
57
58 #### These libraries MUST appear in the same order as they do for Tcl
59 # or linking with it will not work (exact reason unknown).
60 #
61 LIB += -lnetapi32 -lkernel32 -luser32 -ladvapi32 -lws2_32
62
63 #### Tcl shell for use in running the fossil testsuite. This is only
64 # used for testing. If you do not run
65 #
66 TCLSH = tclsh
@@ -393,12 +398,12 @@
398 $(BCC) -o $(OBJDIR)/version $(SRCDIR)/mkversion.c
399
400 # WARNING. DANGER. Running the testsuite modifies the repository the
401 # build is done from, i.e. the checkout belongs to. Do not sync/push
402 # the repository after running the tests.
403 test: $(OBJDIR) $(APPNAME)
404 $(TCLSH) $(SRCDIR)/../test/tester.tcl $(APPNAME)
405
406 $(OBJDIR)/VERSION.h: $(SRCDIR)/../manifest.uuid $(SRCDIR)/../manifest $(VERSION)
407 $(VERSION) $(SRCDIR)/../manifest.uuid $(SRCDIR)/../manifest $(SRCDIR)/../VERSION >$(OBJDIR)/VERSION.h
408
409 EXTRAOBJ = $(OBJDIR)/sqlite3.o $(OBJDIR)/shell.o $(OBJDIR)/th.o $(OBJDIR)/th_lang.o $(OBJDIR)/cson_amalgamation.o
@@ -407,18 +412,18 @@
412 $(TCC) -o $(APPNAME) $(OBJ) $(EXTRAOBJ) $(LIB) $(OBJDIR)/icon.o
413
414 # This rule prevents make from using its default rules to try build
415 # an executable named "manifest" out of the file named "manifest.c"
416 #
417 $(SRCDIR)/../manifest:
418 # noop
419
420 # Requires msys to be installed in addition to the mingw, for the "rm"
421 # command. "del" will not work here because it is not a separate command
422 # but a MSDOS-shell builtin.
423 #
424 clean:
425 rm -rf $(OBJDIR) $(APPNAME)
426
427 setup: $(OBJDIR) $(APPNAME)
428 $(MAKENSIS) ./fossil.nsi
429
@@ -1093,15 +1098,16 @@
1098 $(XTCC) -DSQLITE_OMIT_LOAD_EXTENSION=1 -DSQLITE_THREADSAFE=0 -DSQLITE_DEFAULT_FILE_FORMAT=4 -DSQLITE_ENABLE_STAT3 -Dlocaltime=fossil_localtime -DSQLITE_ENABLE_LOCKING_STYLE=0 -c $(SRCDIR)/sqlite3.c -o $(OBJDIR)/sqlite3.o
1099
1100 $(OBJDIR)/cson_amalgamation.o: $(SRCDIR)/cson_amalgamation.c
1101 $(XTCC) -c $(SRCDIR)/cson_amalgamation.c -o $(OBJDIR)/cson_amalgamation.o -DCSON_FOSSIL_MODE
1102
1103 $(OBJDIR)/json.o $(OBJDIR)/json_artifact.o $(OBJDIR)/json_branch.o $(OBJDIR)/json_diff.o $(OBJDIR)/json_login.o $(OBJDIR)/json_query.o $(OBJDIR)/json_report.o $(OBJDIR)/json_tag.o $(OBJDIR)/json_timeline.o $(OBJDIR)/json_user.o $(OBJDIR)/json_wiki.o: $(SRCDIR)/json_detail.h
1104
1105 $(OBJDIR)/shell.o: $(SRCDIR)/shell.c $(SRCDIR)/sqlite3.h
1106 $(XTCC) -Dmain=sqlite3_shell -DSQLITE_OMIT_LOAD_EXTENSION=1 -c $(SRCDIR)/shell.c -o $(OBJDIR)/shell.o
1107
1108 $(OBJDIR)/th.o: $(SRCDIR)/th.c
1109 $(XTCC) -I$(SRCDIR) -c $(SRCDIR)/th.c -o $(OBJDIR)/th.o
1110
1111 $(OBJDIR)/th_lang.o: $(SRCDIR)/th_lang.c
1112 $(XTCC) -I$(SRCDIR) -c $(SRCDIR)/th_lang.c -o $(OBJDIR)/th_lang.o
1113
1114
M win/Makefile.mingw.mistachkin
+118 -3
--- win/Makefile.mingw.mistachkin
+++ win/Makefile.mingw.mistachkin
@@ -170,10 +170,21 @@
170170
 $(SRCDIR)/http_socket.c \
171171
 $(SRCDIR)/http_ssl.c \
172172
 $(SRCDIR)/http_transport.c \
173173
 $(SRCDIR)/import.c \
174174
 $(SRCDIR)/info.c \
175
+ $(SRCDIR)/json.c \
176
+ $(SRCDIR)/json_artifact.c \
177
+ $(SRCDIR)/json_branch.c \
178
+ $(SRCDIR)/json_diff.c \
179
+ $(SRCDIR)/json_login.c \
180
+ $(SRCDIR)/json_query.c \
181
+ $(SRCDIR)/json_report.c \
182
+ $(SRCDIR)/json_tag.c \
183
+ $(SRCDIR)/json_timeline.c \
184
+ $(SRCDIR)/json_user.c \
185
+ $(SRCDIR)/json_wiki.c \
175186
 $(SRCDIR)/leaf.c \
176187
 $(SRCDIR)/login.c \
177188
 $(SRCDIR)/main.c \
178189
 $(SRCDIR)/manifest.c \
179190
 $(SRCDIR)/md5.c \
@@ -255,10 +266,21 @@
255266
 $(OBJDIR)/http_socket_.c \
256267
 $(OBJDIR)/http_ssl_.c \
257268
 $(OBJDIR)/http_transport_.c \
258269
 $(OBJDIR)/import_.c \
259270
 $(OBJDIR)/info_.c \
271
+ $(OBJDIR)/json_.c \
272
+ $(OBJDIR)/json_artifact_.c \
273
+ $(OBJDIR)/json_branch_.c \
274
+ $(OBJDIR)/json_diff_.c \
275
+ $(OBJDIR)/json_login_.c \
276
+ $(OBJDIR)/json_query_.c \
277
+ $(OBJDIR)/json_report_.c \
278
+ $(OBJDIR)/json_tag_.c \
279
+ $(OBJDIR)/json_timeline_.c \
280
+ $(OBJDIR)/json_user_.c \
281
+ $(OBJDIR)/json_wiki_.c \
260282
 $(OBJDIR)/leaf_.c \
261283
 $(OBJDIR)/login_.c \
262284
 $(OBJDIR)/main_.c \
263285
 $(OBJDIR)/manifest_.c \
264286
 $(OBJDIR)/md5_.c \
@@ -340,10 +362,21 @@
340362
 $(OBJDIR)/http_socket.o \
341363
 $(OBJDIR)/http_ssl.o \
342364
 $(OBJDIR)/http_transport.o \
343365
 $(OBJDIR)/import.o \
344366
 $(OBJDIR)/info.o \
367
+ $(OBJDIR)/json.o \
368
+ $(OBJDIR)/json_artifact.o \
369
+ $(OBJDIR)/json_branch.o \
370
+ $(OBJDIR)/json_diff.o \
371
+ $(OBJDIR)/json_login.o \
372
+ $(OBJDIR)/json_query.o \
373
+ $(OBJDIR)/json_report.o \
374
+ $(OBJDIR)/json_tag.o \
375
+ $(OBJDIR)/json_timeline.o \
376
+ $(OBJDIR)/json_user.o \
377
+ $(OBJDIR)/json_wiki.o \
345378
 $(OBJDIR)/leaf.o \
346379
 $(OBJDIR)/login.o \
347380
 $(OBJDIR)/main.o \
348381
 $(OBJDIR)/manifest.o \
349382
 $(OBJDIR)/md5.o \
@@ -426,11 +459,11 @@
426459
 $(TCLSH) $(SRCDIR)/../test/tester.tcl $(APPNAME)
427460
428461
 $(OBJDIR)/VERSION.h: $(SRCDIR)/../manifest.uuid $(SRCDIR)/../manifest $(VERSION)
429462
 $(VERSION) $(SRCDIR)/../manifest.uuid $(SRCDIR)/../manifest $(SRCDIR)/../VERSION >$(OBJDIR)/VERSION.h
430463
431
-EXTRAOBJ = $(OBJDIR)/sqlite3.o $(OBJDIR)/shell.o $(OBJDIR)/th.o $(OBJDIR)/th_lang.o
464
+EXTRAOBJ = $(OBJDIR)/sqlite3.o $(OBJDIR)/shell.o $(OBJDIR)/th.o $(OBJDIR)/th_lang.o $(OBJDIR)/cson_amalgamation.o
432465
433466
 ifdef FOSSIL_ENABLE_TCL
434467
 EXTRAOBJ += $(OBJDIR)/th_tcl.o
435468
 endif
436469
@@ -455,11 +488,11 @@
455488
456489
457490
 $(OBJDIR)/page_index.h: $(TRANS_SRC) $(OBJDIR)/mkindex
458491
 $(MKINDEX) $(TRANS_SRC) >$@
459492
 $(OBJDIR)/headers: $(OBJDIR)/page_index.h $(OBJDIR)/makeheaders $(OBJDIR)/VERSION.h
460
- $(MAKEHEADERS) $(OBJDIR)/add_.c:$(OBJDIR)/add.h $(OBJDIR)/allrepo_.c:$(OBJDIR)/allrepo.h $(OBJDIR)/attach_.c:$(OBJDIR)/attach.h $(OBJDIR)/bag_.c:$(OBJDIR)/bag.h $(OBJDIR)/bisect_.c:$(OBJDIR)/bisect.h $(OBJDIR)/blob_.c:$(OBJDIR)/blob.h $(OBJDIR)/branch_.c:$(OBJDIR)/branch.h $(OBJDIR)/browse_.c:$(OBJDIR)/browse.h $(OBJDIR)/captcha_.c:$(OBJDIR)/captcha.h $(OBJDIR)/cgi_.c:$(OBJDIR)/cgi.h $(OBJDIR)/checkin_.c:$(OBJDIR)/checkin.h $(OBJDIR)/checkout_.c:$(OBJDIR)/checkout.h $(OBJDIR)/clearsign_.c:$(OBJDIR)/clearsign.h $(OBJDIR)/clone_.c:$(OBJDIR)/clone.h $(OBJDIR)/comformat_.c:$(OBJDIR)/comformat.h $(OBJDIR)/configure_.c:$(OBJDIR)/configure.h $(OBJDIR)/content_.c:$(OBJDIR)/content.h $(OBJDIR)/db_.c:$(OBJDIR)/db.h $(OBJDIR)/delta_.c:$(OBJDIR)/delta.h $(OBJDIR)/deltacmd_.c:$(OBJDIR)/deltacmd.h $(OBJDIR)/descendants_.c:$(OBJDIR)/descendants.h $(OBJDIR)/diff_.c:$(OBJDIR)/diff.h $(OBJDIR)/diffcmd_.c:$(OBJDIR)/diffcmd.h $(OBJDIR)/doc_.c:$(OBJDIR)/doc.h $(OBJDIR)/encode_.c:$(OBJDIR)/encode.h $(OBJDIR)/event_.c:$(OBJDIR)/event.h $(OBJDIR)/export_.c:$(OBJDIR)/export.h $(OBJDIR)/file_.c:$(OBJDIR)/file.h $(OBJDIR)/finfo_.c:$(OBJDIR)/finfo.h $(OBJDIR)/glob_.c:$(OBJDIR)/glob.h $(OBJDIR)/graph_.c:$(OBJDIR)/graph.h $(OBJDIR)/gzip_.c:$(OBJDIR)/gzip.h $(OBJDIR)/http_.c:$(OBJDIR)/http.h $(OBJDIR)/http_socket_.c:$(OBJDIR)/http_socket.h $(OBJDIR)/http_ssl_.c:$(OBJDIR)/http_ssl.h $(OBJDIR)/http_transport_.c:$(OBJDIR)/http_transport.h $(OBJDIR)/import_.c:$(OBJDIR)/import.h $(OBJDIR)/info_.c:$(OBJDIR)/info.h $(OBJDIR)/leaf_.c:$(OBJDIR)/leaf.h $(OBJDIR)/login_.c:$(OBJDIR)/login.h $(OBJDIR)/main_.c:$(OBJDIR)/main.h $(OBJDIR)/manifest_.c:$(OBJDIR)/manifest.h $(OBJDIR)/md5_.c:$(OBJDIR)/md5.h $(OBJDIR)/merge_.c:$(OBJDIR)/merge.h $(OBJDIR)/merge3_.c:$(OBJDIR)/merge3.h $(OBJDIR)/name_.c:$(OBJDIR)/name.h $(OBJDIR)/path_.c:$(OBJDIR)/path.h $(OBJDIR)/pivot_.c:$(OBJDIR)/pivot.h $(OBJDIR)/popen_.c:$(OBJDIR)/popen.h $(OBJDIR)/pqueue_.c:$(OBJDIR)/pqueue.h $(OBJDIR)/printf_.c:$(OBJDIR)/printf.h $(OBJDIR)/rebuild_.c:$(OBJDIR)/rebuild.h $(OBJDIR)/report_.c:$(OBJDIR)/report.h $(OBJDIR)/rss_.c:$(OBJDIR)/rss.h $(OBJDIR)/schema_.c:$(OBJDIR)/schema.h $(OBJDIR)/search_.c:$(OBJDIR)/search.h $(OBJDIR)/setup_.c:$(OBJDIR)/setup.h $(OBJDIR)/sha1_.c:$(OBJDIR)/sha1.h $(OBJDIR)/shun_.c:$(OBJDIR)/shun.h $(OBJDIR)/skins_.c:$(OBJDIR)/skins.h $(OBJDIR)/sqlcmd_.c:$(OBJDIR)/sqlcmd.h $(OBJDIR)/stash_.c:$(OBJDIR)/stash.h $(OBJDIR)/stat_.c:$(OBJDIR)/stat.h $(OBJDIR)/style_.c:$(OBJDIR)/style.h $(OBJDIR)/sync_.c:$(OBJDIR)/sync.h $(OBJDIR)/tag_.c:$(OBJDIR)/tag.h $(OBJDIR)/tar_.c:$(OBJDIR)/tar.h $(OBJDIR)/th_main_.c:$(OBJDIR)/th_main.h $(OBJDIR)/timeline_.c:$(OBJDIR)/timeline.h $(OBJDIR)/tkt_.c:$(OBJDIR)/tkt.h $(OBJDIR)/tktsetup_.c:$(OBJDIR)/tktsetup.h $(OBJDIR)/undo_.c:$(OBJDIR)/undo.h $(OBJDIR)/update_.c:$(OBJDIR)/update.h $(OBJDIR)/url_.c:$(OBJDIR)/url.h $(OBJDIR)/user_.c:$(OBJDIR)/user.h $(OBJDIR)/verify_.c:$(OBJDIR)/verify.h $(OBJDIR)/vfile_.c:$(OBJDIR)/vfile.h $(OBJDIR)/wiki_.c:$(OBJDIR)/wiki.h $(OBJDIR)/wikiformat_.c:$(OBJDIR)/wikiformat.h $(OBJDIR)/winhttp_.c:$(OBJDIR)/winhttp.h $(OBJDIR)/xfer_.c:$(OBJDIR)/xfer.h $(OBJDIR)/xfersetup_.c:$(OBJDIR)/xfersetup.h $(OBJDIR)/zip_.c:$(OBJDIR)/zip.h $(SRCDIR)/sqlite3.h $(SRCDIR)/th.h $(OBJDIR)/VERSION.h
493
+ $(MAKEHEADERS) $(OBJDIR)/add_.c:$(OBJDIR)/add.h $(OBJDIR)/allrepo_.c:$(OBJDIR)/allrepo.h $(OBJDIR)/attach_.c:$(OBJDIR)/attach.h $(OBJDIR)/bag_.c:$(OBJDIR)/bag.h $(OBJDIR)/bisect_.c:$(OBJDIR)/bisect.h $(OBJDIR)/blob_.c:$(OBJDIR)/blob.h $(OBJDIR)/branch_.c:$(OBJDIR)/branch.h $(OBJDIR)/browse_.c:$(OBJDIR)/browse.h $(OBJDIR)/captcha_.c:$(OBJDIR)/captcha.h $(OBJDIR)/cgi_.c:$(OBJDIR)/cgi.h $(OBJDIR)/checkin_.c:$(OBJDIR)/checkin.h $(OBJDIR)/checkout_.c:$(OBJDIR)/checkout.h $(OBJDIR)/clearsign_.c:$(OBJDIR)/clearsign.h $(OBJDIR)/clone_.c:$(OBJDIR)/clone.h $(OBJDIR)/comformat_.c:$(OBJDIR)/comformat.h $(OBJDIR)/configure_.c:$(OBJDIR)/configure.h $(OBJDIR)/content_.c:$(OBJDIR)/content.h $(OBJDIR)/db_.c:$(OBJDIR)/db.h $(OBJDIR)/delta_.c:$(OBJDIR)/delta.h $(OBJDIR)/deltacmd_.c:$(OBJDIR)/deltacmd.h $(OBJDIR)/descendants_.c:$(OBJDIR)/descendants.h $(OBJDIR)/diff_.c:$(OBJDIR)/diff.h $(OBJDIR)/diffcmd_.c:$(OBJDIR)/diffcmd.h $(OBJDIR)/doc_.c:$(OBJDIR)/doc.h $(OBJDIR)/encode_.c:$(OBJDIR)/encode.h $(OBJDIR)/event_.c:$(OBJDIR)/event.h $(OBJDIR)/export_.c:$(OBJDIR)/export.h $(OBJDIR)/file_.c:$(OBJDIR)/file.h $(OBJDIR)/finfo_.c:$(OBJDIR)/finfo.h $(OBJDIR)/glob_.c:$(OBJDIR)/glob.h $(OBJDIR)/graph_.c:$(OBJDIR)/graph.h $(OBJDIR)/gzip_.c:$(OBJDIR)/gzip.h $(OBJDIR)/http_.c:$(OBJDIR)/http.h $(OBJDIR)/http_socket_.c:$(OBJDIR)/http_socket.h $(OBJDIR)/http_ssl_.c:$(OBJDIR)/http_ssl.h $(OBJDIR)/http_transport_.c:$(OBJDIR)/http_transport.h $(OBJDIR)/import_.c:$(OBJDIR)/import.h $(OBJDIR)/info_.c:$(OBJDIR)/info.h $(OBJDIR)/json_.c:$(OBJDIR)/json.h $(OBJDIR)/json_artifact_.c:$(OBJDIR)/json_artifact.h $(OBJDIR)/json_branch_.c:$(OBJDIR)/json_branch.h $(OBJDIR)/json_diff_.c:$(OBJDIR)/json_diff.h $(OBJDIR)/json_login_.c:$(OBJDIR)/json_login.h $(OBJDIR)/json_query_.c:$(OBJDIR)/json_query.h $(OBJDIR)/json_report_.c:$(OBJDIR)/json_report.h $(OBJDIR)/json_tag_.c:$(OBJDIR)/json_tag.h $(OBJDIR)/json_timeline_.c:$(OBJDIR)/json_timeline.h $(OBJDIR)/json_user_.c:$(OBJDIR)/json_user.h $(OBJDIR)/json_wiki_.c:$(OBJDIR)/json_wiki.h $(OBJDIR)/leaf_.c:$(OBJDIR)/leaf.h $(OBJDIR)/login_.c:$(OBJDIR)/login.h $(OBJDIR)/main_.c:$(OBJDIR)/main.h $(OBJDIR)/manifest_.c:$(OBJDIR)/manifest.h $(OBJDIR)/md5_.c:$(OBJDIR)/md5.h $(OBJDIR)/merge_.c:$(OBJDIR)/merge.h $(OBJDIR)/merge3_.c:$(OBJDIR)/merge3.h $(OBJDIR)/name_.c:$(OBJDIR)/name.h $(OBJDIR)/path_.c:$(OBJDIR)/path.h $(OBJDIR)/pivot_.c:$(OBJDIR)/pivot.h $(OBJDIR)/popen_.c:$(OBJDIR)/popen.h $(OBJDIR)/pqueue_.c:$(OBJDIR)/pqueue.h $(OBJDIR)/printf_.c:$(OBJDIR)/printf.h $(OBJDIR)/rebuild_.c:$(OBJDIR)/rebuild.h $(OBJDIR)/report_.c:$(OBJDIR)/report.h $(OBJDIR)/rss_.c:$(OBJDIR)/rss.h $(OBJDIR)/schema_.c:$(OBJDIR)/schema.h $(OBJDIR)/search_.c:$(OBJDIR)/search.h $(OBJDIR)/setup_.c:$(OBJDIR)/setup.h $(OBJDIR)/sha1_.c:$(OBJDIR)/sha1.h $(OBJDIR)/shun_.c:$(OBJDIR)/shun.h $(OBJDIR)/skins_.c:$(OBJDIR)/skins.h $(OBJDIR)/sqlcmd_.c:$(OBJDIR)/sqlcmd.h $(OBJDIR)/stash_.c:$(OBJDIR)/stash.h $(OBJDIR)/stat_.c:$(OBJDIR)/stat.h $(OBJDIR)/style_.c:$(OBJDIR)/style.h $(OBJDIR)/sync_.c:$(OBJDIR)/sync.h $(OBJDIR)/tag_.c:$(OBJDIR)/tag.h $(OBJDIR)/tar_.c:$(OBJDIR)/tar.h $(OBJDIR)/th_main_.c:$(OBJDIR)/th_main.h $(OBJDIR)/timeline_.c:$(OBJDIR)/timeline.h $(OBJDIR)/tkt_.c:$(OBJDIR)/tkt.h $(OBJDIR)/tktsetup_.c:$(OBJDIR)/tktsetup.h $(OBJDIR)/undo_.c:$(OBJDIR)/undo.h $(OBJDIR)/update_.c:$(OBJDIR)/update.h $(OBJDIR)/url_.c:$(OBJDIR)/url.h $(OBJDIR)/user_.c:$(OBJDIR)/user.h $(OBJDIR)/verify_.c:$(OBJDIR)/verify.h $(OBJDIR)/vfile_.c:$(OBJDIR)/vfile.h $(OBJDIR)/wiki_.c:$(OBJDIR)/wiki.h $(OBJDIR)/wikiformat_.c:$(OBJDIR)/wikiformat.h $(OBJDIR)/winhttp_.c:$(OBJDIR)/winhttp.h $(OBJDIR)/xfer_.c:$(OBJDIR)/xfer.h $(OBJDIR)/xfersetup_.c:$(OBJDIR)/xfersetup.h $(OBJDIR)/zip_.c:$(OBJDIR)/zip.h $(SRCDIR)/sqlite3.h $(SRCDIR)/th.h $(OBJDIR)/VERSION.h
461494
 echo Done >$(OBJDIR)/headers
462495
463496
 $(OBJDIR)/headers: Makefile
464497
 Makefile:
465498
 $(OBJDIR)/add_.c: $(SRCDIR)/add.c $(OBJDIR)/translate
@@ -726,10 +759,87 @@
726759
727760
 $(OBJDIR)/info.o: $(OBJDIR)/info_.c $(OBJDIR)/info.h $(SRCDIR)/config.h
728761
 $(XTCC) -o $(OBJDIR)/info.o -c $(OBJDIR)/info_.c
729762
730763
 info.h: $(OBJDIR)/headers
764
+$(OBJDIR)/json_.c: $(SRCDIR)/json.c $(OBJDIR)/translate
765
+ $(TRANSLATE) $(SRCDIR)/json.c >$(OBJDIR)/json_.c
766
+
767
+$(OBJDIR)/json.o: $(OBJDIR)/json_.c $(OBJDIR)/json.h $(SRCDIR)/config.h
768
+ $(XTCC) -o $(OBJDIR)/json.o -c $(OBJDIR)/json_.c
769
+
770
+json.h: $(OBJDIR)/headers
771
+$(OBJDIR)/json_artifact_.c: $(SRCDIR)/json_artifact.c $(OBJDIR)/translate
772
+ $(TRANSLATE) $(SRCDIR)/json_artifact.c >$(OBJDIR)/json_artifact_.c
773
+
774
+$(OBJDIR)/json_artifact.o: $(OBJDIR)/json_artifact_.c $(OBJDIR)/json_artifact.h $(SRCDIR)/config.h
775
+ $(XTCC) -o $(OBJDIR)/json_artifact.o -c $(OBJDIR)/json_artifact_.c
776
+
777
+json_artifact.h: $(OBJDIR)/headers
778
+$(OBJDIR)/json_branch_.c: $(SRCDIR)/json_branch.c $(OBJDIR)/translate
779
+ $(TRANSLATE) $(SRCDIR)/json_branch.c >$(OBJDIR)/json_branch_.c
780
+
781
+$(OBJDIR)/json_branch.o: $(OBJDIR)/json_branch_.c $(OBJDIR)/json_branch.h $(SRCDIR)/config.h
782
+ $(XTCC) -o $(OBJDIR)/json_branch.o -c $(OBJDIR)/json_branch_.c
783
+
784
+json_branch.h: $(OBJDIR)/headers
785
+$(OBJDIR)/json_diff_.c: $(SRCDIR)/json_diff.c $(OBJDIR)/translate
786
+ $(TRANSLATE) $(SRCDIR)/json_diff.c >$(OBJDIR)/json_diff_.c
787
+
788
+$(OBJDIR)/json_diff.o: $(OBJDIR)/json_diff_.c $(OBJDIR)/json_diff.h $(SRCDIR)/config.h
789
+ $(XTCC) -o $(OBJDIR)/json_diff.o -c $(OBJDIR)/json_diff_.c
790
+
791
+json_diff.h: $(OBJDIR)/headers
792
+$(OBJDIR)/json_login_.c: $(SRCDIR)/json_login.c $(OBJDIR)/translate
793
+ $(TRANSLATE) $(SRCDIR)/json_login.c >$(OBJDIR)/json_login_.c
794
+
795
+$(OBJDIR)/json_login.o: $(OBJDIR)/json_login_.c $(OBJDIR)/json_login.h $(SRCDIR)/config.h
796
+ $(XTCC) -o $(OBJDIR)/json_login.o -c $(OBJDIR)/json_login_.c
797
+
798
+json_login.h: $(OBJDIR)/headers
799
+$(OBJDIR)/json_query_.c: $(SRCDIR)/json_query.c $(OBJDIR)/translate
800
+ $(TRANSLATE) $(SRCDIR)/json_query.c >$(OBJDIR)/json_query_.c
801
+
802
+$(OBJDIR)/json_query.o: $(OBJDIR)/json_query_.c $(OBJDIR)/json_query.h $(SRCDIR)/config.h
803
+ $(XTCC) -o $(OBJDIR)/json_query.o -c $(OBJDIR)/json_query_.c
804
+
805
+json_query.h: $(OBJDIR)/headers
806
+$(OBJDIR)/json_report_.c: $(SRCDIR)/json_report.c $(OBJDIR)/translate
807
+ $(TRANSLATE) $(SRCDIR)/json_report.c >$(OBJDIR)/json_report_.c
808
+
809
+$(OBJDIR)/json_report.o: $(OBJDIR)/json_report_.c $(OBJDIR)/json_report.h $(SRCDIR)/config.h
810
+ $(XTCC) -o $(OBJDIR)/json_report.o -c $(OBJDIR)/json_report_.c
811
+
812
+json_report.h: $(OBJDIR)/headers
813
+$(OBJDIR)/json_tag_.c: $(SRCDIR)/json_tag.c $(OBJDIR)/translate
814
+ $(TRANSLATE) $(SRCDIR)/json_tag.c >$(OBJDIR)/json_tag_.c
815
+
816
+$(OBJDIR)/json_tag.o: $(OBJDIR)/json_tag_.c $(OBJDIR)/json_tag.h $(SRCDIR)/config.h
817
+ $(XTCC) -o $(OBJDIR)/json_tag.o -c $(OBJDIR)/json_tag_.c
818
+
819
+json_tag.h: $(OBJDIR)/headers
820
+$(OBJDIR)/json_timeline_.c: $(SRCDIR)/json_timeline.c $(OBJDIR)/translate
821
+ $(TRANSLATE) $(SRCDIR)/json_timeline.c >$(OBJDIR)/json_timeline_.c
822
+
823
+$(OBJDIR)/json_timeline.o: $(OBJDIR)/json_timeline_.c $(OBJDIR)/json_timeline.h $(SRCDIR)/config.h
824
+ $(XTCC) -o $(OBJDIR)/json_timeline.o -c $(OBJDIR)/json_timeline_.c
825
+
826
+json_timeline.h: $(OBJDIR)/headers
827
+$(OBJDIR)/json_user_.c: $(SRCDIR)/json_user.c $(OBJDIR)/translate
828
+ $(TRANSLATE) $(SRCDIR)/json_user.c >$(OBJDIR)/json_user_.c
829
+
830
+$(OBJDIR)/json_user.o: $(OBJDIR)/json_user_.c $(OBJDIR)/json_user.h $(SRCDIR)/config.h
831
+ $(XTCC) -o $(OBJDIR)/json_user.o -c $(OBJDIR)/json_user_.c
832
+
833
+json_user.h: $(OBJDIR)/headers
834
+$(OBJDIR)/json_wiki_.c: $(SRCDIR)/json_wiki.c $(OBJDIR)/translate
835
+ $(TRANSLATE) $(SRCDIR)/json_wiki.c >$(OBJDIR)/json_wiki_.c
836
+
837
+$(OBJDIR)/json_wiki.o: $(OBJDIR)/json_wiki_.c $(OBJDIR)/json_wiki.h $(SRCDIR)/config.h
838
+ $(XTCC) -o $(OBJDIR)/json_wiki.o -c $(OBJDIR)/json_wiki_.c
839
+
840
+json_wiki.h: $(OBJDIR)/headers
731841
 $(OBJDIR)/leaf_.c: $(SRCDIR)/leaf.c $(OBJDIR)/translate
732842
 $(TRANSLATE) $(SRCDIR)/leaf.c >$(OBJDIR)/leaf_.c
733843
734844
 $(OBJDIR)/leaf.o: $(OBJDIR)/leaf_.c $(OBJDIR)/leaf.h $(SRCDIR)/config.h
735845
 $(XTCC) -o $(OBJDIR)/leaf.o -c $(OBJDIR)/leaf_.c
@@ -1042,11 +1152,16 @@
10421152
 $(OBJDIR)/zip.o: $(OBJDIR)/zip_.c $(OBJDIR)/zip.h $(SRCDIR)/config.h
10431153
 $(XTCC) -o $(OBJDIR)/zip.o -c $(OBJDIR)/zip_.c
10441154
10451155
 zip.h: $(OBJDIR)/headers
10461156
 $(OBJDIR)/sqlite3.o: $(SRCDIR)/sqlite3.c
1047
- $(XTCC) -DSQLITE_OMIT_LOAD_EXTENSION=1 -DSQLITE_THREADSAFE=0 -DSQLITE_DEFAULT_FILE_FORMAT=4 -DSQLITE_ENABLE_STAT2 -Dlocaltime=fossil_localtime -DSQLITE_ENABLE_LOCKING_STYLE=0 -c $(SRCDIR)/sqlite3.c -o $(OBJDIR)/sqlite3.o
1157
+ $(XTCC) -DSQLITE_OMIT_LOAD_EXTENSION=1 -DSQLITE_THREADSAFE=0 -DSQLITE_DEFAULT_FILE_FORMAT=4 -DSQLITE_ENABLE_STAT3 -Dlocaltime=fossil_localtime -DSQLITE_ENABLE_LOCKING_STYLE=0 -c $(SRCDIR)/sqlite3.c -o $(OBJDIR)/sqlite3.o
1158
+
1159
+$(OBJDIR)/cson_amalgamation.o: $(SRCDIR)/cson_amalgamation.c
1160
+ $(XTCC) -c $(SRCDIR)/cson_amalgamation.c -o $(OBJDIR)/cson_amalgamation.o -DCSON_FOSSIL_MODE
1161
+
1162
+$(OBJDIR)/json.o $(OBJDIR)/json_artifact.o $(OBJDIR)/json_branch.o $(OBJDIR)/json_diff.o $(OBJDIR)/json_login.o $(OBJDIR)/json_query.o $(OBJDIR)/json_report.o $(OBJDIR)/json_tag.o $(OBJDIR)/json_timeline.o $(OBJDIR)/json_user.o $(OBJDIR)/json_wiki.o: $(SRCDIR)/json_detail.h
10481163
10491164
 $(OBJDIR)/shell.o: $(SRCDIR)/shell.c $(SRCDIR)/sqlite3.h
10501165
 $(XTCC) -Dmain=sqlite3_shell -DSQLITE_OMIT_LOAD_EXTENSION=1 -c $(SRCDIR)/shell.c -o $(OBJDIR)/shell.o
10511166
10521167
 $(OBJDIR)/th.o: $(SRCDIR)/th.c
10531168
--- win/Makefile.mingw.mistachkin
+++ win/Makefile.mingw.mistachkin
@@ -170,10 +170,21 @@
170 $(SRCDIR)/http_socket.c \
171 $(SRCDIR)/http_ssl.c \
172 $(SRCDIR)/http_transport.c \
173 $(SRCDIR)/import.c \
174 $(SRCDIR)/info.c \
 
 
 
 
 
 
 
 
 
 
 
175 $(SRCDIR)/leaf.c \
176 $(SRCDIR)/login.c \
177 $(SRCDIR)/main.c \
178 $(SRCDIR)/manifest.c \
179 $(SRCDIR)/md5.c \
@@ -255,10 +266,21 @@
255 $(OBJDIR)/http_socket_.c \
256 $(OBJDIR)/http_ssl_.c \
257 $(OBJDIR)/http_transport_.c \
258 $(OBJDIR)/import_.c \
259 $(OBJDIR)/info_.c \
 
 
 
 
 
 
 
 
 
 
 
260 $(OBJDIR)/leaf_.c \
261 $(OBJDIR)/login_.c \
262 $(OBJDIR)/main_.c \
263 $(OBJDIR)/manifest_.c \
264 $(OBJDIR)/md5_.c \
@@ -340,10 +362,21 @@
340 $(OBJDIR)/http_socket.o \
341 $(OBJDIR)/http_ssl.o \
342 $(OBJDIR)/http_transport.o \
343 $(OBJDIR)/import.o \
344 $(OBJDIR)/info.o \
 
 
 
 
 
 
 
 
 
 
 
345 $(OBJDIR)/leaf.o \
346 $(OBJDIR)/login.o \
347 $(OBJDIR)/main.o \
348 $(OBJDIR)/manifest.o \
349 $(OBJDIR)/md5.o \
@@ -426,11 +459,11 @@
426 $(TCLSH) $(SRCDIR)/../test/tester.tcl $(APPNAME)
427
428 $(OBJDIR)/VERSION.h: $(SRCDIR)/../manifest.uuid $(SRCDIR)/../manifest $(VERSION)
429 $(VERSION) $(SRCDIR)/../manifest.uuid $(SRCDIR)/../manifest $(SRCDIR)/../VERSION >$(OBJDIR)/VERSION.h
430
431 EXTRAOBJ = $(OBJDIR)/sqlite3.o $(OBJDIR)/shell.o $(OBJDIR)/th.o $(OBJDIR)/th_lang.o
432
433 ifdef FOSSIL_ENABLE_TCL
434 EXTRAOBJ += $(OBJDIR)/th_tcl.o
435 endif
436
@@ -455,11 +488,11 @@
455
456
457 $(OBJDIR)/page_index.h: $(TRANS_SRC) $(OBJDIR)/mkindex
458 $(MKINDEX) $(TRANS_SRC) >$@
459 $(OBJDIR)/headers: $(OBJDIR)/page_index.h $(OBJDIR)/makeheaders $(OBJDIR)/VERSION.h
460 $(MAKEHEADERS) $(OBJDIR)/add_.c:$(OBJDIR)/add.h $(OBJDIR)/allrepo_.c:$(OBJDIR)/allrepo.h $(OBJDIR)/attach_.c:$(OBJDIR)/attach.h $(OBJDIR)/bag_.c:$(OBJDIR)/bag.h $(OBJDIR)/bisect_.c:$(OBJDIR)/bisect.h $(OBJDIR)/blob_.c:$(OBJDIR)/blob.h $(OBJDIR)/branch_.c:$(OBJDIR)/branch.h $(OBJDIR)/browse_.c:$(OBJDIR)/browse.h $(OBJDIR)/captcha_.c:$(OBJDIR)/captcha.h $(OBJDIR)/cgi_.c:$(OBJDIR)/cgi.h $(OBJDIR)/checkin_.c:$(OBJDIR)/checkin.h $(OBJDIR)/checkout_.c:$(OBJDIR)/checkout.h $(OBJDIR)/clearsign_.c:$(OBJDIR)/clearsign.h $(OBJDIR)/clone_.c:$(OBJDIR)/clone.h $(OBJDIR)/comformat_.c:$(OBJDIR)/comformat.h $(OBJDIR)/configure_.c:$(OBJDIR)/configure.h $(OBJDIR)/content_.c:$(OBJDIR)/content.h $(OBJDIR)/db_.c:$(OBJDIR)/db.h $(OBJDIR)/delta_.c:$(OBJDIR)/delta.h $(OBJDIR)/deltacmd_.c:$(OBJDIR)/deltacmd.h $(OBJDIR)/descendants_.c:$(OBJDIR)/descendants.h $(OBJDIR)/diff_.c:$(OBJDIR)/diff.h $(OBJDIR)/diffcmd_.c:$(OBJDIR)/diffcmd.h $(OBJDIR)/doc_.c:$(OBJDIR)/doc.h $(OBJDIR)/encode_.c:$(OBJDIR)/encode.h $(OBJDIR)/event_.c:$(OBJDIR)/event.h $(OBJDIR)/export_.c:$(OBJDIR)/export.h $(OBJDIR)/file_.c:$(OBJDIR)/file.h $(OBJDIR)/finfo_.c:$(OBJDIR)/finfo.h $(OBJDIR)/glob_.c:$(OBJDIR)/glob.h $(OBJDIR)/graph_.c:$(OBJDIR)/graph.h $(OBJDIR)/gzip_.c:$(OBJDIR)/gzip.h $(OBJDIR)/http_.c:$(OBJDIR)/http.h $(OBJDIR)/http_socket_.c:$(OBJDIR)/http_socket.h $(OBJDIR)/http_ssl_.c:$(OBJDIR)/http_ssl.h $(OBJDIR)/http_transport_.c:$(OBJDIR)/http_transport.h $(OBJDIR)/import_.c:$(OBJDIR)/import.h $(OBJDIR)/info_.c:$(OBJDIR)/info.h $(OBJDIR)/leaf_.c:$(OBJDIR)/leaf.h $(OBJDIR)/login_.c:$(OBJDIR)/login.h $(OBJDIR)/main_.c:$(OBJDIR)/main.h $(OBJDIR)/manifest_.c:$(OBJDIR)/manifest.h $(OBJDIR)/md5_.c:$(OBJDIR)/md5.h $(OBJDIR)/merge_.c:$(OBJDIR)/merge.h $(OBJDIR)/merge3_.c:$(OBJDIR)/merge3.h $(OBJDIR)/name_.c:$(OBJDIR)/name.h $(OBJDIR)/path_.c:$(OBJDIR)/path.h $(OBJDIR)/pivot_.c:$(OBJDIR)/pivot.h $(OBJDIR)/popen_.c:$(OBJDIR)/popen.h $(OBJDIR)/pqueue_.c:$(OBJDIR)/pqueue.h $(OBJDIR)/printf_.c:$(OBJDIR)/printf.h $(OBJDIR)/rebuild_.c:$(OBJDIR)/rebuild.h $(OBJDIR)/report_.c:$(OBJDIR)/report.h $(OBJDIR)/rss_.c:$(OBJDIR)/rss.h $(OBJDIR)/schema_.c:$(OBJDIR)/schema.h $(OBJDIR)/search_.c:$(OBJDIR)/search.h $(OBJDIR)/setup_.c:$(OBJDIR)/setup.h $(OBJDIR)/sha1_.c:$(OBJDIR)/sha1.h $(OBJDIR)/shun_.c:$(OBJDIR)/shun.h $(OBJDIR)/skins_.c:$(OBJDIR)/skins.h $(OBJDIR)/sqlcmd_.c:$(OBJDIR)/sqlcmd.h $(OBJDIR)/stash_.c:$(OBJDIR)/stash.h $(OBJDIR)/stat_.c:$(OBJDIR)/stat.h $(OBJDIR)/style_.c:$(OBJDIR)/style.h $(OBJDIR)/sync_.c:$(OBJDIR)/sync.h $(OBJDIR)/tag_.c:$(OBJDIR)/tag.h $(OBJDIR)/tar_.c:$(OBJDIR)/tar.h $(OBJDIR)/th_main_.c:$(OBJDIR)/th_main.h $(OBJDIR)/timeline_.c:$(OBJDIR)/timeline.h $(OBJDIR)/tkt_.c:$(OBJDIR)/tkt.h $(OBJDIR)/tktsetup_.c:$(OBJDIR)/tktsetup.h $(OBJDIR)/undo_.c:$(OBJDIR)/undo.h $(OBJDIR)/update_.c:$(OBJDIR)/update.h $(OBJDIR)/url_.c:$(OBJDIR)/url.h $(OBJDIR)/user_.c:$(OBJDIR)/user.h $(OBJDIR)/verify_.c:$(OBJDIR)/verify.h $(OBJDIR)/vfile_.c:$(OBJDIR)/vfile.h $(OBJDIR)/wiki_.c:$(OBJDIR)/wiki.h $(OBJDIR)/wikiformat_.c:$(OBJDIR)/wikiformat.h $(OBJDIR)/winhttp_.c:$(OBJDIR)/winhttp.h $(OBJDIR)/xfer_.c:$(OBJDIR)/xfer.h $(OBJDIR)/xfersetup_.c:$(OBJDIR)/xfersetup.h $(OBJDIR)/zip_.c:$(OBJDIR)/zip.h $(SRCDIR)/sqlite3.h $(SRCDIR)/th.h $(OBJDIR)/VERSION.h
461 echo Done >$(OBJDIR)/headers
462
463 $(OBJDIR)/headers: Makefile
464 Makefile:
465 $(OBJDIR)/add_.c: $(SRCDIR)/add.c $(OBJDIR)/translate
@@ -726,10 +759,87 @@
726
727 $(OBJDIR)/info.o: $(OBJDIR)/info_.c $(OBJDIR)/info.h $(SRCDIR)/config.h
728 $(XTCC) -o $(OBJDIR)/info.o -c $(OBJDIR)/info_.c
729
730 info.h: $(OBJDIR)/headers
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
731 $(OBJDIR)/leaf_.c: $(SRCDIR)/leaf.c $(OBJDIR)/translate
732 $(TRANSLATE) $(SRCDIR)/leaf.c >$(OBJDIR)/leaf_.c
733
734 $(OBJDIR)/leaf.o: $(OBJDIR)/leaf_.c $(OBJDIR)/leaf.h $(SRCDIR)/config.h
735 $(XTCC) -o $(OBJDIR)/leaf.o -c $(OBJDIR)/leaf_.c
@@ -1042,11 +1152,16 @@
1042 $(OBJDIR)/zip.o: $(OBJDIR)/zip_.c $(OBJDIR)/zip.h $(SRCDIR)/config.h
1043 $(XTCC) -o $(OBJDIR)/zip.o -c $(OBJDIR)/zip_.c
1044
1045 zip.h: $(OBJDIR)/headers
1046 $(OBJDIR)/sqlite3.o: $(SRCDIR)/sqlite3.c
1047 $(XTCC) -DSQLITE_OMIT_LOAD_EXTENSION=1 -DSQLITE_THREADSAFE=0 -DSQLITE_DEFAULT_FILE_FORMAT=4 -DSQLITE_ENABLE_STAT2 -Dlocaltime=fossil_localtime -DSQLITE_ENABLE_LOCKING_STYLE=0 -c $(SRCDIR)/sqlite3.c -o $(OBJDIR)/sqlite3.o
 
 
 
 
 
1048
1049 $(OBJDIR)/shell.o: $(SRCDIR)/shell.c $(SRCDIR)/sqlite3.h
1050 $(XTCC) -Dmain=sqlite3_shell -DSQLITE_OMIT_LOAD_EXTENSION=1 -c $(SRCDIR)/shell.c -o $(OBJDIR)/shell.o
1051
1052 $(OBJDIR)/th.o: $(SRCDIR)/th.c
1053
--- win/Makefile.mingw.mistachkin
+++ win/Makefile.mingw.mistachkin
@@ -170,10 +170,21 @@
170 $(SRCDIR)/http_socket.c \
171 $(SRCDIR)/http_ssl.c \
172 $(SRCDIR)/http_transport.c \
173 $(SRCDIR)/import.c \
174 $(SRCDIR)/info.c \
175 $(SRCDIR)/json.c \
176 $(SRCDIR)/json_artifact.c \
177 $(SRCDIR)/json_branch.c \
178 $(SRCDIR)/json_diff.c \
179 $(SRCDIR)/json_login.c \
180 $(SRCDIR)/json_query.c \
181 $(SRCDIR)/json_report.c \
182 $(SRCDIR)/json_tag.c \
183 $(SRCDIR)/json_timeline.c \
184 $(SRCDIR)/json_user.c \
185 $(SRCDIR)/json_wiki.c \
186 $(SRCDIR)/leaf.c \
187 $(SRCDIR)/login.c \
188 $(SRCDIR)/main.c \
189 $(SRCDIR)/manifest.c \
190 $(SRCDIR)/md5.c \
@@ -255,10 +266,21 @@
266 $(OBJDIR)/http_socket_.c \
267 $(OBJDIR)/http_ssl_.c \
268 $(OBJDIR)/http_transport_.c \
269 $(OBJDIR)/import_.c \
270 $(OBJDIR)/info_.c \
271 $(OBJDIR)/json_.c \
272 $(OBJDIR)/json_artifact_.c \
273 $(OBJDIR)/json_branch_.c \
274 $(OBJDIR)/json_diff_.c \
275 $(OBJDIR)/json_login_.c \
276 $(OBJDIR)/json_query_.c \
277 $(OBJDIR)/json_report_.c \
278 $(OBJDIR)/json_tag_.c \
279 $(OBJDIR)/json_timeline_.c \
280 $(OBJDIR)/json_user_.c \
281 $(OBJDIR)/json_wiki_.c \
282 $(OBJDIR)/leaf_.c \
283 $(OBJDIR)/login_.c \
284 $(OBJDIR)/main_.c \
285 $(OBJDIR)/manifest_.c \
286 $(OBJDIR)/md5_.c \
@@ -340,10 +362,21 @@
362 $(OBJDIR)/http_socket.o \
363 $(OBJDIR)/http_ssl.o \
364 $(OBJDIR)/http_transport.o \
365 $(OBJDIR)/import.o \
366 $(OBJDIR)/info.o \
367 $(OBJDIR)/json.o \
368 $(OBJDIR)/json_artifact.o \
369 $(OBJDIR)/json_branch.o \
370 $(OBJDIR)/json_diff.o \
371 $(OBJDIR)/json_login.o \
372 $(OBJDIR)/json_query.o \
373 $(OBJDIR)/json_report.o \
374 $(OBJDIR)/json_tag.o \
375 $(OBJDIR)/json_timeline.o \
376 $(OBJDIR)/json_user.o \
377 $(OBJDIR)/json_wiki.o \
378 $(OBJDIR)/leaf.o \
379 $(OBJDIR)/login.o \
380 $(OBJDIR)/main.o \
381 $(OBJDIR)/manifest.o \
382 $(OBJDIR)/md5.o \
@@ -426,11 +459,11 @@
459 $(TCLSH) $(SRCDIR)/../test/tester.tcl $(APPNAME)
460
461 $(OBJDIR)/VERSION.h: $(SRCDIR)/../manifest.uuid $(SRCDIR)/../manifest $(VERSION)
462 $(VERSION) $(SRCDIR)/../manifest.uuid $(SRCDIR)/../manifest $(SRCDIR)/../VERSION >$(OBJDIR)/VERSION.h
463
464 EXTRAOBJ = $(OBJDIR)/sqlite3.o $(OBJDIR)/shell.o $(OBJDIR)/th.o $(OBJDIR)/th_lang.o $(OBJDIR)/cson_amalgamation.o
465
466 ifdef FOSSIL_ENABLE_TCL
467 EXTRAOBJ += $(OBJDIR)/th_tcl.o
468 endif
469
@@ -455,11 +488,11 @@
488
489
490 $(OBJDIR)/page_index.h: $(TRANS_SRC) $(OBJDIR)/mkindex
491 $(MKINDEX) $(TRANS_SRC) >$@
492 $(OBJDIR)/headers: $(OBJDIR)/page_index.h $(OBJDIR)/makeheaders $(OBJDIR)/VERSION.h
493 $(MAKEHEADERS) $(OBJDIR)/add_.c:$(OBJDIR)/add.h $(OBJDIR)/allrepo_.c:$(OBJDIR)/allrepo.h $(OBJDIR)/attach_.c:$(OBJDIR)/attach.h $(OBJDIR)/bag_.c:$(OBJDIR)/bag.h $(OBJDIR)/bisect_.c:$(OBJDIR)/bisect.h $(OBJDIR)/blob_.c:$(OBJDIR)/blob.h $(OBJDIR)/branch_.c:$(OBJDIR)/branch.h $(OBJDIR)/browse_.c:$(OBJDIR)/browse.h $(OBJDIR)/captcha_.c:$(OBJDIR)/captcha.h $(OBJDIR)/cgi_.c:$(OBJDIR)/cgi.h $(OBJDIR)/checkin_.c:$(OBJDIR)/checkin.h $(OBJDIR)/checkout_.c:$(OBJDIR)/checkout.h $(OBJDIR)/clearsign_.c:$(OBJDIR)/clearsign.h $(OBJDIR)/clone_.c:$(OBJDIR)/clone.h $(OBJDIR)/comformat_.c:$(OBJDIR)/comformat.h $(OBJDIR)/configure_.c:$(OBJDIR)/configure.h $(OBJDIR)/content_.c:$(OBJDIR)/content.h $(OBJDIR)/db_.c:$(OBJDIR)/db.h $(OBJDIR)/delta_.c:$(OBJDIR)/delta.h $(OBJDIR)/deltacmd_.c:$(OBJDIR)/deltacmd.h $(OBJDIR)/descendants_.c:$(OBJDIR)/descendants.h $(OBJDIR)/diff_.c:$(OBJDIR)/diff.h $(OBJDIR)/diffcmd_.c:$(OBJDIR)/diffcmd.h $(OBJDIR)/doc_.c:$(OBJDIR)/doc.h $(OBJDIR)/encode_.c:$(OBJDIR)/encode.h $(OBJDIR)/event_.c:$(OBJDIR)/event.h $(OBJDIR)/export_.c:$(OBJDIR)/export.h $(OBJDIR)/file_.c:$(OBJDIR)/file.h $(OBJDIR)/finfo_.c:$(OBJDIR)/finfo.h $(OBJDIR)/glob_.c:$(OBJDIR)/glob.h $(OBJDIR)/graph_.c:$(OBJDIR)/graph.h $(OBJDIR)/gzip_.c:$(OBJDIR)/gzip.h $(OBJDIR)/http_.c:$(OBJDIR)/http.h $(OBJDIR)/http_socket_.c:$(OBJDIR)/http_socket.h $(OBJDIR)/http_ssl_.c:$(OBJDIR)/http_ssl.h $(OBJDIR)/http_transport_.c:$(OBJDIR)/http_transport.h $(OBJDIR)/import_.c:$(OBJDIR)/import.h $(OBJDIR)/info_.c:$(OBJDIR)/info.h $(OBJDIR)/json_.c:$(OBJDIR)/json.h $(OBJDIR)/json_artifact_.c:$(OBJDIR)/json_artifact.h $(OBJDIR)/json_branch_.c:$(OBJDIR)/json_branch.h $(OBJDIR)/json_diff_.c:$(OBJDIR)/json_diff.h $(OBJDIR)/json_login_.c:$(OBJDIR)/json_login.h $(OBJDIR)/json_query_.c:$(OBJDIR)/json_query.h $(OBJDIR)/json_report_.c:$(OBJDIR)/json_report.h $(OBJDIR)/json_tag_.c:$(OBJDIR)/json_tag.h $(OBJDIR)/json_timeline_.c:$(OBJDIR)/json_timeline.h $(OBJDIR)/json_user_.c:$(OBJDIR)/json_user.h $(OBJDIR)/json_wiki_.c:$(OBJDIR)/json_wiki.h $(OBJDIR)/leaf_.c:$(OBJDIR)/leaf.h $(OBJDIR)/login_.c:$(OBJDIR)/login.h $(OBJDIR)/main_.c:$(OBJDIR)/main.h $(OBJDIR)/manifest_.c:$(OBJDIR)/manifest.h $(OBJDIR)/md5_.c:$(OBJDIR)/md5.h $(OBJDIR)/merge_.c:$(OBJDIR)/merge.h $(OBJDIR)/merge3_.c:$(OBJDIR)/merge3.h $(OBJDIR)/name_.c:$(OBJDIR)/name.h $(OBJDIR)/path_.c:$(OBJDIR)/path.h $(OBJDIR)/pivot_.c:$(OBJDIR)/pivot.h $(OBJDIR)/popen_.c:$(OBJDIR)/popen.h $(OBJDIR)/pqueue_.c:$(OBJDIR)/pqueue.h $(OBJDIR)/printf_.c:$(OBJDIR)/printf.h $(OBJDIR)/rebuild_.c:$(OBJDIR)/rebuild.h $(OBJDIR)/report_.c:$(OBJDIR)/report.h $(OBJDIR)/rss_.c:$(OBJDIR)/rss.h $(OBJDIR)/schema_.c:$(OBJDIR)/schema.h $(OBJDIR)/search_.c:$(OBJDIR)/search.h $(OBJDIR)/setup_.c:$(OBJDIR)/setup.h $(OBJDIR)/sha1_.c:$(OBJDIR)/sha1.h $(OBJDIR)/shun_.c:$(OBJDIR)/shun.h $(OBJDIR)/skins_.c:$(OBJDIR)/skins.h $(OBJDIR)/sqlcmd_.c:$(OBJDIR)/sqlcmd.h $(OBJDIR)/stash_.c:$(OBJDIR)/stash.h $(OBJDIR)/stat_.c:$(OBJDIR)/stat.h $(OBJDIR)/style_.c:$(OBJDIR)/style.h $(OBJDIR)/sync_.c:$(OBJDIR)/sync.h $(OBJDIR)/tag_.c:$(OBJDIR)/tag.h $(OBJDIR)/tar_.c:$(OBJDIR)/tar.h $(OBJDIR)/th_main_.c:$(OBJDIR)/th_main.h $(OBJDIR)/timeline_.c:$(OBJDIR)/timeline.h $(OBJDIR)/tkt_.c:$(OBJDIR)/tkt.h $(OBJDIR)/tktsetup_.c:$(OBJDIR)/tktsetup.h $(OBJDIR)/undo_.c:$(OBJDIR)/undo.h $(OBJDIR)/update_.c:$(OBJDIR)/update.h $(OBJDIR)/url_.c:$(OBJDIR)/url.h $(OBJDIR)/user_.c:$(OBJDIR)/user.h $(OBJDIR)/verify_.c:$(OBJDIR)/verify.h $(OBJDIR)/vfile_.c:$(OBJDIR)/vfile.h $(OBJDIR)/wiki_.c:$(OBJDIR)/wiki.h $(OBJDIR)/wikiformat_.c:$(OBJDIR)/wikiformat.h $(OBJDIR)/winhttp_.c:$(OBJDIR)/winhttp.h $(OBJDIR)/xfer_.c:$(OBJDIR)/xfer.h $(OBJDIR)/xfersetup_.c:$(OBJDIR)/xfersetup.h $(OBJDIR)/zip_.c:$(OBJDIR)/zip.h $(SRCDIR)/sqlite3.h $(SRCDIR)/th.h $(OBJDIR)/VERSION.h
494 echo Done >$(OBJDIR)/headers
495
496 $(OBJDIR)/headers: Makefile
497 Makefile:
498 $(OBJDIR)/add_.c: $(SRCDIR)/add.c $(OBJDIR)/translate
@@ -726,10 +759,87 @@
759
760 $(OBJDIR)/info.o: $(OBJDIR)/info_.c $(OBJDIR)/info.h $(SRCDIR)/config.h
761 $(XTCC) -o $(OBJDIR)/info.o -c $(OBJDIR)/info_.c
762
763 info.h: $(OBJDIR)/headers
764 $(OBJDIR)/json_.c: $(SRCDIR)/json.c $(OBJDIR)/translate
765 $(TRANSLATE) $(SRCDIR)/json.c >$(OBJDIR)/json_.c
766
767 $(OBJDIR)/json.o: $(OBJDIR)/json_.c $(OBJDIR)/json.h $(SRCDIR)/config.h
768 $(XTCC) -o $(OBJDIR)/json.o -c $(OBJDIR)/json_.c
769
770 json.h: $(OBJDIR)/headers
771 $(OBJDIR)/json_artifact_.c: $(SRCDIR)/json_artifact.c $(OBJDIR)/translate
772 $(TRANSLATE) $(SRCDIR)/json_artifact.c >$(OBJDIR)/json_artifact_.c
773
774 $(OBJDIR)/json_artifact.o: $(OBJDIR)/json_artifact_.c $(OBJDIR)/json_artifact.h $(SRCDIR)/config.h
775 $(XTCC) -o $(OBJDIR)/json_artifact.o -c $(OBJDIR)/json_artifact_.c
776
777 json_artifact.h: $(OBJDIR)/headers
778 $(OBJDIR)/json_branch_.c: $(SRCDIR)/json_branch.c $(OBJDIR)/translate
779 $(TRANSLATE) $(SRCDIR)/json_branch.c >$(OBJDIR)/json_branch_.c
780
781 $(OBJDIR)/json_branch.o: $(OBJDIR)/json_branch_.c $(OBJDIR)/json_branch.h $(SRCDIR)/config.h
782 $(XTCC) -o $(OBJDIR)/json_branch.o -c $(OBJDIR)/json_branch_.c
783
784 json_branch.h: $(OBJDIR)/headers
785 $(OBJDIR)/json_diff_.c: $(SRCDIR)/json_diff.c $(OBJDIR)/translate
786 $(TRANSLATE) $(SRCDIR)/json_diff.c >$(OBJDIR)/json_diff_.c
787
788 $(OBJDIR)/json_diff.o: $(OBJDIR)/json_diff_.c $(OBJDIR)/json_diff.h $(SRCDIR)/config.h
789 $(XTCC) -o $(OBJDIR)/json_diff.o -c $(OBJDIR)/json_diff_.c
790
791 json_diff.h: $(OBJDIR)/headers
792 $(OBJDIR)/json_login_.c: $(SRCDIR)/json_login.c $(OBJDIR)/translate
793 $(TRANSLATE) $(SRCDIR)/json_login.c >$(OBJDIR)/json_login_.c
794
795 $(OBJDIR)/json_login.o: $(OBJDIR)/json_login_.c $(OBJDIR)/json_login.h $(SRCDIR)/config.h
796 $(XTCC) -o $(OBJDIR)/json_login.o -c $(OBJDIR)/json_login_.c
797
798 json_login.h: $(OBJDIR)/headers
799 $(OBJDIR)/json_query_.c: $(SRCDIR)/json_query.c $(OBJDIR)/translate
800 $(TRANSLATE) $(SRCDIR)/json_query.c >$(OBJDIR)/json_query_.c
801
802 $(OBJDIR)/json_query.o: $(OBJDIR)/json_query_.c $(OBJDIR)/json_query.h $(SRCDIR)/config.h
803 $(XTCC) -o $(OBJDIR)/json_query.o -c $(OBJDIR)/json_query_.c
804
805 json_query.h: $(OBJDIR)/headers
806 $(OBJDIR)/json_report_.c: $(SRCDIR)/json_report.c $(OBJDIR)/translate
807 $(TRANSLATE) $(SRCDIR)/json_report.c >$(OBJDIR)/json_report_.c
808
809 $(OBJDIR)/json_report.o: $(OBJDIR)/json_report_.c $(OBJDIR)/json_report.h $(SRCDIR)/config.h
810 $(XTCC) -o $(OBJDIR)/json_report.o -c $(OBJDIR)/json_report_.c
811
812 json_report.h: $(OBJDIR)/headers
813 $(OBJDIR)/json_tag_.c: $(SRCDIR)/json_tag.c $(OBJDIR)/translate
814 $(TRANSLATE) $(SRCDIR)/json_tag.c >$(OBJDIR)/json_tag_.c
815
816 $(OBJDIR)/json_tag.o: $(OBJDIR)/json_tag_.c $(OBJDIR)/json_tag.h $(SRCDIR)/config.h
817 $(XTCC) -o $(OBJDIR)/json_tag.o -c $(OBJDIR)/json_tag_.c
818
819 json_tag.h: $(OBJDIR)/headers
820 $(OBJDIR)/json_timeline_.c: $(SRCDIR)/json_timeline.c $(OBJDIR)/translate
821 $(TRANSLATE) $(SRCDIR)/json_timeline.c >$(OBJDIR)/json_timeline_.c
822
823 $(OBJDIR)/json_timeline.o: $(OBJDIR)/json_timeline_.c $(OBJDIR)/json_timeline.h $(SRCDIR)/config.h
824 $(XTCC) -o $(OBJDIR)/json_timeline.o -c $(OBJDIR)/json_timeline_.c
825
826 json_timeline.h: $(OBJDIR)/headers
827 $(OBJDIR)/json_user_.c: $(SRCDIR)/json_user.c $(OBJDIR)/translate
828 $(TRANSLATE) $(SRCDIR)/json_user.c >$(OBJDIR)/json_user_.c
829
830 $(OBJDIR)/json_user.o: $(OBJDIR)/json_user_.c $(OBJDIR)/json_user.h $(SRCDIR)/config.h
831 $(XTCC) -o $(OBJDIR)/json_user.o -c $(OBJDIR)/json_user_.c
832
833 json_user.h: $(OBJDIR)/headers
834 $(OBJDIR)/json_wiki_.c: $(SRCDIR)/json_wiki.c $(OBJDIR)/translate
835 $(TRANSLATE) $(SRCDIR)/json_wiki.c >$(OBJDIR)/json_wiki_.c
836
837 $(OBJDIR)/json_wiki.o: $(OBJDIR)/json_wiki_.c $(OBJDIR)/json_wiki.h $(SRCDIR)/config.h
838 $(XTCC) -o $(OBJDIR)/json_wiki.o -c $(OBJDIR)/json_wiki_.c
839
840 json_wiki.h: $(OBJDIR)/headers
841 $(OBJDIR)/leaf_.c: $(SRCDIR)/leaf.c $(OBJDIR)/translate
842 $(TRANSLATE) $(SRCDIR)/leaf.c >$(OBJDIR)/leaf_.c
843
844 $(OBJDIR)/leaf.o: $(OBJDIR)/leaf_.c $(OBJDIR)/leaf.h $(SRCDIR)/config.h
845 $(XTCC) -o $(OBJDIR)/leaf.o -c $(OBJDIR)/leaf_.c
@@ -1042,11 +1152,16 @@
1152 $(OBJDIR)/zip.o: $(OBJDIR)/zip_.c $(OBJDIR)/zip.h $(SRCDIR)/config.h
1153 $(XTCC) -o $(OBJDIR)/zip.o -c $(OBJDIR)/zip_.c
1154
1155 zip.h: $(OBJDIR)/headers
1156 $(OBJDIR)/sqlite3.o: $(SRCDIR)/sqlite3.c
1157 $(XTCC) -DSQLITE_OMIT_LOAD_EXTENSION=1 -DSQLITE_THREADSAFE=0 -DSQLITE_DEFAULT_FILE_FORMAT=4 -DSQLITE_ENABLE_STAT3 -Dlocaltime=fossil_localtime -DSQLITE_ENABLE_LOCKING_STYLE=0 -c $(SRCDIR)/sqlite3.c -o $(OBJDIR)/sqlite3.o
1158
1159 $(OBJDIR)/cson_amalgamation.o: $(SRCDIR)/cson_amalgamation.c
1160 $(XTCC) -c $(SRCDIR)/cson_amalgamation.c -o $(OBJDIR)/cson_amalgamation.o -DCSON_FOSSIL_MODE
1161
1162 $(OBJDIR)/json.o $(OBJDIR)/json_artifact.o $(OBJDIR)/json_branch.o $(OBJDIR)/json_diff.o $(OBJDIR)/json_login.o $(OBJDIR)/json_query.o $(OBJDIR)/json_report.o $(OBJDIR)/json_tag.o $(OBJDIR)/json_timeline.o $(OBJDIR)/json_user.o $(OBJDIR)/json_wiki.o: $(SRCDIR)/json_detail.h
1163
1164 $(OBJDIR)/shell.o: $(SRCDIR)/shell.c $(SRCDIR)/sqlite3.h
1165 $(XTCC) -Dmain=sqlite3_shell -DSQLITE_OMIT_LOAD_EXTENSION=1 -c $(SRCDIR)/shell.c -o $(OBJDIR)/shell.o
1166
1167 $(OBJDIR)/th.o: $(SRCDIR)/th.c
1168
M win/Makefile.mingw.mistachkin
+118 -3
--- win/Makefile.mingw.mistachkin
+++ win/Makefile.mingw.mistachkin
@@ -170,10 +170,21 @@
170170
 $(SRCDIR)/http_socket.c \
171171
 $(SRCDIR)/http_ssl.c \
172172
 $(SRCDIR)/http_transport.c \
173173
 $(SRCDIR)/import.c \
174174
 $(SRCDIR)/info.c \
175
+ $(SRCDIR)/json.c \
176
+ $(SRCDIR)/json_artifact.c \
177
+ $(SRCDIR)/json_branch.c \
178
+ $(SRCDIR)/json_diff.c \
179
+ $(SRCDIR)/json_login.c \
180
+ $(SRCDIR)/json_query.c \
181
+ $(SRCDIR)/json_report.c \
182
+ $(SRCDIR)/json_tag.c \
183
+ $(SRCDIR)/json_timeline.c \
184
+ $(SRCDIR)/json_user.c \
185
+ $(SRCDIR)/json_wiki.c \
175186
 $(SRCDIR)/leaf.c \
176187
 $(SRCDIR)/login.c \
177188
 $(SRCDIR)/main.c \
178189
 $(SRCDIR)/manifest.c \
179190
 $(SRCDIR)/md5.c \
@@ -255,10 +266,21 @@
255266
 $(OBJDIR)/http_socket_.c \
256267
 $(OBJDIR)/http_ssl_.c \
257268
 $(OBJDIR)/http_transport_.c \
258269
 $(OBJDIR)/import_.c \
259270
 $(OBJDIR)/info_.c \
271
+ $(OBJDIR)/json_.c \
272
+ $(OBJDIR)/json_artifact_.c \
273
+ $(OBJDIR)/json_branch_.c \
274
+ $(OBJDIR)/json_diff_.c \
275
+ $(OBJDIR)/json_login_.c \
276
+ $(OBJDIR)/json_query_.c \
277
+ $(OBJDIR)/json_report_.c \
278
+ $(OBJDIR)/json_tag_.c \
279
+ $(OBJDIR)/json_timeline_.c \
280
+ $(OBJDIR)/json_user_.c \
281
+ $(OBJDIR)/json_wiki_.c \
260282
 $(OBJDIR)/leaf_.c \
261283
 $(OBJDIR)/login_.c \
262284
 $(OBJDIR)/main_.c \
263285
 $(OBJDIR)/manifest_.c \
264286
 $(OBJDIR)/md5_.c \
@@ -340,10 +362,21 @@
340362
 $(OBJDIR)/http_socket.o \
341363
 $(OBJDIR)/http_ssl.o \
342364
 $(OBJDIR)/http_transport.o \
343365
 $(OBJDIR)/import.o \
344366
 $(OBJDIR)/info.o \
367
+ $(OBJDIR)/json.o \
368
+ $(OBJDIR)/json_artifact.o \
369
+ $(OBJDIR)/json_branch.o \
370
+ $(OBJDIR)/json_diff.o \
371
+ $(OBJDIR)/json_login.o \
372
+ $(OBJDIR)/json_query.o \
373
+ $(OBJDIR)/json_report.o \
374
+ $(OBJDIR)/json_tag.o \
375
+ $(OBJDIR)/json_timeline.o \
376
+ $(OBJDIR)/json_user.o \
377
+ $(OBJDIR)/json_wiki.o \
345378
 $(OBJDIR)/leaf.o \
346379
 $(OBJDIR)/login.o \
347380
 $(OBJDIR)/main.o \
348381
 $(OBJDIR)/manifest.o \
349382
 $(OBJDIR)/md5.o \
@@ -426,11 +459,11 @@
426459
 $(TCLSH) $(SRCDIR)/../test/tester.tcl $(APPNAME)
427460
428461
 $(OBJDIR)/VERSION.h: $(SRCDIR)/../manifest.uuid $(SRCDIR)/../manifest $(VERSION)
429462
 $(VERSION) $(SRCDIR)/../manifest.uuid $(SRCDIR)/../manifest $(SRCDIR)/../VERSION >$(OBJDIR)/VERSION.h
430463
431
-EXTRAOBJ = $(OBJDIR)/sqlite3.o $(OBJDIR)/shell.o $(OBJDIR)/th.o $(OBJDIR)/th_lang.o
464
+EXTRAOBJ = $(OBJDIR)/sqlite3.o $(OBJDIR)/shell.o $(OBJDIR)/th.o $(OBJDIR)/th_lang.o $(OBJDIR)/cson_amalgamation.o
432465
433466
 ifdef FOSSIL_ENABLE_TCL
434467
 EXTRAOBJ += $(OBJDIR)/th_tcl.o
435468
 endif
436469
@@ -455,11 +488,11 @@
455488
456489
457490
 $(OBJDIR)/page_index.h: $(TRANS_SRC) $(OBJDIR)/mkindex
458491
 $(MKINDEX) $(TRANS_SRC) >$@
459492
 $(OBJDIR)/headers: $(OBJDIR)/page_index.h $(OBJDIR)/makeheaders $(OBJDIR)/VERSION.h
460
- $(MAKEHEADERS) $(OBJDIR)/add_.c:$(OBJDIR)/add.h $(OBJDIR)/allrepo_.c:$(OBJDIR)/allrepo.h $(OBJDIR)/attach_.c:$(OBJDIR)/attach.h $(OBJDIR)/bag_.c:$(OBJDIR)/bag.h $(OBJDIR)/bisect_.c:$(OBJDIR)/bisect.h $(OBJDIR)/blob_.c:$(OBJDIR)/blob.h $(OBJDIR)/branch_.c:$(OBJDIR)/branch.h $(OBJDIR)/browse_.c:$(OBJDIR)/browse.h $(OBJDIR)/captcha_.c:$(OBJDIR)/captcha.h $(OBJDIR)/cgi_.c:$(OBJDIR)/cgi.h $(OBJDIR)/checkin_.c:$(OBJDIR)/checkin.h $(OBJDIR)/checkout_.c:$(OBJDIR)/checkout.h $(OBJDIR)/clearsign_.c:$(OBJDIR)/clearsign.h $(OBJDIR)/clone_.c:$(OBJDIR)/clone.h $(OBJDIR)/comformat_.c:$(OBJDIR)/comformat.h $(OBJDIR)/configure_.c:$(OBJDIR)/configure.h $(OBJDIR)/content_.c:$(OBJDIR)/content.h $(OBJDIR)/db_.c:$(OBJDIR)/db.h $(OBJDIR)/delta_.c:$(OBJDIR)/delta.h $(OBJDIR)/deltacmd_.c:$(OBJDIR)/deltacmd.h $(OBJDIR)/descendants_.c:$(OBJDIR)/descendants.h $(OBJDIR)/diff_.c:$(OBJDIR)/diff.h $(OBJDIR)/diffcmd_.c:$(OBJDIR)/diffcmd.h $(OBJDIR)/doc_.c:$(OBJDIR)/doc.h $(OBJDIR)/encode_.c:$(OBJDIR)/encode.h $(OBJDIR)/event_.c:$(OBJDIR)/event.h $(OBJDIR)/export_.c:$(OBJDIR)/export.h $(OBJDIR)/file_.c:$(OBJDIR)/file.h $(OBJDIR)/finfo_.c:$(OBJDIR)/finfo.h $(OBJDIR)/glob_.c:$(OBJDIR)/glob.h $(OBJDIR)/graph_.c:$(OBJDIR)/graph.h $(OBJDIR)/gzip_.c:$(OBJDIR)/gzip.h $(OBJDIR)/http_.c:$(OBJDIR)/http.h $(OBJDIR)/http_socket_.c:$(OBJDIR)/http_socket.h $(OBJDIR)/http_ssl_.c:$(OBJDIR)/http_ssl.h $(OBJDIR)/http_transport_.c:$(OBJDIR)/http_transport.h $(OBJDIR)/import_.c:$(OBJDIR)/import.h $(OBJDIR)/info_.c:$(OBJDIR)/info.h $(OBJDIR)/leaf_.c:$(OBJDIR)/leaf.h $(OBJDIR)/login_.c:$(OBJDIR)/login.h $(OBJDIR)/main_.c:$(OBJDIR)/main.h $(OBJDIR)/manifest_.c:$(OBJDIR)/manifest.h $(OBJDIR)/md5_.c:$(OBJDIR)/md5.h $(OBJDIR)/merge_.c:$(OBJDIR)/merge.h $(OBJDIR)/merge3_.c:$(OBJDIR)/merge3.h $(OBJDIR)/name_.c:$(OBJDIR)/name.h $(OBJDIR)/path_.c:$(OBJDIR)/path.h $(OBJDIR)/pivot_.c:$(OBJDIR)/pivot.h $(OBJDIR)/popen_.c:$(OBJDIR)/popen.h $(OBJDIR)/pqueue_.c:$(OBJDIR)/pqueue.h $(OBJDIR)/printf_.c:$(OBJDIR)/printf.h $(OBJDIR)/rebuild_.c:$(OBJDIR)/rebuild.h $(OBJDIR)/report_.c:$(OBJDIR)/report.h $(OBJDIR)/rss_.c:$(OBJDIR)/rss.h $(OBJDIR)/schema_.c:$(OBJDIR)/schema.h $(OBJDIR)/search_.c:$(OBJDIR)/search.h $(OBJDIR)/setup_.c:$(OBJDIR)/setup.h $(OBJDIR)/sha1_.c:$(OBJDIR)/sha1.h $(OBJDIR)/shun_.c:$(OBJDIR)/shun.h $(OBJDIR)/skins_.c:$(OBJDIR)/skins.h $(OBJDIR)/sqlcmd_.c:$(OBJDIR)/sqlcmd.h $(OBJDIR)/stash_.c:$(OBJDIR)/stash.h $(OBJDIR)/stat_.c:$(OBJDIR)/stat.h $(OBJDIR)/style_.c:$(OBJDIR)/style.h $(OBJDIR)/sync_.c:$(OBJDIR)/sync.h $(OBJDIR)/tag_.c:$(OBJDIR)/tag.h $(OBJDIR)/tar_.c:$(OBJDIR)/tar.h $(OBJDIR)/th_main_.c:$(OBJDIR)/th_main.h $(OBJDIR)/timeline_.c:$(OBJDIR)/timeline.h $(OBJDIR)/tkt_.c:$(OBJDIR)/tkt.h $(OBJDIR)/tktsetup_.c:$(OBJDIR)/tktsetup.h $(OBJDIR)/undo_.c:$(OBJDIR)/undo.h $(OBJDIR)/update_.c:$(OBJDIR)/update.h $(OBJDIR)/url_.c:$(OBJDIR)/url.h $(OBJDIR)/user_.c:$(OBJDIR)/user.h $(OBJDIR)/verify_.c:$(OBJDIR)/verify.h $(OBJDIR)/vfile_.c:$(OBJDIR)/vfile.h $(OBJDIR)/wiki_.c:$(OBJDIR)/wiki.h $(OBJDIR)/wikiformat_.c:$(OBJDIR)/wikiformat.h $(OBJDIR)/winhttp_.c:$(OBJDIR)/winhttp.h $(OBJDIR)/xfer_.c:$(OBJDIR)/xfer.h $(OBJDIR)/xfersetup_.c:$(OBJDIR)/xfersetup.h $(OBJDIR)/zip_.c:$(OBJDIR)/zip.h $(SRCDIR)/sqlite3.h $(SRCDIR)/th.h $(OBJDIR)/VERSION.h
493
+ $(MAKEHEADERS) $(OBJDIR)/add_.c:$(OBJDIR)/add.h $(OBJDIR)/allrepo_.c:$(OBJDIR)/allrepo.h $(OBJDIR)/attach_.c:$(OBJDIR)/attach.h $(OBJDIR)/bag_.c:$(OBJDIR)/bag.h $(OBJDIR)/bisect_.c:$(OBJDIR)/bisect.h $(OBJDIR)/blob_.c:$(OBJDIR)/blob.h $(OBJDIR)/branch_.c:$(OBJDIR)/branch.h $(OBJDIR)/browse_.c:$(OBJDIR)/browse.h $(OBJDIR)/captcha_.c:$(OBJDIR)/captcha.h $(OBJDIR)/cgi_.c:$(OBJDIR)/cgi.h $(OBJDIR)/checkin_.c:$(OBJDIR)/checkin.h $(OBJDIR)/checkout_.c:$(OBJDIR)/checkout.h $(OBJDIR)/clearsign_.c:$(OBJDIR)/clearsign.h $(OBJDIR)/clone_.c:$(OBJDIR)/clone.h $(OBJDIR)/comformat_.c:$(OBJDIR)/comformat.h $(OBJDIR)/configure_.c:$(OBJDIR)/configure.h $(OBJDIR)/content_.c:$(OBJDIR)/content.h $(OBJDIR)/db_.c:$(OBJDIR)/db.h $(OBJDIR)/delta_.c:$(OBJDIR)/delta.h $(OBJDIR)/deltacmd_.c:$(OBJDIR)/deltacmd.h $(OBJDIR)/descendants_.c:$(OBJDIR)/descendants.h $(OBJDIR)/diff_.c:$(OBJDIR)/diff.h $(OBJDIR)/diffcmd_.c:$(OBJDIR)/diffcmd.h $(OBJDIR)/doc_.c:$(OBJDIR)/doc.h $(OBJDIR)/encode_.c:$(OBJDIR)/encode.h $(OBJDIR)/event_.c:$(OBJDIR)/event.h $(OBJDIR)/export_.c:$(OBJDIR)/export.h $(OBJDIR)/file_.c:$(OBJDIR)/file.h $(OBJDIR)/finfo_.c:$(OBJDIR)/finfo.h $(OBJDIR)/glob_.c:$(OBJDIR)/glob.h $(OBJDIR)/graph_.c:$(OBJDIR)/graph.h $(OBJDIR)/gzip_.c:$(OBJDIR)/gzip.h $(OBJDIR)/http_.c:$(OBJDIR)/http.h $(OBJDIR)/http_socket_.c:$(OBJDIR)/http_socket.h $(OBJDIR)/http_ssl_.c:$(OBJDIR)/http_ssl.h $(OBJDIR)/http_transport_.c:$(OBJDIR)/http_transport.h $(OBJDIR)/import_.c:$(OBJDIR)/import.h $(OBJDIR)/info_.c:$(OBJDIR)/info.h $(OBJDIR)/json_.c:$(OBJDIR)/json.h $(OBJDIR)/json_artifact_.c:$(OBJDIR)/json_artifact.h $(OBJDIR)/json_branch_.c:$(OBJDIR)/json_branch.h $(OBJDIR)/json_diff_.c:$(OBJDIR)/json_diff.h $(OBJDIR)/json_login_.c:$(OBJDIR)/json_login.h $(OBJDIR)/json_query_.c:$(OBJDIR)/json_query.h $(OBJDIR)/json_report_.c:$(OBJDIR)/json_report.h $(OBJDIR)/json_tag_.c:$(OBJDIR)/json_tag.h $(OBJDIR)/json_timeline_.c:$(OBJDIR)/json_timeline.h $(OBJDIR)/json_user_.c:$(OBJDIR)/json_user.h $(OBJDIR)/json_wiki_.c:$(OBJDIR)/json_wiki.h $(OBJDIR)/leaf_.c:$(OBJDIR)/leaf.h $(OBJDIR)/login_.c:$(OBJDIR)/login.h $(OBJDIR)/main_.c:$(OBJDIR)/main.h $(OBJDIR)/manifest_.c:$(OBJDIR)/manifest.h $(OBJDIR)/md5_.c:$(OBJDIR)/md5.h $(OBJDIR)/merge_.c:$(OBJDIR)/merge.h $(OBJDIR)/merge3_.c:$(OBJDIR)/merge3.h $(OBJDIR)/name_.c:$(OBJDIR)/name.h $(OBJDIR)/path_.c:$(OBJDIR)/path.h $(OBJDIR)/pivot_.c:$(OBJDIR)/pivot.h $(OBJDIR)/popen_.c:$(OBJDIR)/popen.h $(OBJDIR)/pqueue_.c:$(OBJDIR)/pqueue.h $(OBJDIR)/printf_.c:$(OBJDIR)/printf.h $(OBJDIR)/rebuild_.c:$(OBJDIR)/rebuild.h $(OBJDIR)/report_.c:$(OBJDIR)/report.h $(OBJDIR)/rss_.c:$(OBJDIR)/rss.h $(OBJDIR)/schema_.c:$(OBJDIR)/schema.h $(OBJDIR)/search_.c:$(OBJDIR)/search.h $(OBJDIR)/setup_.c:$(OBJDIR)/setup.h $(OBJDIR)/sha1_.c:$(OBJDIR)/sha1.h $(OBJDIR)/shun_.c:$(OBJDIR)/shun.h $(OBJDIR)/skins_.c:$(OBJDIR)/skins.h $(OBJDIR)/sqlcmd_.c:$(OBJDIR)/sqlcmd.h $(OBJDIR)/stash_.c:$(OBJDIR)/stash.h $(OBJDIR)/stat_.c:$(OBJDIR)/stat.h $(OBJDIR)/style_.c:$(OBJDIR)/style.h $(OBJDIR)/sync_.c:$(OBJDIR)/sync.h $(OBJDIR)/tag_.c:$(OBJDIR)/tag.h $(OBJDIR)/tar_.c:$(OBJDIR)/tar.h $(OBJDIR)/th_main_.c:$(OBJDIR)/th_main.h $(OBJDIR)/timeline_.c:$(OBJDIR)/timeline.h $(OBJDIR)/tkt_.c:$(OBJDIR)/tkt.h $(OBJDIR)/tktsetup_.c:$(OBJDIR)/tktsetup.h $(OBJDIR)/undo_.c:$(OBJDIR)/undo.h $(OBJDIR)/update_.c:$(OBJDIR)/update.h $(OBJDIR)/url_.c:$(OBJDIR)/url.h $(OBJDIR)/user_.c:$(OBJDIR)/user.h $(OBJDIR)/verify_.c:$(OBJDIR)/verify.h $(OBJDIR)/vfile_.c:$(OBJDIR)/vfile.h $(OBJDIR)/wiki_.c:$(OBJDIR)/wiki.h $(OBJDIR)/wikiformat_.c:$(OBJDIR)/wikiformat.h $(OBJDIR)/winhttp_.c:$(OBJDIR)/winhttp.h $(OBJDIR)/xfer_.c:$(OBJDIR)/xfer.h $(OBJDIR)/xfersetup_.c:$(OBJDIR)/xfersetup.h $(OBJDIR)/zip_.c:$(OBJDIR)/zip.h $(SRCDIR)/sqlite3.h $(SRCDIR)/th.h $(OBJDIR)/VERSION.h
461494
 echo Done >$(OBJDIR)/headers
462495
463496
 $(OBJDIR)/headers: Makefile
464497
 Makefile:
465498
 $(OBJDIR)/add_.c: $(SRCDIR)/add.c $(OBJDIR)/translate
@@ -726,10 +759,87 @@
726759
727760
 $(OBJDIR)/info.o: $(OBJDIR)/info_.c $(OBJDIR)/info.h $(SRCDIR)/config.h
728761
 $(XTCC) -o $(OBJDIR)/info.o -c $(OBJDIR)/info_.c
729762
730763
 info.h: $(OBJDIR)/headers
764
+$(OBJDIR)/json_.c: $(SRCDIR)/json.c $(OBJDIR)/translate
765
+ $(TRANSLATE) $(SRCDIR)/json.c >$(OBJDIR)/json_.c
766
+
767
+$(OBJDIR)/json.o: $(OBJDIR)/json_.c $(OBJDIR)/json.h $(SRCDIR)/config.h
768
+ $(XTCC) -o $(OBJDIR)/json.o -c $(OBJDIR)/json_.c
769
+
770
+json.h: $(OBJDIR)/headers
771
+$(OBJDIR)/json_artifact_.c: $(SRCDIR)/json_artifact.c $(OBJDIR)/translate
772
+ $(TRANSLATE) $(SRCDIR)/json_artifact.c >$(OBJDIR)/json_artifact_.c
773
+
774
+$(OBJDIR)/json_artifact.o: $(OBJDIR)/json_artifact_.c $(OBJDIR)/json_artifact.h $(SRCDIR)/config.h
775
+ $(XTCC) -o $(OBJDIR)/json_artifact.o -c $(OBJDIR)/json_artifact_.c
776
+
777
+json_artifact.h: $(OBJDIR)/headers
778
+$(OBJDIR)/json_branch_.c: $(SRCDIR)/json_branch.c $(OBJDIR)/translate
779
+ $(TRANSLATE) $(SRCDIR)/json_branch.c >$(OBJDIR)/json_branch_.c
780
+
781
+$(OBJDIR)/json_branch.o: $(OBJDIR)/json_branch_.c $(OBJDIR)/json_branch.h $(SRCDIR)/config.h
782
+ $(XTCC) -o $(OBJDIR)/json_branch.o -c $(OBJDIR)/json_branch_.c
783
+
784
+json_branch.h: $(OBJDIR)/headers
785
+$(OBJDIR)/json_diff_.c: $(SRCDIR)/json_diff.c $(OBJDIR)/translate
786
+ $(TRANSLATE) $(SRCDIR)/json_diff.c >$(OBJDIR)/json_diff_.c
787
+
788
+$(OBJDIR)/json_diff.o: $(OBJDIR)/json_diff_.c $(OBJDIR)/json_diff.h $(SRCDIR)/config.h
789
+ $(XTCC) -o $(OBJDIR)/json_diff.o -c $(OBJDIR)/json_diff_.c
790
+
791
+json_diff.h: $(OBJDIR)/headers
792
+$(OBJDIR)/json_login_.c: $(SRCDIR)/json_login.c $(OBJDIR)/translate
793
+ $(TRANSLATE) $(SRCDIR)/json_login.c >$(OBJDIR)/json_login_.c
794
+
795
+$(OBJDIR)/json_login.o: $(OBJDIR)/json_login_.c $(OBJDIR)/json_login.h $(SRCDIR)/config.h
796
+ $(XTCC) -o $(OBJDIR)/json_login.o -c $(OBJDIR)/json_login_.c
797
+
798
+json_login.h: $(OBJDIR)/headers
799
+$(OBJDIR)/json_query_.c: $(SRCDIR)/json_query.c $(OBJDIR)/translate
800
+ $(TRANSLATE) $(SRCDIR)/json_query.c >$(OBJDIR)/json_query_.c
801
+
802
+$(OBJDIR)/json_query.o: $(OBJDIR)/json_query_.c $(OBJDIR)/json_query.h $(SRCDIR)/config.h
803
+ $(XTCC) -o $(OBJDIR)/json_query.o -c $(OBJDIR)/json_query_.c
804
+
805
+json_query.h: $(OBJDIR)/headers
806
+$(OBJDIR)/json_report_.c: $(SRCDIR)/json_report.c $(OBJDIR)/translate
807
+ $(TRANSLATE) $(SRCDIR)/json_report.c >$(OBJDIR)/json_report_.c
808
+
809
+$(OBJDIR)/json_report.o: $(OBJDIR)/json_report_.c $(OBJDIR)/json_report.h $(SRCDIR)/config.h
810
+ $(XTCC) -o $(OBJDIR)/json_report.o -c $(OBJDIR)/json_report_.c
811
+
812
+json_report.h: $(OBJDIR)/headers
813
+$(OBJDIR)/json_tag_.c: $(SRCDIR)/json_tag.c $(OBJDIR)/translate
814
+ $(TRANSLATE) $(SRCDIR)/json_tag.c >$(OBJDIR)/json_tag_.c
815
+
816
+$(OBJDIR)/json_tag.o: $(OBJDIR)/json_tag_.c $(OBJDIR)/json_tag.h $(SRCDIR)/config.h
817
+ $(XTCC) -o $(OBJDIR)/json_tag.o -c $(OBJDIR)/json_tag_.c
818
+
819
+json_tag.h: $(OBJDIR)/headers
820
+$(OBJDIR)/json_timeline_.c: $(SRCDIR)/json_timeline.c $(OBJDIR)/translate
821
+ $(TRANSLATE) $(SRCDIR)/json_timeline.c >$(OBJDIR)/json_timeline_.c
822
+
823
+$(OBJDIR)/json_timeline.o: $(OBJDIR)/json_timeline_.c $(OBJDIR)/json_timeline.h $(SRCDIR)/config.h
824
+ $(XTCC) -o $(OBJDIR)/json_timeline.o -c $(OBJDIR)/json_timeline_.c
825
+
826
+json_timeline.h: $(OBJDIR)/headers
827
+$(OBJDIR)/json_user_.c: $(SRCDIR)/json_user.c $(OBJDIR)/translate
828
+ $(TRANSLATE) $(SRCDIR)/json_user.c >$(OBJDIR)/json_user_.c
829
+
830
+$(OBJDIR)/json_user.o: $(OBJDIR)/json_user_.c $(OBJDIR)/json_user.h $(SRCDIR)/config.h
831
+ $(XTCC) -o $(OBJDIR)/json_user.o -c $(OBJDIR)/json_user_.c
832
+
833
+json_user.h: $(OBJDIR)/headers
834
+$(OBJDIR)/json_wiki_.c: $(SRCDIR)/json_wiki.c $(OBJDIR)/translate
835
+ $(TRANSLATE) $(SRCDIR)/json_wiki.c >$(OBJDIR)/json_wiki_.c
836
+
837
+$(OBJDIR)/json_wiki.o: $(OBJDIR)/json_wiki_.c $(OBJDIR)/json_wiki.h $(SRCDIR)/config.h
838
+ $(XTCC) -o $(OBJDIR)/json_wiki.o -c $(OBJDIR)/json_wiki_.c
839
+
840
+json_wiki.h: $(OBJDIR)/headers
731841
 $(OBJDIR)/leaf_.c: $(SRCDIR)/leaf.c $(OBJDIR)/translate
732842
 $(TRANSLATE) $(SRCDIR)/leaf.c >$(OBJDIR)/leaf_.c
733843
734844
 $(OBJDIR)/leaf.o: $(OBJDIR)/leaf_.c $(OBJDIR)/leaf.h $(SRCDIR)/config.h
735845
 $(XTCC) -o $(OBJDIR)/leaf.o -c $(OBJDIR)/leaf_.c
@@ -1042,11 +1152,16 @@
10421152
 $(OBJDIR)/zip.o: $(OBJDIR)/zip_.c $(OBJDIR)/zip.h $(SRCDIR)/config.h
10431153
 $(XTCC) -o $(OBJDIR)/zip.o -c $(OBJDIR)/zip_.c
10441154
10451155
 zip.h: $(OBJDIR)/headers
10461156
 $(OBJDIR)/sqlite3.o: $(SRCDIR)/sqlite3.c
1047
- $(XTCC) -DSQLITE_OMIT_LOAD_EXTENSION=1 -DSQLITE_THREADSAFE=0 -DSQLITE_DEFAULT_FILE_FORMAT=4 -DSQLITE_ENABLE_STAT2 -Dlocaltime=fossil_localtime -DSQLITE_ENABLE_LOCKING_STYLE=0 -c $(SRCDIR)/sqlite3.c -o $(OBJDIR)/sqlite3.o
1157
+ $(XTCC) -DSQLITE_OMIT_LOAD_EXTENSION=1 -DSQLITE_THREADSAFE=0 -DSQLITE_DEFAULT_FILE_FORMAT=4 -DSQLITE_ENABLE_STAT3 -Dlocaltime=fossil_localtime -DSQLITE_ENABLE_LOCKING_STYLE=0 -c $(SRCDIR)/sqlite3.c -o $(OBJDIR)/sqlite3.o
1158
+
1159
+$(OBJDIR)/cson_amalgamation.o: $(SRCDIR)/cson_amalgamation.c
1160
+ $(XTCC) -c $(SRCDIR)/cson_amalgamation.c -o $(OBJDIR)/cson_amalgamation.o -DCSON_FOSSIL_MODE
1161
+
1162
+$(OBJDIR)/json.o $(OBJDIR)/json_artifact.o $(OBJDIR)/json_branch.o $(OBJDIR)/json_diff.o $(OBJDIR)/json_login.o $(OBJDIR)/json_query.o $(OBJDIR)/json_report.o $(OBJDIR)/json_tag.o $(OBJDIR)/json_timeline.o $(OBJDIR)/json_user.o $(OBJDIR)/json_wiki.o: $(SRCDIR)/json_detail.h
10481163
10491164
 $(OBJDIR)/shell.o: $(SRCDIR)/shell.c $(SRCDIR)/sqlite3.h
10501165
 $(XTCC) -Dmain=sqlite3_shell -DSQLITE_OMIT_LOAD_EXTENSION=1 -c $(SRCDIR)/shell.c -o $(OBJDIR)/shell.o
10511166
10521167
 $(OBJDIR)/th.o: $(SRCDIR)/th.c
10531168
--- win/Makefile.mingw.mistachkin
+++ win/Makefile.mingw.mistachkin
@@ -170,10 +170,21 @@
170 $(SRCDIR)/http_socket.c \
171 $(SRCDIR)/http_ssl.c \
172 $(SRCDIR)/http_transport.c \
173 $(SRCDIR)/import.c \
174 $(SRCDIR)/info.c \
 
 
 
 
 
 
 
 
 
 
 
175 $(SRCDIR)/leaf.c \
176 $(SRCDIR)/login.c \
177 $(SRCDIR)/main.c \
178 $(SRCDIR)/manifest.c \
179 $(SRCDIR)/md5.c \
@@ -255,10 +266,21 @@
255 $(OBJDIR)/http_socket_.c \
256 $(OBJDIR)/http_ssl_.c \
257 $(OBJDIR)/http_transport_.c \
258 $(OBJDIR)/import_.c \
259 $(OBJDIR)/info_.c \
 
 
 
 
 
 
 
 
 
 
 
260 $(OBJDIR)/leaf_.c \
261 $(OBJDIR)/login_.c \
262 $(OBJDIR)/main_.c \
263 $(OBJDIR)/manifest_.c \
264 $(OBJDIR)/md5_.c \
@@ -340,10 +362,21 @@
340 $(OBJDIR)/http_socket.o \
341 $(OBJDIR)/http_ssl.o \
342 $(OBJDIR)/http_transport.o \
343 $(OBJDIR)/import.o \
344 $(OBJDIR)/info.o \
 
 
 
 
 
 
 
 
 
 
 
345 $(OBJDIR)/leaf.o \
346 $(OBJDIR)/login.o \
347 $(OBJDIR)/main.o \
348 $(OBJDIR)/manifest.o \
349 $(OBJDIR)/md5.o \
@@ -426,11 +459,11 @@
426 $(TCLSH) $(SRCDIR)/../test/tester.tcl $(APPNAME)
427
428 $(OBJDIR)/VERSION.h: $(SRCDIR)/../manifest.uuid $(SRCDIR)/../manifest $(VERSION)
429 $(VERSION) $(SRCDIR)/../manifest.uuid $(SRCDIR)/../manifest $(SRCDIR)/../VERSION >$(OBJDIR)/VERSION.h
430
431 EXTRAOBJ = $(OBJDIR)/sqlite3.o $(OBJDIR)/shell.o $(OBJDIR)/th.o $(OBJDIR)/th_lang.o
432
433 ifdef FOSSIL_ENABLE_TCL
434 EXTRAOBJ += $(OBJDIR)/th_tcl.o
435 endif
436
@@ -455,11 +488,11 @@
455
456
457 $(OBJDIR)/page_index.h: $(TRANS_SRC) $(OBJDIR)/mkindex
458 $(MKINDEX) $(TRANS_SRC) >$@
459 $(OBJDIR)/headers: $(OBJDIR)/page_index.h $(OBJDIR)/makeheaders $(OBJDIR)/VERSION.h
460 $(MAKEHEADERS) $(OBJDIR)/add_.c:$(OBJDIR)/add.h $(OBJDIR)/allrepo_.c:$(OBJDIR)/allrepo.h $(OBJDIR)/attach_.c:$(OBJDIR)/attach.h $(OBJDIR)/bag_.c:$(OBJDIR)/bag.h $(OBJDIR)/bisect_.c:$(OBJDIR)/bisect.h $(OBJDIR)/blob_.c:$(OBJDIR)/blob.h $(OBJDIR)/branch_.c:$(OBJDIR)/branch.h $(OBJDIR)/browse_.c:$(OBJDIR)/browse.h $(OBJDIR)/captcha_.c:$(OBJDIR)/captcha.h $(OBJDIR)/cgi_.c:$(OBJDIR)/cgi.h $(OBJDIR)/checkin_.c:$(OBJDIR)/checkin.h $(OBJDIR)/checkout_.c:$(OBJDIR)/checkout.h $(OBJDIR)/clearsign_.c:$(OBJDIR)/clearsign.h $(OBJDIR)/clone_.c:$(OBJDIR)/clone.h $(OBJDIR)/comformat_.c:$(OBJDIR)/comformat.h $(OBJDIR)/configure_.c:$(OBJDIR)/configure.h $(OBJDIR)/content_.c:$(OBJDIR)/content.h $(OBJDIR)/db_.c:$(OBJDIR)/db.h $(OBJDIR)/delta_.c:$(OBJDIR)/delta.h $(OBJDIR)/deltacmd_.c:$(OBJDIR)/deltacmd.h $(OBJDIR)/descendants_.c:$(OBJDIR)/descendants.h $(OBJDIR)/diff_.c:$(OBJDIR)/diff.h $(OBJDIR)/diffcmd_.c:$(OBJDIR)/diffcmd.h $(OBJDIR)/doc_.c:$(OBJDIR)/doc.h $(OBJDIR)/encode_.c:$(OBJDIR)/encode.h $(OBJDIR)/event_.c:$(OBJDIR)/event.h $(OBJDIR)/export_.c:$(OBJDIR)/export.h $(OBJDIR)/file_.c:$(OBJDIR)/file.h $(OBJDIR)/finfo_.c:$(OBJDIR)/finfo.h $(OBJDIR)/glob_.c:$(OBJDIR)/glob.h $(OBJDIR)/graph_.c:$(OBJDIR)/graph.h $(OBJDIR)/gzip_.c:$(OBJDIR)/gzip.h $(OBJDIR)/http_.c:$(OBJDIR)/http.h $(OBJDIR)/http_socket_.c:$(OBJDIR)/http_socket.h $(OBJDIR)/http_ssl_.c:$(OBJDIR)/http_ssl.h $(OBJDIR)/http_transport_.c:$(OBJDIR)/http_transport.h $(OBJDIR)/import_.c:$(OBJDIR)/import.h $(OBJDIR)/info_.c:$(OBJDIR)/info.h $(OBJDIR)/leaf_.c:$(OBJDIR)/leaf.h $(OBJDIR)/login_.c:$(OBJDIR)/login.h $(OBJDIR)/main_.c:$(OBJDIR)/main.h $(OBJDIR)/manifest_.c:$(OBJDIR)/manifest.h $(OBJDIR)/md5_.c:$(OBJDIR)/md5.h $(OBJDIR)/merge_.c:$(OBJDIR)/merge.h $(OBJDIR)/merge3_.c:$(OBJDIR)/merge3.h $(OBJDIR)/name_.c:$(OBJDIR)/name.h $(OBJDIR)/path_.c:$(OBJDIR)/path.h $(OBJDIR)/pivot_.c:$(OBJDIR)/pivot.h $(OBJDIR)/popen_.c:$(OBJDIR)/popen.h $(OBJDIR)/pqueue_.c:$(OBJDIR)/pqueue.h $(OBJDIR)/printf_.c:$(OBJDIR)/printf.h $(OBJDIR)/rebuild_.c:$(OBJDIR)/rebuild.h $(OBJDIR)/report_.c:$(OBJDIR)/report.h $(OBJDIR)/rss_.c:$(OBJDIR)/rss.h $(OBJDIR)/schema_.c:$(OBJDIR)/schema.h $(OBJDIR)/search_.c:$(OBJDIR)/search.h $(OBJDIR)/setup_.c:$(OBJDIR)/setup.h $(OBJDIR)/sha1_.c:$(OBJDIR)/sha1.h $(OBJDIR)/shun_.c:$(OBJDIR)/shun.h $(OBJDIR)/skins_.c:$(OBJDIR)/skins.h $(OBJDIR)/sqlcmd_.c:$(OBJDIR)/sqlcmd.h $(OBJDIR)/stash_.c:$(OBJDIR)/stash.h $(OBJDIR)/stat_.c:$(OBJDIR)/stat.h $(OBJDIR)/style_.c:$(OBJDIR)/style.h $(OBJDIR)/sync_.c:$(OBJDIR)/sync.h $(OBJDIR)/tag_.c:$(OBJDIR)/tag.h $(OBJDIR)/tar_.c:$(OBJDIR)/tar.h $(OBJDIR)/th_main_.c:$(OBJDIR)/th_main.h $(OBJDIR)/timeline_.c:$(OBJDIR)/timeline.h $(OBJDIR)/tkt_.c:$(OBJDIR)/tkt.h $(OBJDIR)/tktsetup_.c:$(OBJDIR)/tktsetup.h $(OBJDIR)/undo_.c:$(OBJDIR)/undo.h $(OBJDIR)/update_.c:$(OBJDIR)/update.h $(OBJDIR)/url_.c:$(OBJDIR)/url.h $(OBJDIR)/user_.c:$(OBJDIR)/user.h $(OBJDIR)/verify_.c:$(OBJDIR)/verify.h $(OBJDIR)/vfile_.c:$(OBJDIR)/vfile.h $(OBJDIR)/wiki_.c:$(OBJDIR)/wiki.h $(OBJDIR)/wikiformat_.c:$(OBJDIR)/wikiformat.h $(OBJDIR)/winhttp_.c:$(OBJDIR)/winhttp.h $(OBJDIR)/xfer_.c:$(OBJDIR)/xfer.h $(OBJDIR)/xfersetup_.c:$(OBJDIR)/xfersetup.h $(OBJDIR)/zip_.c:$(OBJDIR)/zip.h $(SRCDIR)/sqlite3.h $(SRCDIR)/th.h $(OBJDIR)/VERSION.h
461 echo Done >$(OBJDIR)/headers
462
463 $(OBJDIR)/headers: Makefile
464 Makefile:
465 $(OBJDIR)/add_.c: $(SRCDIR)/add.c $(OBJDIR)/translate
@@ -726,10 +759,87 @@
726
727 $(OBJDIR)/info.o: $(OBJDIR)/info_.c $(OBJDIR)/info.h $(SRCDIR)/config.h
728 $(XTCC) -o $(OBJDIR)/info.o -c $(OBJDIR)/info_.c
729
730 info.h: $(OBJDIR)/headers
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
731 $(OBJDIR)/leaf_.c: $(SRCDIR)/leaf.c $(OBJDIR)/translate
732 $(TRANSLATE) $(SRCDIR)/leaf.c >$(OBJDIR)/leaf_.c
733
734 $(OBJDIR)/leaf.o: $(OBJDIR)/leaf_.c $(OBJDIR)/leaf.h $(SRCDIR)/config.h
735 $(XTCC) -o $(OBJDIR)/leaf.o -c $(OBJDIR)/leaf_.c
@@ -1042,11 +1152,16 @@
1042 $(OBJDIR)/zip.o: $(OBJDIR)/zip_.c $(OBJDIR)/zip.h $(SRCDIR)/config.h
1043 $(XTCC) -o $(OBJDIR)/zip.o -c $(OBJDIR)/zip_.c
1044
1045 zip.h: $(OBJDIR)/headers
1046 $(OBJDIR)/sqlite3.o: $(SRCDIR)/sqlite3.c
1047 $(XTCC) -DSQLITE_OMIT_LOAD_EXTENSION=1 -DSQLITE_THREADSAFE=0 -DSQLITE_DEFAULT_FILE_FORMAT=4 -DSQLITE_ENABLE_STAT2 -Dlocaltime=fossil_localtime -DSQLITE_ENABLE_LOCKING_STYLE=0 -c $(SRCDIR)/sqlite3.c -o $(OBJDIR)/sqlite3.o
 
 
 
 
 
1048
1049 $(OBJDIR)/shell.o: $(SRCDIR)/shell.c $(SRCDIR)/sqlite3.h
1050 $(XTCC) -Dmain=sqlite3_shell -DSQLITE_OMIT_LOAD_EXTENSION=1 -c $(SRCDIR)/shell.c -o $(OBJDIR)/shell.o
1051
1052 $(OBJDIR)/th.o: $(SRCDIR)/th.c
1053
--- win/Makefile.mingw.mistachkin
+++ win/Makefile.mingw.mistachkin
@@ -170,10 +170,21 @@
170 $(SRCDIR)/http_socket.c \
171 $(SRCDIR)/http_ssl.c \
172 $(SRCDIR)/http_transport.c \
173 $(SRCDIR)/import.c \
174 $(SRCDIR)/info.c \
175 $(SRCDIR)/json.c \
176 $(SRCDIR)/json_artifact.c \
177 $(SRCDIR)/json_branch.c \
178 $(SRCDIR)/json_diff.c \
179 $(SRCDIR)/json_login.c \
180 $(SRCDIR)/json_query.c \
181 $(SRCDIR)/json_report.c \
182 $(SRCDIR)/json_tag.c \
183 $(SRCDIR)/json_timeline.c \
184 $(SRCDIR)/json_user.c \
185 $(SRCDIR)/json_wiki.c \
186 $(SRCDIR)/leaf.c \
187 $(SRCDIR)/login.c \
188 $(SRCDIR)/main.c \
189 $(SRCDIR)/manifest.c \
190 $(SRCDIR)/md5.c \
@@ -255,10 +266,21 @@
266 $(OBJDIR)/http_socket_.c \
267 $(OBJDIR)/http_ssl_.c \
268 $(OBJDIR)/http_transport_.c \
269 $(OBJDIR)/import_.c \
270 $(OBJDIR)/info_.c \
271 $(OBJDIR)/json_.c \
272 $(OBJDIR)/json_artifact_.c \
273 $(OBJDIR)/json_branch_.c \
274 $(OBJDIR)/json_diff_.c \
275 $(OBJDIR)/json_login_.c \
276 $(OBJDIR)/json_query_.c \
277 $(OBJDIR)/json_report_.c \
278 $(OBJDIR)/json_tag_.c \
279 $(OBJDIR)/json_timeline_.c \
280 $(OBJDIR)/json_user_.c \
281 $(OBJDIR)/json_wiki_.c \
282 $(OBJDIR)/leaf_.c \
283 $(OBJDIR)/login_.c \
284 $(OBJDIR)/main_.c \
285 $(OBJDIR)/manifest_.c \
286 $(OBJDIR)/md5_.c \
@@ -340,10 +362,21 @@
362 $(OBJDIR)/http_socket.o \
363 $(OBJDIR)/http_ssl.o \
364 $(OBJDIR)/http_transport.o \
365 $(OBJDIR)/import.o \
366 $(OBJDIR)/info.o \
367 $(OBJDIR)/json.o \
368 $(OBJDIR)/json_artifact.o \
369 $(OBJDIR)/json_branch.o \
370 $(OBJDIR)/json_diff.o \
371 $(OBJDIR)/json_login.o \
372 $(OBJDIR)/json_query.o \
373 $(OBJDIR)/json_report.o \
374 $(OBJDIR)/json_tag.o \
375 $(OBJDIR)/json_timeline.o \
376 $(OBJDIR)/json_user.o \
377 $(OBJDIR)/json_wiki.o \
378 $(OBJDIR)/leaf.o \
379 $(OBJDIR)/login.o \
380 $(OBJDIR)/main.o \
381 $(OBJDIR)/manifest.o \
382 $(OBJDIR)/md5.o \
@@ -426,11 +459,11 @@
459 $(TCLSH) $(SRCDIR)/../test/tester.tcl $(APPNAME)
460
461 $(OBJDIR)/VERSION.h: $(SRCDIR)/../manifest.uuid $(SRCDIR)/../manifest $(VERSION)
462 $(VERSION) $(SRCDIR)/../manifest.uuid $(SRCDIR)/../manifest $(SRCDIR)/../VERSION >$(OBJDIR)/VERSION.h
463
464 EXTRAOBJ = $(OBJDIR)/sqlite3.o $(OBJDIR)/shell.o $(OBJDIR)/th.o $(OBJDIR)/th_lang.o $(OBJDIR)/cson_amalgamation.o
465
466 ifdef FOSSIL_ENABLE_TCL
467 EXTRAOBJ += $(OBJDIR)/th_tcl.o
468 endif
469
@@ -455,11 +488,11 @@
488
489
490 $(OBJDIR)/page_index.h: $(TRANS_SRC) $(OBJDIR)/mkindex
491 $(MKINDEX) $(TRANS_SRC) >$@
492 $(OBJDIR)/headers: $(OBJDIR)/page_index.h $(OBJDIR)/makeheaders $(OBJDIR)/VERSION.h
493 $(MAKEHEADERS) $(OBJDIR)/add_.c:$(OBJDIR)/add.h $(OBJDIR)/allrepo_.c:$(OBJDIR)/allrepo.h $(OBJDIR)/attach_.c:$(OBJDIR)/attach.h $(OBJDIR)/bag_.c:$(OBJDIR)/bag.h $(OBJDIR)/bisect_.c:$(OBJDIR)/bisect.h $(OBJDIR)/blob_.c:$(OBJDIR)/blob.h $(OBJDIR)/branch_.c:$(OBJDIR)/branch.h $(OBJDIR)/browse_.c:$(OBJDIR)/browse.h $(OBJDIR)/captcha_.c:$(OBJDIR)/captcha.h $(OBJDIR)/cgi_.c:$(OBJDIR)/cgi.h $(OBJDIR)/checkin_.c:$(OBJDIR)/checkin.h $(OBJDIR)/checkout_.c:$(OBJDIR)/checkout.h $(OBJDIR)/clearsign_.c:$(OBJDIR)/clearsign.h $(OBJDIR)/clone_.c:$(OBJDIR)/clone.h $(OBJDIR)/comformat_.c:$(OBJDIR)/comformat.h $(OBJDIR)/configure_.c:$(OBJDIR)/configure.h $(OBJDIR)/content_.c:$(OBJDIR)/content.h $(OBJDIR)/db_.c:$(OBJDIR)/db.h $(OBJDIR)/delta_.c:$(OBJDIR)/delta.h $(OBJDIR)/deltacmd_.c:$(OBJDIR)/deltacmd.h $(OBJDIR)/descendants_.c:$(OBJDIR)/descendants.h $(OBJDIR)/diff_.c:$(OBJDIR)/diff.h $(OBJDIR)/diffcmd_.c:$(OBJDIR)/diffcmd.h $(OBJDIR)/doc_.c:$(OBJDIR)/doc.h $(OBJDIR)/encode_.c:$(OBJDIR)/encode.h $(OBJDIR)/event_.c:$(OBJDIR)/event.h $(OBJDIR)/export_.c:$(OBJDIR)/export.h $(OBJDIR)/file_.c:$(OBJDIR)/file.h $(OBJDIR)/finfo_.c:$(OBJDIR)/finfo.h $(OBJDIR)/glob_.c:$(OBJDIR)/glob.h $(OBJDIR)/graph_.c:$(OBJDIR)/graph.h $(OBJDIR)/gzip_.c:$(OBJDIR)/gzip.h $(OBJDIR)/http_.c:$(OBJDIR)/http.h $(OBJDIR)/http_socket_.c:$(OBJDIR)/http_socket.h $(OBJDIR)/http_ssl_.c:$(OBJDIR)/http_ssl.h $(OBJDIR)/http_transport_.c:$(OBJDIR)/http_transport.h $(OBJDIR)/import_.c:$(OBJDIR)/import.h $(OBJDIR)/info_.c:$(OBJDIR)/info.h $(OBJDIR)/json_.c:$(OBJDIR)/json.h $(OBJDIR)/json_artifact_.c:$(OBJDIR)/json_artifact.h $(OBJDIR)/json_branch_.c:$(OBJDIR)/json_branch.h $(OBJDIR)/json_diff_.c:$(OBJDIR)/json_diff.h $(OBJDIR)/json_login_.c:$(OBJDIR)/json_login.h $(OBJDIR)/json_query_.c:$(OBJDIR)/json_query.h $(OBJDIR)/json_report_.c:$(OBJDIR)/json_report.h $(OBJDIR)/json_tag_.c:$(OBJDIR)/json_tag.h $(OBJDIR)/json_timeline_.c:$(OBJDIR)/json_timeline.h $(OBJDIR)/json_user_.c:$(OBJDIR)/json_user.h $(OBJDIR)/json_wiki_.c:$(OBJDIR)/json_wiki.h $(OBJDIR)/leaf_.c:$(OBJDIR)/leaf.h $(OBJDIR)/login_.c:$(OBJDIR)/login.h $(OBJDIR)/main_.c:$(OBJDIR)/main.h $(OBJDIR)/manifest_.c:$(OBJDIR)/manifest.h $(OBJDIR)/md5_.c:$(OBJDIR)/md5.h $(OBJDIR)/merge_.c:$(OBJDIR)/merge.h $(OBJDIR)/merge3_.c:$(OBJDIR)/merge3.h $(OBJDIR)/name_.c:$(OBJDIR)/name.h $(OBJDIR)/path_.c:$(OBJDIR)/path.h $(OBJDIR)/pivot_.c:$(OBJDIR)/pivot.h $(OBJDIR)/popen_.c:$(OBJDIR)/popen.h $(OBJDIR)/pqueue_.c:$(OBJDIR)/pqueue.h $(OBJDIR)/printf_.c:$(OBJDIR)/printf.h $(OBJDIR)/rebuild_.c:$(OBJDIR)/rebuild.h $(OBJDIR)/report_.c:$(OBJDIR)/report.h $(OBJDIR)/rss_.c:$(OBJDIR)/rss.h $(OBJDIR)/schema_.c:$(OBJDIR)/schema.h $(OBJDIR)/search_.c:$(OBJDIR)/search.h $(OBJDIR)/setup_.c:$(OBJDIR)/setup.h $(OBJDIR)/sha1_.c:$(OBJDIR)/sha1.h $(OBJDIR)/shun_.c:$(OBJDIR)/shun.h $(OBJDIR)/skins_.c:$(OBJDIR)/skins.h $(OBJDIR)/sqlcmd_.c:$(OBJDIR)/sqlcmd.h $(OBJDIR)/stash_.c:$(OBJDIR)/stash.h $(OBJDIR)/stat_.c:$(OBJDIR)/stat.h $(OBJDIR)/style_.c:$(OBJDIR)/style.h $(OBJDIR)/sync_.c:$(OBJDIR)/sync.h $(OBJDIR)/tag_.c:$(OBJDIR)/tag.h $(OBJDIR)/tar_.c:$(OBJDIR)/tar.h $(OBJDIR)/th_main_.c:$(OBJDIR)/th_main.h $(OBJDIR)/timeline_.c:$(OBJDIR)/timeline.h $(OBJDIR)/tkt_.c:$(OBJDIR)/tkt.h $(OBJDIR)/tktsetup_.c:$(OBJDIR)/tktsetup.h $(OBJDIR)/undo_.c:$(OBJDIR)/undo.h $(OBJDIR)/update_.c:$(OBJDIR)/update.h $(OBJDIR)/url_.c:$(OBJDIR)/url.h $(OBJDIR)/user_.c:$(OBJDIR)/user.h $(OBJDIR)/verify_.c:$(OBJDIR)/verify.h $(OBJDIR)/vfile_.c:$(OBJDIR)/vfile.h $(OBJDIR)/wiki_.c:$(OBJDIR)/wiki.h $(OBJDIR)/wikiformat_.c:$(OBJDIR)/wikiformat.h $(OBJDIR)/winhttp_.c:$(OBJDIR)/winhttp.h $(OBJDIR)/xfer_.c:$(OBJDIR)/xfer.h $(OBJDIR)/xfersetup_.c:$(OBJDIR)/xfersetup.h $(OBJDIR)/zip_.c:$(OBJDIR)/zip.h $(SRCDIR)/sqlite3.h $(SRCDIR)/th.h $(OBJDIR)/VERSION.h
494 echo Done >$(OBJDIR)/headers
495
496 $(OBJDIR)/headers: Makefile
497 Makefile:
498 $(OBJDIR)/add_.c: $(SRCDIR)/add.c $(OBJDIR)/translate
@@ -726,10 +759,87 @@
759
760 $(OBJDIR)/info.o: $(OBJDIR)/info_.c $(OBJDIR)/info.h $(SRCDIR)/config.h
761 $(XTCC) -o $(OBJDIR)/info.o -c $(OBJDIR)/info_.c
762
763 info.h: $(OBJDIR)/headers
764 $(OBJDIR)/json_.c: $(SRCDIR)/json.c $(OBJDIR)/translate
765 $(TRANSLATE) $(SRCDIR)/json.c >$(OBJDIR)/json_.c
766
767 $(OBJDIR)/json.o: $(OBJDIR)/json_.c $(OBJDIR)/json.h $(SRCDIR)/config.h
768 $(XTCC) -o $(OBJDIR)/json.o -c $(OBJDIR)/json_.c
769
770 json.h: $(OBJDIR)/headers
771 $(OBJDIR)/json_artifact_.c: $(SRCDIR)/json_artifact.c $(OBJDIR)/translate
772 $(TRANSLATE) $(SRCDIR)/json_artifact.c >$(OBJDIR)/json_artifact_.c
773
774 $(OBJDIR)/json_artifact.o: $(OBJDIR)/json_artifact_.c $(OBJDIR)/json_artifact.h $(SRCDIR)/config.h
775 $(XTCC) -o $(OBJDIR)/json_artifact.o -c $(OBJDIR)/json_artifact_.c
776
777 json_artifact.h: $(OBJDIR)/headers
778 $(OBJDIR)/json_branch_.c: $(SRCDIR)/json_branch.c $(OBJDIR)/translate
779 $(TRANSLATE) $(SRCDIR)/json_branch.c >$(OBJDIR)/json_branch_.c
780
781 $(OBJDIR)/json_branch.o: $(OBJDIR)/json_branch_.c $(OBJDIR)/json_branch.h $(SRCDIR)/config.h
782 $(XTCC) -o $(OBJDIR)/json_branch.o -c $(OBJDIR)/json_branch_.c
783
784 json_branch.h: $(OBJDIR)/headers
785 $(OBJDIR)/json_diff_.c: $(SRCDIR)/json_diff.c $(OBJDIR)/translate
786 $(TRANSLATE) $(SRCDIR)/json_diff.c >$(OBJDIR)/json_diff_.c
787
788 $(OBJDIR)/json_diff.o: $(OBJDIR)/json_diff_.c $(OBJDIR)/json_diff.h $(SRCDIR)/config.h
789 $(XTCC) -o $(OBJDIR)/json_diff.o -c $(OBJDIR)/json_diff_.c
790
791 json_diff.h: $(OBJDIR)/headers
792 $(OBJDIR)/json_login_.c: $(SRCDIR)/json_login.c $(OBJDIR)/translate
793 $(TRANSLATE) $(SRCDIR)/json_login.c >$(OBJDIR)/json_login_.c
794
795 $(OBJDIR)/json_login.o: $(OBJDIR)/json_login_.c $(OBJDIR)/json_login.h $(SRCDIR)/config.h
796 $(XTCC) -o $(OBJDIR)/json_login.o -c $(OBJDIR)/json_login_.c
797
798 json_login.h: $(OBJDIR)/headers
799 $(OBJDIR)/json_query_.c: $(SRCDIR)/json_query.c $(OBJDIR)/translate
800 $(TRANSLATE) $(SRCDIR)/json_query.c >$(OBJDIR)/json_query_.c
801
802 $(OBJDIR)/json_query.o: $(OBJDIR)/json_query_.c $(OBJDIR)/json_query.h $(SRCDIR)/config.h
803 $(XTCC) -o $(OBJDIR)/json_query.o -c $(OBJDIR)/json_query_.c
804
805 json_query.h: $(OBJDIR)/headers
806 $(OBJDIR)/json_report_.c: $(SRCDIR)/json_report.c $(OBJDIR)/translate
807 $(TRANSLATE) $(SRCDIR)/json_report.c >$(OBJDIR)/json_report_.c
808
809 $(OBJDIR)/json_report.o: $(OBJDIR)/json_report_.c $(OBJDIR)/json_report.h $(SRCDIR)/config.h
810 $(XTCC) -o $(OBJDIR)/json_report.o -c $(OBJDIR)/json_report_.c
811
812 json_report.h: $(OBJDIR)/headers
813 $(OBJDIR)/json_tag_.c: $(SRCDIR)/json_tag.c $(OBJDIR)/translate
814 $(TRANSLATE) $(SRCDIR)/json_tag.c >$(OBJDIR)/json_tag_.c
815
816 $(OBJDIR)/json_tag.o: $(OBJDIR)/json_tag_.c $(OBJDIR)/json_tag.h $(SRCDIR)/config.h
817 $(XTCC) -o $(OBJDIR)/json_tag.o -c $(OBJDIR)/json_tag_.c
818
819 json_tag.h: $(OBJDIR)/headers
820 $(OBJDIR)/json_timeline_.c: $(SRCDIR)/json_timeline.c $(OBJDIR)/translate
821 $(TRANSLATE) $(SRCDIR)/json_timeline.c >$(OBJDIR)/json_timeline_.c
822
823 $(OBJDIR)/json_timeline.o: $(OBJDIR)/json_timeline_.c $(OBJDIR)/json_timeline.h $(SRCDIR)/config.h
824 $(XTCC) -o $(OBJDIR)/json_timeline.o -c $(OBJDIR)/json_timeline_.c
825
826 json_timeline.h: $(OBJDIR)/headers
827 $(OBJDIR)/json_user_.c: $(SRCDIR)/json_user.c $(OBJDIR)/translate
828 $(TRANSLATE) $(SRCDIR)/json_user.c >$(OBJDIR)/json_user_.c
829
830 $(OBJDIR)/json_user.o: $(OBJDIR)/json_user_.c $(OBJDIR)/json_user.h $(SRCDIR)/config.h
831 $(XTCC) -o $(OBJDIR)/json_user.o -c $(OBJDIR)/json_user_.c
832
833 json_user.h: $(OBJDIR)/headers
834 $(OBJDIR)/json_wiki_.c: $(SRCDIR)/json_wiki.c $(OBJDIR)/translate
835 $(TRANSLATE) $(SRCDIR)/json_wiki.c >$(OBJDIR)/json_wiki_.c
836
837 $(OBJDIR)/json_wiki.o: $(OBJDIR)/json_wiki_.c $(OBJDIR)/json_wiki.h $(SRCDIR)/config.h
838 $(XTCC) -o $(OBJDIR)/json_wiki.o -c $(OBJDIR)/json_wiki_.c
839
840 json_wiki.h: $(OBJDIR)/headers
841 $(OBJDIR)/leaf_.c: $(SRCDIR)/leaf.c $(OBJDIR)/translate
842 $(TRANSLATE) $(SRCDIR)/leaf.c >$(OBJDIR)/leaf_.c
843
844 $(OBJDIR)/leaf.o: $(OBJDIR)/leaf_.c $(OBJDIR)/leaf.h $(SRCDIR)/config.h
845 $(XTCC) -o $(OBJDIR)/leaf.o -c $(OBJDIR)/leaf_.c
@@ -1042,11 +1152,16 @@
1152 $(OBJDIR)/zip.o: $(OBJDIR)/zip_.c $(OBJDIR)/zip.h $(SRCDIR)/config.h
1153 $(XTCC) -o $(OBJDIR)/zip.o -c $(OBJDIR)/zip_.c
1154
1155 zip.h: $(OBJDIR)/headers
1156 $(OBJDIR)/sqlite3.o: $(SRCDIR)/sqlite3.c
1157 $(XTCC) -DSQLITE_OMIT_LOAD_EXTENSION=1 -DSQLITE_THREADSAFE=0 -DSQLITE_DEFAULT_FILE_FORMAT=4 -DSQLITE_ENABLE_STAT3 -Dlocaltime=fossil_localtime -DSQLITE_ENABLE_LOCKING_STYLE=0 -c $(SRCDIR)/sqlite3.c -o $(OBJDIR)/sqlite3.o
1158
1159 $(OBJDIR)/cson_amalgamation.o: $(SRCDIR)/cson_amalgamation.c
1160 $(XTCC) -c $(SRCDIR)/cson_amalgamation.c -o $(OBJDIR)/cson_amalgamation.o -DCSON_FOSSIL_MODE
1161
1162 $(OBJDIR)/json.o $(OBJDIR)/json_artifact.o $(OBJDIR)/json_branch.o $(OBJDIR)/json_diff.o $(OBJDIR)/json_login.o $(OBJDIR)/json_query.o $(OBJDIR)/json_report.o $(OBJDIR)/json_tag.o $(OBJDIR)/json_timeline.o $(OBJDIR)/json_user.o $(OBJDIR)/json_wiki.o: $(SRCDIR)/json_detail.h
1163
1164 $(OBJDIR)/shell.o: $(SRCDIR)/shell.c $(SRCDIR)/sqlite3.h
1165 $(XTCC) -Dmain=sqlite3_shell -DSQLITE_OMIT_LOAD_EXTENSION=1 -c $(SRCDIR)/shell.c -o $(OBJDIR)/shell.o
1166
1167 $(OBJDIR)/th.o: $(SRCDIR)/th.c
1168

Keyboard Shortcuts

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