Fossil SCM
Got Makefile.classic mostly working again, with the caveat that it assumes an SSL build.
Commit
6c3d398a91794ef6154131819bc68f41c083416a97e52c9e370f4ff2a2bd9f16
Parent
2ac4ab2b2f195f1…
1 file changed
+19
-12
+19
-12
| --- Makefile.classic | ||
| +++ Makefile.classic | ||
| @@ -7,10 +7,16 @@ | ||
| 7 | 7 | #### The toplevel directory of the source tree. Fossil can be built |
| 8 | 8 | # in a directory that is separate from the source tree. Just change |
| 9 | 9 | # the following to point from the build directory to the src/ folder. |
| 10 | 10 | # |
| 11 | 11 | SRCDIR = ./src |
| 12 | +#### Upstream source files included directly in this repository. | |
| 13 | +# | |
| 14 | +SRCDIR_extsrc = ./extsrc | |
| 15 | +#### In-tree tools such as code generators and translators: | |
| 16 | +# | |
| 17 | +SRCDIR_tools = ./tools | |
| 12 | 18 | |
| 13 | 19 | #### The directory into which object code files should be written. |
| 14 | 20 | # |
| 15 | 21 | # |
| 16 | 22 | OBJDIR = ./bld |
| @@ -36,14 +42,10 @@ | ||
| 36 | 42 | # |
| 37 | 43 | #TCC = gcc -O6 |
| 38 | 44 | #TCC = gcc -g -O0 -Wall -fprofile-arcs -ftest-coverage |
| 39 | 45 | TCC = gcc -g -Os -Wall |
| 40 | 46 | |
| 41 | -# To use the included miniz library | |
| 42 | -# FOSSIL_ENABLE_MINIZ = 1 | |
| 43 | -# TCC += -DFOSSIL_ENABLE_MINIZ | |
| 44 | - | |
| 45 | 47 | # To add support for HTTPS |
| 46 | 48 | TCC += -DFOSSIL_ENABLE_SSL |
| 47 | 49 | |
| 48 | 50 | #### We sometimes add the -static option here so that we can build a |
| 49 | 51 | # static executable that will run in a chroot jail. |
| @@ -58,19 +60,16 @@ | ||
| 58 | 60 | # ifdef'd out elsewhere for that platform. Note that this is a make |
| 59 | 61 | # flag handled in src/main.mk, not a C preprocessor flag. |
| 60 | 62 | USE_LINENOISE := 1 |
| 61 | 63 | |
| 62 | 64 | #### Extra arguments for linking the finished binary. Fossil needs |
| 63 | -# to link against the Z-Lib compression library unless the miniz | |
| 64 | -# library in the source tree is being used. There are no other | |
| 65 | -# required dependencies. | |
| 66 | -ZLIB_LIB.0 = -lz | |
| 67 | -ZLIB_LIB.1 = | |
| 68 | -ZLIB_LIB. = $(ZLIB_LIB.0) | |
| 65 | +# to link against the Z-Lib compression library. There are no | |
| 66 | +# other required dependencies. | |
| 67 | +ZLIB_LIB = -lz | |
| 69 | 68 | |
| 70 | 69 | # If using zlib: |
| 71 | -LIB += $(ZLIB_LIB.$(FOSSIL_ENABLE_MINIZ)) $(LDFLAGS) | |
| 70 | +LIB += $(ZLIB_LIB) $(LDFLAGS) | |
| 72 | 71 | |
| 73 | 72 | # If using HTTPS: |
| 74 | 73 | LIB += -lcrypto -lssl |
| 75 | 74 | |
| 76 | 75 | # Many platforms put cos() needed by src/piechart.c in libm, rather than |
| @@ -80,10 +79,18 @@ | ||
| 80 | 79 | |
| 81 | 80 | #### Tcl shell for use in running the fossil testsuite. If you do not |
| 82 | 81 | # care about testing the end result, this can be blank. |
| 83 | 82 | # |
| 84 | 83 | TCLSH = tclsh |
| 84 | + | |
| 85 | +CFLAGS += -fPIE | |
| 86 | +CPPFLAGS += -I. -I$(SRCDIR_extsrc) -I$(SRCDIR) | |
| 87 | +LIB = -lm -lz -lssl | |
| 88 | +INSTALLDIR = $(DESTDIR)$(prefix)/bin | |
| 89 | +SQLITE3_ORIGINAL = 0 | |
| 90 | +USE_LINENOISE = 1 | |
| 91 | + | |
| 85 | 92 | |
| 86 | 93 | # You should not need to change anything below this line |
| 87 | 94 | ############################################################################### |
| 88 | 95 | # |
| 89 | 96 | # Automatic platform-specific options. |
| @@ -98,7 +105,7 @@ | ||
| 98 | 105 | TCC.NetBSD += -DUSE_PREAD |
| 99 | 106 | TCC.OpenBSD += -DUSE_PREAD |
| 100 | 107 | TCC += $(TCC.$(HOST_OS)) |
| 101 | 108 | |
| 102 | 109 | APPNAME = fossil$(E) |
| 103 | - | |
| 110 | +.PHONY: all tags | |
| 104 | 111 | include $(SRCDIR)/main.mk |
| 105 | 112 |
| --- Makefile.classic | |
| +++ Makefile.classic | |
| @@ -7,10 +7,16 @@ | |
| 7 | #### The toplevel directory of the source tree. Fossil can be built |
| 8 | # in a directory that is separate from the source tree. Just change |
| 9 | # the following to point from the build directory to the src/ folder. |
| 10 | # |
| 11 | SRCDIR = ./src |
| 12 | |
| 13 | #### The directory into which object code files should be written. |
| 14 | # |
| 15 | # |
| 16 | OBJDIR = ./bld |
| @@ -36,14 +42,10 @@ | |
| 36 | # |
| 37 | #TCC = gcc -O6 |
| 38 | #TCC = gcc -g -O0 -Wall -fprofile-arcs -ftest-coverage |
| 39 | TCC = gcc -g -Os -Wall |
| 40 | |
| 41 | # To use the included miniz library |
| 42 | # FOSSIL_ENABLE_MINIZ = 1 |
| 43 | # TCC += -DFOSSIL_ENABLE_MINIZ |
| 44 | |
| 45 | # To add support for HTTPS |
| 46 | TCC += -DFOSSIL_ENABLE_SSL |
| 47 | |
| 48 | #### We sometimes add the -static option here so that we can build a |
| 49 | # static executable that will run in a chroot jail. |
| @@ -58,19 +60,16 @@ | |
| 58 | # ifdef'd out elsewhere for that platform. Note that this is a make |
| 59 | # flag handled in src/main.mk, not a C preprocessor flag. |
| 60 | USE_LINENOISE := 1 |
| 61 | |
| 62 | #### Extra arguments for linking the finished binary. Fossil needs |
| 63 | # to link against the Z-Lib compression library unless the miniz |
| 64 | # library in the source tree is being used. There are no other |
| 65 | # required dependencies. |
| 66 | ZLIB_LIB.0 = -lz |
| 67 | ZLIB_LIB.1 = |
| 68 | ZLIB_LIB. = $(ZLIB_LIB.0) |
| 69 | |
| 70 | # If using zlib: |
| 71 | LIB += $(ZLIB_LIB.$(FOSSIL_ENABLE_MINIZ)) $(LDFLAGS) |
| 72 | |
| 73 | # If using HTTPS: |
| 74 | LIB += -lcrypto -lssl |
| 75 | |
| 76 | # Many platforms put cos() needed by src/piechart.c in libm, rather than |
| @@ -80,10 +79,18 @@ | |
| 80 | |
| 81 | #### Tcl shell for use in running the fossil testsuite. If you do not |
| 82 | # care about testing the end result, this can be blank. |
| 83 | # |
| 84 | TCLSH = tclsh |
| 85 | |
| 86 | # You should not need to change anything below this line |
| 87 | ############################################################################### |
| 88 | # |
| 89 | # Automatic platform-specific options. |
| @@ -98,7 +105,7 @@ | |
| 98 | TCC.NetBSD += -DUSE_PREAD |
| 99 | TCC.OpenBSD += -DUSE_PREAD |
| 100 | TCC += $(TCC.$(HOST_OS)) |
| 101 | |
| 102 | APPNAME = fossil$(E) |
| 103 | |
| 104 | include $(SRCDIR)/main.mk |
| 105 |
| --- Makefile.classic | |
| +++ Makefile.classic | |
| @@ -7,10 +7,16 @@ | |
| 7 | #### The toplevel directory of the source tree. Fossil can be built |
| 8 | # in a directory that is separate from the source tree. Just change |
| 9 | # the following to point from the build directory to the src/ folder. |
| 10 | # |
| 11 | SRCDIR = ./src |
| 12 | #### Upstream source files included directly in this repository. |
| 13 | # |
| 14 | SRCDIR_extsrc = ./extsrc |
| 15 | #### In-tree tools such as code generators and translators: |
| 16 | # |
| 17 | SRCDIR_tools = ./tools |
| 18 | |
| 19 | #### The directory into which object code files should be written. |
| 20 | # |
| 21 | # |
| 22 | OBJDIR = ./bld |
| @@ -36,14 +42,10 @@ | |
| 42 | # |
| 43 | #TCC = gcc -O6 |
| 44 | #TCC = gcc -g -O0 -Wall -fprofile-arcs -ftest-coverage |
| 45 | TCC = gcc -g -Os -Wall |
| 46 | |
| 47 | # To add support for HTTPS |
| 48 | TCC += -DFOSSIL_ENABLE_SSL |
| 49 | |
| 50 | #### We sometimes add the -static option here so that we can build a |
| 51 | # static executable that will run in a chroot jail. |
| @@ -58,19 +60,16 @@ | |
| 60 | # ifdef'd out elsewhere for that platform. Note that this is a make |
| 61 | # flag handled in src/main.mk, not a C preprocessor flag. |
| 62 | USE_LINENOISE := 1 |
| 63 | |
| 64 | #### Extra arguments for linking the finished binary. Fossil needs |
| 65 | # to link against the Z-Lib compression library. There are no |
| 66 | # other required dependencies. |
| 67 | ZLIB_LIB = -lz |
| 68 | |
| 69 | # If using zlib: |
| 70 | LIB += $(ZLIB_LIB) $(LDFLAGS) |
| 71 | |
| 72 | # If using HTTPS: |
| 73 | LIB += -lcrypto -lssl |
| 74 | |
| 75 | # Many platforms put cos() needed by src/piechart.c in libm, rather than |
| @@ -80,10 +79,18 @@ | |
| 79 | |
| 80 | #### Tcl shell for use in running the fossil testsuite. If you do not |
| 81 | # care about testing the end result, this can be blank. |
| 82 | # |
| 83 | TCLSH = tclsh |
| 84 | |
| 85 | CFLAGS += -fPIE |
| 86 | CPPFLAGS += -I. -I$(SRCDIR_extsrc) -I$(SRCDIR) |
| 87 | LIB = -lm -lz -lssl |
| 88 | INSTALLDIR = $(DESTDIR)$(prefix)/bin |
| 89 | SQLITE3_ORIGINAL = 0 |
| 90 | USE_LINENOISE = 1 |
| 91 | |
| 92 | |
| 93 | # You should not need to change anything below this line |
| 94 | ############################################################################### |
| 95 | # |
| 96 | # Automatic platform-specific options. |
| @@ -98,7 +105,7 @@ | |
| 105 | TCC.NetBSD += -DUSE_PREAD |
| 106 | TCC.OpenBSD += -DUSE_PREAD |
| 107 | TCC += $(TCC.$(HOST_OS)) |
| 108 | |
| 109 | APPNAME = fossil$(E) |
| 110 | .PHONY: all tags |
| 111 | include $(SRCDIR)/main.mk |
| 112 |