Many hyperlinks are disabled.
Use anonymous login
to enable hyperlinks.
Changes In Branch configure-make Excluding Merge-Ins
This is equivalent to a diff from 0448438c56 to 5abe6347c2
|
2011-05-30
| ||
| 16:46 | Makefile which works under the BSDs and Solaris using their non-GNU make. Resolves [5a96dd5f52]. check-in: 3abab7e177 user: ben tags: trunk | |
| 07:14 | Add configure script, which must be run before running make, as it appears there's no cross-platform way to set a make variable to the output of a shell command. Closed-Leaf check-in: 5abe6347c2 user: ben tags: configure-make | |
| 07:04 | Create new branch named "configure-make" check-in: 62284df93a user: ben tags: configure-make | |
|
2011-05-28
| ||
| 18:51 | Release check-in: 0448438c56 user: drh tags: trunk, release | |
| 17:56 | Merge the latest changes from the ben-security branch into trunk. check-in: 6d35cde78d user: drh tags: trunk, test-%-&-tag | |
Deleted Makefile.
1 -#!/usr/bin/make 2 -# 3 -# This is the top-level makefile for Fossil when the build is occurring 4 -# on a unix platform. This works out-of-the-box on most unix platforms. 5 -# But you are free to vary some of the definitions if desired. 6 -# 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 17 - 18 -#### C Compiler and options for use in building executables that 19 -# will run on the platform that is doing the build. This is used 20 -# to compile code-generator programs as part of the build process. 21 -# See TCC below for the C compiler for building the finished binary. 22 -# 23 -BCC = gcc 24 - 25 -#### The suffix to add to final executable file. When cross-compiling 26 -# to windows, make this ".exe". Otherwise leave it blank. 27 -# 28 -E = 29 - 30 -#### C Compile and options for use in building executables that 31 -# will run on the target platform. This is usually the same 32 -# as BCC, unless you are cross-compiling. This C compiler builds 33 -# the finished binary for fossil. The BCC compiler above is used 34 -# for building intermediate code-generator tools. 35 -# 36 -#TCC = gcc -O6 37 -#TCC = gcc -g -O0 -Wall -fprofile-arcs -ftest-coverage 38 -TCC = gcc -g -Os -Wall 39 - 40 -# To add support for HTTPS 41 -TCC += -DFOSSIL_ENABLE_SSL 42 - 43 -#### Extra arguments for linking the finished binary. Fossil needs 44 -# to link against the Z-Lib compression library. There are no 45 -# other dependencies. We sometimes add the -static option here 46 -# so that we can build a static executable that will run in a 47 -# chroot jail. 48 -# 49 -LIB = -lz $(LDFLAGS) 50 - 51 -# If using HTTPS: 52 -LIB += -lcrypto -lssl 53 - 54 -#### Tcl shell for use in running the fossil testsuite. If you do not 55 -# care about testing the end result, this can be blank. 56 -# 57 -TCLSH = tclsh 58 - 59 -# You should not need to change anything below this line 60 -############################################################################### 61 -# 62 -# Automatic platform-specific options. 63 -HOST_OS :sh = uname -s 64 - 65 -LIB.SunOS= -lsocket -lnsl 66 -LIB += $(LIB.$(HOST_OS)) 67 - 68 -TCC.DragonFly += -DUSE_PREAD 69 -TCC.FreeBSD += -DUSE_PREAD 70 -TCC.NetBSD += -DUSE_PREAD 71 -TCC.OpenBSD += -DUSE_PREAD 72 -TCC += $(TCC.$(HOST_OS)) 73 - 74 -include $(SRCDIR)/main.mk
Added Makefile.in.
1 +# 2 +# This is the top-level makefile for Fossil when the build is occurring 3 +# on a unix platform. You are free to vary some of the definitions if 4 +# desired. 5 +# 6 +#### The toplevel directory of the source tree. Fossil can be built 7 +# in a directory that is separate from the source tree. Just change 8 +# the following to point from the build directory to the src/ folder. 9 +# 10 +SRCDIR = ./src 11 + 12 +#### The directory into which object code files should be written. 13 +# 14 +# 15 +OBJDIR = ./bld 16 + 17 +#### C Compiler and options for use in building executables that 18 +# will run on the platform that is doing the build. This is used 19 +# to compile code-generator programs as part of the build process. 20 +# See TCC below for the C compiler for building the finished binary. 21 +# 22 +BCC = gcc 23 + 24 +#### The suffix to add to final executable file. When cross-compiling 25 +# to windows, make this ".exe". Otherwise leave it blank. 26 +# 27 +E = 28 + 29 +#### C Compile and options for use in building executables that 30 +# will run on the target platform. This is usually the same 31 +# as BCC, unless you are cross-compiling. This C compiler builds 32 +# the finished binary for fossil. The BCC compiler above is used 33 +# for building intermediate code-generator tools. 34 +# 35 +#TCC = gcc -O6 36 +#TCC = gcc -g -O0 -Wall -fprofile-arcs -ftest-coverage 37 +TCC = gcc -g -Os -Wall 38 + 39 +# To add support for HTTPS 40 +TCC += -DFOSSIL_ENABLE_SSL 41 + 42 +#### Extra arguments for linking the finished binary. Fossil needs 43 +# to link against the Z-Lib compression library. There are no 44 +# other dependencies. We sometimes add the -static option here 45 +# so that we can build a static executable that will run in a 46 +# chroot jail. 47 +# 48 +LIB = -lz $(LDFLAGS) 49 + 50 +# If using HTTPS: 51 +LIB += -lcrypto -lssl 52 + 53 +#### Tcl shell for use in running the fossil testsuite. If you do not 54 +# care about testing the end result, this can be blank. 55 +# 56 +TCLSH = tclsh 57 + 58 +# You should not need to change anything below this line 59 +############################################################################### 60 +# 61 +# Automatic platform-specific options. 62 + 63 +LIB.SunOS= -lsocket -lnsl 64 +LIB += $(LIB.$(HOST_OS)) 65 + 66 +TCC.DragonFly += -DUSE_PREAD 67 +TCC.FreeBSD += -DUSE_PREAD 68 +TCC.NetBSD += -DUSE_PREAD 69 +TCC.OpenBSD += -DUSE_PREAD 70 +TCC += $(TCC.$(HOST_OS)) 71 + 72 +include $(SRCDIR)/main.mk
Added configure.
1 +#!/bin/sh 2 + 3 +HOST_OS=`uname -s` 4 + 5 +echo "#!`which make`" > Makefile 6 +echo HOST_OS = $HOST_OS >> Makefile 7 +echo "# ** End of section generated by configure script **" >> Makefile 8 +cat Makefile.in >> Makefile 9 + 10 +echo Configured for $HOST_OS