Fossil SCM
Additional refinements to the Makefile stemming from the cut-over of SSL.
Commit
5c30ad4ce154ac1b3a63b3f2adaf181e79fee202
Parent
fcd7ecb7f1d7d4e…
1 file changed
+2
-6
M
Makefile
+2
-6
| --- Makefile | ||
| +++ Makefile | ||
| @@ -16,24 +16,20 @@ | ||
| 16 | 16 | #### The suffix to add to executable files. ".exe" for windows. |
| 17 | 17 | # Nothing for unix. |
| 18 | 18 | # |
| 19 | 19 | E = |
| 20 | 20 | |
| 21 | -#### Enable HTTPS support via OpenSSL (links to libssl and libcrypto) | |
| 22 | -# | |
| 23 | -FOSSIL_ENABLE_SSL=1 | |
| 24 | - | |
| 25 | 21 | #### C Compile and options for use in building executables that |
| 26 | 22 | # will run on the target platform. This is usually the same |
| 27 | 23 | # as BCC, unless you are cross-compiling. This C compiler builds |
| 28 | 24 | # the finished binary for fossil. The BCC compiler above is used |
| 29 | 25 | # for building intermediate code-generator tools. |
| 30 | 26 | # |
| 31 | 27 | #TCC = gcc -O6 |
| 32 | 28 | #TCC = gcc -g -O0 -Wall -fprofile-arcs -ftest-coverage |
| 33 | 29 | TCC = gcc -g -Os -Wall |
| 34 | -TCC = gcc -g -Os -Wall -DFOSSIL_ENABLE_SSL | |
| 30 | +TCC += -DFOSSIL_ENABLE_SSL | |
| 35 | 31 | |
| 36 | 32 | #### Extra arguments for linking the finished binary. Fossil needs |
| 37 | 33 | # to link against the Z-Lib compression library. There are no |
| 38 | 34 | # other dependencies. We sometimes add the -static option here |
| 39 | 35 | # so that we can build a static executable that will run in a |
| @@ -44,11 +40,11 @@ | ||
| 44 | 40 | # LIB += lsocket |
| 45 | 41 | # Solaris 10 needs: |
| 46 | 42 | # LIB += -lsocket -lnsl |
| 47 | 43 | # My assumption is that the Sol10 flags will work for Sol8/9 and possibly 11. |
| 48 | 44 | # |
| 49 | -# OpenSSL: | |
| 45 | +# If using FOSSIL_ENABLE_SSL, also enable the following: | |
| 50 | 46 | LIB += -lcrypto -lssl |
| 51 | 47 | |
| 52 | 48 | #### Tcl shell for use in running the fossil testsuite. |
| 53 | 49 | # |
| 54 | 50 | TCLSH = tclsh |
| 55 | 51 |
| --- Makefile | |
| +++ Makefile | |
| @@ -16,24 +16,20 @@ | |
| 16 | #### The suffix to add to executable files. ".exe" for windows. |
| 17 | # Nothing for unix. |
| 18 | # |
| 19 | E = |
| 20 | |
| 21 | #### Enable HTTPS support via OpenSSL (links to libssl and libcrypto) |
| 22 | # |
| 23 | FOSSIL_ENABLE_SSL=1 |
| 24 | |
| 25 | #### C Compile and options for use in building executables that |
| 26 | # will run on the target platform. This is usually the same |
| 27 | # as BCC, unless you are cross-compiling. This C compiler builds |
| 28 | # the finished binary for fossil. The BCC compiler above is used |
| 29 | # for building intermediate code-generator tools. |
| 30 | # |
| 31 | #TCC = gcc -O6 |
| 32 | #TCC = gcc -g -O0 -Wall -fprofile-arcs -ftest-coverage |
| 33 | TCC = gcc -g -Os -Wall |
| 34 | TCC = gcc -g -Os -Wall -DFOSSIL_ENABLE_SSL |
| 35 | |
| 36 | #### Extra arguments for linking the finished binary. Fossil needs |
| 37 | # to link against the Z-Lib compression library. There are no |
| 38 | # other dependencies. We sometimes add the -static option here |
| 39 | # so that we can build a static executable that will run in a |
| @@ -44,11 +40,11 @@ | |
| 44 | # LIB += lsocket |
| 45 | # Solaris 10 needs: |
| 46 | # LIB += -lsocket -lnsl |
| 47 | # My assumption is that the Sol10 flags will work for Sol8/9 and possibly 11. |
| 48 | # |
| 49 | # OpenSSL: |
| 50 | LIB += -lcrypto -lssl |
| 51 | |
| 52 | #### Tcl shell for use in running the fossil testsuite. |
| 53 | # |
| 54 | TCLSH = tclsh |
| 55 |
| --- Makefile | |
| +++ Makefile | |
| @@ -16,24 +16,20 @@ | |
| 16 | #### The suffix to add to executable files. ".exe" for windows. |
| 17 | # Nothing for unix. |
| 18 | # |
| 19 | E = |
| 20 | |
| 21 | #### C Compile and options for use in building executables that |
| 22 | # will run on the target platform. This is usually the same |
| 23 | # as BCC, unless you are cross-compiling. This C compiler builds |
| 24 | # the finished binary for fossil. The BCC compiler above is used |
| 25 | # for building intermediate code-generator tools. |
| 26 | # |
| 27 | #TCC = gcc -O6 |
| 28 | #TCC = gcc -g -O0 -Wall -fprofile-arcs -ftest-coverage |
| 29 | TCC = gcc -g -Os -Wall |
| 30 | TCC += -DFOSSIL_ENABLE_SSL |
| 31 | |
| 32 | #### Extra arguments for linking the finished binary. Fossil needs |
| 33 | # to link against the Z-Lib compression library. There are no |
| 34 | # other dependencies. We sometimes add the -static option here |
| 35 | # so that we can build a static executable that will run in a |
| @@ -44,11 +40,11 @@ | |
| 40 | # LIB += lsocket |
| 41 | # Solaris 10 needs: |
| 42 | # LIB += -lsocket -lnsl |
| 43 | # My assumption is that the Sol10 flags will work for Sol8/9 and possibly 11. |
| 44 | # |
| 45 | # If using FOSSIL_ENABLE_SSL, also enable the following: |
| 46 | LIB += -lcrypto -lssl |
| 47 | |
| 48 | #### Tcl shell for use in running the fossil testsuite. |
| 49 | # |
| 50 | TCLSH = tclsh |
| 51 |