Fossil SCM
Cleanup and unify the MinGW makefiles.
Commit
a88a241d727b1090aea140c7e318aedf339ce42f
Parent
2827d449a994c92…
2 files changed
+18
-12
+118
-3
+18
-12
| --- win/Makefile.mingw | ||
| +++ win/Makefile.mingw | ||
| @@ -8,11 +8,10 @@ | ||
| 8 | 8 | # |
| 9 | 9 | SRCDIR = src |
| 10 | 10 | |
| 11 | 11 | #### The directory into which object code files should be written. |
| 12 | 12 | # |
| 13 | -# | |
| 14 | 13 | OBJDIR = wbld |
| 15 | 14 | |
| 16 | 15 | #### C Compiler and options for use in building executables that |
| 17 | 16 | # will run on the platform that is doing the build. This is used |
| 18 | 17 | # to compile code-generator programs as part of the build process. |
| @@ -27,35 +26,41 @@ | ||
| 27 | 26 | #### The directory in which the zlib compression library is installed. |
| 28 | 27 | # |
| 29 | 28 | # |
| 30 | 29 | ZLIBDIR = /programs/gnuwin32 |
| 31 | 30 | |
| 32 | -#### C Compile and options for use in building executables that | |
| 31 | +#### C Compile and options for use in building executables that | |
| 33 | 32 | # will run on the target platform. This is usually the same |
| 34 | 33 | # as BCC, unless you are cross-compiling. This C compiler builds |
| 35 | 34 | # the finished binary for fossil. The BCC compiler above is used |
| 36 | 35 | # for building intermediate code-generator tools. |
| 37 | 36 | # |
| 38 | 37 | TCC = gcc -Os -Wall -L$(ZLIBDIR)/lib -I$(ZLIBDIR)/include |
| 39 | 38 | |
| 40 | 39 | # With HTTPS support |
| 41 | 40 | ifdef FOSSIL_ENABLE_SSL |
| 42 | -TCC += -static -DFOSSIL_ENABLE_SSL=1 | |
| 41 | +TCC += -DFOSSIL_ENABLE_SSL=1 | |
| 43 | 42 | endif |
| 44 | 43 | |
| 45 | 44 | #### Extra arguments for linking the finished binary. Fossil needs |
| 46 | 45 | # 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 | |
| 48 | 47 | # so that we can build a static executable that will run in a |
| 49 | 48 | # chroot jail. |
| 50 | 49 | # |
| 51 | -#LIB = -lz -lws2_32 | |
| 52 | -# OpenSSL: | |
| 50 | +LIB = -static | |
| 51 | +LIB += -lmingwex -lz | |
| 52 | + | |
| 53 | +# OpenSSL: Add the necessary libaries required. | |
| 53 | 54 | ifdef FOSSIL_ENABLE_SSL |
| 54 | 55 | LIB += -lssl -lcrypto -lgdi32 |
| 55 | 56 | 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 | |
| 57 | 62 | |
| 58 | 63 | #### Tcl shell for use in running the fossil testsuite. This is only |
| 59 | 64 | # used for testing. If you do not run |
| 60 | 65 | # |
| 61 | 66 | TCLSH = tclsh |
| @@ -390,12 +395,12 @@ | ||
| 390 | 395 | $(BCC) -o $(OBJDIR)/version $(SRCDIR)/mkversion.c |
| 391 | 396 | |
| 392 | 397 | # WARNING. DANGER. Running the testsuite modifies the repository the |
| 393 | 398 | # build is done from, i.e. the checkout belongs to. Do not sync/push |
| 394 | 399 | # the repository after running the tests. |
| 395 | -test: $(APPNAME) | |
| 396 | - $(TCLSH) test/tester.tcl $(APPNAME) | |
| 400 | +test: $(OBJDIR) $(APPNAME) | |
| 401 | + $(TCLSH) $(SRCDIR)/../test/tester.tcl $(APPNAME) | |
| 397 | 402 | |
| 398 | 403 | $(OBJDIR)/VERSION.h: $(SRCDIR)/../manifest.uuid $(SRCDIR)/../manifest $(VERSION) |
| 399 | 404 | $(VERSION) $(SRCDIR)/../manifest.uuid $(SRCDIR)/../manifest $(SRCDIR)/../VERSION >$(OBJDIR)/VERSION.h |
| 400 | 405 | |
| 401 | 406 | EXTRAOBJ = $(OBJDIR)/sqlite3.o $(OBJDIR)/shell.o $(OBJDIR)/th.o $(OBJDIR)/th_lang.o $(OBJDIR)/cson_amalgamation.o |
| @@ -404,18 +409,18 @@ | ||
| 404 | 409 | $(TCC) -o $(APPNAME) $(OBJ) $(EXTRAOBJ) $(LIB) $(OBJDIR)/icon.o |
| 405 | 410 | |
| 406 | 411 | # This rule prevents make from using its default rules to try build |
| 407 | 412 | # an executable named "manifest" out of the file named "manifest.c" |
| 408 | 413 | # |
| 409 | -$(SRCDIR)/../manifest: | |
| 414 | +$(SRCDIR)/../manifest: | |
| 410 | 415 | # noop |
| 411 | 416 | |
| 412 | 417 | # Requires msys to be installed in addition to the mingw, for the "rm" |
| 413 | 418 | # command. "del" will not work here because it is not a separate command |
| 414 | 419 | # but a MSDOS-shell builtin. |
| 415 | 420 | # |
| 416 | -clean: | |
| 421 | +clean: | |
| 417 | 422 | rm -rf $(OBJDIR) $(APPNAME) |
| 418 | 423 | |
| 419 | 424 | setup: $(OBJDIR) $(APPNAME) |
| 420 | 425 | $(MAKENSIS) ./fossil.nsi |
| 421 | 426 | |
| @@ -1083,15 +1088,16 @@ | ||
| 1083 | 1088 | $(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 |
| 1084 | 1089 | |
| 1085 | 1090 | $(OBJDIR)/cson_amalgamation.o: $(SRCDIR)/cson_amalgamation.c |
| 1086 | 1091 | $(XTCC) -c $(SRCDIR)/cson_amalgamation.c -o $(OBJDIR)/cson_amalgamation.o -DCSON_FOSSIL_MODE |
| 1087 | 1092 | |
| 1088 | -$(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 | |
| 1093 | +$(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 | |
| 1094 | + | |
| 1089 | 1095 | $(OBJDIR)/shell.o: $(SRCDIR)/shell.c $(SRCDIR)/sqlite3.h |
| 1090 | 1096 | $(XTCC) -Dmain=sqlite3_shell -DSQLITE_OMIT_LOAD_EXTENSION=1 -c $(SRCDIR)/shell.c -o $(OBJDIR)/shell.o |
| 1091 | 1097 | |
| 1092 | 1098 | $(OBJDIR)/th.o: $(SRCDIR)/th.c |
| 1093 | 1099 | $(XTCC) -I$(SRCDIR) -c $(SRCDIR)/th.c -o $(OBJDIR)/th.o |
| 1094 | 1100 | |
| 1095 | 1101 | $(OBJDIR)/th_lang.o: $(SRCDIR)/th_lang.c |
| 1096 | 1102 | $(XTCC) -I$(SRCDIR) -c $(SRCDIR)/th_lang.c -o $(OBJDIR)/th_lang.o |
| 1097 | 1103 | |
| 1098 | 1104 |
| --- 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 |
| @@ -390,12 +395,12 @@ | |
| 390 | $(BCC) -o $(OBJDIR)/version $(SRCDIR)/mkversion.c |
| 391 | |
| 392 | # WARNING. DANGER. Running the testsuite modifies the repository the |
| 393 | # build is done from, i.e. the checkout belongs to. Do not sync/push |
| 394 | # the repository after running the tests. |
| 395 | test: $(APPNAME) |
| 396 | $(TCLSH) test/tester.tcl $(APPNAME) |
| 397 | |
| 398 | $(OBJDIR)/VERSION.h: $(SRCDIR)/../manifest.uuid $(SRCDIR)/../manifest $(VERSION) |
| 399 | $(VERSION) $(SRCDIR)/../manifest.uuid $(SRCDIR)/../manifest $(SRCDIR)/../VERSION >$(OBJDIR)/VERSION.h |
| 400 | |
| 401 | EXTRAOBJ = $(OBJDIR)/sqlite3.o $(OBJDIR)/shell.o $(OBJDIR)/th.o $(OBJDIR)/th_lang.o $(OBJDIR)/cson_amalgamation.o |
| @@ -404,18 +409,18 @@ | |
| 404 | $(TCC) -o $(APPNAME) $(OBJ) $(EXTRAOBJ) $(LIB) $(OBJDIR)/icon.o |
| 405 | |
| 406 | # This rule prevents make from using its default rules to try build |
| 407 | # an executable named "manifest" out of the file named "manifest.c" |
| 408 | # |
| 409 | $(SRCDIR)/../manifest: |
| 410 | # noop |
| 411 | |
| 412 | # Requires msys to be installed in addition to the mingw, for the "rm" |
| 413 | # command. "del" will not work here because it is not a separate command |
| 414 | # but a MSDOS-shell builtin. |
| 415 | # |
| 416 | clean: |
| 417 | rm -rf $(OBJDIR) $(APPNAME) |
| 418 | |
| 419 | setup: $(OBJDIR) $(APPNAME) |
| 420 | $(MAKENSIS) ./fossil.nsi |
| 421 | |
| @@ -1083,15 +1088,16 @@ | |
| 1083 | $(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 |
| 1084 | |
| 1085 | $(OBJDIR)/cson_amalgamation.o: $(SRCDIR)/cson_amalgamation.c |
| 1086 | $(XTCC) -c $(SRCDIR)/cson_amalgamation.c -o $(OBJDIR)/cson_amalgamation.o -DCSON_FOSSIL_MODE |
| 1087 | |
| 1088 | $(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 |
| 1089 | $(OBJDIR)/shell.o: $(SRCDIR)/shell.c $(SRCDIR)/sqlite3.h |
| 1090 | $(XTCC) -Dmain=sqlite3_shell -DSQLITE_OMIT_LOAD_EXTENSION=1 -c $(SRCDIR)/shell.c -o $(OBJDIR)/shell.o |
| 1091 | |
| 1092 | $(OBJDIR)/th.o: $(SRCDIR)/th.c |
| 1093 | $(XTCC) -I$(SRCDIR) -c $(SRCDIR)/th.c -o $(OBJDIR)/th.o |
| 1094 | |
| 1095 | $(OBJDIR)/th_lang.o: $(SRCDIR)/th_lang.c |
| 1096 | $(XTCC) -I$(SRCDIR) -c $(SRCDIR)/th_lang.c -o $(OBJDIR)/th_lang.o |
| 1097 | |
| 1098 |
| --- 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 |
| @@ -390,12 +395,12 @@ | |
| 395 | $(BCC) -o $(OBJDIR)/version $(SRCDIR)/mkversion.c |
| 396 | |
| 397 | # WARNING. DANGER. Running the testsuite modifies the repository the |
| 398 | # build is done from, i.e. the checkout belongs to. Do not sync/push |
| 399 | # the repository after running the tests. |
| 400 | test: $(OBJDIR) $(APPNAME) |
| 401 | $(TCLSH) $(SRCDIR)/../test/tester.tcl $(APPNAME) |
| 402 | |
| 403 | $(OBJDIR)/VERSION.h: $(SRCDIR)/../manifest.uuid $(SRCDIR)/../manifest $(VERSION) |
| 404 | $(VERSION) $(SRCDIR)/../manifest.uuid $(SRCDIR)/../manifest $(SRCDIR)/../VERSION >$(OBJDIR)/VERSION.h |
| 405 | |
| 406 | EXTRAOBJ = $(OBJDIR)/sqlite3.o $(OBJDIR)/shell.o $(OBJDIR)/th.o $(OBJDIR)/th_lang.o $(OBJDIR)/cson_amalgamation.o |
| @@ -404,18 +409,18 @@ | |
| 409 | $(TCC) -o $(APPNAME) $(OBJ) $(EXTRAOBJ) $(LIB) $(OBJDIR)/icon.o |
| 410 | |
| 411 | # This rule prevents make from using its default rules to try build |
| 412 | # an executable named "manifest" out of the file named "manifest.c" |
| 413 | # |
| 414 | $(SRCDIR)/../manifest: |
| 415 | # noop |
| 416 | |
| 417 | # Requires msys to be installed in addition to the mingw, for the "rm" |
| 418 | # command. "del" will not work here because it is not a separate command |
| 419 | # but a MSDOS-shell builtin. |
| 420 | # |
| 421 | clean: |
| 422 | rm -rf $(OBJDIR) $(APPNAME) |
| 423 | |
| 424 | setup: $(OBJDIR) $(APPNAME) |
| 425 | $(MAKENSIS) ./fossil.nsi |
| 426 | |
| @@ -1083,15 +1088,16 @@ | |
| 1088 | $(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 |
| 1089 | |
| 1090 | $(OBJDIR)/cson_amalgamation.o: $(SRCDIR)/cson_amalgamation.c |
| 1091 | $(XTCC) -c $(SRCDIR)/cson_amalgamation.c -o $(OBJDIR)/cson_amalgamation.o -DCSON_FOSSIL_MODE |
| 1092 | |
| 1093 | $(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 |
| 1094 | |
| 1095 | $(OBJDIR)/shell.o: $(SRCDIR)/shell.c $(SRCDIR)/sqlite3.h |
| 1096 | $(XTCC) -Dmain=sqlite3_shell -DSQLITE_OMIT_LOAD_EXTENSION=1 -c $(SRCDIR)/shell.c -o $(OBJDIR)/shell.o |
| 1097 | |
| 1098 | $(OBJDIR)/th.o: $(SRCDIR)/th.c |
| 1099 | $(XTCC) -I$(SRCDIR) -c $(SRCDIR)/th.c -o $(OBJDIR)/th.o |
| 1100 | |
| 1101 | $(OBJDIR)/th_lang.o: $(SRCDIR)/th_lang.c |
| 1102 | $(XTCC) -I$(SRCDIR) -c $(SRCDIR)/th_lang.c -o $(OBJDIR)/th_lang.o |
| 1103 | |
| 1104 |
+118
-3
| --- win/Makefile.mingw.mistachkin | ||
| +++ win/Makefile.mingw.mistachkin | ||
| @@ -170,10 +170,21 @@ | ||
| 170 | 170 | $(SRCDIR)/http_socket.c \ |
| 171 | 171 | $(SRCDIR)/http_ssl.c \ |
| 172 | 172 | $(SRCDIR)/http_transport.c \ |
| 173 | 173 | $(SRCDIR)/import.c \ |
| 174 | 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 \ | |
| 175 | 186 | $(SRCDIR)/leaf.c \ |
| 176 | 187 | $(SRCDIR)/login.c \ |
| 177 | 188 | $(SRCDIR)/main.c \ |
| 178 | 189 | $(SRCDIR)/manifest.c \ |
| 179 | 190 | $(SRCDIR)/md5.c \ |
| @@ -254,10 +265,21 @@ | ||
| 254 | 265 | $(OBJDIR)/http_socket_.c \ |
| 255 | 266 | $(OBJDIR)/http_ssl_.c \ |
| 256 | 267 | $(OBJDIR)/http_transport_.c \ |
| 257 | 268 | $(OBJDIR)/import_.c \ |
| 258 | 269 | $(OBJDIR)/info_.c \ |
| 270 | + $(OBJDIR)/json_.c \ | |
| 271 | + $(OBJDIR)/json_artifact_.c \ | |
| 272 | + $(OBJDIR)/json_branch_.c \ | |
| 273 | + $(OBJDIR)/json_diff_.c \ | |
| 274 | + $(OBJDIR)/json_login_.c \ | |
| 275 | + $(OBJDIR)/json_query_.c \ | |
| 276 | + $(OBJDIR)/json_report_.c \ | |
| 277 | + $(OBJDIR)/json_tag_.c \ | |
| 278 | + $(OBJDIR)/json_timeline_.c \ | |
| 279 | + $(OBJDIR)/json_user_.c \ | |
| 280 | + $(OBJDIR)/json_wiki_.c \ | |
| 259 | 281 | $(OBJDIR)/leaf_.c \ |
| 260 | 282 | $(OBJDIR)/login_.c \ |
| 261 | 283 | $(OBJDIR)/main_.c \ |
| 262 | 284 | $(OBJDIR)/manifest_.c \ |
| 263 | 285 | $(OBJDIR)/md5_.c \ |
| @@ -338,10 +360,21 @@ | ||
| 338 | 360 | $(OBJDIR)/http_socket.o \ |
| 339 | 361 | $(OBJDIR)/http_ssl.o \ |
| 340 | 362 | $(OBJDIR)/http_transport.o \ |
| 341 | 363 | $(OBJDIR)/import.o \ |
| 342 | 364 | $(OBJDIR)/info.o \ |
| 365 | + $(OBJDIR)/json.o \ | |
| 366 | + $(OBJDIR)/json_artifact.o \ | |
| 367 | + $(OBJDIR)/json_branch.o \ | |
| 368 | + $(OBJDIR)/json_diff.o \ | |
| 369 | + $(OBJDIR)/json_login.o \ | |
| 370 | + $(OBJDIR)/json_query.o \ | |
| 371 | + $(OBJDIR)/json_report.o \ | |
| 372 | + $(OBJDIR)/json_tag.o \ | |
| 373 | + $(OBJDIR)/json_timeline.o \ | |
| 374 | + $(OBJDIR)/json_user.o \ | |
| 375 | + $(OBJDIR)/json_wiki.o \ | |
| 343 | 376 | $(OBJDIR)/leaf.o \ |
| 344 | 377 | $(OBJDIR)/login.o \ |
| 345 | 378 | $(OBJDIR)/main.o \ |
| 346 | 379 | $(OBJDIR)/manifest.o \ |
| 347 | 380 | $(OBJDIR)/md5.o \ |
| @@ -423,11 +456,11 @@ | ||
| 423 | 456 | $(TCLSH) $(SRCDIR)/../test/tester.tcl $(APPNAME) |
| 424 | 457 | |
| 425 | 458 | $(OBJDIR)/VERSION.h: $(SRCDIR)/../manifest.uuid $(SRCDIR)/../manifest $(VERSION) |
| 426 | 459 | $(VERSION) $(SRCDIR)/../manifest.uuid $(SRCDIR)/../manifest $(SRCDIR)/../VERSION >$(OBJDIR)/VERSION.h |
| 427 | 460 | |
| 428 | -EXTRAOBJ = $(OBJDIR)/sqlite3.o $(OBJDIR)/shell.o $(OBJDIR)/th.o $(OBJDIR)/th_lang.o | |
| 461 | +EXTRAOBJ = $(OBJDIR)/sqlite3.o $(OBJDIR)/shell.o $(OBJDIR)/th.o $(OBJDIR)/th_lang.o $(OBJDIR)/cson_amalgamation.o | |
| 429 | 462 | |
| 430 | 463 | ifdef FOSSIL_ENABLE_TCL |
| 431 | 464 | EXTRAOBJ += $(OBJDIR)/th_tcl.o |
| 432 | 465 | endif |
| 433 | 466 | |
| @@ -452,11 +485,11 @@ | ||
| 452 | 485 | |
| 453 | 486 | |
| 454 | 487 | $(OBJDIR)/page_index.h: $(TRANS_SRC) $(OBJDIR)/mkindex |
| 455 | 488 | $(MKINDEX) $(TRANS_SRC) >$@ |
| 456 | 489 | $(OBJDIR)/headers: $(OBJDIR)/page_index.h $(OBJDIR)/makeheaders $(OBJDIR)/VERSION.h |
| 457 | - $(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)/zip_.c:$(OBJDIR)/zip.h $(SRCDIR)/sqlite3.h $(SRCDIR)/th.h $(OBJDIR)/VERSION.h | |
| 490 | + $(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)/zip_.c:$(OBJDIR)/zip.h $(SRCDIR)/sqlite3.h $(SRCDIR)/th.h $(OBJDIR)/VERSION.h | |
| 458 | 491 | echo Done >$(OBJDIR)/headers |
| 459 | 492 | |
| 460 | 493 | $(OBJDIR)/headers: Makefile |
| 461 | 494 | Makefile: |
| 462 | 495 | $(OBJDIR)/add_.c: $(SRCDIR)/add.c $(OBJDIR)/translate |
| @@ -723,10 +756,87 @@ | ||
| 723 | 756 | |
| 724 | 757 | $(OBJDIR)/info.o: $(OBJDIR)/info_.c $(OBJDIR)/info.h $(SRCDIR)/config.h |
| 725 | 758 | $(XTCC) -o $(OBJDIR)/info.o -c $(OBJDIR)/info_.c |
| 726 | 759 | |
| 727 | 760 | info.h: $(OBJDIR)/headers |
| 761 | +$(OBJDIR)/json_.c: $(SRCDIR)/json.c $(OBJDIR)/translate | |
| 762 | + $(TRANSLATE) $(SRCDIR)/json.c >$(OBJDIR)/json_.c | |
| 763 | + | |
| 764 | +$(OBJDIR)/json.o: $(OBJDIR)/json_.c $(OBJDIR)/json.h $(SRCDIR)/config.h | |
| 765 | + $(XTCC) -o $(OBJDIR)/json.o -c $(OBJDIR)/json_.c | |
| 766 | + | |
| 767 | +json.h: $(OBJDIR)/headers | |
| 768 | +$(OBJDIR)/json_artifact_.c: $(SRCDIR)/json_artifact.c $(OBJDIR)/translate | |
| 769 | + $(TRANSLATE) $(SRCDIR)/json_artifact.c >$(OBJDIR)/json_artifact_.c | |
| 770 | + | |
| 771 | +$(OBJDIR)/json_artifact.o: $(OBJDIR)/json_artifact_.c $(OBJDIR)/json_artifact.h $(SRCDIR)/config.h | |
| 772 | + $(XTCC) -o $(OBJDIR)/json_artifact.o -c $(OBJDIR)/json_artifact_.c | |
| 773 | + | |
| 774 | +json_artifact.h: $(OBJDIR)/headers | |
| 775 | +$(OBJDIR)/json_branch_.c: $(SRCDIR)/json_branch.c $(OBJDIR)/translate | |
| 776 | + $(TRANSLATE) $(SRCDIR)/json_branch.c >$(OBJDIR)/json_branch_.c | |
| 777 | + | |
| 778 | +$(OBJDIR)/json_branch.o: $(OBJDIR)/json_branch_.c $(OBJDIR)/json_branch.h $(SRCDIR)/config.h | |
| 779 | + $(XTCC) -o $(OBJDIR)/json_branch.o -c $(OBJDIR)/json_branch_.c | |
| 780 | + | |
| 781 | +json_branch.h: $(OBJDIR)/headers | |
| 782 | +$(OBJDIR)/json_diff_.c: $(SRCDIR)/json_diff.c $(OBJDIR)/translate | |
| 783 | + $(TRANSLATE) $(SRCDIR)/json_diff.c >$(OBJDIR)/json_diff_.c | |
| 784 | + | |
| 785 | +$(OBJDIR)/json_diff.o: $(OBJDIR)/json_diff_.c $(OBJDIR)/json_diff.h $(SRCDIR)/config.h | |
| 786 | + $(XTCC) -o $(OBJDIR)/json_diff.o -c $(OBJDIR)/json_diff_.c | |
| 787 | + | |
| 788 | +json_diff.h: $(OBJDIR)/headers | |
| 789 | +$(OBJDIR)/json_login_.c: $(SRCDIR)/json_login.c $(OBJDIR)/translate | |
| 790 | + $(TRANSLATE) $(SRCDIR)/json_login.c >$(OBJDIR)/json_login_.c | |
| 791 | + | |
| 792 | +$(OBJDIR)/json_login.o: $(OBJDIR)/json_login_.c $(OBJDIR)/json_login.h $(SRCDIR)/config.h | |
| 793 | + $(XTCC) -o $(OBJDIR)/json_login.o -c $(OBJDIR)/json_login_.c | |
| 794 | + | |
| 795 | +json_login.h: $(OBJDIR)/headers | |
| 796 | +$(OBJDIR)/json_query_.c: $(SRCDIR)/json_query.c $(OBJDIR)/translate | |
| 797 | + $(TRANSLATE) $(SRCDIR)/json_query.c >$(OBJDIR)/json_query_.c | |
| 798 | + | |
| 799 | +$(OBJDIR)/json_query.o: $(OBJDIR)/json_query_.c $(OBJDIR)/json_query.h $(SRCDIR)/config.h | |
| 800 | + $(XTCC) -o $(OBJDIR)/json_query.o -c $(OBJDIR)/json_query_.c | |
| 801 | + | |
| 802 | +json_query.h: $(OBJDIR)/headers | |
| 803 | +$(OBJDIR)/json_report_.c: $(SRCDIR)/json_report.c $(OBJDIR)/translate | |
| 804 | + $(TRANSLATE) $(SRCDIR)/json_report.c >$(OBJDIR)/json_report_.c | |
| 805 | + | |
| 806 | +$(OBJDIR)/json_report.o: $(OBJDIR)/json_report_.c $(OBJDIR)/json_report.h $(SRCDIR)/config.h | |
| 807 | + $(XTCC) -o $(OBJDIR)/json_report.o -c $(OBJDIR)/json_report_.c | |
| 808 | + | |
| 809 | +json_report.h: $(OBJDIR)/headers | |
| 810 | +$(OBJDIR)/json_tag_.c: $(SRCDIR)/json_tag.c $(OBJDIR)/translate | |
| 811 | + $(TRANSLATE) $(SRCDIR)/json_tag.c >$(OBJDIR)/json_tag_.c | |
| 812 | + | |
| 813 | +$(OBJDIR)/json_tag.o: $(OBJDIR)/json_tag_.c $(OBJDIR)/json_tag.h $(SRCDIR)/config.h | |
| 814 | + $(XTCC) -o $(OBJDIR)/json_tag.o -c $(OBJDIR)/json_tag_.c | |
| 815 | + | |
| 816 | +json_tag.h: $(OBJDIR)/headers | |
| 817 | +$(OBJDIR)/json_timeline_.c: $(SRCDIR)/json_timeline.c $(OBJDIR)/translate | |
| 818 | + $(TRANSLATE) $(SRCDIR)/json_timeline.c >$(OBJDIR)/json_timeline_.c | |
| 819 | + | |
| 820 | +$(OBJDIR)/json_timeline.o: $(OBJDIR)/json_timeline_.c $(OBJDIR)/json_timeline.h $(SRCDIR)/config.h | |
| 821 | + $(XTCC) -o $(OBJDIR)/json_timeline.o -c $(OBJDIR)/json_timeline_.c | |
| 822 | + | |
| 823 | +json_timeline.h: $(OBJDIR)/headers | |
| 824 | +$(OBJDIR)/json_user_.c: $(SRCDIR)/json_user.c $(OBJDIR)/translate | |
| 825 | + $(TRANSLATE) $(SRCDIR)/json_user.c >$(OBJDIR)/json_user_.c | |
| 826 | + | |
| 827 | +$(OBJDIR)/json_user.o: $(OBJDIR)/json_user_.c $(OBJDIR)/json_user.h $(SRCDIR)/config.h | |
| 828 | + $(XTCC) -o $(OBJDIR)/json_user.o -c $(OBJDIR)/json_user_.c | |
| 829 | + | |
| 830 | +json_user.h: $(OBJDIR)/headers | |
| 831 | +$(OBJDIR)/json_wiki_.c: $(SRCDIR)/json_wiki.c $(OBJDIR)/translate | |
| 832 | + $(TRANSLATE) $(SRCDIR)/json_wiki.c >$(OBJDIR)/json_wiki_.c | |
| 833 | + | |
| 834 | +$(OBJDIR)/json_wiki.o: $(OBJDIR)/json_wiki_.c $(OBJDIR)/json_wiki.h $(SRCDIR)/config.h | |
| 835 | + $(XTCC) -o $(OBJDIR)/json_wiki.o -c $(OBJDIR)/json_wiki_.c | |
| 836 | + | |
| 837 | +json_wiki.h: $(OBJDIR)/headers | |
| 728 | 838 | $(OBJDIR)/leaf_.c: $(SRCDIR)/leaf.c $(OBJDIR)/translate |
| 729 | 839 | $(TRANSLATE) $(SRCDIR)/leaf.c >$(OBJDIR)/leaf_.c |
| 730 | 840 | |
| 731 | 841 | $(OBJDIR)/leaf.o: $(OBJDIR)/leaf_.c $(OBJDIR)/leaf.h $(SRCDIR)/config.h |
| 732 | 842 | $(XTCC) -o $(OBJDIR)/leaf.o -c $(OBJDIR)/leaf_.c |
| @@ -1032,11 +1142,16 @@ | ||
| 1032 | 1142 | $(OBJDIR)/zip.o: $(OBJDIR)/zip_.c $(OBJDIR)/zip.h $(SRCDIR)/config.h |
| 1033 | 1143 | $(XTCC) -o $(OBJDIR)/zip.o -c $(OBJDIR)/zip_.c |
| 1034 | 1144 | |
| 1035 | 1145 | zip.h: $(OBJDIR)/headers |
| 1036 | 1146 | $(OBJDIR)/sqlite3.o: $(SRCDIR)/sqlite3.c |
| 1037 | - $(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 | |
| 1147 | + $(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 | |
| 1148 | + | |
| 1149 | +$(OBJDIR)/cson_amalgamation.o: $(SRCDIR)/cson_amalgamation.c | |
| 1150 | + $(XTCC) -c $(SRCDIR)/cson_amalgamation.c -o $(OBJDIR)/cson_amalgamation.o -DCSON_FOSSIL_MODE | |
| 1151 | + | |
| 1152 | +$(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 | |
| 1038 | 1153 | |
| 1039 | 1154 | $(OBJDIR)/shell.o: $(SRCDIR)/shell.c $(SRCDIR)/sqlite3.h |
| 1040 | 1155 | $(XTCC) -Dmain=sqlite3_shell -DSQLITE_OMIT_LOAD_EXTENSION=1 -c $(SRCDIR)/shell.c -o $(OBJDIR)/shell.o |
| 1041 | 1156 | |
| 1042 | 1157 | $(OBJDIR)/th.o: $(SRCDIR)/th.c |
| 1043 | 1158 |
| --- 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 \ |
| @@ -254,10 +265,21 @@ | |
| 254 | $(OBJDIR)/http_socket_.c \ |
| 255 | $(OBJDIR)/http_ssl_.c \ |
| 256 | $(OBJDIR)/http_transport_.c \ |
| 257 | $(OBJDIR)/import_.c \ |
| 258 | $(OBJDIR)/info_.c \ |
| 259 | $(OBJDIR)/leaf_.c \ |
| 260 | $(OBJDIR)/login_.c \ |
| 261 | $(OBJDIR)/main_.c \ |
| 262 | $(OBJDIR)/manifest_.c \ |
| 263 | $(OBJDIR)/md5_.c \ |
| @@ -338,10 +360,21 @@ | |
| 338 | $(OBJDIR)/http_socket.o \ |
| 339 | $(OBJDIR)/http_ssl.o \ |
| 340 | $(OBJDIR)/http_transport.o \ |
| 341 | $(OBJDIR)/import.o \ |
| 342 | $(OBJDIR)/info.o \ |
| 343 | $(OBJDIR)/leaf.o \ |
| 344 | $(OBJDIR)/login.o \ |
| 345 | $(OBJDIR)/main.o \ |
| 346 | $(OBJDIR)/manifest.o \ |
| 347 | $(OBJDIR)/md5.o \ |
| @@ -423,11 +456,11 @@ | |
| 423 | $(TCLSH) $(SRCDIR)/../test/tester.tcl $(APPNAME) |
| 424 | |
| 425 | $(OBJDIR)/VERSION.h: $(SRCDIR)/../manifest.uuid $(SRCDIR)/../manifest $(VERSION) |
| 426 | $(VERSION) $(SRCDIR)/../manifest.uuid $(SRCDIR)/../manifest $(SRCDIR)/../VERSION >$(OBJDIR)/VERSION.h |
| 427 | |
| 428 | EXTRAOBJ = $(OBJDIR)/sqlite3.o $(OBJDIR)/shell.o $(OBJDIR)/th.o $(OBJDIR)/th_lang.o |
| 429 | |
| 430 | ifdef FOSSIL_ENABLE_TCL |
| 431 | EXTRAOBJ += $(OBJDIR)/th_tcl.o |
| 432 | endif |
| 433 | |
| @@ -452,11 +485,11 @@ | |
| 452 | |
| 453 | |
| 454 | $(OBJDIR)/page_index.h: $(TRANS_SRC) $(OBJDIR)/mkindex |
| 455 | $(MKINDEX) $(TRANS_SRC) >$@ |
| 456 | $(OBJDIR)/headers: $(OBJDIR)/page_index.h $(OBJDIR)/makeheaders $(OBJDIR)/VERSION.h |
| 457 | $(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)/zip_.c:$(OBJDIR)/zip.h $(SRCDIR)/sqlite3.h $(SRCDIR)/th.h $(OBJDIR)/VERSION.h |
| 458 | echo Done >$(OBJDIR)/headers |
| 459 | |
| 460 | $(OBJDIR)/headers: Makefile |
| 461 | Makefile: |
| 462 | $(OBJDIR)/add_.c: $(SRCDIR)/add.c $(OBJDIR)/translate |
| @@ -723,10 +756,87 @@ | |
| 723 | |
| 724 | $(OBJDIR)/info.o: $(OBJDIR)/info_.c $(OBJDIR)/info.h $(SRCDIR)/config.h |
| 725 | $(XTCC) -o $(OBJDIR)/info.o -c $(OBJDIR)/info_.c |
| 726 | |
| 727 | info.h: $(OBJDIR)/headers |
| 728 | $(OBJDIR)/leaf_.c: $(SRCDIR)/leaf.c $(OBJDIR)/translate |
| 729 | $(TRANSLATE) $(SRCDIR)/leaf.c >$(OBJDIR)/leaf_.c |
| 730 | |
| 731 | $(OBJDIR)/leaf.o: $(OBJDIR)/leaf_.c $(OBJDIR)/leaf.h $(SRCDIR)/config.h |
| 732 | $(XTCC) -o $(OBJDIR)/leaf.o -c $(OBJDIR)/leaf_.c |
| @@ -1032,11 +1142,16 @@ | |
| 1032 | $(OBJDIR)/zip.o: $(OBJDIR)/zip_.c $(OBJDIR)/zip.h $(SRCDIR)/config.h |
| 1033 | $(XTCC) -o $(OBJDIR)/zip.o -c $(OBJDIR)/zip_.c |
| 1034 | |
| 1035 | zip.h: $(OBJDIR)/headers |
| 1036 | $(OBJDIR)/sqlite3.o: $(SRCDIR)/sqlite3.c |
| 1037 | $(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 |
| 1038 | |
| 1039 | $(OBJDIR)/shell.o: $(SRCDIR)/shell.c $(SRCDIR)/sqlite3.h |
| 1040 | $(XTCC) -Dmain=sqlite3_shell -DSQLITE_OMIT_LOAD_EXTENSION=1 -c $(SRCDIR)/shell.c -o $(OBJDIR)/shell.o |
| 1041 | |
| 1042 | $(OBJDIR)/th.o: $(SRCDIR)/th.c |
| 1043 |
| --- 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 \ |
| @@ -254,10 +265,21 @@ | |
| 265 | $(OBJDIR)/http_socket_.c \ |
| 266 | $(OBJDIR)/http_ssl_.c \ |
| 267 | $(OBJDIR)/http_transport_.c \ |
| 268 | $(OBJDIR)/import_.c \ |
| 269 | $(OBJDIR)/info_.c \ |
| 270 | $(OBJDIR)/json_.c \ |
| 271 | $(OBJDIR)/json_artifact_.c \ |
| 272 | $(OBJDIR)/json_branch_.c \ |
| 273 | $(OBJDIR)/json_diff_.c \ |
| 274 | $(OBJDIR)/json_login_.c \ |
| 275 | $(OBJDIR)/json_query_.c \ |
| 276 | $(OBJDIR)/json_report_.c \ |
| 277 | $(OBJDIR)/json_tag_.c \ |
| 278 | $(OBJDIR)/json_timeline_.c \ |
| 279 | $(OBJDIR)/json_user_.c \ |
| 280 | $(OBJDIR)/json_wiki_.c \ |
| 281 | $(OBJDIR)/leaf_.c \ |
| 282 | $(OBJDIR)/login_.c \ |
| 283 | $(OBJDIR)/main_.c \ |
| 284 | $(OBJDIR)/manifest_.c \ |
| 285 | $(OBJDIR)/md5_.c \ |
| @@ -338,10 +360,21 @@ | |
| 360 | $(OBJDIR)/http_socket.o \ |
| 361 | $(OBJDIR)/http_ssl.o \ |
| 362 | $(OBJDIR)/http_transport.o \ |
| 363 | $(OBJDIR)/import.o \ |
| 364 | $(OBJDIR)/info.o \ |
| 365 | $(OBJDIR)/json.o \ |
| 366 | $(OBJDIR)/json_artifact.o \ |
| 367 | $(OBJDIR)/json_branch.o \ |
| 368 | $(OBJDIR)/json_diff.o \ |
| 369 | $(OBJDIR)/json_login.o \ |
| 370 | $(OBJDIR)/json_query.o \ |
| 371 | $(OBJDIR)/json_report.o \ |
| 372 | $(OBJDIR)/json_tag.o \ |
| 373 | $(OBJDIR)/json_timeline.o \ |
| 374 | $(OBJDIR)/json_user.o \ |
| 375 | $(OBJDIR)/json_wiki.o \ |
| 376 | $(OBJDIR)/leaf.o \ |
| 377 | $(OBJDIR)/login.o \ |
| 378 | $(OBJDIR)/main.o \ |
| 379 | $(OBJDIR)/manifest.o \ |
| 380 | $(OBJDIR)/md5.o \ |
| @@ -423,11 +456,11 @@ | |
| 456 | $(TCLSH) $(SRCDIR)/../test/tester.tcl $(APPNAME) |
| 457 | |
| 458 | $(OBJDIR)/VERSION.h: $(SRCDIR)/../manifest.uuid $(SRCDIR)/../manifest $(VERSION) |
| 459 | $(VERSION) $(SRCDIR)/../manifest.uuid $(SRCDIR)/../manifest $(SRCDIR)/../VERSION >$(OBJDIR)/VERSION.h |
| 460 | |
| 461 | EXTRAOBJ = $(OBJDIR)/sqlite3.o $(OBJDIR)/shell.o $(OBJDIR)/th.o $(OBJDIR)/th_lang.o $(OBJDIR)/cson_amalgamation.o |
| 462 | |
| 463 | ifdef FOSSIL_ENABLE_TCL |
| 464 | EXTRAOBJ += $(OBJDIR)/th_tcl.o |
| 465 | endif |
| 466 | |
| @@ -452,11 +485,11 @@ | |
| 485 | |
| 486 | |
| 487 | $(OBJDIR)/page_index.h: $(TRANS_SRC) $(OBJDIR)/mkindex |
| 488 | $(MKINDEX) $(TRANS_SRC) >$@ |
| 489 | $(OBJDIR)/headers: $(OBJDIR)/page_index.h $(OBJDIR)/makeheaders $(OBJDIR)/VERSION.h |
| 490 | $(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)/zip_.c:$(OBJDIR)/zip.h $(SRCDIR)/sqlite3.h $(SRCDIR)/th.h $(OBJDIR)/VERSION.h |
| 491 | echo Done >$(OBJDIR)/headers |
| 492 | |
| 493 | $(OBJDIR)/headers: Makefile |
| 494 | Makefile: |
| 495 | $(OBJDIR)/add_.c: $(SRCDIR)/add.c $(OBJDIR)/translate |
| @@ -723,10 +756,87 @@ | |
| 756 | |
| 757 | $(OBJDIR)/info.o: $(OBJDIR)/info_.c $(OBJDIR)/info.h $(SRCDIR)/config.h |
| 758 | $(XTCC) -o $(OBJDIR)/info.o -c $(OBJDIR)/info_.c |
| 759 | |
| 760 | info.h: $(OBJDIR)/headers |
| 761 | $(OBJDIR)/json_.c: $(SRCDIR)/json.c $(OBJDIR)/translate |
| 762 | $(TRANSLATE) $(SRCDIR)/json.c >$(OBJDIR)/json_.c |
| 763 | |
| 764 | $(OBJDIR)/json.o: $(OBJDIR)/json_.c $(OBJDIR)/json.h $(SRCDIR)/config.h |
| 765 | $(XTCC) -o $(OBJDIR)/json.o -c $(OBJDIR)/json_.c |
| 766 | |
| 767 | json.h: $(OBJDIR)/headers |
| 768 | $(OBJDIR)/json_artifact_.c: $(SRCDIR)/json_artifact.c $(OBJDIR)/translate |
| 769 | $(TRANSLATE) $(SRCDIR)/json_artifact.c >$(OBJDIR)/json_artifact_.c |
| 770 | |
| 771 | $(OBJDIR)/json_artifact.o: $(OBJDIR)/json_artifact_.c $(OBJDIR)/json_artifact.h $(SRCDIR)/config.h |
| 772 | $(XTCC) -o $(OBJDIR)/json_artifact.o -c $(OBJDIR)/json_artifact_.c |
| 773 | |
| 774 | json_artifact.h: $(OBJDIR)/headers |
| 775 | $(OBJDIR)/json_branch_.c: $(SRCDIR)/json_branch.c $(OBJDIR)/translate |
| 776 | $(TRANSLATE) $(SRCDIR)/json_branch.c >$(OBJDIR)/json_branch_.c |
| 777 | |
| 778 | $(OBJDIR)/json_branch.o: $(OBJDIR)/json_branch_.c $(OBJDIR)/json_branch.h $(SRCDIR)/config.h |
| 779 | $(XTCC) -o $(OBJDIR)/json_branch.o -c $(OBJDIR)/json_branch_.c |
| 780 | |
| 781 | json_branch.h: $(OBJDIR)/headers |
| 782 | $(OBJDIR)/json_diff_.c: $(SRCDIR)/json_diff.c $(OBJDIR)/translate |
| 783 | $(TRANSLATE) $(SRCDIR)/json_diff.c >$(OBJDIR)/json_diff_.c |
| 784 | |
| 785 | $(OBJDIR)/json_diff.o: $(OBJDIR)/json_diff_.c $(OBJDIR)/json_diff.h $(SRCDIR)/config.h |
| 786 | $(XTCC) -o $(OBJDIR)/json_diff.o -c $(OBJDIR)/json_diff_.c |
| 787 | |
| 788 | json_diff.h: $(OBJDIR)/headers |
| 789 | $(OBJDIR)/json_login_.c: $(SRCDIR)/json_login.c $(OBJDIR)/translate |
| 790 | $(TRANSLATE) $(SRCDIR)/json_login.c >$(OBJDIR)/json_login_.c |
| 791 | |
| 792 | $(OBJDIR)/json_login.o: $(OBJDIR)/json_login_.c $(OBJDIR)/json_login.h $(SRCDIR)/config.h |
| 793 | $(XTCC) -o $(OBJDIR)/json_login.o -c $(OBJDIR)/json_login_.c |
| 794 | |
| 795 | json_login.h: $(OBJDIR)/headers |
| 796 | $(OBJDIR)/json_query_.c: $(SRCDIR)/json_query.c $(OBJDIR)/translate |
| 797 | $(TRANSLATE) $(SRCDIR)/json_query.c >$(OBJDIR)/json_query_.c |
| 798 | |
| 799 | $(OBJDIR)/json_query.o: $(OBJDIR)/json_query_.c $(OBJDIR)/json_query.h $(SRCDIR)/config.h |
| 800 | $(XTCC) -o $(OBJDIR)/json_query.o -c $(OBJDIR)/json_query_.c |
| 801 | |
| 802 | json_query.h: $(OBJDIR)/headers |
| 803 | $(OBJDIR)/json_report_.c: $(SRCDIR)/json_report.c $(OBJDIR)/translate |
| 804 | $(TRANSLATE) $(SRCDIR)/json_report.c >$(OBJDIR)/json_report_.c |
| 805 | |
| 806 | $(OBJDIR)/json_report.o: $(OBJDIR)/json_report_.c $(OBJDIR)/json_report.h $(SRCDIR)/config.h |
| 807 | $(XTCC) -o $(OBJDIR)/json_report.o -c $(OBJDIR)/json_report_.c |
| 808 | |
| 809 | json_report.h: $(OBJDIR)/headers |
| 810 | $(OBJDIR)/json_tag_.c: $(SRCDIR)/json_tag.c $(OBJDIR)/translate |
| 811 | $(TRANSLATE) $(SRCDIR)/json_tag.c >$(OBJDIR)/json_tag_.c |
| 812 | |
| 813 | $(OBJDIR)/json_tag.o: $(OBJDIR)/json_tag_.c $(OBJDIR)/json_tag.h $(SRCDIR)/config.h |
| 814 | $(XTCC) -o $(OBJDIR)/json_tag.o -c $(OBJDIR)/json_tag_.c |
| 815 | |
| 816 | json_tag.h: $(OBJDIR)/headers |
| 817 | $(OBJDIR)/json_timeline_.c: $(SRCDIR)/json_timeline.c $(OBJDIR)/translate |
| 818 | $(TRANSLATE) $(SRCDIR)/json_timeline.c >$(OBJDIR)/json_timeline_.c |
| 819 | |
| 820 | $(OBJDIR)/json_timeline.o: $(OBJDIR)/json_timeline_.c $(OBJDIR)/json_timeline.h $(SRCDIR)/config.h |
| 821 | $(XTCC) -o $(OBJDIR)/json_timeline.o -c $(OBJDIR)/json_timeline_.c |
| 822 | |
| 823 | json_timeline.h: $(OBJDIR)/headers |
| 824 | $(OBJDIR)/json_user_.c: $(SRCDIR)/json_user.c $(OBJDIR)/translate |
| 825 | $(TRANSLATE) $(SRCDIR)/json_user.c >$(OBJDIR)/json_user_.c |
| 826 | |
| 827 | $(OBJDIR)/json_user.o: $(OBJDIR)/json_user_.c $(OBJDIR)/json_user.h $(SRCDIR)/config.h |
| 828 | $(XTCC) -o $(OBJDIR)/json_user.o -c $(OBJDIR)/json_user_.c |
| 829 | |
| 830 | json_user.h: $(OBJDIR)/headers |
| 831 | $(OBJDIR)/json_wiki_.c: $(SRCDIR)/json_wiki.c $(OBJDIR)/translate |
| 832 | $(TRANSLATE) $(SRCDIR)/json_wiki.c >$(OBJDIR)/json_wiki_.c |
| 833 | |
| 834 | $(OBJDIR)/json_wiki.o: $(OBJDIR)/json_wiki_.c $(OBJDIR)/json_wiki.h $(SRCDIR)/config.h |
| 835 | $(XTCC) -o $(OBJDIR)/json_wiki.o -c $(OBJDIR)/json_wiki_.c |
| 836 | |
| 837 | json_wiki.h: $(OBJDIR)/headers |
| 838 | $(OBJDIR)/leaf_.c: $(SRCDIR)/leaf.c $(OBJDIR)/translate |
| 839 | $(TRANSLATE) $(SRCDIR)/leaf.c >$(OBJDIR)/leaf_.c |
| 840 | |
| 841 | $(OBJDIR)/leaf.o: $(OBJDIR)/leaf_.c $(OBJDIR)/leaf.h $(SRCDIR)/config.h |
| 842 | $(XTCC) -o $(OBJDIR)/leaf.o -c $(OBJDIR)/leaf_.c |
| @@ -1032,11 +1142,16 @@ | |
| 1142 | $(OBJDIR)/zip.o: $(OBJDIR)/zip_.c $(OBJDIR)/zip.h $(SRCDIR)/config.h |
| 1143 | $(XTCC) -o $(OBJDIR)/zip.o -c $(OBJDIR)/zip_.c |
| 1144 | |
| 1145 | zip.h: $(OBJDIR)/headers |
| 1146 | $(OBJDIR)/sqlite3.o: $(SRCDIR)/sqlite3.c |
| 1147 | $(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 |
| 1148 | |
| 1149 | $(OBJDIR)/cson_amalgamation.o: $(SRCDIR)/cson_amalgamation.c |
| 1150 | $(XTCC) -c $(SRCDIR)/cson_amalgamation.c -o $(OBJDIR)/cson_amalgamation.o -DCSON_FOSSIL_MODE |
| 1151 | |
| 1152 | $(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 |
| 1153 | |
| 1154 | $(OBJDIR)/shell.o: $(SRCDIR)/shell.c $(SRCDIR)/sqlite3.h |
| 1155 | $(XTCC) -Dmain=sqlite3_shell -DSQLITE_OMIT_LOAD_EXTENSION=1 -c $(SRCDIR)/shell.c -o $(OBJDIR)/shell.o |
| 1156 | |
| 1157 | $(OBJDIR)/th.o: $(SRCDIR)/th.c |
| 1158 |