Fossil SCM
By default on MinGW, do not include the 'openssl' target when building as this causes OpenSSL to be needlessly rebuilt (can be overridden via FOSSIL_BUILD_SSL=1).
Commit
06e5595a06a62fd5e9ef8a65653abb7146f1879a
Parent
68c11dbafa0df5f…
3 files changed
+6
-1
+6
-1
+6
-1
+6
-1
| --- src/makemake.tcl | ||
| +++ src/makemake.tcl | ||
| @@ -439,10 +439,15 @@ | ||
| 439 | 439 | # FOSSIL_ENABLE_JSON = 1 |
| 440 | 440 | |
| 441 | 441 | #### Enable HTTPS support via OpenSSL (links to libssl and libcrypto) |
| 442 | 442 | # |
| 443 | 443 | # FOSSIL_ENABLE_SSL = 1 |
| 444 | + | |
| 445 | +#### Automatically build OpenSSL when building Fossil (causes rebuild | |
| 446 | +# issues when building incrementally). | |
| 447 | +# | |
| 448 | +# FOSSIL_BUILD_SSL = 1 | |
| 444 | 449 | |
| 445 | 450 | #### Enable hooks for commands and web pages via TH1 |
| 446 | 451 | # |
| 447 | 452 | # FOSSIL_ENABLE_TH1_HOOKS = 1 |
| 448 | 453 | |
| @@ -863,11 +868,11 @@ | ||
| 863 | 868 | clean-tcl: |
| 864 | 869 | $(MAKE) -C $(TCLSRCDIR)/win distclean |
| 865 | 870 | |
| 866 | 871 | APPTARGETS += $(LIBTARGETS) |
| 867 | 872 | |
| 868 | -ifdef FOSSIL_ENABLE_SSL | |
| 873 | +ifdef FOSSIL_BUILD_SSL | |
| 869 | 874 | APPTARGETS += openssl |
| 870 | 875 | endif |
| 871 | 876 | |
| 872 | 877 | $(APPNAME): $(OBJDIR)/headers $(OBJ) $(EXTRAOBJ) $(OBJDIR)/fossil.o $(APPTARGETS) |
| 873 | 878 | $(TCC) -o $(APPNAME) $(OBJ) $(EXTRAOBJ) $(LIB) $(OBJDIR)/fossil.o |
| 874 | 879 |
| --- src/makemake.tcl | |
| +++ src/makemake.tcl | |
| @@ -439,10 +439,15 @@ | |
| 439 | # FOSSIL_ENABLE_JSON = 1 |
| 440 | |
| 441 | #### Enable HTTPS support via OpenSSL (links to libssl and libcrypto) |
| 442 | # |
| 443 | # FOSSIL_ENABLE_SSL = 1 |
| 444 | |
| 445 | #### Enable hooks for commands and web pages via TH1 |
| 446 | # |
| 447 | # FOSSIL_ENABLE_TH1_HOOKS = 1 |
| 448 | |
| @@ -863,11 +868,11 @@ | |
| 863 | clean-tcl: |
| 864 | $(MAKE) -C $(TCLSRCDIR)/win distclean |
| 865 | |
| 866 | APPTARGETS += $(LIBTARGETS) |
| 867 | |
| 868 | ifdef FOSSIL_ENABLE_SSL |
| 869 | APPTARGETS += openssl |
| 870 | endif |
| 871 | |
| 872 | $(APPNAME): $(OBJDIR)/headers $(OBJ) $(EXTRAOBJ) $(OBJDIR)/fossil.o $(APPTARGETS) |
| 873 | $(TCC) -o $(APPNAME) $(OBJ) $(EXTRAOBJ) $(LIB) $(OBJDIR)/fossil.o |
| 874 |
| --- src/makemake.tcl | |
| +++ src/makemake.tcl | |
| @@ -439,10 +439,15 @@ | |
| 439 | # FOSSIL_ENABLE_JSON = 1 |
| 440 | |
| 441 | #### Enable HTTPS support via OpenSSL (links to libssl and libcrypto) |
| 442 | # |
| 443 | # FOSSIL_ENABLE_SSL = 1 |
| 444 | |
| 445 | #### Automatically build OpenSSL when building Fossil (causes rebuild |
| 446 | # issues when building incrementally). |
| 447 | # |
| 448 | # FOSSIL_BUILD_SSL = 1 |
| 449 | |
| 450 | #### Enable hooks for commands and web pages via TH1 |
| 451 | # |
| 452 | # FOSSIL_ENABLE_TH1_HOOKS = 1 |
| 453 | |
| @@ -863,11 +868,11 @@ | |
| 868 | clean-tcl: |
| 869 | $(MAKE) -C $(TCLSRCDIR)/win distclean |
| 870 | |
| 871 | APPTARGETS += $(LIBTARGETS) |
| 872 | |
| 873 | ifdef FOSSIL_BUILD_SSL |
| 874 | APPTARGETS += openssl |
| 875 | endif |
| 876 | |
| 877 | $(APPNAME): $(OBJDIR)/headers $(OBJ) $(EXTRAOBJ) $(OBJDIR)/fossil.o $(APPTARGETS) |
| 878 | $(TCC) -o $(APPNAME) $(OBJ) $(EXTRAOBJ) $(LIB) $(OBJDIR)/fossil.o |
| 879 |
+6
-1
| --- win/Makefile.mingw | ||
| +++ win/Makefile.mingw | ||
| @@ -47,10 +47,15 @@ | ||
| 47 | 47 | # FOSSIL_ENABLE_JSON = 1 |
| 48 | 48 | |
| 49 | 49 | #### Enable HTTPS support via OpenSSL (links to libssl and libcrypto) |
| 50 | 50 | # |
| 51 | 51 | # FOSSIL_ENABLE_SSL = 1 |
| 52 | + | |
| 53 | +#### Automatically build OpenSSL when building Fossil (causes rebuild | |
| 54 | +# issues when building incrementally). | |
| 55 | +# | |
| 56 | +# FOSSIL_BUILD_SSL = 1 | |
| 52 | 57 | |
| 53 | 58 | #### Enable hooks for commands and web pages via TH1 |
| 54 | 59 | # |
| 55 | 60 | # FOSSIL_ENABLE_TH1_HOOKS = 1 |
| 56 | 61 | |
| @@ -792,11 +797,11 @@ | ||
| 792 | 797 | clean-tcl: |
| 793 | 798 | $(MAKE) -C $(TCLSRCDIR)/win distclean |
| 794 | 799 | |
| 795 | 800 | APPTARGETS += $(LIBTARGETS) |
| 796 | 801 | |
| 797 | -ifdef FOSSIL_ENABLE_SSL | |
| 802 | +ifdef FOSSIL_BUILD_SSL | |
| 798 | 803 | APPTARGETS += openssl |
| 799 | 804 | endif |
| 800 | 805 | |
| 801 | 806 | $(APPNAME): $(OBJDIR)/headers $(OBJ) $(EXTRAOBJ) $(OBJDIR)/fossil.o $(APPTARGETS) |
| 802 | 807 | $(TCC) -o $(APPNAME) $(OBJ) $(EXTRAOBJ) $(LIB) $(OBJDIR)/fossil.o |
| 803 | 808 |
| --- win/Makefile.mingw | |
| +++ win/Makefile.mingw | |
| @@ -47,10 +47,15 @@ | |
| 47 | # FOSSIL_ENABLE_JSON = 1 |
| 48 | |
| 49 | #### Enable HTTPS support via OpenSSL (links to libssl and libcrypto) |
| 50 | # |
| 51 | # FOSSIL_ENABLE_SSL = 1 |
| 52 | |
| 53 | #### Enable hooks for commands and web pages via TH1 |
| 54 | # |
| 55 | # FOSSIL_ENABLE_TH1_HOOKS = 1 |
| 56 | |
| @@ -792,11 +797,11 @@ | |
| 792 | clean-tcl: |
| 793 | $(MAKE) -C $(TCLSRCDIR)/win distclean |
| 794 | |
| 795 | APPTARGETS += $(LIBTARGETS) |
| 796 | |
| 797 | ifdef FOSSIL_ENABLE_SSL |
| 798 | APPTARGETS += openssl |
| 799 | endif |
| 800 | |
| 801 | $(APPNAME): $(OBJDIR)/headers $(OBJ) $(EXTRAOBJ) $(OBJDIR)/fossil.o $(APPTARGETS) |
| 802 | $(TCC) -o $(APPNAME) $(OBJ) $(EXTRAOBJ) $(LIB) $(OBJDIR)/fossil.o |
| 803 |
| --- win/Makefile.mingw | |
| +++ win/Makefile.mingw | |
| @@ -47,10 +47,15 @@ | |
| 47 | # FOSSIL_ENABLE_JSON = 1 |
| 48 | |
| 49 | #### Enable HTTPS support via OpenSSL (links to libssl and libcrypto) |
| 50 | # |
| 51 | # FOSSIL_ENABLE_SSL = 1 |
| 52 | |
| 53 | #### Automatically build OpenSSL when building Fossil (causes rebuild |
| 54 | # issues when building incrementally). |
| 55 | # |
| 56 | # FOSSIL_BUILD_SSL = 1 |
| 57 | |
| 58 | #### Enable hooks for commands and web pages via TH1 |
| 59 | # |
| 60 | # FOSSIL_ENABLE_TH1_HOOKS = 1 |
| 61 | |
| @@ -792,11 +797,11 @@ | |
| 797 | clean-tcl: |
| 798 | $(MAKE) -C $(TCLSRCDIR)/win distclean |
| 799 | |
| 800 | APPTARGETS += $(LIBTARGETS) |
| 801 | |
| 802 | ifdef FOSSIL_BUILD_SSL |
| 803 | APPTARGETS += openssl |
| 804 | endif |
| 805 | |
| 806 | $(APPNAME): $(OBJDIR)/headers $(OBJ) $(EXTRAOBJ) $(OBJDIR)/fossil.o $(APPTARGETS) |
| 807 | $(TCC) -o $(APPNAME) $(OBJ) $(EXTRAOBJ) $(LIB) $(OBJDIR)/fossil.o |
| 808 |
+6
-1
| --- win/Makefile.mingw.mistachkin | ||
| +++ win/Makefile.mingw.mistachkin | ||
| @@ -47,10 +47,15 @@ | ||
| 47 | 47 | FOSSIL_ENABLE_JSON = 1 |
| 48 | 48 | |
| 49 | 49 | #### Enable HTTPS support via OpenSSL (links to libssl and libcrypto) |
| 50 | 50 | # |
| 51 | 51 | FOSSIL_ENABLE_SSL = 1 |
| 52 | + | |
| 53 | +#### Automatically build OpenSSL when building Fossil (causes rebuild | |
| 54 | +# issues when building incrementally). | |
| 55 | +# | |
| 56 | +# FOSSIL_BUILD_SSL = 1 | |
| 52 | 57 | |
| 53 | 58 | #### Enable hooks for commands and web pages via TH1 |
| 54 | 59 | # |
| 55 | 60 | FOSSIL_ENABLE_TH1_HOOKS = 1 |
| 56 | 61 | |
| @@ -792,11 +797,11 @@ | ||
| 792 | 797 | clean-tcl: |
| 793 | 798 | $(MAKE) -C $(TCLSRCDIR)/win distclean |
| 794 | 799 | |
| 795 | 800 | APPTARGETS += $(LIBTARGETS) |
| 796 | 801 | |
| 797 | -ifdef FOSSIL_ENABLE_SSL | |
| 802 | +ifdef FOSSIL_BUILD_SSL | |
| 798 | 803 | APPTARGETS += openssl |
| 799 | 804 | endif |
| 800 | 805 | |
| 801 | 806 | $(APPNAME): $(OBJDIR)/headers $(OBJ) $(EXTRAOBJ) $(OBJDIR)/fossil.o $(APPTARGETS) |
| 802 | 807 | $(TCC) -o $(APPNAME) $(OBJ) $(EXTRAOBJ) $(LIB) $(OBJDIR)/fossil.o |
| 803 | 808 |
| --- win/Makefile.mingw.mistachkin | |
| +++ win/Makefile.mingw.mistachkin | |
| @@ -47,10 +47,15 @@ | |
| 47 | FOSSIL_ENABLE_JSON = 1 |
| 48 | |
| 49 | #### Enable HTTPS support via OpenSSL (links to libssl and libcrypto) |
| 50 | # |
| 51 | FOSSIL_ENABLE_SSL = 1 |
| 52 | |
| 53 | #### Enable hooks for commands and web pages via TH1 |
| 54 | # |
| 55 | FOSSIL_ENABLE_TH1_HOOKS = 1 |
| 56 | |
| @@ -792,11 +797,11 @@ | |
| 792 | clean-tcl: |
| 793 | $(MAKE) -C $(TCLSRCDIR)/win distclean |
| 794 | |
| 795 | APPTARGETS += $(LIBTARGETS) |
| 796 | |
| 797 | ifdef FOSSIL_ENABLE_SSL |
| 798 | APPTARGETS += openssl |
| 799 | endif |
| 800 | |
| 801 | $(APPNAME): $(OBJDIR)/headers $(OBJ) $(EXTRAOBJ) $(OBJDIR)/fossil.o $(APPTARGETS) |
| 802 | $(TCC) -o $(APPNAME) $(OBJ) $(EXTRAOBJ) $(LIB) $(OBJDIR)/fossil.o |
| 803 |
| --- win/Makefile.mingw.mistachkin | |
| +++ win/Makefile.mingw.mistachkin | |
| @@ -47,10 +47,15 @@ | |
| 47 | FOSSIL_ENABLE_JSON = 1 |
| 48 | |
| 49 | #### Enable HTTPS support via OpenSSL (links to libssl and libcrypto) |
| 50 | # |
| 51 | FOSSIL_ENABLE_SSL = 1 |
| 52 | |
| 53 | #### Automatically build OpenSSL when building Fossil (causes rebuild |
| 54 | # issues when building incrementally). |
| 55 | # |
| 56 | # FOSSIL_BUILD_SSL = 1 |
| 57 | |
| 58 | #### Enable hooks for commands and web pages via TH1 |
| 59 | # |
| 60 | FOSSIL_ENABLE_TH1_HOOKS = 1 |
| 61 | |
| @@ -792,11 +797,11 @@ | |
| 797 | clean-tcl: |
| 798 | $(MAKE) -C $(TCLSRCDIR)/win distclean |
| 799 | |
| 800 | APPTARGETS += $(LIBTARGETS) |
| 801 | |
| 802 | ifdef FOSSIL_BUILD_SSL |
| 803 | APPTARGETS += openssl |
| 804 | endif |
| 805 | |
| 806 | $(APPNAME): $(OBJDIR)/headers $(OBJ) $(EXTRAOBJ) $(OBJDIR)/fossil.o $(APPTARGETS) |
| 807 | $(TCC) -o $(APPNAME) $(OBJ) $(EXTRAOBJ) $(LIB) $(OBJDIR)/fossil.o |
| 808 |