Fossil SCM
More cleanup of MinGW makefiles.
Commit
533caec0a6711c8d246476c2aec3e889d5aa6e3d
Parent
a88a241d727b109…
2 files changed
+6
-6
+34
-13
+6
-6
| --- win/Makefile.mingw | ||
| +++ win/Makefile.mingw | ||
| @@ -19,24 +19,24 @@ | ||
| 19 | 19 | # |
| 20 | 20 | BCC = gcc |
| 21 | 21 | |
| 22 | 22 | #### Enable HTTPS support via OpenSSL (links to libssl and libcrypto) |
| 23 | 23 | # |
| 24 | -# FOSSIL_ENABLE_SSL=1 | |
| 24 | +# FOSSIL_ENABLE_SSL = 1 | |
| 25 | 25 | |
| 26 | -#### The directory in which the zlib compression library is installed. | |
| 26 | +#### The directories where the zlib include and library files are located. | |
| 27 | 27 | # |
| 28 | -# | |
| 29 | -ZLIBDIR = /programs/gnuwin32 | |
| 28 | +ZINCDIR = /programs/gnuwin32/include | |
| 29 | +ZLIBDIR = /programs/gnuwin32/lib | |
| 30 | 30 | |
| 31 | 31 | #### C Compile and options for use in building executables that |
| 32 | 32 | # will run on the target platform. This is usually the same |
| 33 | 33 | # as BCC, unless you are cross-compiling. This C compiler builds |
| 34 | 34 | # the finished binary for fossil. The BCC compiler above is used |
| 35 | 35 | # for building intermediate code-generator tools. |
| 36 | 36 | # |
| 37 | -TCC = gcc -Os -Wall -L$(ZLIBDIR)/lib -I$(ZLIBDIR)/include | |
| 37 | +TCC = gcc -Os -Wall -L$(ZLIBDIR) -I$(ZINCDIR) | |
| 38 | 38 | |
| 39 | 39 | # With HTTPS support |
| 40 | 40 | ifdef FOSSIL_ENABLE_SSL |
| 41 | 41 | TCC += -DFOSSIL_ENABLE_SSL=1 |
| 42 | 42 | endif |
| @@ -56,11 +56,11 @@ | ||
| 56 | 56 | endif |
| 57 | 57 | |
| 58 | 58 | #### These libraries MUST appear in the same order as they do for Tcl |
| 59 | 59 | # or linking with it will not work (exact reason unknown). |
| 60 | 60 | # |
| 61 | -LIB += -lnetapi32 -lkernel32 -luser32 -ladvapi32 -lws2_32 | |
| 61 | +LIB += -lws2_32 | |
| 62 | 62 | |
| 63 | 63 | #### Tcl shell for use in running the fossil testsuite. This is only |
| 64 | 64 | # used for testing. If you do not run |
| 65 | 65 | # |
| 66 | 66 | TCLSH = tclsh |
| 67 | 67 |
| --- win/Makefile.mingw | |
| +++ win/Makefile.mingw | |
| @@ -19,24 +19,24 @@ | |
| 19 | # |
| 20 | BCC = gcc |
| 21 | |
| 22 | #### Enable HTTPS support via OpenSSL (links to libssl and libcrypto) |
| 23 | # |
| 24 | # FOSSIL_ENABLE_SSL=1 |
| 25 | |
| 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 |
| @@ -56,11 +56,11 @@ | |
| 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 |
| 67 |
| --- win/Makefile.mingw | |
| +++ win/Makefile.mingw | |
| @@ -19,24 +19,24 @@ | |
| 19 | # |
| 20 | BCC = gcc |
| 21 | |
| 22 | #### Enable HTTPS support via OpenSSL (links to libssl and libcrypto) |
| 23 | # |
| 24 | # FOSSIL_ENABLE_SSL = 1 |
| 25 | |
| 26 | #### The directories where the zlib include and library files are located. |
| 27 | # |
| 28 | ZINCDIR = /programs/gnuwin32/include |
| 29 | ZLIBDIR = /programs/gnuwin32/lib |
| 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) -I$(ZINCDIR) |
| 38 | |
| 39 | # With HTTPS support |
| 40 | ifdef FOSSIL_ENABLE_SSL |
| 41 | TCC += -DFOSSIL_ENABLE_SSL=1 |
| 42 | endif |
| @@ -56,11 +56,11 @@ | |
| 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 += -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 |
| 67 |
+34
-13
| --- win/Makefile.mingw.mistachkin | ||
| +++ win/Makefile.mingw.mistachkin | ||
| @@ -19,34 +19,36 @@ | ||
| 19 | 19 | # |
| 20 | 20 | BCC = gcc |
| 21 | 21 | |
| 22 | 22 | #### Enable HTTPS support via OpenSSL (links to libssl and libcrypto) |
| 23 | 23 | # |
| 24 | -FOSSIL_ENABLE_SSL=1 | |
| 24 | +FOSSIL_ENABLE_SSL = 1 | |
| 25 | 25 | |
| 26 | 26 | #### Enable scripting support via Tcl/Tk |
| 27 | 27 | # |
| 28 | -FOSSIL_ENABLE_TCL=1 | |
| 28 | +FOSSIL_ENABLE_TCL = 1 | |
| 29 | 29 | |
| 30 | 30 | #### Use the Tcl source directory instead of the install directory? |
| 31 | 31 | # This is useful when Tcl has been compiled statically with MinGW. |
| 32 | 32 | # |
| 33 | -FOSSIL_TCL_SOURCE=1 | |
| 33 | +FOSSIL_TCL_SOURCE = 1 | |
| 34 | 34 | |
| 35 | -#### The directory where the zlib library source code is located. | |
| 35 | +#### The directories where the zlib include and library files are located. | |
| 36 | 36 | # The recommended usage here is to use the Sysinternals junction tool |
| 37 | 37 | # to create a hard link between an "zlib-1.x.y" sub-directory of the |
| 38 | 38 | # Fossil source code directory and the target zlib source directory. |
| 39 | 39 | # |
| 40 | +ZINCDIR = $(SRCDIR)/../zlib-1.2.5 | |
| 40 | 41 | ZLIBDIR = $(SRCDIR)/../zlib-1.2.5 |
| 41 | 42 | |
| 42 | -#### The directory where the OpenSSL library source code is located. | |
| 43 | +#### The directories where the OpenSSL include and library files are located. | |
| 43 | 44 | # The recommended usage here is to use the Sysinternals junction tool |
| 44 | 45 | # to create a hard link between an "openssl-1.x" sub-directory of the |
| 45 | 46 | # Fossil source code directory and the target OpenSSL source directory. |
| 46 | 47 | # |
| 47 | -OPENSSLDIR = $(SRCDIR)/../openssl-1.0.0e | |
| 48 | +OPENSSLINCDIR = $(SRCDIR)/../openssl-1.0.0e/include | |
| 49 | +OPENSSLLIBDIR = $(SRCDIR)/../openssl-1.0.0e | |
| 48 | 50 | |
| 49 | 51 | #### Either the directory where the Tcl library is installed or the Tcl |
| 50 | 52 | # source code directory resides (depending on the value of the macro |
| 51 | 53 | # FOSSIL_TCL_SOURCE). If this points to the Tcl install directory, |
| 52 | 54 | # this directory must have "include" and "lib" sub-directories. If |
| @@ -56,30 +58,45 @@ | ||
| 56 | 58 | # link between a "tcl-8.x" sub-directory of the Fossil source code |
| 57 | 59 | # directory and the target Tcl directory. This removes the need to |
| 58 | 60 | # hard-code the necessary paths in this Makefile. |
| 59 | 61 | # |
| 60 | 62 | TCLDIR = $(SRCDIR)/../tcl-8.6 |
| 63 | + | |
| 64 | +#### The Tcl source code directory. This defaults to the same value as | |
| 65 | +# TCLDIR macro (above), which may not be correct. This value will | |
| 66 | +# only be used if the FOSSIL_TCL_SOURCE macro is defined. | |
| 67 | +# | |
| 68 | +TCLSRCDIR = $(TCLDIR) | |
| 69 | + | |
| 70 | +#### The Tcl include and library directories. | |
| 71 | +# | |
| 72 | +TCLINCDIR = $(TCLDIR)/include | |
| 73 | +TCLLIBDIR = $(TCLDIR)/lib | |
| 74 | + | |
| 75 | +#### Tcl: Which Tcl library do we want to use (8.4, 8.5, 8.6, etc)? | |
| 76 | +# | |
| 77 | +LIBTCL = -ltcl86 | |
| 61 | 78 | |
| 62 | 79 | #### C Compile and options for use in building executables that |
| 63 | 80 | # will run on the target platform. This is usually the same |
| 64 | 81 | # as BCC, unless you are cross-compiling. This C compiler builds |
| 65 | 82 | # the finished binary for fossil. The BCC compiler above is used |
| 66 | 83 | # for building intermediate code-generator tools. |
| 67 | 84 | # |
| 68 | -TCC = gcc -Os -Wall -L$(ZLIBDIR) -I$(ZLIBDIR) | |
| 85 | +TCC = gcc -Os -Wall -L$(ZLIBDIR) -I$(ZINCDIR) | |
| 69 | 86 | |
| 70 | 87 | # With HTTPS support |
| 71 | 88 | ifdef FOSSIL_ENABLE_SSL |
| 72 | -TCC += -L$(OPENSSLDIR) -I$(OPENSSLDIR)/include | |
| 89 | +TCC += -L$(OPENSSLLIBDIR) -I$(OPENSSLINCDIR) | |
| 73 | 90 | endif |
| 74 | 91 | |
| 75 | 92 | # With Tcl support |
| 76 | 93 | ifdef FOSSIL_ENABLE_TCL |
| 77 | 94 | ifdef FOSSIL_TCL_SOURCE |
| 78 | -TCC += -L$(TCLDIR)/win -I$(TCLDIR)/generic -I$(TCLDIR)/win | |
| 95 | +TCC += -L$(TCLSRCDIR)/win -I$(TCLSRCDIR)/generic -I$(TCLSRCDIR)/win | |
| 79 | 96 | else |
| 80 | -TCC += -L$(TCLDIR)/lib -I$(TCLDIR)/include | |
| 97 | +TCC += -L$(TCLLIBDIR) -I$(TCLINCDIR) | |
| 81 | 98 | endif |
| 82 | 99 | endif |
| 83 | 100 | |
| 84 | 101 | # With HTTPS support |
| 85 | 102 | ifdef FOSSIL_ENABLE_SSL |
| @@ -98,24 +115,28 @@ | ||
| 98 | 115 | # chroot jail. |
| 99 | 116 | # |
| 100 | 117 | LIB = -static |
| 101 | 118 | LIB += -lmingwex -lz |
| 102 | 119 | |
| 103 | -# OpenSSL: Add the necessary libaries required. | |
| 120 | +# OpenSSL: Add the necessary libaries required, if enabled. | |
| 104 | 121 | ifdef FOSSIL_ENABLE_SSL |
| 105 | 122 | LIB += -lssl -lcrypto -lgdi32 |
| 106 | 123 | endif |
| 107 | 124 | |
| 108 | -# Tcl: Which Tcl library do we want to use (8.4, 8.5, 8.6, etc)? | |
| 125 | +# Tcl: Add the necessary libaries required, if enabled. | |
| 109 | 126 | ifdef FOSSIL_ENABLE_TCL |
| 110 | -LIB += -ltcl86 | |
| 127 | +LIB += $(LIBTCL) | |
| 111 | 128 | endif |
| 112 | 129 | |
| 113 | 130 | #### These libraries MUST appear in the same order as they do for Tcl |
| 114 | 131 | # or linking with it will not work (exact reason unknown). |
| 115 | 132 | # |
| 133 | +ifdef FOSSIL_ENABLE_TCL | |
| 116 | 134 | LIB += -lnetapi32 -lkernel32 -luser32 -ladvapi32 -lws2_32 |
| 135 | +else | |
| 136 | +LIB += -lws2_32 | |
| 137 | +endif | |
| 117 | 138 | |
| 118 | 139 | #### Tcl shell for use in running the fossil testsuite. This is only |
| 119 | 140 | # used for testing. If you do not run |
| 120 | 141 | # |
| 121 | 142 | TCLSH = tclsh |
| 122 | 143 |
| --- win/Makefile.mingw.mistachkin | |
| +++ win/Makefile.mingw.mistachkin | |
| @@ -19,34 +19,36 @@ | |
| 19 | # |
| 20 | BCC = gcc |
| 21 | |
| 22 | #### Enable HTTPS support via OpenSSL (links to libssl and libcrypto) |
| 23 | # |
| 24 | FOSSIL_ENABLE_SSL=1 |
| 25 | |
| 26 | #### Enable scripting support via Tcl/Tk |
| 27 | # |
| 28 | FOSSIL_ENABLE_TCL=1 |
| 29 | |
| 30 | #### Use the Tcl source directory instead of the install directory? |
| 31 | # This is useful when Tcl has been compiled statically with MinGW. |
| 32 | # |
| 33 | FOSSIL_TCL_SOURCE=1 |
| 34 | |
| 35 | #### The directory where the zlib library source code is located. |
| 36 | # The recommended usage here is to use the Sysinternals junction tool |
| 37 | # to create a hard link between an "zlib-1.x.y" sub-directory of the |
| 38 | # Fossil source code directory and the target zlib source directory. |
| 39 | # |
| 40 | ZLIBDIR = $(SRCDIR)/../zlib-1.2.5 |
| 41 | |
| 42 | #### The directory where the OpenSSL library source code is located. |
| 43 | # The recommended usage here is to use the Sysinternals junction tool |
| 44 | # to create a hard link between an "openssl-1.x" sub-directory of the |
| 45 | # Fossil source code directory and the target OpenSSL source directory. |
| 46 | # |
| 47 | OPENSSLDIR = $(SRCDIR)/../openssl-1.0.0e |
| 48 | |
| 49 | #### Either the directory where the Tcl library is installed or the Tcl |
| 50 | # source code directory resides (depending on the value of the macro |
| 51 | # FOSSIL_TCL_SOURCE). If this points to the Tcl install directory, |
| 52 | # this directory must have "include" and "lib" sub-directories. If |
| @@ -56,30 +58,45 @@ | |
| 56 | # link between a "tcl-8.x" sub-directory of the Fossil source code |
| 57 | # directory and the target Tcl directory. This removes the need to |
| 58 | # hard-code the necessary paths in this Makefile. |
| 59 | # |
| 60 | TCLDIR = $(SRCDIR)/../tcl-8.6 |
| 61 | |
| 62 | #### C Compile and options for use in building executables that |
| 63 | # will run on the target platform. This is usually the same |
| 64 | # as BCC, unless you are cross-compiling. This C compiler builds |
| 65 | # the finished binary for fossil. The BCC compiler above is used |
| 66 | # for building intermediate code-generator tools. |
| 67 | # |
| 68 | TCC = gcc -Os -Wall -L$(ZLIBDIR) -I$(ZLIBDIR) |
| 69 | |
| 70 | # With HTTPS support |
| 71 | ifdef FOSSIL_ENABLE_SSL |
| 72 | TCC += -L$(OPENSSLDIR) -I$(OPENSSLDIR)/include |
| 73 | endif |
| 74 | |
| 75 | # With Tcl support |
| 76 | ifdef FOSSIL_ENABLE_TCL |
| 77 | ifdef FOSSIL_TCL_SOURCE |
| 78 | TCC += -L$(TCLDIR)/win -I$(TCLDIR)/generic -I$(TCLDIR)/win |
| 79 | else |
| 80 | TCC += -L$(TCLDIR)/lib -I$(TCLDIR)/include |
| 81 | endif |
| 82 | endif |
| 83 | |
| 84 | # With HTTPS support |
| 85 | ifdef FOSSIL_ENABLE_SSL |
| @@ -98,24 +115,28 @@ | |
| 98 | # chroot jail. |
| 99 | # |
| 100 | LIB = -static |
| 101 | LIB += -lmingwex -lz |
| 102 | |
| 103 | # OpenSSL: Add the necessary libaries required. |
| 104 | ifdef FOSSIL_ENABLE_SSL |
| 105 | LIB += -lssl -lcrypto -lgdi32 |
| 106 | endif |
| 107 | |
| 108 | # Tcl: Which Tcl library do we want to use (8.4, 8.5, 8.6, etc)? |
| 109 | ifdef FOSSIL_ENABLE_TCL |
| 110 | LIB += -ltcl86 |
| 111 | endif |
| 112 | |
| 113 | #### These libraries MUST appear in the same order as they do for Tcl |
| 114 | # or linking with it will not work (exact reason unknown). |
| 115 | # |
| 116 | LIB += -lnetapi32 -lkernel32 -luser32 -ladvapi32 -lws2_32 |
| 117 | |
| 118 | #### Tcl shell for use in running the fossil testsuite. This is only |
| 119 | # used for testing. If you do not run |
| 120 | # |
| 121 | TCLSH = tclsh |
| 122 |
| --- win/Makefile.mingw.mistachkin | |
| +++ win/Makefile.mingw.mistachkin | |
| @@ -19,34 +19,36 @@ | |
| 19 | # |
| 20 | BCC = gcc |
| 21 | |
| 22 | #### Enable HTTPS support via OpenSSL (links to libssl and libcrypto) |
| 23 | # |
| 24 | FOSSIL_ENABLE_SSL = 1 |
| 25 | |
| 26 | #### Enable scripting support via Tcl/Tk |
| 27 | # |
| 28 | FOSSIL_ENABLE_TCL = 1 |
| 29 | |
| 30 | #### Use the Tcl source directory instead of the install directory? |
| 31 | # This is useful when Tcl has been compiled statically with MinGW. |
| 32 | # |
| 33 | FOSSIL_TCL_SOURCE = 1 |
| 34 | |
| 35 | #### The directories where the zlib include and library files are located. |
| 36 | # The recommended usage here is to use the Sysinternals junction tool |
| 37 | # to create a hard link between an "zlib-1.x.y" sub-directory of the |
| 38 | # Fossil source code directory and the target zlib source directory. |
| 39 | # |
| 40 | ZINCDIR = $(SRCDIR)/../zlib-1.2.5 |
| 41 | ZLIBDIR = $(SRCDIR)/../zlib-1.2.5 |
| 42 | |
| 43 | #### The directories where the OpenSSL include and library files are located. |
| 44 | # The recommended usage here is to use the Sysinternals junction tool |
| 45 | # to create a hard link between an "openssl-1.x" sub-directory of the |
| 46 | # Fossil source code directory and the target OpenSSL source directory. |
| 47 | # |
| 48 | OPENSSLINCDIR = $(SRCDIR)/../openssl-1.0.0e/include |
| 49 | OPENSSLLIBDIR = $(SRCDIR)/../openssl-1.0.0e |
| 50 | |
| 51 | #### Either the directory where the Tcl library is installed or the Tcl |
| 52 | # source code directory resides (depending on the value of the macro |
| 53 | # FOSSIL_TCL_SOURCE). If this points to the Tcl install directory, |
| 54 | # this directory must have "include" and "lib" sub-directories. If |
| @@ -56,30 +58,45 @@ | |
| 58 | # link between a "tcl-8.x" sub-directory of the Fossil source code |
| 59 | # directory and the target Tcl directory. This removes the need to |
| 60 | # hard-code the necessary paths in this Makefile. |
| 61 | # |
| 62 | TCLDIR = $(SRCDIR)/../tcl-8.6 |
| 63 | |
| 64 | #### The Tcl source code directory. This defaults to the same value as |
| 65 | # TCLDIR macro (above), which may not be correct. This value will |
| 66 | # only be used if the FOSSIL_TCL_SOURCE macro is defined. |
| 67 | # |
| 68 | TCLSRCDIR = $(TCLDIR) |
| 69 | |
| 70 | #### The Tcl include and library directories. |
| 71 | # |
| 72 | TCLINCDIR = $(TCLDIR)/include |
| 73 | TCLLIBDIR = $(TCLDIR)/lib |
| 74 | |
| 75 | #### Tcl: Which Tcl library do we want to use (8.4, 8.5, 8.6, etc)? |
| 76 | # |
| 77 | LIBTCL = -ltcl86 |
| 78 | |
| 79 | #### C Compile and options for use in building executables that |
| 80 | # will run on the target platform. This is usually the same |
| 81 | # as BCC, unless you are cross-compiling. This C compiler builds |
| 82 | # the finished binary for fossil. The BCC compiler above is used |
| 83 | # for building intermediate code-generator tools. |
| 84 | # |
| 85 | TCC = gcc -Os -Wall -L$(ZLIBDIR) -I$(ZINCDIR) |
| 86 | |
| 87 | # With HTTPS support |
| 88 | ifdef FOSSIL_ENABLE_SSL |
| 89 | TCC += -L$(OPENSSLLIBDIR) -I$(OPENSSLINCDIR) |
| 90 | endif |
| 91 | |
| 92 | # With Tcl support |
| 93 | ifdef FOSSIL_ENABLE_TCL |
| 94 | ifdef FOSSIL_TCL_SOURCE |
| 95 | TCC += -L$(TCLSRCDIR)/win -I$(TCLSRCDIR)/generic -I$(TCLSRCDIR)/win |
| 96 | else |
| 97 | TCC += -L$(TCLLIBDIR) -I$(TCLINCDIR) |
| 98 | endif |
| 99 | endif |
| 100 | |
| 101 | # With HTTPS support |
| 102 | ifdef FOSSIL_ENABLE_SSL |
| @@ -98,24 +115,28 @@ | |
| 115 | # chroot jail. |
| 116 | # |
| 117 | LIB = -static |
| 118 | LIB += -lmingwex -lz |
| 119 | |
| 120 | # OpenSSL: Add the necessary libaries required, if enabled. |
| 121 | ifdef FOSSIL_ENABLE_SSL |
| 122 | LIB += -lssl -lcrypto -lgdi32 |
| 123 | endif |
| 124 | |
| 125 | # Tcl: Add the necessary libaries required, if enabled. |
| 126 | ifdef FOSSIL_ENABLE_TCL |
| 127 | LIB += $(LIBTCL) |
| 128 | endif |
| 129 | |
| 130 | #### These libraries MUST appear in the same order as they do for Tcl |
| 131 | # or linking with it will not work (exact reason unknown). |
| 132 | # |
| 133 | ifdef FOSSIL_ENABLE_TCL |
| 134 | LIB += -lnetapi32 -lkernel32 -luser32 -ladvapi32 -lws2_32 |
| 135 | else |
| 136 | LIB += -lws2_32 |
| 137 | endif |
| 138 | |
| 139 | #### Tcl shell for use in running the fossil testsuite. This is only |
| 140 | # used for testing. If you do not run |
| 141 | # |
| 142 | TCLSH = tclsh |
| 143 |