Fossil SCM
In the makefiles, put sqlite3.o early in the dependency list so that on a multithreaded make, it starts earliest. This makes the multithreaded makes finish sooner.
Commit
8ca760ce9705101c48879e6892ea9db43954b3bb104252ce801b2925b33cbad9
Parent
fdeebddea7abf6a…
3 files changed
+2
-2
+4
-4
+2
-2
+2
-2
| --- src/main.mk | ||
| +++ src/main.mk | ||
| @@ -745,13 +745,13 @@ | ||
| 745 | 745 | $(OBJDIR)/th_lang.o \ |
| 746 | 746 | $(OBJDIR)/th_tcl.o \ |
| 747 | 747 | $(OBJDIR)/cson_amalgamation.o |
| 748 | 748 | |
| 749 | 749 | |
| 750 | -$(APPNAME): $(OBJDIR)/headers $(OBJDIR)/codecheck1 $(OBJ) $(EXTRAOBJ) | |
| 750 | +$(APPNAME): $(OBJDIR)/headers $(OBJDIR)/codecheck1 $(EXTRAOBJ) $(OBJ) | |
| 751 | 751 | $(OBJDIR)/codecheck1 $(TRANS_SRC) |
| 752 | - $(TCC) $(TCCFLAGS) -o $(APPNAME) $(OBJ) $(EXTRAOBJ) $(LIB) | |
| 752 | + $(TCC) $(TCCFLAGS) -o $(APPNAME) $(EXTRAOBJ) $(OBJ) $(LIB) | |
| 753 | 753 | |
| 754 | 754 | # This rule prevents make from using its default rules to try build |
| 755 | 755 | # an executable named "manifest" out of the file named "manifest.c" |
| 756 | 756 | # |
| 757 | 757 | $(SRCDIR)/../manifest: |
| 758 | 758 |
| --- src/main.mk | |
| +++ src/main.mk | |
| @@ -745,13 +745,13 @@ | |
| 745 | $(OBJDIR)/th_lang.o \ |
| 746 | $(OBJDIR)/th_tcl.o \ |
| 747 | $(OBJDIR)/cson_amalgamation.o |
| 748 | |
| 749 | |
| 750 | $(APPNAME): $(OBJDIR)/headers $(OBJDIR)/codecheck1 $(OBJ) $(EXTRAOBJ) |
| 751 | $(OBJDIR)/codecheck1 $(TRANS_SRC) |
| 752 | $(TCC) $(TCCFLAGS) -o $(APPNAME) $(OBJ) $(EXTRAOBJ) $(LIB) |
| 753 | |
| 754 | # This rule prevents make from using its default rules to try build |
| 755 | # an executable named "manifest" out of the file named "manifest.c" |
| 756 | # |
| 757 | $(SRCDIR)/../manifest: |
| 758 |
| --- src/main.mk | |
| +++ src/main.mk | |
| @@ -745,13 +745,13 @@ | |
| 745 | $(OBJDIR)/th_lang.o \ |
| 746 | $(OBJDIR)/th_tcl.o \ |
| 747 | $(OBJDIR)/cson_amalgamation.o |
| 748 | |
| 749 | |
| 750 | $(APPNAME): $(OBJDIR)/headers $(OBJDIR)/codecheck1 $(EXTRAOBJ) $(OBJ) |
| 751 | $(OBJDIR)/codecheck1 $(TRANS_SRC) |
| 752 | $(TCC) $(TCCFLAGS) -o $(APPNAME) $(EXTRAOBJ) $(OBJ) $(LIB) |
| 753 | |
| 754 | # This rule prevents make from using its default rules to try build |
| 755 | # an executable named "manifest" out of the file named "manifest.c" |
| 756 | # |
| 757 | $(SRCDIR)/../manifest: |
| 758 |
+4
-4
| --- src/makemake.tcl | ||
| +++ src/makemake.tcl | ||
| @@ -447,13 +447,13 @@ | ||
| 447 | 447 | $(OBJDIR)/th_tcl.o <<<NEXT_LINE>>> |
| 448 | 448 | $(OBJDIR)/cson_amalgamation.o |
| 449 | 449 | }] |
| 450 | 450 | |
| 451 | 451 | writeln { |
| 452 | -$(APPNAME): $(OBJDIR)/headers $(OBJDIR)/codecheck1 $(OBJ) $(EXTRAOBJ) | |
| 452 | +$(APPNAME): $(OBJDIR)/headers $(OBJDIR)/codecheck1 $(EXTRAOBJ) $(OBJ) | |
| 453 | 453 | $(OBJDIR)/codecheck1 $(TRANS_SRC) |
| 454 | - $(TCC) $(TCCFLAGS) -o $(APPNAME) $(OBJ) $(EXTRAOBJ) $(LIB) | |
| 454 | + $(TCC) $(TCCFLAGS) -o $(APPNAME) $(EXTRAOBJ) $(OBJ) $(LIB) | |
| 455 | 455 | |
| 456 | 456 | # This rule prevents make from using its default rules to try build |
| 457 | 457 | # an executable named "manifest" out of the file named "manifest.c" |
| 458 | 458 | # |
| 459 | 459 | $(SRCDIR)/../manifest: |
| @@ -1178,13 +1178,13 @@ | ||
| 1178 | 1178 | |
| 1179 | 1179 | ifdef FOSSIL_BUILD_SSL |
| 1180 | 1180 | APPTARGETS += openssl |
| 1181 | 1181 | endif |
| 1182 | 1182 | |
| 1183 | -$(APPNAME): $(APPTARGETS) $(OBJDIR)/headers $(CODECHECK1) $(OBJ) $(EXTRAOBJ) $(OBJDIR)/fossil.o | |
| 1183 | +$(APPNAME): $(APPTARGETS) $(OBJDIR)/headers $(CODECHECK1) $(EXTRAOBJ) $(OBJ) $(OBJDIR)/fossil.o | |
| 1184 | 1184 | $(CODECHECK1) $(TRANS_SRC) |
| 1185 | - $(TCC) -o $@ $(OBJ) $(EXTRAOBJ) $(OBJDIR)/fossil.o $(LIB) | |
| 1185 | + $(TCC) -o $@ $(EXTRAOBJ) $(OBJ) $(OBJDIR)/fossil.o $(LIB) | |
| 1186 | 1186 | |
| 1187 | 1187 | # This rule prevents make from using its default rules to try build |
| 1188 | 1188 | # an executable named "manifest" out of the file named "manifest.c" |
| 1189 | 1189 | # |
| 1190 | 1190 | $(SRCDIR)/../manifest: |
| 1191 | 1191 |
| --- src/makemake.tcl | |
| +++ src/makemake.tcl | |
| @@ -447,13 +447,13 @@ | |
| 447 | $(OBJDIR)/th_tcl.o <<<NEXT_LINE>>> |
| 448 | $(OBJDIR)/cson_amalgamation.o |
| 449 | }] |
| 450 | |
| 451 | writeln { |
| 452 | $(APPNAME): $(OBJDIR)/headers $(OBJDIR)/codecheck1 $(OBJ) $(EXTRAOBJ) |
| 453 | $(OBJDIR)/codecheck1 $(TRANS_SRC) |
| 454 | $(TCC) $(TCCFLAGS) -o $(APPNAME) $(OBJ) $(EXTRAOBJ) $(LIB) |
| 455 | |
| 456 | # This rule prevents make from using its default rules to try build |
| 457 | # an executable named "manifest" out of the file named "manifest.c" |
| 458 | # |
| 459 | $(SRCDIR)/../manifest: |
| @@ -1178,13 +1178,13 @@ | |
| 1178 | |
| 1179 | ifdef FOSSIL_BUILD_SSL |
| 1180 | APPTARGETS += openssl |
| 1181 | endif |
| 1182 | |
| 1183 | $(APPNAME): $(APPTARGETS) $(OBJDIR)/headers $(CODECHECK1) $(OBJ) $(EXTRAOBJ) $(OBJDIR)/fossil.o |
| 1184 | $(CODECHECK1) $(TRANS_SRC) |
| 1185 | $(TCC) -o $@ $(OBJ) $(EXTRAOBJ) $(OBJDIR)/fossil.o $(LIB) |
| 1186 | |
| 1187 | # This rule prevents make from using its default rules to try build |
| 1188 | # an executable named "manifest" out of the file named "manifest.c" |
| 1189 | # |
| 1190 | $(SRCDIR)/../manifest: |
| 1191 |
| --- src/makemake.tcl | |
| +++ src/makemake.tcl | |
| @@ -447,13 +447,13 @@ | |
| 447 | $(OBJDIR)/th_tcl.o <<<NEXT_LINE>>> |
| 448 | $(OBJDIR)/cson_amalgamation.o |
| 449 | }] |
| 450 | |
| 451 | writeln { |
| 452 | $(APPNAME): $(OBJDIR)/headers $(OBJDIR)/codecheck1 $(EXTRAOBJ) $(OBJ) |
| 453 | $(OBJDIR)/codecheck1 $(TRANS_SRC) |
| 454 | $(TCC) $(TCCFLAGS) -o $(APPNAME) $(EXTRAOBJ) $(OBJ) $(LIB) |
| 455 | |
| 456 | # This rule prevents make from using its default rules to try build |
| 457 | # an executable named "manifest" out of the file named "manifest.c" |
| 458 | # |
| 459 | $(SRCDIR)/../manifest: |
| @@ -1178,13 +1178,13 @@ | |
| 1178 | |
| 1179 | ifdef FOSSIL_BUILD_SSL |
| 1180 | APPTARGETS += openssl |
| 1181 | endif |
| 1182 | |
| 1183 | $(APPNAME): $(APPTARGETS) $(OBJDIR)/headers $(CODECHECK1) $(EXTRAOBJ) $(OBJ) $(OBJDIR)/fossil.o |
| 1184 | $(CODECHECK1) $(TRANS_SRC) |
| 1185 | $(TCC) -o $@ $(EXTRAOBJ) $(OBJ) $(OBJDIR)/fossil.o $(LIB) |
| 1186 | |
| 1187 | # This rule prevents make from using its default rules to try build |
| 1188 | # an executable named "manifest" out of the file named "manifest.c" |
| 1189 | # |
| 1190 | $(SRCDIR)/../manifest: |
| 1191 |
+2
-2
| --- win/Makefile.mingw | ||
| +++ win/Makefile.mingw | ||
| @@ -1171,13 +1171,13 @@ | ||
| 1171 | 1171 | |
| 1172 | 1172 | ifdef FOSSIL_BUILD_SSL |
| 1173 | 1173 | APPTARGETS += openssl |
| 1174 | 1174 | endif |
| 1175 | 1175 | |
| 1176 | -$(APPNAME): $(APPTARGETS) $(OBJDIR)/headers $(CODECHECK1) $(OBJ) $(EXTRAOBJ) $(OBJDIR)/fossil.o | |
| 1176 | +$(APPNAME): $(APPTARGETS) $(OBJDIR)/headers $(CODECHECK1) $(EXTRAOBJ) $(OBJ) $(OBJDIR)/fossil.o | |
| 1177 | 1177 | $(CODECHECK1) $(TRANS_SRC) |
| 1178 | - $(TCC) -o $@ $(OBJ) $(EXTRAOBJ) $(OBJDIR)/fossil.o $(LIB) | |
| 1178 | + $(TCC) -o $@ $(EXTRAOBJ) $(OBJ) $(OBJDIR)/fossil.o $(LIB) | |
| 1179 | 1179 | |
| 1180 | 1180 | # This rule prevents make from using its default rules to try build |
| 1181 | 1181 | # an executable named "manifest" out of the file named "manifest.c" |
| 1182 | 1182 | # |
| 1183 | 1183 | $(SRCDIR)/../manifest: |
| 1184 | 1184 |
| --- win/Makefile.mingw | |
| +++ win/Makefile.mingw | |
| @@ -1171,13 +1171,13 @@ | |
| 1171 | |
| 1172 | ifdef FOSSIL_BUILD_SSL |
| 1173 | APPTARGETS += openssl |
| 1174 | endif |
| 1175 | |
| 1176 | $(APPNAME): $(APPTARGETS) $(OBJDIR)/headers $(CODECHECK1) $(OBJ) $(EXTRAOBJ) $(OBJDIR)/fossil.o |
| 1177 | $(CODECHECK1) $(TRANS_SRC) |
| 1178 | $(TCC) -o $@ $(OBJ) $(EXTRAOBJ) $(OBJDIR)/fossil.o $(LIB) |
| 1179 | |
| 1180 | # This rule prevents make from using its default rules to try build |
| 1181 | # an executable named "manifest" out of the file named "manifest.c" |
| 1182 | # |
| 1183 | $(SRCDIR)/../manifest: |
| 1184 |
| --- win/Makefile.mingw | |
| +++ win/Makefile.mingw | |
| @@ -1171,13 +1171,13 @@ | |
| 1171 | |
| 1172 | ifdef FOSSIL_BUILD_SSL |
| 1173 | APPTARGETS += openssl |
| 1174 | endif |
| 1175 | |
| 1176 | $(APPNAME): $(APPTARGETS) $(OBJDIR)/headers $(CODECHECK1) $(EXTRAOBJ) $(OBJ) $(OBJDIR)/fossil.o |
| 1177 | $(CODECHECK1) $(TRANS_SRC) |
| 1178 | $(TCC) -o $@ $(EXTRAOBJ) $(OBJ) $(OBJDIR)/fossil.o $(LIB) |
| 1179 | |
| 1180 | # This rule prevents make from using its default rules to try build |
| 1181 | # an executable named "manifest" out of the file named "manifest.c" |
| 1182 | # |
| 1183 | $(SRCDIR)/../manifest: |
| 1184 |