Many hyperlinks are disabled.
Use anonymous login
to enable hyperlinks.
Overview
| SHA1 Hash: | dff26b750e4c3ce7c0eace7f15a767957564ad84 |
|---|---|
| Date: | 2012-07-20 11:56:05 |
| User: | stephan |
| Comment: | Removed unneeded th.c/blob.h dep (having it does not fix parallel builds). |
Tags And Properties
- branch=th1-query-api inherited from [c3b10e12a1]
- sym-th1-query-api inherited from [c3b10e12a1]
Changes
Changes to src/main.mk
354 # The FOSSIL_ENABLE_TCL variable may be undefined, set to 0, or set to 1. 354 # The FOSSIL_ENABLE_TCL variable may be undefined, set to 0, or set to 1. 355 # If it is set to 1, then we need to build the Tcl integration code and 355 # If it is set to 1, then we need to build the Tcl integration code and 356 # link to the Tcl library. 356 # link to the Tcl library. 357 TCL_OBJ.0 = 357 TCL_OBJ.0 = 358 TCL_OBJ.1 = $(OBJDIR)/th_tcl.o 358 TCL_OBJ.1 = $(OBJDIR)/th_tcl.o 359 TCL_OBJ. = $(TCL_OBJ.0) 359 TCL_OBJ. = $(TCL_OBJ.0) 360 360 361 $(OBJDIR)/th.o: $(OBJDIR)/blob.h # horrible kludge! < 362 < 363 EXTRAOBJ = $(SQLITE3_OBJ.$(USE_SYSTEM_SQLITE)) $(OBJDIR)/shell.o $(OBJDIR)/th 361 EXTRAOBJ = $(SQLITE3_OBJ.$(USE_SYSTEM_SQLITE)) $(OBJDIR)/shell.o $(OBJDIR)/th 364 362 365 $(APPNAME): $(OBJDIR)/headers $(OBJ) $(EXTRAOBJ) 363 $(APPNAME): $(OBJDIR)/headers $(OBJ) $(EXTRAOBJ) 366 $(TCC) -o $(APPNAME) $(OBJ) $(EXTRAOBJ) $(LIB) 364 $(TCC) -o $(APPNAME) $(OBJ) $(EXTRAOBJ) $(LIB) 367 365 368 # This rule prevents make from using its default rules to try build 366 # This rule prevents make from using its default rules to try build 369 # an executable named "manifest" out of the file named "manifest.c" 367 # an executable named "manifest" out of the file named "manifest.c" ................................................................................................................................................................................ 1064 $(OBJDIR)/zip.h: $(OBJDIR)/headers 1062 $(OBJDIR)/zip.h: $(OBJDIR)/headers 1065 $(OBJDIR)/sqlite3.o: $(SRCDIR)/sqlite3.c 1063 $(OBJDIR)/sqlite3.o: $(SRCDIR)/sqlite3.c 1066 $(XTCC) -DSQLITE_OMIT_LOAD_EXTENSION=1 -DSQLITE_THREADSAFE=0 -DSQLITE_DE 1064 $(XTCC) -DSQLITE_OMIT_LOAD_EXTENSION=1 -DSQLITE_THREADSAFE=0 -DSQLITE_DE 1067 1065 1068 $(OBJDIR)/shell.o: $(SRCDIR)/shell.c $(SRCDIR)/sqlite3.h 1066 $(OBJDIR)/shell.o: $(SRCDIR)/shell.c $(SRCDIR)/sqlite3.h 1069 $(XTCC) -Dmain=sqlite3_shell -DSQLITE_OMIT_LOAD_EXTENSION=1 -c $(SRCDIR) 1067 $(XTCC) -Dmain=sqlite3_shell -DSQLITE_OMIT_LOAD_EXTENSION=1 -c $(SRCDIR) 1070 1068 1071 $(OBJDIR)/th.o: $(SRCDIR)/th.c $(OBJDIR)/blob.h | 1069 $(OBJDIR)/th.o: $(SRCDIR)/th.c 1072 $(XTCC) -c $(SRCDIR)/th.c -o $(OBJDIR)/th.o 1070 $(XTCC) -c $(SRCDIR)/th.c -o $(OBJDIR)/th.o 1073 1071 1074 $(OBJDIR)/th_lang.o: $(SRCDIR)/th_lang.c 1072 $(OBJDIR)/th_lang.o: $(SRCDIR)/th_lang.c 1075 $(XTCC) -c $(SRCDIR)/th_lang.c -o $(OBJDIR)/th_lang.o 1073 $(XTCC) -c $(SRCDIR)/th_lang.c -o $(OBJDIR)/th_lang.o 1076 1074 1077 $(OBJDIR)/th_tcl.o: $(SRCDIR)/th_tcl.c 1075 $(OBJDIR)/th_tcl.o: $(SRCDIR)/th_tcl.c 1078 $(XTCC) -c $(SRCDIR)/th_tcl.c -o $(OBJDIR)/th_tcl.o 1076 $(XTCC) -c $(SRCDIR)/th_tcl.c -o $(OBJDIR)/th_tcl.o 1079 1077 1080 1078 1081 $(OBJDIR)/cson_amalgamation.o: $(SRCDIR)/cson_amalgamation.c 1079 $(OBJDIR)/cson_amalgamation.o: $(SRCDIR)/cson_amalgamation.c 1082 $(XTCC) -c $(SRCDIR)/cson_amalgamation.c -o $(OBJDIR)/cson_amalgamation. 1080 $(XTCC) -c $(SRCDIR)/cson_amalgamation.c -o $(OBJDIR)/cson_amalgamation. 1083 1081
Changes to src/makemake.tcl
221 # The FOSSIL_ENABLE_TCL variable may be undefined, set to 0, or set to 1. 221 # The FOSSIL_ENABLE_TCL variable may be undefined, set to 0, or set to 1. 222 # If it is set to 1, then we need to build the Tcl integration code and 222 # If it is set to 1, then we need to build the Tcl integration code and 223 # link to the Tcl library. 223 # link to the Tcl library. 224 TCL_OBJ.0 = 224 TCL_OBJ.0 = 225 TCL_OBJ.1 = $(OBJDIR)/th_tcl.o 225 TCL_OBJ.1 = $(OBJDIR)/th_tcl.o 226 TCL_OBJ. = $(TCL_OBJ.0) 226 TCL_OBJ. = $(TCL_OBJ.0) 227 227 228 $(OBJDIR)/th.o: $(OBJDIR)/blob.h # horrible kludge! < 229 < 230 EXTRAOBJ = \ 228 EXTRAOBJ = \ 231 $(SQLITE3_OBJ.$(USE_SYSTEM_SQLITE)) \ 229 $(SQLITE3_OBJ.$(USE_SYSTEM_SQLITE)) \ 232 $(OBJDIR)/shell.o \ 230 $(OBJDIR)/shell.o \ 233 $(OBJDIR)/th.o \ 231 $(OBJDIR)/th.o \ 234 $(OBJDIR)/th_lang.o \ 232 $(OBJDIR)/th_lang.o \ 235 $(TCL_OBJ.$(FOSSIL_ENABLE_TCL)) \ 233 $(TCL_OBJ.$(FOSSIL_ENABLE_TCL)) \ 236 $(OBJDIR)/cson_amalgamation.o 234 $(OBJDIR)/cson_amalgamation.o ................................................................................................................................................................................ 288 writeln "\t\$(XTCC) $opt -c \$(SRCDIR)/sqlite3.c -o \$(OBJDIR)/sqlite3.o\n" 286 writeln "\t\$(XTCC) $opt -c \$(SRCDIR)/sqlite3.c -o \$(OBJDIR)/sqlite3.o\n" 289 287 290 writeln "\$(OBJDIR)/shell.o:\t\$(SRCDIR)/shell.c \$(SRCDIR)/sqlite3.h" 288 writeln "\$(OBJDIR)/shell.o:\t\$(SRCDIR)/shell.c \$(SRCDIR)/sqlite3.h" 291 set opt {-Dmain=sqlite3_shell} 289 set opt {-Dmain=sqlite3_shell} 292 append opt " -DSQLITE_OMIT_LOAD_EXTENSION=1" 290 append opt " -DSQLITE_OMIT_LOAD_EXTENSION=1" 293 writeln "\t\$(XTCC) $opt -c \$(SRCDIR)/shell.c -o \$(OBJDIR)/shell.o\n" 291 writeln "\t\$(XTCC) $opt -c \$(SRCDIR)/shell.c -o \$(OBJDIR)/shell.o\n" 294 292 295 writeln "\$(OBJDIR)/th.o:\t\$(SRCDIR)/th.c \$(OBJDIR)/blob.h" | 293 writeln "\$(OBJDIR)/th.o:\t\$(SRCDIR)/th.c" 296 writeln "\t\$(XTCC) -c \$(SRCDIR)/th.c -o \$(OBJDIR)/th.o\n" 294 writeln "\t\$(XTCC) -c \$(SRCDIR)/th.c -o \$(OBJDIR)/th.o\n" 297 295 298 writeln "\$(OBJDIR)/th_lang.o:\t\$(SRCDIR)/th_lang.c" 296 writeln "\$(OBJDIR)/th_lang.o:\t\$(SRCDIR)/th_lang.c" 299 writeln "\t\$(XTCC) -c \$(SRCDIR)/th_lang.c -o \$(OBJDIR)/th_lang.o\n" 297 writeln "\t\$(XTCC) -c \$(SRCDIR)/th_lang.c -o \$(OBJDIR)/th_lang.o\n" 300 298 301 writeln "\$(OBJDIR)/th_tcl.o:\t\$(SRCDIR)/th_tcl.c" 299 writeln "\$(OBJDIR)/th_tcl.o:\t\$(SRCDIR)/th_tcl.c" 302 writeln "\t\$(XTCC) -c \$(SRCDIR)/th_tcl.c -o \$(OBJDIR)/th_tcl.o\n" 300 writeln "\t\$(XTCC) -c \$(SRCDIR)/th_tcl.c -o \$(OBJDIR)/th_tcl.o\n" ................................................................................................................................................................................ 618 writeln "\$(OBJDIR)/json.o \$(OBJDIR)/json_artifact.o \$(OBJDIR)/json_branch.o \ 616 writeln "\$(OBJDIR)/json.o \$(OBJDIR)/json_artifact.o \$(OBJDIR)/json_branch.o \ 619 617 620 writeln "\$(OBJDIR)/shell.o:\t\$(SRCDIR)/shell.c \$(SRCDIR)/sqlite3.h" 618 writeln "\$(OBJDIR)/shell.o:\t\$(SRCDIR)/shell.c \$(SRCDIR)/sqlite3.h" 621 set opt {-Dmain=sqlite3_shell} 619 set opt {-Dmain=sqlite3_shell} 622 append opt " -DSQLITE_OMIT_LOAD_EXTENSION=1" 620 append opt " -DSQLITE_OMIT_LOAD_EXTENSION=1" 623 writeln "\t\$(XTCC) $opt -c \$(SRCDIR)/shell.c -o \$(OBJDIR)/shell.o\n" 621 writeln "\t\$(XTCC) $opt -c \$(SRCDIR)/shell.c -o \$(OBJDIR)/shell.o\n" 624 622 625 writeln "\$(OBJDIR)/th.o:\t\$(SRCDIR)/th.c \$(OBJDIR)/blob.h" | 623 writeln "\$(OBJDIR)/th.o:\t\$(SRCDIR)/th.c" 626 writeln "\t\$(XTCC) -c \$(SRCDIR)/th.c -o \$(OBJDIR)/th.o\n" 624 writeln "\t\$(XTCC) -c \$(SRCDIR)/th.c -o \$(OBJDIR)/th.o\n" 627 625 628 writeln "\$(OBJDIR)/th_lang.o:\t\$(SRCDIR)/th_lang.c" 626 writeln "\$(OBJDIR)/th_lang.o:\t\$(SRCDIR)/th_lang.c" 629 writeln "\t\$(XTCC) -c \$(SRCDIR)/th_lang.c -o \$(OBJDIR)/th_lang.o\n" 627 writeln "\t\$(XTCC) -c \$(SRCDIR)/th_lang.c -o \$(OBJDIR)/th_lang.o\n" 630 628 631 writeln {ifdef FOSSIL_ENABLE_TCL 629 writeln {ifdef FOSSIL_ENABLE_TCL 632 $(OBJDIR)/th_tcl.o: $(SRCDIR)/th_tcl.c 630 $(OBJDIR)/th_tcl.o: $(SRCDIR)/th_tcl.c
Changes to win/Makefile.mingw
1229 $(XTCC) -c $(SRCDIR)/cson_amalgamation.c -o $(OBJDIR)/cson_amalgamation 1229 $(XTCC) -c $(SRCDIR)/cson_amalgamation.c -o $(OBJDIR)/cson_amalgamation 1230 1230 1231 $(OBJDIR)/json.o $(OBJDIR)/json_artifact.o $(OBJDIR)/json_branch.o $(OBJDIR)/jso 1231 $(OBJDIR)/json.o $(OBJDIR)/json_artifact.o $(OBJDIR)/json_branch.o $(OBJDIR)/jso 1232 1232 1233 $(OBJDIR)/shell.o: $(SRCDIR)/shell.c $(SRCDIR)/sqlite3.h 1233 $(OBJDIR)/shell.o: $(SRCDIR)/shell.c $(SRCDIR)/sqlite3.h 1234 $(XTCC) -Dmain=sqlite3_shell -DSQLITE_OMIT_LOAD_EXTENSION=1 -c $(SRCDIR) 1234 $(XTCC) -Dmain=sqlite3_shell -DSQLITE_OMIT_LOAD_EXTENSION=1 -c $(SRCDIR) 1235 1235 1236 $(OBJDIR)/th.o: $(SRCDIR)/th.c $(OBJDIR)/blob.h | 1236 $(OBJDIR)/th.o: $(SRCDIR)/th.c 1237 $(XTCC) -c $(SRCDIR)/th.c -o $(OBJDIR)/th.o 1237 $(XTCC) -c $(SRCDIR)/th.c -o $(OBJDIR)/th.o 1238 1238 1239 $(OBJDIR)/th_lang.o: $(SRCDIR)/th_lang.c 1239 $(OBJDIR)/th_lang.o: $(SRCDIR)/th_lang.c 1240 $(XTCC) -c $(SRCDIR)/th_lang.c -o $(OBJDIR)/th_lang.o 1240 $(XTCC) -c $(SRCDIR)/th_lang.c -o $(OBJDIR)/th_lang.o 1241 1241 1242 ifdef FOSSIL_ENABLE_TCL 1242 ifdef FOSSIL_ENABLE_TCL 1243 $(OBJDIR)/th_tcl.o: $(SRCDIR)/th_tcl.c 1243 $(OBJDIR)/th_tcl.o: $(SRCDIR)/th_tcl.c 1244 $(XTCC) -c $(SRCDIR)/th_tcl.c -o $(OBJDIR)/th_tcl.o 1244 $(XTCC) -c $(SRCDIR)/th_tcl.c -o $(OBJDIR)/th_tcl.o 1245 endif 1245 endif 1246 1246