Fossil SCM
When building with MinGW, make sure to build OpenSSL first if the FOSSIL_BUILD_SSL option is enabled.
Commit
c8ed137ae7609197f780d613a0b319dcaf9c6749
Parent
14302b6cc7d4278…
3 files changed
+1
-1
+1
-1
+1
-1
+1
-1
| --- src/makemake.tcl | ||
| +++ src/makemake.tcl | ||
| @@ -990,11 +990,11 @@ | ||
| 990 | 990 | |
| 991 | 991 | ifdef FOSSIL_BUILD_SSL |
| 992 | 992 | APPTARGETS += openssl |
| 993 | 993 | endif |
| 994 | 994 | |
| 995 | -$(APPNAME): $(OBJDIR)/headers $(CODECHECK1) $(OBJ) $(EXTRAOBJ) $(OBJDIR)/fossil.o $(APPTARGETS) | |
| 995 | +$(APPNAME): $(APPTARGETS) $(OBJDIR)/headers $(CODECHECK1) $(OBJ) $(EXTRAOBJ) $(OBJDIR)/fossil.o | |
| 996 | 996 | $(CODECHECK1) $(TRANS_SRC) |
| 997 | 997 | $(TCC) -o $@ $(OBJ) $(EXTRAOBJ) $(LIB) $(OBJDIR)/fossil.o |
| 998 | 998 | |
| 999 | 999 | # This rule prevents make from using its default rules to try build |
| 1000 | 1000 | # an executable named "manifest" out of the file named "manifest.c" |
| 1001 | 1001 |
| --- src/makemake.tcl | |
| +++ src/makemake.tcl | |
| @@ -990,11 +990,11 @@ | |
| 990 | |
| 991 | ifdef FOSSIL_BUILD_SSL |
| 992 | APPTARGETS += openssl |
| 993 | endif |
| 994 | |
| 995 | $(APPNAME): $(OBJDIR)/headers $(CODECHECK1) $(OBJ) $(EXTRAOBJ) $(OBJDIR)/fossil.o $(APPTARGETS) |
| 996 | $(CODECHECK1) $(TRANS_SRC) |
| 997 | $(TCC) -o $@ $(OBJ) $(EXTRAOBJ) $(LIB) $(OBJDIR)/fossil.o |
| 998 | |
| 999 | # This rule prevents make from using its default rules to try build |
| 1000 | # an executable named "manifest" out of the file named "manifest.c" |
| 1001 |
| --- src/makemake.tcl | |
| +++ src/makemake.tcl | |
| @@ -990,11 +990,11 @@ | |
| 990 | |
| 991 | ifdef FOSSIL_BUILD_SSL |
| 992 | APPTARGETS += openssl |
| 993 | endif |
| 994 | |
| 995 | $(APPNAME): $(APPTARGETS) $(OBJDIR)/headers $(CODECHECK1) $(OBJ) $(EXTRAOBJ) $(OBJDIR)/fossil.o |
| 996 | $(CODECHECK1) $(TRANS_SRC) |
| 997 | $(TCC) -o $@ $(OBJ) $(EXTRAOBJ) $(LIB) $(OBJDIR)/fossil.o |
| 998 | |
| 999 | # This rule prevents make from using its default rules to try build |
| 1000 | # an executable named "manifest" out of the file named "manifest.c" |
| 1001 |
+1
-1
| --- win/Makefile.mingw | ||
| +++ win/Makefile.mingw | ||
| @@ -914,11 +914,11 @@ | ||
| 914 | 914 | |
| 915 | 915 | ifdef FOSSIL_BUILD_SSL |
| 916 | 916 | APPTARGETS += openssl |
| 917 | 917 | endif |
| 918 | 918 | |
| 919 | -$(APPNAME): $(OBJDIR)/headers $(CODECHECK1) $(OBJ) $(EXTRAOBJ) $(OBJDIR)/fossil.o $(APPTARGETS) | |
| 919 | +$(APPNAME): $(APPTARGETS) $(OBJDIR)/headers $(CODECHECK1) $(OBJ) $(EXTRAOBJ) $(OBJDIR)/fossil.o | |
| 920 | 920 | $(CODECHECK1) $(TRANS_SRC) |
| 921 | 921 | $(TCC) -o $@ $(OBJ) $(EXTRAOBJ) $(LIB) $(OBJDIR)/fossil.o |
| 922 | 922 | |
| 923 | 923 | # This rule prevents make from using its default rules to try build |
| 924 | 924 | # an executable named "manifest" out of the file named "manifest.c" |
| 925 | 925 |
| --- win/Makefile.mingw | |
| +++ win/Makefile.mingw | |
| @@ -914,11 +914,11 @@ | |
| 914 | |
| 915 | ifdef FOSSIL_BUILD_SSL |
| 916 | APPTARGETS += openssl |
| 917 | endif |
| 918 | |
| 919 | $(APPNAME): $(OBJDIR)/headers $(CODECHECK1) $(OBJ) $(EXTRAOBJ) $(OBJDIR)/fossil.o $(APPTARGETS) |
| 920 | $(CODECHECK1) $(TRANS_SRC) |
| 921 | $(TCC) -o $@ $(OBJ) $(EXTRAOBJ) $(LIB) $(OBJDIR)/fossil.o |
| 922 | |
| 923 | # This rule prevents make from using its default rules to try build |
| 924 | # an executable named "manifest" out of the file named "manifest.c" |
| 925 |
| --- win/Makefile.mingw | |
| +++ win/Makefile.mingw | |
| @@ -914,11 +914,11 @@ | |
| 914 | |
| 915 | ifdef FOSSIL_BUILD_SSL |
| 916 | APPTARGETS += openssl |
| 917 | endif |
| 918 | |
| 919 | $(APPNAME): $(APPTARGETS) $(OBJDIR)/headers $(CODECHECK1) $(OBJ) $(EXTRAOBJ) $(OBJDIR)/fossil.o |
| 920 | $(CODECHECK1) $(TRANS_SRC) |
| 921 | $(TCC) -o $@ $(OBJ) $(EXTRAOBJ) $(LIB) $(OBJDIR)/fossil.o |
| 922 | |
| 923 | # This rule prevents make from using its default rules to try build |
| 924 | # an executable named "manifest" out of the file named "manifest.c" |
| 925 |
+1
-1
| --- win/Makefile.mingw.mistachkin | ||
| +++ win/Makefile.mingw.mistachkin | ||
| @@ -914,11 +914,11 @@ | ||
| 914 | 914 | |
| 915 | 915 | ifdef FOSSIL_BUILD_SSL |
| 916 | 916 | APPTARGETS += openssl |
| 917 | 917 | endif |
| 918 | 918 | |
| 919 | -$(APPNAME): $(OBJDIR)/headers $(CODECHECK1) $(OBJ) $(EXTRAOBJ) $(OBJDIR)/fossil.o $(APPTARGETS) | |
| 919 | +$(APPNAME): $(APPTARGETS) $(OBJDIR)/headers $(CODECHECK1) $(OBJ) $(EXTRAOBJ) $(OBJDIR)/fossil.o | |
| 920 | 920 | $(CODECHECK1) $(TRANS_SRC) |
| 921 | 921 | $(TCC) -o $@ $(OBJ) $(EXTRAOBJ) $(LIB) $(OBJDIR)/fossil.o |
| 922 | 922 | |
| 923 | 923 | # This rule prevents make from using its default rules to try build |
| 924 | 924 | # an executable named "manifest" out of the file named "manifest.c" |
| 925 | 925 |
| --- win/Makefile.mingw.mistachkin | |
| +++ win/Makefile.mingw.mistachkin | |
| @@ -914,11 +914,11 @@ | |
| 914 | |
| 915 | ifdef FOSSIL_BUILD_SSL |
| 916 | APPTARGETS += openssl |
| 917 | endif |
| 918 | |
| 919 | $(APPNAME): $(OBJDIR)/headers $(CODECHECK1) $(OBJ) $(EXTRAOBJ) $(OBJDIR)/fossil.o $(APPTARGETS) |
| 920 | $(CODECHECK1) $(TRANS_SRC) |
| 921 | $(TCC) -o $@ $(OBJ) $(EXTRAOBJ) $(LIB) $(OBJDIR)/fossil.o |
| 922 | |
| 923 | # This rule prevents make from using its default rules to try build |
| 924 | # an executable named "manifest" out of the file named "manifest.c" |
| 925 |
| --- win/Makefile.mingw.mistachkin | |
| +++ win/Makefile.mingw.mistachkin | |
| @@ -914,11 +914,11 @@ | |
| 914 | |
| 915 | ifdef FOSSIL_BUILD_SSL |
| 916 | APPTARGETS += openssl |
| 917 | endif |
| 918 | |
| 919 | $(APPNAME): $(APPTARGETS) $(OBJDIR)/headers $(CODECHECK1) $(OBJ) $(EXTRAOBJ) $(OBJDIR)/fossil.o |
| 920 | $(CODECHECK1) $(TRANS_SRC) |
| 921 | $(TCC) -o $@ $(OBJ) $(EXTRAOBJ) $(LIB) $(OBJDIR)/fossil.o |
| 922 | |
| 923 | # This rule prevents make from using its default rules to try build |
| 924 | # an executable named "manifest" out of the file named "manifest.c" |
| 925 |