Fossil SCM
Modified into a saner scheme than using fragments and oddball defaults.
Commit
fad57367c9bfe1b0dae6bd29179e7528f46d2bec
Parent
0ec2c22dfe504f5…
18 files changed
+7
-46
+11
-21
-56
-23
+81
-3
-4
-56
+79
-2
-22
+81
-1
-3
-1
-39
+97
-3
-4
-23
+79
-2
-3
~
Makefile
~
make/README.wiki
-
make/clang-fragment.mk
-
make/freebsd-fragment.mk
~
make/freebsd-gcc-config.mk
-
make/freebsdgcc-pre-config.mk
-
make/gcc-fragment.mk
~
make/linux-clang-config.mk
-
make/linux-fragment.mk
~
make/linux-gcc-config.mk
-
make/linuxclang-pre-config.mk
-
make/linuxgcc-pre-config.mk
-
make/mingw32-fragment.mk
~
make/mingw32-gcc-config.mk
-
make/mingw32-pre-config.mk
-
make/solaris-fragment.mk
~
make/solaris-gcc-config.mk
-
make/solarisgcc-pre-config.mk
M
Makefile
+7
-46
| --- Makefile | ||
| +++ Makefile | ||
| @@ -2,62 +2,23 @@ | ||
| 2 | 2 | # |
| 3 | 3 | #### The directory in which Makefile fragments are stored. |
| 4 | 4 | # |
| 5 | 5 | MAKEDIR = ./make |
| 6 | 6 | |
| 7 | -#### Any site-specific pre-defined settings go here. Settings in this file are | |
| 8 | -# intended to direct the compilation below. | |
| 9 | -# | |
| 10 | --include pre-config.mk | |
| 11 | - | |
| 12 | -#### Set up our compiler if it hasn't already been defined. | |
| 13 | - | |
| 14 | -ifndef COMPILER | |
| 15 | - COMPILER = gcc | |
| 16 | -endif | |
| 17 | - | |
| 18 | -#### Set up our platform if it hasn't already been defined. | |
| 19 | -# | |
| 20 | -ifndef PLATFORM | |
| 21 | - # We default to Linux. | |
| 22 | - # TODO: Figure out how to reliably identify the platform from Make. Sadly the | |
| 23 | - # OSTYPE environment variable isn't carried through into GNU Make, so we | |
| 24 | - # can't do this the obvious way. | |
| 25 | - PLATFORM = linux | |
| 26 | -endif | |
| 27 | - | |
| 28 | 7 | #### The toplevel directory of the source tree. Fossil can be built |
| 29 | 8 | # in a directory that is separate from the source tree. Just change |
| 30 | 9 | # the following to point from the build directory to the src/ folder. |
| 31 | 10 | # |
| 32 | 11 | SRCDIR = ./src |
| 33 | 12 | |
| 34 | -#### Include the fragments we need from our specific environment. | |
| 35 | -# | |
| 36 | -include $(MAKEDIR)/$(PLATFORM)-fragment.mk | |
| 37 | -include $(MAKEDIR)/$(COMPILER)-fragment.mk | |
| 38 | - | |
| 39 | -#### Any site-specific post-defined settings go here. Settings in this file are | |
| 40 | -# intended to override the settings already established. | |
| 41 | -# | |
| 42 | --include post-config.mk | |
| 43 | - | |
| 44 | -#### The following section beginning after #+++ and ending before #--- is used | |
| 45 | -# inside the $(PLATFORM)-fragment.mk files to turn on the features required | |
| 46 | -# or desired by builds on that platform. They are replicated here for | |
| 47 | -# documentation purposes only and should not be set in this file. | |
| 48 | -#+++ | |
| 49 | -#### The following variable definitions decide which features are turned on or | |
| 50 | -# of when building Fossil. Comment out the features which are not needed by | |
| 51 | -# this platform. | |
| 52 | -# | |
| 53 | -#ENABLE_STATIC = 1 # we want a static build | |
| 54 | -#ENABLE_SSL = 1 # we are using SSL | |
| 55 | -#ENABLE_SOCKET = 1 # we are using libsocket (OpenSolaris and Solaris) | |
| 56 | -#ENABLE_NSL = 1 # we are using libnsl library (Solaris) | |
| 57 | -#ENABLE_I18N = 1 # we are using i18n settings | |
| 58 | -#--- | |
| 13 | +#### Any site-specific pre-defined settings go here. Settings in this file are | |
| 14 | +# intended to direct the compilation below. | |
| 15 | +# | |
| 16 | +-include config.mk # Configure if present. | |
| 17 | +ifndef CONFIG_MK_COMPLETE | |
| 18 | + include $(MAKEDIR)/linux-gcc-config.mk # Default to linux-gcc. | |
| 19 | +endif | |
| 59 | 20 | |
| 60 | 21 | #### The Tcl shell to run for test suites. |
| 61 | 22 | # |
| 62 | 23 | TCLSH = tclsh |
| 63 | 24 | |
| 64 | 25 |
| --- Makefile | |
| +++ Makefile | |
| @@ -2,62 +2,23 @@ | |
| 2 | # |
| 3 | #### The directory in which Makefile fragments are stored. |
| 4 | # |
| 5 | MAKEDIR = ./make |
| 6 | |
| 7 | #### Any site-specific pre-defined settings go here. Settings in this file are |
| 8 | # intended to direct the compilation below. |
| 9 | # |
| 10 | -include pre-config.mk |
| 11 | |
| 12 | #### Set up our compiler if it hasn't already been defined. |
| 13 | |
| 14 | ifndef COMPILER |
| 15 | COMPILER = gcc |
| 16 | endif |
| 17 | |
| 18 | #### Set up our platform if it hasn't already been defined. |
| 19 | # |
| 20 | ifndef PLATFORM |
| 21 | # We default to Linux. |
| 22 | # TODO: Figure out how to reliably identify the platform from Make. Sadly the |
| 23 | # OSTYPE environment variable isn't carried through into GNU Make, so we |
| 24 | # can't do this the obvious way. |
| 25 | PLATFORM = linux |
| 26 | endif |
| 27 | |
| 28 | #### The toplevel directory of the source tree. Fossil can be built |
| 29 | # in a directory that is separate from the source tree. Just change |
| 30 | # the following to point from the build directory to the src/ folder. |
| 31 | # |
| 32 | SRCDIR = ./src |
| 33 | |
| 34 | #### Include the fragments we need from our specific environment. |
| 35 | # |
| 36 | include $(MAKEDIR)/$(PLATFORM)-fragment.mk |
| 37 | include $(MAKEDIR)/$(COMPILER)-fragment.mk |
| 38 | |
| 39 | #### Any site-specific post-defined settings go here. Settings in this file are |
| 40 | # intended to override the settings already established. |
| 41 | # |
| 42 | -include post-config.mk |
| 43 | |
| 44 | #### The following section beginning after #+++ and ending before #--- is used |
| 45 | # inside the $(PLATFORM)-fragment.mk files to turn on the features required |
| 46 | # or desired by builds on that platform. They are replicated here for |
| 47 | # documentation purposes only and should not be set in this file. |
| 48 | #+++ |
| 49 | #### The following variable definitions decide which features are turned on or |
| 50 | # of when building Fossil. Comment out the features which are not needed by |
| 51 | # this platform. |
| 52 | # |
| 53 | #ENABLE_STATIC = 1 # we want a static build |
| 54 | #ENABLE_SSL = 1 # we are using SSL |
| 55 | #ENABLE_SOCKET = 1 # we are using libsocket (OpenSolaris and Solaris) |
| 56 | #ENABLE_NSL = 1 # we are using libnsl library (Solaris) |
| 57 | #ENABLE_I18N = 1 # we are using i18n settings |
| 58 | #--- |
| 59 | |
| 60 | #### The Tcl shell to run for test suites. |
| 61 | # |
| 62 | TCLSH = tclsh |
| 63 | |
| 64 |
| --- Makefile | |
| +++ Makefile | |
| @@ -2,62 +2,23 @@ | |
| 2 | # |
| 3 | #### The directory in which Makefile fragments are stored. |
| 4 | # |
| 5 | MAKEDIR = ./make |
| 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 | #### Any site-specific pre-defined settings go here. Settings in this file are |
| 14 | # intended to direct the compilation below. |
| 15 | # |
| 16 | -include config.mk # Configure if present. |
| 17 | ifndef CONFIG_MK_COMPLETE |
| 18 | include $(MAKEDIR)/linux-gcc-config.mk # Default to linux-gcc. |
| 19 | endif |
| 20 | |
| 21 | #### The Tcl shell to run for test suites. |
| 22 | # |
| 23 | TCLSH = tclsh |
| 24 | |
| 25 |
+11
-21
| --- make/README.wiki | ||
| +++ make/README.wiki | ||
| @@ -1,24 +1,14 @@ | ||
| 1 | -The makefile fragments in this "new build" directory are of three kinds: | |
| 2 | - | |
| 3 | - * Platform fragments for OS-specific settings. (e.g. | |
| 4 | - <code>linux-fragment.mk</code>); | |
| 5 | - * Compiler fragments for compiler-specific settings (e.g. | |
| 6 | - <code>clang-fragment.mk</code>); | |
| 7 | - * Sample <code>pre-config.mk</code> fragments to use as a baseline for | |
| 8 | - site-specific customization of the build process (e.g. | |
| 9 | - <code>linuxgcc-pre-config.mk</code>. | |
| 10 | - | |
| 11 | -Platform and compiler fragments should not be edited at site except to correct | |
| 12 | -errors in implementation or to add desirable new features so that clashes with | |
| 13 | -the <cite>Fossil</cite> repository don't interfere with operations. Where | |
| 14 | -possible all site customization should be done in pre- and post-config makefile | |
| 15 | -fragments. (Where this is not possible is probably indicative of modifications | |
| 16 | -required to the new build process. | |
| 17 | - | |
| 18 | -To use the sample pre-config fragments, simply copy them into the | |
| 19 | -<cite>Fossil</cite> distribution's root directory as <code>pre-config.mk</code> | |
| 20 | -and edit to taste. | |
| 1 | +The makefile fragments in this "new build" directory are used to provide | |
| 2 | +platform-specific builds out-of-the-box with minimal user intervention. They are | |
| 3 | +named as <code>PLATFORM-COMPILER-config.mk</code> and are used by copying them | |
| 4 | +into the <cite>Fossil</cite> distribution root directory as | |
| 5 | +<code>config.mk</code>. | |
| 6 | + | |
| 7 | +The file <code>linux-gcc-config.mk</code> is the default make file fragment | |
| 8 | +brought in by the main <code>Makefile</code> if no <code>config.mk</code> file | |
| 9 | +has been copied. | |
| 21 | 10 | |
| 22 | 11 | Note: new platform and compiler files are always welcome additions to the |
| 23 | -community. In particular MacOSX build files would be nice to have. | |
| 12 | +community. In particular MacOSX build files would be nice to have as well as | |
| 13 | +alternative compilers. | |
| 24 | 14 | |
| 25 | 15 | |
| 26 | 16 | DELETED make/clang-fragment.mk |
| 27 | 17 | DELETED make/freebsd-fragment.mk |
| 28 | 18 | ADDED make/freebsd-gcc-config.mk |
| 29 | 19 | DELETED make/freebsdgcc-pre-config.mk |
| 30 | 20 | DELETED make/gcc-fragment.mk |
| 31 | 21 | ADDED make/linux-clang-config.mk |
| 32 | 22 | DELETED make/linux-fragment.mk |
| 33 | 23 | ADDED make/linux-gcc-config.mk |
| 34 | 24 | DELETED make/linuxclang-pre-config.mk |
| 35 | 25 | DELETED make/linuxgcc-pre-config.mk |
| 36 | 26 | DELETED make/mingw32-fragment.mk |
| 37 | 27 | ADDED make/mingw32-gcc-config.mk |
| 38 | 28 | DELETED make/mingw32-pre-config.mk |
| 39 | 29 | DELETED make/solaris-fragment.mk |
| 40 | 30 | ADDED make/solaris-gcc-config.mk |
| 41 | 31 | DELETED make/solarisgcc-pre-config.mk |
| --- make/README.wiki | |
| +++ make/README.wiki | |
| @@ -1,24 +1,14 @@ | |
| 1 | The makefile fragments in this "new build" directory are of three kinds: |
| 2 | |
| 3 | * Platform fragments for OS-specific settings. (e.g. |
| 4 | <code>linux-fragment.mk</code>); |
| 5 | * Compiler fragments for compiler-specific settings (e.g. |
| 6 | <code>clang-fragment.mk</code>); |
| 7 | * Sample <code>pre-config.mk</code> fragments to use as a baseline for |
| 8 | site-specific customization of the build process (e.g. |
| 9 | <code>linuxgcc-pre-config.mk</code>. |
| 10 | |
| 11 | Platform and compiler fragments should not be edited at site except to correct |
| 12 | errors in implementation or to add desirable new features so that clashes with |
| 13 | the <cite>Fossil</cite> repository don't interfere with operations. Where |
| 14 | possible all site customization should be done in pre- and post-config makefile |
| 15 | fragments. (Where this is not possible is probably indicative of modifications |
| 16 | required to the new build process. |
| 17 | |
| 18 | To use the sample pre-config fragments, simply copy them into the |
| 19 | <cite>Fossil</cite> distribution's root directory as <code>pre-config.mk</code> |
| 20 | and edit to taste. |
| 21 | |
| 22 | Note: new platform and compiler files are always welcome additions to the |
| 23 | community. In particular MacOSX build files would be nice to have. |
| 24 | |
| 25 | |
| 26 | ELETED make/clang-fragment.mk |
| 27 | ELETED make/freebsd-fragment.mk |
| 28 | DDED make/freebsd-gcc-config.mk |
| 29 | ELETED make/freebsdgcc-pre-config.mk |
| 30 | ELETED make/gcc-fragment.mk |
| 31 | DDED make/linux-clang-config.mk |
| 32 | ELETED make/linux-fragment.mk |
| 33 | DDED make/linux-gcc-config.mk |
| 34 | ELETED make/linuxclang-pre-config.mk |
| 35 | ELETED make/linuxgcc-pre-config.mk |
| 36 | ELETED make/mingw32-fragment.mk |
| 37 | DDED make/mingw32-gcc-config.mk |
| 38 | ELETED make/mingw32-pre-config.mk |
| 39 | ELETED make/solaris-fragment.mk |
| 40 | DDED make/solaris-gcc-config.mk |
| 41 | ELETED make/solarisgcc-pre-config.mk |
| --- make/README.wiki | |
| +++ make/README.wiki | |
| @@ -1,24 +1,14 @@ | |
| 1 | The makefile fragments in this "new build" directory are used to provide |
| 2 | platform-specific builds out-of-the-box with minimal user intervention. They are |
| 3 | named as <code>PLATFORM-COMPILER-config.mk</code> and are used by copying them |
| 4 | into the <cite>Fossil</cite> distribution root directory as |
| 5 | <code>config.mk</code>. |
| 6 | |
| 7 | The file <code>linux-gcc-config.mk</code> is the default make file fragment |
| 8 | brought in by the main <code>Makefile</code> if no <code>config.mk</code> file |
| 9 | has been copied. |
| 10 | |
| 11 | Note: new platform and compiler files are always welcome additions to the |
| 12 | community. In particular MacOSX build files would be nice to have as well as |
| 13 | alternative compilers. |
| 14 | |
| 15 | |
| 16 | ELETED make/clang-fragment.mk |
| 17 | ELETED make/freebsd-fragment.mk |
| 18 | DDED make/freebsd-gcc-config.mk |
| 19 | ELETED make/freebsdgcc-pre-config.mk |
| 20 | ELETED make/gcc-fragment.mk |
| 21 | DDED make/linux-clang-config.mk |
| 22 | ELETED make/linux-fragment.mk |
| 23 | DDED make/linux-gcc-config.mk |
| 24 | ELETED make/linuxclang-pre-config.mk |
| 25 | ELETED make/linuxgcc-pre-config.mk |
| 26 | ELETED make/mingw32-fragment.mk |
| 27 | DDED make/mingw32-gcc-config.mk |
| 28 | ELETED make/mingw32-pre-config.mk |
| 29 | ELETED make/solaris-fragment.mk |
| 30 | DDED make/solaris-gcc-config.mk |
| 31 | ELETED make/solarisgcc-pre-config.mk |
D
make/clang-fragment.mk
-56
| --- a/make/clang-fragment.mk | ||
| +++ b/make/clang-fragment.mk | ||
| @@ -1,56 +0,0 @@ | ||
| 1 | -#### Compiler-specific configuration for users of the CLANG compiler suite. | |
| 2 | -# | |
| 3 | - | |
| 4 | -#### C Compiler and options for use in building executables that | |
| 5 | -# will run on the platform that is doing the build. This is used | |
| 6 | -# to compile code-generator programs as part of the build process. | |
| 7 | -# See TCC below for the C compiler for building the finished binary. | |
| 8 | -# | |
| 9 | -BCC = clang -g -O2 | |
| 10 | - | |
| 11 | -#### C Compile and options for use in building executables that | |
| 12 | -# will run on the target platform. This is usually the same | |
| 13 | -# as BCC, unless you are cross-compiling. This C compiler builds | |
| 14 | -# the finished binary for fossil. The BCC compiler above is used | |
| 15 | -# for building intermediate code-generator tools. | |
| 16 | -# | |
| 17 | -TCC = clang -g -Os -Wall | |
| 18 | - | |
| 19 | -#### Compiler options. | |
| 20 | -# The variables tested are defined in the make/PLATFORM-fragment.mk files. | |
| 21 | -# | |
| 22 | -ifdef ENABLE_SSL | |
| 23 | - TCC += -DFOSSIL_ENABLE_SSL=1 | |
| 24 | -endif | |
| 25 | -ifndef ENABLE_I18N | |
| 26 | - TCC += -DFOSSIL_I18N=0 | |
| 27 | -endif | |
| 28 | -ifdef PLATFORM_SPECIFIC_CLANG | |
| 29 | - TCC += $(PLATFORM_SPECIFIC_CLANG) | |
| 30 | -endif | |
| 31 | - | |
| 32 | -#### Linker dependencies. Fossil only requires libz as an external dependency. | |
| 33 | -# All other library settings are optional and toggled in platform-specific | |
| 34 | -# make fragments. | |
| 35 | -# | |
| 36 | -LIB = -lz $(LDFLAGS) | |
| 37 | - | |
| 38 | -#### Linker options. | |
| 39 | -# The variables tested are defined in the make/PLATFORM-fragment.mk files. | |
| 40 | -# | |
| 41 | -ifdef ENABLE_STATIC | |
| 42 | - LIB += -static | |
| 43 | -endif | |
| 44 | -ifdef ENABLE_SSL | |
| 45 | - LIB += -lcrypto -lssl | |
| 46 | -endif | |
| 47 | -ifdef ENABLE_SOCKET | |
| 48 | - LIB += -lsocket | |
| 49 | -endif | |
| 50 | -ifdef ENABLE_NSL | |
| 51 | - LIB += -lnsl | |
| 52 | -endif | |
| 53 | -ifdef PLATFORM_SPECIFIC_LIB | |
| 54 | - LIB += $(PLATFORM_SPECIFIC_LIB) | |
| 55 | -endif | |
| 56 | - |
| --- a/make/clang-fragment.mk | |
| +++ b/make/clang-fragment.mk | |
| @@ -1,56 +0,0 @@ | |
| 1 | #### Compiler-specific configuration for users of the CLANG compiler suite. |
| 2 | # |
| 3 | |
| 4 | #### C Compiler and options for use in building executables that |
| 5 | # will run on the platform that is doing the build. This is used |
| 6 | # to compile code-generator programs as part of the build process. |
| 7 | # See TCC below for the C compiler for building the finished binary. |
| 8 | # |
| 9 | BCC = clang -g -O2 |
| 10 | |
| 11 | #### C Compile and options for use in building executables that |
| 12 | # will run on the target platform. This is usually the same |
| 13 | # as BCC, unless you are cross-compiling. This C compiler builds |
| 14 | # the finished binary for fossil. The BCC compiler above is used |
| 15 | # for building intermediate code-generator tools. |
| 16 | # |
| 17 | TCC = clang -g -Os -Wall |
| 18 | |
| 19 | #### Compiler options. |
| 20 | # The variables tested are defined in the make/PLATFORM-fragment.mk files. |
| 21 | # |
| 22 | ifdef ENABLE_SSL |
| 23 | TCC += -DFOSSIL_ENABLE_SSL=1 |
| 24 | endif |
| 25 | ifndef ENABLE_I18N |
| 26 | TCC += -DFOSSIL_I18N=0 |
| 27 | endif |
| 28 | ifdef PLATFORM_SPECIFIC_CLANG |
| 29 | TCC += $(PLATFORM_SPECIFIC_CLANG) |
| 30 | endif |
| 31 | |
| 32 | #### Linker dependencies. Fossil only requires libz as an external dependency. |
| 33 | # All other library settings are optional and toggled in platform-specific |
| 34 | # make fragments. |
| 35 | # |
| 36 | LIB = -lz $(LDFLAGS) |
| 37 | |
| 38 | #### Linker options. |
| 39 | # The variables tested are defined in the make/PLATFORM-fragment.mk files. |
| 40 | # |
| 41 | ifdef ENABLE_STATIC |
| 42 | LIB += -static |
| 43 | endif |
| 44 | ifdef ENABLE_SSL |
| 45 | LIB += -lcrypto -lssl |
| 46 | endif |
| 47 | ifdef ENABLE_SOCKET |
| 48 | LIB += -lsocket |
| 49 | endif |
| 50 | ifdef ENABLE_NSL |
| 51 | LIB += -lnsl |
| 52 | endif |
| 53 | ifdef PLATFORM_SPECIFIC_LIB |
| 54 | LIB += $(PLATFORM_SPECIFIC_LIB) |
| 55 | endif |
| 56 |
| --- a/make/clang-fragment.mk | |
| +++ b/make/clang-fragment.mk | |
| @@ -1,56 +0,0 @@ | |
D
make/freebsd-fragment.mk
-23
| --- a/make/freebsd-fragment.mk | ||
| +++ b/make/freebsd-fragment.mk | ||
| @@ -1,23 +0,0 @@ | ||
| 1 | -#### OS-specific configuration for building Fossil on FreeBSD systems. | |
| 2 | -# NOTE: You will need to have GNU Make installed to use this. | |
| 3 | -# | |
| 4 | - | |
| 5 | -#### The suffix to add to executable files. ".exe" for windows. | |
| 6 | -# Nothing for unix. | |
| 7 | -# | |
| 8 | -E = | |
| 9 | - | |
| 10 | -#### The directory into which object code files should be written. | |
| 11 | -# | |
| 12 | -OBJDIR = ./obj | |
| 13 | - | |
| 14 | -#### The following variable definitions decide which features are turned on or | |
| 15 | -# of when building Fossil. Comment out the features which are not needed by | |
| 16 | -# this platform. | |
| 17 | -# | |
| 18 | -#ENABLE_STATIC = 1 # we want a static build | |
| 19 | -ENABLE_SSL = 1 # we are using SSL | |
| 20 | -#ENABLE_SOCKET = 1 # we are using libsocket (OpenSolaris and Solaris) | |
| 21 | -#ENABLE_NSL = 1 # we are using libnsl library (Solaris) | |
| 22 | -ENABLE_I18N = 1 # we are using i18n settings | |
| 23 | - |
| --- a/make/freebsd-fragment.mk | |
| +++ b/make/freebsd-fragment.mk | |
| @@ -1,23 +0,0 @@ | |
| 1 | #### OS-specific configuration for building Fossil on FreeBSD systems. |
| 2 | # NOTE: You will need to have GNU Make installed to use this. |
| 3 | # |
| 4 | |
| 5 | #### The suffix to add to executable files. ".exe" for windows. |
| 6 | # Nothing for unix. |
| 7 | # |
| 8 | E = |
| 9 | |
| 10 | #### The directory into which object code files should be written. |
| 11 | # |
| 12 | OBJDIR = ./obj |
| 13 | |
| 14 | #### The following variable definitions decide which features are turned on or |
| 15 | # of when building Fossil. Comment out the features which are not needed by |
| 16 | # this platform. |
| 17 | # |
| 18 | #ENABLE_STATIC = 1 # we want a static build |
| 19 | ENABLE_SSL = 1 # we are using SSL |
| 20 | #ENABLE_SOCKET = 1 # we are using libsocket (OpenSolaris and Solaris) |
| 21 | #ENABLE_NSL = 1 # we are using libnsl library (Solaris) |
| 22 | ENABLE_I18N = 1 # we are using i18n settings |
| 23 |
| --- a/make/freebsd-fragment.mk | |
| +++ b/make/freebsd-fragment.mk | |
| @@ -1,23 +0,0 @@ | |
+81
-3
| --- a/make/freebsd-gcc-config.mk | ||
| +++ b/make/freebsd-gcc-config.mk | ||
| @@ -1,4 +1,82 @@ | ||
| 1 | -#### Sample pre-config.mk file for FreeBSD with Gpre-config.mk in the Fossil root directory to use. | |
| 2 | -# NOTE: You will need to have GNU MakPLATFORM=freebsd | |
| 3 | -COMPILER=gcc | |
| 1 | +#### config.mk file for FreeBSD with GCC. | |
| 2 | +# Copy this file as config.mk in the Fossil root directory to use. | |
| 3 | +# NOTE: You will need to have GNU Make installed to use this. | |
| 4 | +# | |
| 4 | 5 | |
| 6 | +#### OS-specific configuration for building Fossil on FreeBSD systems. | |
| 7 | +# NOTE: You will need to have GNU Make installed to use this. | |
| 8 | +# | |
| 9 | + | |
| 10 | +#### The suffix to add to executable files. ".exe" for windows. | |
| 11 | +# Nothing for unix. | |
| 12 | +# | |
| 13 | +E = | |
| 14 | + | |
| 15 | +#### The directory into which object code files should be written. | |
| 16 | +# | |
| 17 | +OBJDIR = ./obj | |
| 18 | + | |
| 19 | +#### The following variable definitions decide which features are turned on or | |
| 20 | +# of when building Fossil. Comment out the features which are not needed by | |
| 21 | +# this platform. | |
| 22 | +# | |
| 23 | +#ENABLE_STATIC = 1 # we want a static build | |
| 24 | +ENABLE_SSL = 1 # we are using SSL | |
| 25 | +#ENABLE_SOCKET = 1 # we are using libsocket (OpenSolaris and Solaris) | |
| 26 | +#ENABLE_NSL = 1 # we are using libnsl library (Solaris) | |
| 27 | +ENABLE_I18N = 1 # we are using i18n settings | |
| 28 | + | |
| 29 | +#### Compiler-specific configuration for users of the GCC compiler suite. | |
| 30 | +# | |
| 31 | + | |
| 32 | +#### C Compiler and options for use in building executables that | |
| 33 | +# will run on the platform that is doing the build. This is used | |
| 34 | +# to compile code-generator programs as part of the build process. | |
| 35 | +# See TCC below for the C compiler for building the finished binary. | |
| 36 | +# | |
| 37 | +BCC = gcc -g -O2 | |
| 38 | + | |
| 39 | +#### C Compile and options for use in building executables that | |
| 40 | +# will run on the target platform. This is usually the same | |
| 41 | +# as BCC, unless you are cross-compiling. This C compiler builds | |
| 42 | +# the finished binary for fossil. The BCC compiler above is used | |
| 43 | +# for building intermediate code-generator tools. | |
| 44 | +# | |
| 45 | +TCC = gcc -g -Os -Wall | |
| 46 | + | |
| 47 | +#### Compiler options. | |
| 48 | +# The variables tested are defined in the make/PLATFORM-fragment.mk files. | |
| 49 | +# | |
| 50 | +ifdef ENABLE_SSL | |
| 51 | + TCC += -DFOSSIL_ENABLE_SSL=1 | |
| 52 | +endif | |
| 53 | +ifndef ENABLE_I18N | |
| 54 | + TCC += -DFOSSIL_I18N=0 | |
| 55 | +endif | |
| 56 | + | |
| 57 | +#### Linker dependencies. Fossil only requires libz as an external dependency. | |
| 58 | +# All other library settings are optional and toggled in platform-specific | |
| 59 | +# make fragments. | |
| 60 | +# | |
| 61 | +LIB = -lz $(LDFLAGS) | |
| 62 | + | |
| 63 | +#### Linker options. | |
| 64 | +# The variables tested are defined in the make/PLATFORM-fragment.mk files. | |
| 65 | +# | |
| 66 | +ifdef ENABLE_STATIC | |
| 67 | + LIB += -static | |
| 68 | +endif | |
| 69 | +ifdef ENABLE_SSL | |
| 70 | + LIB += -lcrypto -lssl | |
| 71 | +endif | |
| 72 | +ifdef ENABLE_SOCKET | |
| 73 | + LIB += -lsocket | |
| 74 | +endif | |
| 75 | +ifdef ENABLE_NSL | |
| 76 | + LIB += -lnsl | |
| 77 | +endif | |
| 78 | + | |
| 79 | +#### Signal that we've used a config.mk file. | |
| 80 | +# | |
| 81 | +CONFIG_MK_COMPLETE=1 | |
| 82 | + |
| --- a/make/freebsd-gcc-config.mk | |
| +++ b/make/freebsd-gcc-config.mk | |
| @@ -1,4 +1,82 @@ | |
| 1 | #### Sample pre-config.mk file for FreeBSD with Gpre-config.mk in the Fossil root directory to use. |
| 2 | # NOTE: You will need to have GNU MakPLATFORM=freebsd |
| 3 | COMPILER=gcc |
| 4 | |
| --- a/make/freebsd-gcc-config.mk | |
| +++ b/make/freebsd-gcc-config.mk | |
| @@ -1,4 +1,82 @@ | |
| 1 | #### config.mk file for FreeBSD with GCC. |
| 2 | # Copy this file as config.mk in the Fossil root directory to use. |
| 3 | # NOTE: You will need to have GNU Make installed to use this. |
| 4 | # |
| 5 | |
| 6 | #### OS-specific configuration for building Fossil on FreeBSD systems. |
| 7 | # NOTE: You will need to have GNU Make installed to use this. |
| 8 | # |
| 9 | |
| 10 | #### The suffix to add to executable files. ".exe" for windows. |
| 11 | # Nothing for unix. |
| 12 | # |
| 13 | E = |
| 14 | |
| 15 | #### The directory into which object code files should be written. |
| 16 | # |
| 17 | OBJDIR = ./obj |
| 18 | |
| 19 | #### The following variable definitions decide which features are turned on or |
| 20 | # of when building Fossil. Comment out the features which are not needed by |
| 21 | # this platform. |
| 22 | # |
| 23 | #ENABLE_STATIC = 1 # we want a static build |
| 24 | ENABLE_SSL = 1 # we are using SSL |
| 25 | #ENABLE_SOCKET = 1 # we are using libsocket (OpenSolaris and Solaris) |
| 26 | #ENABLE_NSL = 1 # we are using libnsl library (Solaris) |
| 27 | ENABLE_I18N = 1 # we are using i18n settings |
| 28 | |
| 29 | #### Compiler-specific configuration for users of the GCC compiler suite. |
| 30 | # |
| 31 | |
| 32 | #### C Compiler and options for use in building executables that |
| 33 | # will run on the platform that is doing the build. This is used |
| 34 | # to compile code-generator programs as part of the build process. |
| 35 | # See TCC below for the C compiler for building the finished binary. |
| 36 | # |
| 37 | BCC = gcc -g -O2 |
| 38 | |
| 39 | #### C Compile and options for use in building executables that |
| 40 | # will run on the target platform. This is usually the same |
| 41 | # as BCC, unless you are cross-compiling. This C compiler builds |
| 42 | # the finished binary for fossil. The BCC compiler above is used |
| 43 | # for building intermediate code-generator tools. |
| 44 | # |
| 45 | TCC = gcc -g -Os -Wall |
| 46 | |
| 47 | #### Compiler options. |
| 48 | # The variables tested are defined in the make/PLATFORM-fragment.mk files. |
| 49 | # |
| 50 | ifdef ENABLE_SSL |
| 51 | TCC += -DFOSSIL_ENABLE_SSL=1 |
| 52 | endif |
| 53 | ifndef ENABLE_I18N |
| 54 | TCC += -DFOSSIL_I18N=0 |
| 55 | endif |
| 56 | |
| 57 | #### Linker dependencies. Fossil only requires libz as an external dependency. |
| 58 | # All other library settings are optional and toggled in platform-specific |
| 59 | # make fragments. |
| 60 | # |
| 61 | LIB = -lz $(LDFLAGS) |
| 62 | |
| 63 | #### Linker options. |
| 64 | # The variables tested are defined in the make/PLATFORM-fragment.mk files. |
| 65 | # |
| 66 | ifdef ENABLE_STATIC |
| 67 | LIB += -static |
| 68 | endif |
| 69 | ifdef ENABLE_SSL |
| 70 | LIB += -lcrypto -lssl |
| 71 | endif |
| 72 | ifdef ENABLE_SOCKET |
| 73 | LIB += -lsocket |
| 74 | endif |
| 75 | ifdef ENABLE_NSL |
| 76 | LIB += -lnsl |
| 77 | endif |
| 78 | |
| 79 | #### Signal that we've used a config.mk file. |
| 80 | # |
| 81 | CONFIG_MK_COMPLETE=1 |
| 82 |
D
make/freebsdgcc-pre-config.mk
-4
| --- a/make/freebsdgcc-pre-config.mk | ||
| +++ b/make/freebsdgcc-pre-config.mk | ||
| @@ -1,4 +0,0 @@ | ||
| 1 | -#### Sample pre-config.mk file for FreeBSD with Gpre-config.mk in the Fossil root directory to use. | |
| 2 | -# NOTE: You will need to have GNU MakPLATFORM=freebsd | |
| 3 | -COMPILER=gcc | |
| 4 | - |
| --- a/make/freebsdgcc-pre-config.mk | |
| +++ b/make/freebsdgcc-pre-config.mk | |
| @@ -1,4 +0,0 @@ | |
| 1 | #### Sample pre-config.mk file for FreeBSD with Gpre-config.mk in the Fossil root directory to use. |
| 2 | # NOTE: You will need to have GNU MakPLATFORM=freebsd |
| 3 | COMPILER=gcc |
| 4 |
| --- a/make/freebsdgcc-pre-config.mk | |
| +++ b/make/freebsdgcc-pre-config.mk | |
| @@ -1,4 +0,0 @@ | |
D
make/gcc-fragment.mk
-56
| --- a/make/gcc-fragment.mk | ||
| +++ b/make/gcc-fragment.mk | ||
| @@ -1,56 +0,0 @@ | ||
| 1 | -#### Compiler-specific configuration for users of the GCC compiler suite. | |
| 2 | -# | |
| 3 | - | |
| 4 | -#### C Compiler and options for use in building executables that | |
| 5 | -# will run on the platform that is doing the build. This is used | |
| 6 | -# to compile code-generator programs as part of the build process. | |
| 7 | -# See TCC below for the C compiler for building the finished binary. | |
| 8 | -# | |
| 9 | -BCC = gcc -g -O2 | |
| 10 | - | |
| 11 | -#### C Compile and options for use in building executables that | |
| 12 | -# will run on the target platform. This is usually the same | |
| 13 | -# as BCC, unless you are cross-compiling. This C compiler builds | |
| 14 | -# the finished binary for fossil. The BCC compiler above is used | |
| 15 | -# for building intermediate code-generator tools. | |
| 16 | -# | |
| 17 | -TCC = gcc -g -Os -Wall | |
| 18 | - | |
| 19 | -#### Compiler options. | |
| 20 | -# The variables tested are defined in the make/PLATFORM-fragment.mk files. | |
| 21 | -# | |
| 22 | -ifdef ENABLE_SSL | |
| 23 | - TCC += -DFOSSIL_ENABLE_SSL=1 | |
| 24 | -endif | |
| 25 | -ifndef ENABLE_I18N | |
| 26 | - TCC += -DFOSSIL_I18N=0 | |
| 27 | -endif | |
| 28 | -ifdef PLATFORM_SPECIFIC_GCC | |
| 29 | - TCC += $(PLATFORM_SPECIFIC_GCC) | |
| 30 | -endif | |
| 31 | - | |
| 32 | -#### Linker dependencies. Fossil only requires libz as an external dependency. | |
| 33 | -# All other library settings are optional and toggled in platform-specific | |
| 34 | -# make fragments. | |
| 35 | -# | |
| 36 | -LIB = -lz $(LDFLAGS) | |
| 37 | - | |
| 38 | -#### Linker options. | |
| 39 | -# The variables tested are defined in the make/PLATFORM-fragment.mk files. | |
| 40 | -# | |
| 41 | -ifdef ENABLE_STATIC | |
| 42 | - LIB += -static | |
| 43 | -endif | |
| 44 | -ifdef ENABLE_SSL | |
| 45 | - LIB += -lcrypto -lssl | |
| 46 | -endif | |
| 47 | -ifdef ENABLE_SOCKET | |
| 48 | - LIB += -lsocket | |
| 49 | -endif | |
| 50 | -ifdef ENABLE_NSL | |
| 51 | - LIB += -lnsl | |
| 52 | -endif | |
| 53 | -ifdef PLATFORM_SPECIFIC_LIB | |
| 54 | - LIB += $(PLATFORM_SPECIFIC_LIB) | |
| 55 | -endif | |
| 56 | - |
| --- a/make/gcc-fragment.mk | |
| +++ b/make/gcc-fragment.mk | |
| @@ -1,56 +0,0 @@ | |
| 1 | #### Compiler-specific configuration for users of the GCC compiler suite. |
| 2 | # |
| 3 | |
| 4 | #### C Compiler and options for use in building executables that |
| 5 | # will run on the platform that is doing the build. This is used |
| 6 | # to compile code-generator programs as part of the build process. |
| 7 | # See TCC below for the C compiler for building the finished binary. |
| 8 | # |
| 9 | BCC = gcc -g -O2 |
| 10 | |
| 11 | #### C Compile and options for use in building executables that |
| 12 | # will run on the target platform. This is usually the same |
| 13 | # as BCC, unless you are cross-compiling. This C compiler builds |
| 14 | # the finished binary for fossil. The BCC compiler above is used |
| 15 | # for building intermediate code-generator tools. |
| 16 | # |
| 17 | TCC = gcc -g -Os -Wall |
| 18 | |
| 19 | #### Compiler options. |
| 20 | # The variables tested are defined in the make/PLATFORM-fragment.mk files. |
| 21 | # |
| 22 | ifdef ENABLE_SSL |
| 23 | TCC += -DFOSSIL_ENABLE_SSL=1 |
| 24 | endif |
| 25 | ifndef ENABLE_I18N |
| 26 | TCC += -DFOSSIL_I18N=0 |
| 27 | endif |
| 28 | ifdef PLATFORM_SPECIFIC_GCC |
| 29 | TCC += $(PLATFORM_SPECIFIC_GCC) |
| 30 | endif |
| 31 | |
| 32 | #### Linker dependencies. Fossil only requires libz as an external dependency. |
| 33 | # All other library settings are optional and toggled in platform-specific |
| 34 | # make fragments. |
| 35 | # |
| 36 | LIB = -lz $(LDFLAGS) |
| 37 | |
| 38 | #### Linker options. |
| 39 | # The variables tested are defined in the make/PLATFORM-fragment.mk files. |
| 40 | # |
| 41 | ifdef ENABLE_STATIC |
| 42 | LIB += -static |
| 43 | endif |
| 44 | ifdef ENABLE_SSL |
| 45 | LIB += -lcrypto -lssl |
| 46 | endif |
| 47 | ifdef ENABLE_SOCKET |
| 48 | LIB += -lsocket |
| 49 | endif |
| 50 | ifdef ENABLE_NSL |
| 51 | LIB += -lnsl |
| 52 | endif |
| 53 | ifdef PLATFORM_SPECIFIC_LIB |
| 54 | LIB += $(PLATFORM_SPECIFIC_LIB) |
| 55 | endif |
| 56 |
| --- a/make/gcc-fragment.mk | |
| +++ b/make/gcc-fragment.mk | |
| @@ -1,56 +0,0 @@ | |
+79
-2
| --- a/make/linux-clang-config.mk | ||
| +++ b/make/linux-clang-config.mk | ||
| @@ -1,3 +1,80 @@ | ||
| 1 | -#### Sample pre-config.mk file for Linux with CLApre-config.mk in the FossiPLATFORM=linux | |
| 2 | -COMPILER=clang | |
| 1 | +#### config.mk file for Linux with CLANG. | |
| 2 | +# Copy this file as config.mk in the Fossil root directory to use. | |
| 3 | +# | |
| 3 | 4 | |
| 5 | +#### OS-specific configuration for building Fossil on Linux systems. | |
| 6 | +# | |
| 7 | + | |
| 8 | +#### The suffix to add to executable files. ".exe" for windows. | |
| 9 | +# Nothing for unix. | |
| 10 | +# | |
| 11 | +E = | |
| 12 | + | |
| 13 | +#### The directory into which object code files should be written. | |
| 14 | +# | |
| 15 | +OBJDIR = ./obj | |
| 16 | + | |
| 17 | +#### The following variable definitions decide which features are turned on or | |
| 18 | +# of when building Fossil. Comment out the features which are not needed by | |
| 19 | +# this platform. | |
| 20 | +# | |
| 21 | +#ENABLE_STATIC = 1 # we want a static build | |
| 22 | +ENABLE_SSL = 1 # we are using SSL | |
| 23 | +#ENABLE_SOCKET = 1 # we are using libsocket (OpenSolaris and Solaris) | |
| 24 | +#ENABLE_NSL = 1 # we are using libnsl library (Solaris) | |
| 25 | +ENABLE_I18N = 1 # we are using i18n settings | |
| 26 | + | |
| 27 | +#### Compiler-specific configuration for users of the CLANG compiler suite. | |
| 28 | +# | |
| 29 | + | |
| 30 | +#### C Compiler and options for use in building executables that | |
| 31 | +# will run on the platform that is doing the build. This is used | |
| 32 | +# to compile code-generator programs as part of the build process. | |
| 33 | +# See TCC below for the C compiler for building the finished binary. | |
| 34 | +# | |
| 35 | +BCC = clang -g -O2 | |
| 36 | + | |
| 37 | +#### C Compile and options for use in building executables that | |
| 38 | +# will run on the target platform. This is usually the same | |
| 39 | +# as BCC, unless you are cross-compiling. This C compiler builds | |
| 40 | +# the finished binary for fossil. The BCC compiler above is used | |
| 41 | +# for building intermediate code-generator tools. | |
| 42 | +# | |
| 43 | +TCC = clang -g -Os -Wall | |
| 44 | + | |
| 45 | +#### Compiler options. | |
| 46 | +# The variables tested are defined in the make/PLATFORM-fragment.mk files. | |
| 47 | +# | |
| 48 | +ifdef ENABLE_SSL | |
| 49 | + TCC += -DFOSSIL_ENABLE_SSL=1 | |
| 50 | +endif | |
| 51 | +ifndef ENABLE_I18N | |
| 52 | + TCC += -DFOSSIL_I18N=0 | |
| 53 | +endif | |
| 54 | + | |
| 55 | +#### Linker dependencies. Fossil only requires libz as an external dependency. | |
| 56 | +# All other library settings are optional and toggled in platform-specific | |
| 57 | +# make fragments. | |
| 58 | +# | |
| 59 | +LIB = -lz $(LDFLAGS) | |
| 60 | + | |
| 61 | +#### Linker options. | |
| 62 | +# The variables tested are defined in the make/PLATFORM-fragment.mk files. | |
| 63 | +# | |
| 64 | +ifdef ENABLE_STATIC | |
| 65 | + LIB += -static | |
| 66 | +endif | |
| 67 | +ifdef ENABLE_SSL | |
| 68 | + LIB += -lcrypto -lssl | |
| 69 | +endif | |
| 70 | +ifdef ENABLE_SOCKET | |
| 71 | + LIB += -lsocket | |
| 72 | +endif | |
| 73 | +ifdef ENABLE_NSL | |
| 74 | + LIB += -lnsl | |
| 75 | +endif | |
| 76 | + | |
| 77 | +#### Signal that we've used a config.mk file. | |
| 78 | +# | |
| 79 | +CONFIG_MK_COMPLETE=1 | |
| 80 | + |
| --- a/make/linux-clang-config.mk | |
| +++ b/make/linux-clang-config.mk | |
| @@ -1,3 +1,80 @@ | |
| 1 | #### Sample pre-config.mk file for Linux with CLApre-config.mk in the FossiPLATFORM=linux |
| 2 | COMPILER=clang |
| 3 | |
| --- a/make/linux-clang-config.mk | |
| +++ b/make/linux-clang-config.mk | |
| @@ -1,3 +1,80 @@ | |
| 1 | #### config.mk file for Linux with CLANG. |
| 2 | # Copy this file as config.mk in the Fossil root directory to use. |
| 3 | # |
| 4 | |
| 5 | #### OS-specific configuration for building Fossil on Linux systems. |
| 6 | # |
| 7 | |
| 8 | #### The suffix to add to executable files. ".exe" for windows. |
| 9 | # Nothing for unix. |
| 10 | # |
| 11 | E = |
| 12 | |
| 13 | #### The directory into which object code files should be written. |
| 14 | # |
| 15 | OBJDIR = ./obj |
| 16 | |
| 17 | #### The following variable definitions decide which features are turned on or |
| 18 | # of when building Fossil. Comment out the features which are not needed by |
| 19 | # this platform. |
| 20 | # |
| 21 | #ENABLE_STATIC = 1 # we want a static build |
| 22 | ENABLE_SSL = 1 # we are using SSL |
| 23 | #ENABLE_SOCKET = 1 # we are using libsocket (OpenSolaris and Solaris) |
| 24 | #ENABLE_NSL = 1 # we are using libnsl library (Solaris) |
| 25 | ENABLE_I18N = 1 # we are using i18n settings |
| 26 | |
| 27 | #### Compiler-specific configuration for users of the CLANG compiler suite. |
| 28 | # |
| 29 | |
| 30 | #### C Compiler and options for use in building executables that |
| 31 | # will run on the platform that is doing the build. This is used |
| 32 | # to compile code-generator programs as part of the build process. |
| 33 | # See TCC below for the C compiler for building the finished binary. |
| 34 | # |
| 35 | BCC = clang -g -O2 |
| 36 | |
| 37 | #### C Compile and options for use in building executables that |
| 38 | # will run on the target platform. This is usually the same |
| 39 | # as BCC, unless you are cross-compiling. This C compiler builds |
| 40 | # the finished binary for fossil. The BCC compiler above is used |
| 41 | # for building intermediate code-generator tools. |
| 42 | # |
| 43 | TCC = clang -g -Os -Wall |
| 44 | |
| 45 | #### Compiler options. |
| 46 | # The variables tested are defined in the make/PLATFORM-fragment.mk files. |
| 47 | # |
| 48 | ifdef ENABLE_SSL |
| 49 | TCC += -DFOSSIL_ENABLE_SSL=1 |
| 50 | endif |
| 51 | ifndef ENABLE_I18N |
| 52 | TCC += -DFOSSIL_I18N=0 |
| 53 | endif |
| 54 | |
| 55 | #### Linker dependencies. Fossil only requires libz as an external dependency. |
| 56 | # All other library settings are optional and toggled in platform-specific |
| 57 | # make fragments. |
| 58 | # |
| 59 | LIB = -lz $(LDFLAGS) |
| 60 | |
| 61 | #### Linker options. |
| 62 | # The variables tested are defined in the make/PLATFORM-fragment.mk files. |
| 63 | # |
| 64 | ifdef ENABLE_STATIC |
| 65 | LIB += -static |
| 66 | endif |
| 67 | ifdef ENABLE_SSL |
| 68 | LIB += -lcrypto -lssl |
| 69 | endif |
| 70 | ifdef ENABLE_SOCKET |
| 71 | LIB += -lsocket |
| 72 | endif |
| 73 | ifdef ENABLE_NSL |
| 74 | LIB += -lnsl |
| 75 | endif |
| 76 | |
| 77 | #### Signal that we've used a config.mk file. |
| 78 | # |
| 79 | CONFIG_MK_COMPLETE=1 |
| 80 |
D
make/linux-fragment.mk
-22
| --- a/make/linux-fragment.mk | ||
| +++ b/make/linux-fragment.mk | ||
| @@ -1,22 +0,0 @@ | ||
| 1 | -#### OS-specific configuration for building Fossil on Linux systems. | |
| 2 | -# | |
| 3 | - | |
| 4 | -#### The suffix to add to executable files. ".exe" for windows. | |
| 5 | -# Nothing for unix. | |
| 6 | -# | |
| 7 | -E = | |
| 8 | - | |
| 9 | -#### The directory into which object code files should be written. | |
| 10 | -# | |
| 11 | -OBJDIR = ./obj | |
| 12 | - | |
| 13 | -#### The following variable definitions decide which features are turned on or | |
| 14 | -# of when building Fossil. Comment out the features which are not needed by | |
| 15 | -# this platform. | |
| 16 | -# | |
| 17 | -#ENABLE_STATIC = 1 # we want a static build | |
| 18 | -ENABLE_SSL = 1 # we are using SSL | |
| 19 | -#ENABLE_SOCKET = 1 # we are using libsocket (OpenSolaris and Solaris) | |
| 20 | -#ENABLE_NSL = 1 # we are using libnsl library (Solaris) | |
| 21 | -ENABLE_I18N = 1 # we are using i18n settings | |
| 22 | - |
| --- a/make/linux-fragment.mk | |
| +++ b/make/linux-fragment.mk | |
| @@ -1,22 +0,0 @@ | |
| 1 | #### OS-specific configuration for building Fossil on Linux systems. |
| 2 | # |
| 3 | |
| 4 | #### The suffix to add to executable files. ".exe" for windows. |
| 5 | # Nothing for unix. |
| 6 | # |
| 7 | E = |
| 8 | |
| 9 | #### The directory into which object code files should be written. |
| 10 | # |
| 11 | OBJDIR = ./obj |
| 12 | |
| 13 | #### The following variable definitions decide which features are turned on or |
| 14 | # of when building Fossil. Comment out the features which are not needed by |
| 15 | # this platform. |
| 16 | # |
| 17 | #ENABLE_STATIC = 1 # we want a static build |
| 18 | ENABLE_SSL = 1 # we are using SSL |
| 19 | #ENABLE_SOCKET = 1 # we are using libsocket (OpenSolaris and Solaris) |
| 20 | #ENABLE_NSL = 1 # we are using libnsl library (Solaris) |
| 21 | ENABLE_I18N = 1 # we are using i18n settings |
| 22 |
| --- a/make/linux-fragment.mk | |
| +++ b/make/linux-fragment.mk | |
| @@ -1,22 +0,0 @@ | |
+81
-1
| --- a/make/linux-gcc-config.mk | ||
| +++ b/make/linux-gcc-config.mk | ||
| @@ -1 +1,81 @@ | ||
| 1 | -#### Sample pre-config.mk file for Linux with Gpre-#### config.mk file f#### config.mk file for Linux | |
| 1 | +#### config.mk file for Linux with GCC. | |
| 2 | +# Copy this file as config.mk in the Fossil root directory to use. | |
| 3 | +# Note that this is the default configuration for the build system. | |
| 4 | +# | |
| 5 | + | |
| 6 | +#### OS-specific configuration for building Fossil on Linux systems. | |
| 7 | +# | |
| 8 | + | |
| 9 | +#### The suffix to add to executable files. ".exe" for windows. | |
| 10 | +# Nothing for unix. | |
| 11 | +# | |
| 12 | +E = | |
| 13 | + | |
| 14 | +#### The directory into which object code files should be written. | |
| 15 | +# | |
| 16 | +OBJDIR = ./obj | |
| 17 | + | |
| 18 | +#### The following variable definitions decide which features are turned on or | |
| 19 | +# of when building Fossil. Comment out the features which are not needed by | |
| 20 | +# this platform. | |
| 21 | +# | |
| 22 | +#ENABLE_STATIC = 1 # we want a static build | |
| 23 | +ENABLE_SSL = 1 # we are using SSL | |
| 24 | +#ENABLE_SOCKET = 1 # we are using libsocket (OpenSolaris and Solaris) | |
| 25 | +#ENABLE_NSL = 1 # we are using libnsl library (Solaris) | |
| 26 | +ENABLE_I18N = 1 # we are using i18n settings | |
| 27 | + | |
| 28 | +#### Compiler-specific configuration for users of the GCC compiler suite. | |
| 29 | +# | |
| 30 | + | |
| 31 | +#### C Compiler and options for use in building executables that | |
| 32 | +# will run on the platform that is doing the build. This is used | |
| 33 | +# to compile code-generator programs as part of the build process. | |
| 34 | +# See TCC below for the C compiler for building the finished binary. | |
| 35 | +# | |
| 36 | +BCC = gcc -g -O2 | |
| 37 | + | |
| 38 | +#### C Compile and options for use in building executables that | |
| 39 | +# will run on the target platform. This is usually the same | |
| 40 | +# as BCC, unless you are cross-compiling. This C compiler builds | |
| 41 | +# the finished binary for fossil. The BCC compiler above is used | |
| 42 | +# for building intermediate code-generator tools. | |
| 43 | +# | |
| 44 | +TCC = gcc -g -Os -Wall | |
| 45 | + | |
| 46 | +#### Compiler options. | |
| 47 | +# The variables tested are defined in the make/PLATFORM-fragment.mk files. | |
| 48 | +# | |
| 49 | +ifdef ENABLE_SSL | |
| 50 | + TCC += -DFOSSIL_ENABLE_SSL=1 | |
| 51 | +endif | |
| 52 | +ifndef ENABLE_I18N | |
| 53 | + TCC += -DFOSSIL_I18N=0 | |
| 54 | +endif | |
| 55 | + | |
| 56 | +#### Linker dependencies. Fossil only requires libz as an external dependency. | |
| 57 | +# All other library settings are optional and toggled in platform-specific | |
| 58 | +# make fragments. | |
| 59 | +# | |
| 60 | +LIB = -lz $(LDFLAGS) | |
| 61 | + | |
| 62 | +#### Linker options. | |
| 63 | +# The variables tested are defined in the make/PLATFORM-fragment.mk files. | |
| 64 | +# | |
| 65 | +ifdef ENABLE_STATIC | |
| 66 | + LIB += -static | |
| 67 | +endif | |
| 68 | +ifdef ENABLE_SSL | |
| 69 | + LIB += -lcrypto -lssl | |
| 70 | +endif | |
| 71 | +ifdef ENABLE_SOCKET | |
| 72 | + LIB += -lsocket | |
| 73 | +endif | |
| 74 | +ifdef ENABLE_NSL | |
| 75 | + LIB += -lnsl | |
| 76 | +endif | |
| 77 | + | |
| 78 | +#### Signal that we've used a config.mk file. | |
| 79 | +# | |
| 80 | +CONFIG_MK_COMPLETE=1 | |
| 81 | + |
| --- a/make/linux-gcc-config.mk | |
| +++ b/make/linux-gcc-config.mk | |
| @@ -1 +1,81 @@ | |
| 1 | #### Sample pre-config.mk file for Linux with Gpre-#### config.mk file f#### config.mk file for Linux |
| --- a/make/linux-gcc-config.mk | |
| +++ b/make/linux-gcc-config.mk | |
| @@ -1 +1,81 @@ | |
| 1 | #### config.mk file for Linux with GCC. |
| 2 | # Copy this file as config.mk in the Fossil root directory to use. |
| 3 | # Note that this is the default configuration for the build system. |
| 4 | # |
| 5 | |
| 6 | #### OS-specific configuration for building Fossil on Linux systems. |
| 7 | # |
| 8 | |
| 9 | #### The suffix to add to executable files. ".exe" for windows. |
| 10 | # Nothing for unix. |
| 11 | # |
| 12 | E = |
| 13 | |
| 14 | #### The directory into which object code files should be written. |
| 15 | # |
| 16 | OBJDIR = ./obj |
| 17 | |
| 18 | #### The following variable definitions decide which features are turned on or |
| 19 | # of when building Fossil. Comment out the features which are not needed by |
| 20 | # this platform. |
| 21 | # |
| 22 | #ENABLE_STATIC = 1 # we want a static build |
| 23 | ENABLE_SSL = 1 # we are using SSL |
| 24 | #ENABLE_SOCKET = 1 # we are using libsocket (OpenSolaris and Solaris) |
| 25 | #ENABLE_NSL = 1 # we are using libnsl library (Solaris) |
| 26 | ENABLE_I18N = 1 # we are using i18n settings |
| 27 | |
| 28 | #### Compiler-specific configuration for users of the GCC compiler suite. |
| 29 | # |
| 30 | |
| 31 | #### C Compiler and options for use in building executables that |
| 32 | # will run on the platform that is doing the build. This is used |
| 33 | # to compile code-generator programs as part of the build process. |
| 34 | # See TCC below for the C compiler for building the finished binary. |
| 35 | # |
| 36 | BCC = gcc -g -O2 |
| 37 | |
| 38 | #### C Compile and options for use in building executables that |
| 39 | # will run on the target platform. This is usually the same |
| 40 | # as BCC, unless you are cross-compiling. This C compiler builds |
| 41 | # the finished binary for fossil. The BCC compiler above is used |
| 42 | # for building intermediate code-generator tools. |
| 43 | # |
| 44 | TCC = gcc -g -Os -Wall |
| 45 | |
| 46 | #### Compiler options. |
| 47 | # The variables tested are defined in the make/PLATFORM-fragment.mk files. |
| 48 | # |
| 49 | ifdef ENABLE_SSL |
| 50 | TCC += -DFOSSIL_ENABLE_SSL=1 |
| 51 | endif |
| 52 | ifndef ENABLE_I18N |
| 53 | TCC += -DFOSSIL_I18N=0 |
| 54 | endif |
| 55 | |
| 56 | #### Linker dependencies. Fossil only requires libz as an external dependency. |
| 57 | # All other library settings are optional and toggled in platform-specific |
| 58 | # make fragments. |
| 59 | # |
| 60 | LIB = -lz $(LDFLAGS) |
| 61 | |
| 62 | #### Linker options. |
| 63 | # The variables tested are defined in the make/PLATFORM-fragment.mk files. |
| 64 | # |
| 65 | ifdef ENABLE_STATIC |
| 66 | LIB += -static |
| 67 | endif |
| 68 | ifdef ENABLE_SSL |
| 69 | LIB += -lcrypto -lssl |
| 70 | endif |
| 71 | ifdef ENABLE_SOCKET |
| 72 | LIB += -lsocket |
| 73 | endif |
| 74 | ifdef ENABLE_NSL |
| 75 | LIB += -lnsl |
| 76 | endif |
| 77 | |
| 78 | #### Signal that we've used a config.mk file. |
| 79 | # |
| 80 | CONFIG_MK_COMPLETE=1 |
| 81 |
D
make/linuxclang-pre-config.mk
-3
| --- a/make/linuxclang-pre-config.mk | ||
| +++ b/make/linuxclang-pre-config.mk | ||
| @@ -1,3 +0,0 @@ | ||
| 1 | -#### Sample pre-config.mk file for Linux with CLApre-config.mk in the FossiPLATFORM=linux | |
| 2 | -COMPILER=clang | |
| 3 | - |
| --- a/make/linuxclang-pre-config.mk | |
| +++ b/make/linuxclang-pre-config.mk | |
| @@ -1,3 +0,0 @@ | |
| 1 | #### Sample pre-config.mk file for Linux with CLApre-config.mk in the FossiPLATFORM=linux |
| 2 | COMPILER=clang |
| 3 |
| --- a/make/linuxclang-pre-config.mk | |
| +++ b/make/linuxclang-pre-config.mk | |
| @@ -1,3 +0,0 @@ | |
D
make/linuxgcc-pre-config.mk
-1
| --- a/make/linuxgcc-pre-config.mk | ||
| +++ b/make/linuxgcc-pre-config.mk | ||
| @@ -1 +0,0 @@ | ||
| 1 | -#### Sample pre-config.mk file for Linux with Gpre-#### config.mk file f#### config.mk file for Linux |
| --- a/make/linuxgcc-pre-config.mk | |
| +++ b/make/linuxgcc-pre-config.mk | |
| @@ -1 +0,0 @@ | |
| 1 | #### Sample pre-config.mk file for Linux with Gpre-#### config.mk file f#### config.mk file for Linux |
| --- a/make/linuxgcc-pre-config.mk | |
| +++ b/make/linuxgcc-pre-config.mk | |
| @@ -1 +0,0 @@ | |
D
make/mingw32-fragment.mk
-39
| --- a/make/mingw32-fragment.mk | ||
| +++ b/make/mingw32-fragment.mk | ||
| @@ -1,39 +0,0 @@ | ||
| 1 | -#### OS-specific configuration for building Fossil on MingGW32 systems. | |
| 2 | -# | |
| 3 | - | |
| 4 | -#### The suffix to add to executable files. | |
| 5 | -# | |
| 6 | -E = .exe | |
| 7 | - | |
| 8 | -#### The directory into which object code files should be written. | |
| 9 | -# | |
| 10 | -OBJDIR = ./wobj | |
| 11 | - | |
| 12 | -#### MinGW32 can only support the GCC compiler. Force this. | |
| 13 | -# | |
| 14 | -COMPILER = gcc | |
| 15 | - | |
| 16 | -#### The following variable definitions decide which features are turned on or | |
| 17 | -# of when building Fossil. Comment out the features which are not needed by | |
| 18 | -# this platform. | |
| 19 | -# | |
| 20 | -ENABLE_STATIC = 1 # we want a static build | |
| 21 | -#ENABLE_SSL = 1 # we are using SSL | |
| 22 | -#ENABLE_SOCKET = 1 # we are using libsocket (OpenSolaris and Solaris) | |
| 23 | -#ENABLE_NSL = 1 # we are using libnsl library (Solaris) | |
| 24 | -#ENABLE_I18N = 1 # we are using i18n settings | |
| 25 | - | |
| 26 | -#### The following features must be added to the GCC and LD builds respectively. | |
| 27 | -# | |
| 28 | -ifndef MINGW32_GCC | |
| 29 | -PLATFORM_SPECIFIC_GCC = -L/mingw/lib -I/mingw/include | |
| 30 | -else | |
| 31 | -PLATFORM_SPECIFIC_GCC = $(MINGW32_GCC) | |
| 32 | -endif | |
| 33 | - | |
| 34 | -ifndef MINGW32_LIB | |
| 35 | -PLATFORM_SPECIFIC_LIB = -lmingwex -lws2_32 | |
| 36 | -else | |
| 37 | -PLATFORM_SPECIFIC_LIB = $(MINGW32_LIB) | |
| 38 | -endif | |
| 39 | - |
| --- a/make/mingw32-fragment.mk | |
| +++ b/make/mingw32-fragment.mk | |
| @@ -1,39 +0,0 @@ | |
| 1 | #### OS-specific configuration for building Fossil on MingGW32 systems. |
| 2 | # |
| 3 | |
| 4 | #### The suffix to add to executable files. |
| 5 | # |
| 6 | E = .exe |
| 7 | |
| 8 | #### The directory into which object code files should be written. |
| 9 | # |
| 10 | OBJDIR = ./wobj |
| 11 | |
| 12 | #### MinGW32 can only support the GCC compiler. Force this. |
| 13 | # |
| 14 | COMPILER = gcc |
| 15 | |
| 16 | #### The following variable definitions decide which features are turned on or |
| 17 | # of when building Fossil. Comment out the features which are not needed by |
| 18 | # this platform. |
| 19 | # |
| 20 | ENABLE_STATIC = 1 # we want a static build |
| 21 | #ENABLE_SSL = 1 # we are using SSL |
| 22 | #ENABLE_SOCKET = 1 # we are using libsocket (OpenSolaris and Solaris) |
| 23 | #ENABLE_NSL = 1 # we are using libnsl library (Solaris) |
| 24 | #ENABLE_I18N = 1 # we are using i18n settings |
| 25 | |
| 26 | #### The following features must be added to the GCC and LD builds respectively. |
| 27 | # |
| 28 | ifndef MINGW32_GCC |
| 29 | PLATFORM_SPECIFIC_GCC = -L/mingw/lib -I/mingw/include |
| 30 | else |
| 31 | PLATFORM_SPECIFIC_GCC = $(MINGW32_GCC) |
| 32 | endif |
| 33 | |
| 34 | ifndef MINGW32_LIB |
| 35 | PLATFORM_SPECIFIC_LIB = -lmingwex -lws2_32 |
| 36 | else |
| 37 | PLATFORM_SPECIFIC_LIB = $(MINGW32_LIB) |
| 38 | endif |
| 39 |
| --- a/make/mingw32-fragment.mk | |
| +++ b/make/mingw32-fragment.mk | |
| @@ -1,39 +0,0 @@ | |
+97
-3
| --- a/make/mingw32-gcc-config.mk | ||
| +++ b/make/mingw32-gcc-config.mk | ||
| @@ -1,4 +1,98 @@ | ||
| 1 | -#### Sample pre-config.mk file for MinGWpre-32. | |
| 2 | -# Copy this filPLATFORM=mingw32 | |
| 3 | -COMPILER=gcc | |
| 1 | +#### config.mk file for MinGW32. | |
| 2 | +# Copy this file as config.mk in the Fossil root directory to use. | |
| 3 | +# | |
| 4 | 4 | |
| 5 | +#### OS-specific configuration for building Fossil on MingGW32 systems. | |
| 6 | +# | |
| 7 | + | |
| 8 | +#### The suffix to add to executable files. | |
| 9 | +# | |
| 10 | +E = .exe | |
| 11 | + | |
| 12 | +#### The directory into which object code files should be written. | |
| 13 | +# | |
| 14 | +OBJDIR = ./wobj | |
| 15 | + | |
| 16 | +#### MinGW32 can only support the GCC compiler. Force this. | |
| 17 | +# | |
| 18 | +COMPILER = gcc | |
| 19 | + | |
| 20 | +#### The following variable definitions decide which features are turned on or | |
| 21 | +# of when building Fossil. Comment out the features which are not needed by | |
| 22 | +# this platform. | |
| 23 | +# | |
| 24 | +ENABLE_STATIC = 1 # we want a static build | |
| 25 | +#ENABLE_SSL = 1 # we are using SSL | |
| 26 | +#ENABLE_SOCKET = 1 # we are using libsocket (OpenSolaris and Solaris) | |
| 27 | +#ENABLE_NSL = 1 # we are using libnsl library (Solaris) | |
| 28 | +#ENABLE_I18N = 1 # we are using i18n settings | |
| 29 | + | |
| 30 | +#### Compiler-specific configuration for users of the GCC compiler suite. | |
| 31 | +# | |
| 32 | + | |
| 33 | +#### C Compiler and options for use in building executables that | |
| 34 | +# will run on the platform that is doing the build. This is used | |
| 35 | +# to compile code-generator programs as part of the build process. | |
| 36 | +# See TCC below for the C compiler for building the finished binary. | |
| 37 | +# | |
| 38 | +BCC = gcc -g -O2 | |
| 39 | + | |
| 40 | +#### C Compile and options for use in building executables that | |
| 41 | +# will run on the target platform. This is usually the same | |
| 42 | +# as BCC, unless you are cross-compiling. This C compiler builds | |
| 43 | +# the finished binary for fossil. The BCC compiler above is used | |
| 44 | +# for building intermediate code-generator tools. | |
| 45 | +# | |
| 46 | +TCC = gcc -g -Os -Wall | |
| 47 | + | |
| 48 | +#### Compiler options. | |
| 49 | +# The variables tested are defined in the make/PLATFORM-fragment.mk files. | |
| 50 | +# | |
| 51 | +ifdef ENABLE_SSL | |
| 52 | + TCC += -DFOSSIL_ENABLE_SSL=1 | |
| 53 | +endif | |
| 54 | +ifndef ENABLE_I18N | |
| 55 | + TCC += -DFOSSIL_I18N=0 | |
| 56 | +endif | |
| 57 | +ifdef PLATFORM_SPECIFIC_GCC | |
| 58 | + TCC += $(PLATFORM_SPECIFIC_GCC) | |
| 59 | +endif | |
| 60 | + | |
| 61 | +#### Linker dependencies. Fossil only requires libz as an external dependency. | |
| 62 | +# All other library settings are optional and toggled in platform-specific | |
| 63 | +# make fragments. | |
| 64 | +# | |
| 65 | +LIB = -lz $(LDFLAGS) | |
| 66 | + | |
| 67 | +#### Linker options. | |
| 68 | +# The variables tested are defined in the make/PLATFORM-fragment.mk files. | |
| 69 | +# | |
| 70 | +ifdef ENABLE_STATIC | |
| 71 | + LIB += -static | |
| 72 | +endif | |
| 73 | +ifdef ENABLE_SSL | |
| 74 | + LIB += -lcrypto -lssl | |
| 75 | +endif | |
| 76 | +ifdef ENABLE_SOCKET | |
| 77 | + LIB += -lsocket | |
| 78 | +endif | |
| 79 | +ifdef ENABLE_NSL | |
| 80 | + LIB += -lnsl | |
| 81 | +endif | |
| 82 | +ifdef PLATFORM_SPECIFIC_LIB | |
| 83 | + LIB += $(PLATFORM_SPECIFIC_LIB) | |
| 84 | +endif | |
| 85 | + | |
| 86 | +#### These will have to be adjusted for your MinGW32 environment. | |
| 87 | +# | |
| 88 | +MINGW32_GCC = -L/mingw/lib -I/mingw/include | |
| 89 | +#MINGW32_GCC = -L/usr/local/lib -I/usr/local/include | |
| 90 | +TCC += $(MINGW32_GCC) | |
| 91 | + | |
| 92 | +MINGW32_LIB = -lmingwex -lws2_32 | |
| 93 | +LIB += $(MINGW32_LIB) | |
| 94 | + | |
| 95 | +#### Signal that we've used a config.mk file. | |
| 96 | +# | |
| 97 | +CONFIG_MK_COMPLETE=1 | |
| 98 | + |
| --- a/make/mingw32-gcc-config.mk | |
| +++ b/make/mingw32-gcc-config.mk | |
| @@ -1,4 +1,98 @@ | |
| 1 | #### Sample pre-config.mk file for MinGWpre-32. |
| 2 | # Copy this filPLATFORM=mingw32 |
| 3 | COMPILER=gcc |
| 4 | |
| --- a/make/mingw32-gcc-config.mk | |
| +++ b/make/mingw32-gcc-config.mk | |
| @@ -1,4 +1,98 @@ | |
| 1 | #### config.mk file for MinGW32. |
| 2 | # Copy this file as config.mk in the Fossil root directory to use. |
| 3 | # |
| 4 | |
| 5 | #### OS-specific configuration for building Fossil on MingGW32 systems. |
| 6 | # |
| 7 | |
| 8 | #### The suffix to add to executable files. |
| 9 | # |
| 10 | E = .exe |
| 11 | |
| 12 | #### The directory into which object code files should be written. |
| 13 | # |
| 14 | OBJDIR = ./wobj |
| 15 | |
| 16 | #### MinGW32 can only support the GCC compiler. Force this. |
| 17 | # |
| 18 | COMPILER = gcc |
| 19 | |
| 20 | #### The following variable definitions decide which features are turned on or |
| 21 | # of when building Fossil. Comment out the features which are not needed by |
| 22 | # this platform. |
| 23 | # |
| 24 | ENABLE_STATIC = 1 # we want a static build |
| 25 | #ENABLE_SSL = 1 # we are using SSL |
| 26 | #ENABLE_SOCKET = 1 # we are using libsocket (OpenSolaris and Solaris) |
| 27 | #ENABLE_NSL = 1 # we are using libnsl library (Solaris) |
| 28 | #ENABLE_I18N = 1 # we are using i18n settings |
| 29 | |
| 30 | #### Compiler-specific configuration for users of the GCC compiler suite. |
| 31 | # |
| 32 | |
| 33 | #### C Compiler and options for use in building executables that |
| 34 | # will run on the platform that is doing the build. This is used |
| 35 | # to compile code-generator programs as part of the build process. |
| 36 | # See TCC below for the C compiler for building the finished binary. |
| 37 | # |
| 38 | BCC = gcc -g -O2 |
| 39 | |
| 40 | #### C Compile and options for use in building executables that |
| 41 | # will run on the target platform. This is usually the same |
| 42 | # as BCC, unless you are cross-compiling. This C compiler builds |
| 43 | # the finished binary for fossil. The BCC compiler above is used |
| 44 | # for building intermediate code-generator tools. |
| 45 | # |
| 46 | TCC = gcc -g -Os -Wall |
| 47 | |
| 48 | #### Compiler options. |
| 49 | # The variables tested are defined in the make/PLATFORM-fragment.mk files. |
| 50 | # |
| 51 | ifdef ENABLE_SSL |
| 52 | TCC += -DFOSSIL_ENABLE_SSL=1 |
| 53 | endif |
| 54 | ifndef ENABLE_I18N |
| 55 | TCC += -DFOSSIL_I18N=0 |
| 56 | endif |
| 57 | ifdef PLATFORM_SPECIFIC_GCC |
| 58 | TCC += $(PLATFORM_SPECIFIC_GCC) |
| 59 | endif |
| 60 | |
| 61 | #### Linker dependencies. Fossil only requires libz as an external dependency. |
| 62 | # All other library settings are optional and toggled in platform-specific |
| 63 | # make fragments. |
| 64 | # |
| 65 | LIB = -lz $(LDFLAGS) |
| 66 | |
| 67 | #### Linker options. |
| 68 | # The variables tested are defined in the make/PLATFORM-fragment.mk files. |
| 69 | # |
| 70 | ifdef ENABLE_STATIC |
| 71 | LIB += -static |
| 72 | endif |
| 73 | ifdef ENABLE_SSL |
| 74 | LIB += -lcrypto -lssl |
| 75 | endif |
| 76 | ifdef ENABLE_SOCKET |
| 77 | LIB += -lsocket |
| 78 | endif |
| 79 | ifdef ENABLE_NSL |
| 80 | LIB += -lnsl |
| 81 | endif |
| 82 | ifdef PLATFORM_SPECIFIC_LIB |
| 83 | LIB += $(PLATFORM_SPECIFIC_LIB) |
| 84 | endif |
| 85 | |
| 86 | #### These will have to be adjusted for your MinGW32 environment. |
| 87 | # |
| 88 | MINGW32_GCC = -L/mingw/lib -I/mingw/include |
| 89 | #MINGW32_GCC = -L/usr/local/lib -I/usr/local/include |
| 90 | TCC += $(MINGW32_GCC) |
| 91 | |
| 92 | MINGW32_LIB = -lmingwex -lws2_32 |
| 93 | LIB += $(MINGW32_LIB) |
| 94 | |
| 95 | #### Signal that we've used a config.mk file. |
| 96 | # |
| 97 | CONFIG_MK_COMPLETE=1 |
| 98 |
D
make/mingw32-pre-config.mk
-4
| --- a/make/mingw32-pre-config.mk | ||
| +++ b/make/mingw32-pre-config.mk | ||
| @@ -1,4 +0,0 @@ | ||
| 1 | -#### Sample pre-config.mk file for MinGWpre-32. | |
| 2 | -# Copy this filPLATFORM=mingw32 | |
| 3 | -COMPILER=gcc | |
| 4 | - |
| --- a/make/mingw32-pre-config.mk | |
| +++ b/make/mingw32-pre-config.mk | |
| @@ -1,4 +0,0 @@ | |
| 1 | #### Sample pre-config.mk file for MinGWpre-32. |
| 2 | # Copy this filPLATFORM=mingw32 |
| 3 | COMPILER=gcc |
| 4 |
| --- a/make/mingw32-pre-config.mk | |
| +++ b/make/mingw32-pre-config.mk | |
| @@ -1,4 +0,0 @@ | |
D
make/solaris-fragment.mk
-23
| --- a/make/solaris-fragment.mk | ||
| +++ b/make/solaris-fragment.mk | ||
| @@ -1,23 +0,0 @@ | ||
| 1 | -#### OS-specific configuration for building Fossil on Solaris (but not | |
| 2 | -# OpenSolaris) systems. | |
| 3 | -# | |
| 4 | - | |
| 5 | -#### The suffix to add to executable files. ".exe" for windows. | |
| 6 | -# Nothing for unix. | |
| 7 | -# | |
| 8 | -E = | |
| 9 | - | |
| 10 | -#### The directory into which object code files should be written. | |
| 11 | -# | |
| 12 | -OBJDIR = ./obj | |
| 13 | - | |
| 14 | -#### The following variable definitions decide which features are turned on or | |
| 15 | -# of when building Fossil. Comment out the features which are not needed by | |
| 16 | -# this platform. | |
| 17 | -# | |
| 18 | -#ENABLE_STATIC = 1 # we want a static build | |
| 19 | -ENABLE_SSL = 1 # we are using SSL | |
| 20 | -ENABLE_SOCKET = 1 # we are using libsocket (OpenSolaris and Solaris) | |
| 21 | -ENABLE_NSL = 1 # we are using libnsl library (Solaris) | |
| 22 | -ENABLE_I18N = 1 # we are using i18n settings | |
| 23 | - |
| --- a/make/solaris-fragment.mk | |
| +++ b/make/solaris-fragment.mk | |
| @@ -1,23 +0,0 @@ | |
| 1 | #### OS-specific configuration for building Fossil on Solaris (but not |
| 2 | # OpenSolaris) systems. |
| 3 | # |
| 4 | |
| 5 | #### The suffix to add to executable files. ".exe" for windows. |
| 6 | # Nothing for unix. |
| 7 | # |
| 8 | E = |
| 9 | |
| 10 | #### The directory into which object code files should be written. |
| 11 | # |
| 12 | OBJDIR = ./obj |
| 13 | |
| 14 | #### The following variable definitions decide which features are turned on or |
| 15 | # of when building Fossil. Comment out the features which are not needed by |
| 16 | # this platform. |
| 17 | # |
| 18 | #ENABLE_STATIC = 1 # we want a static build |
| 19 | ENABLE_SSL = 1 # we are using SSL |
| 20 | ENABLE_SOCKET = 1 # we are using libsocket (OpenSolaris and Solaris) |
| 21 | ENABLE_NSL = 1 # we are using libnsl library (Solaris) |
| 22 | ENABLE_I18N = 1 # we are using i18n settings |
| 23 |
| --- a/make/solaris-fragment.mk | |
| +++ b/make/solaris-fragment.mk | |
| @@ -1,23 +0,0 @@ | |
+79
-2
| --- a/make/solaris-gcc-config.mk | ||
| +++ b/make/solaris-gcc-config.mk | ||
| @@ -1,3 +1,80 @@ | ||
| 1 | -#### Sample pre-config.mk file for Solaris with Gpre-config.mk in the FossiPLATFORM=solaris | |
| 2 | -COMPILER=gcc | |
| 1 | +#### config.mk file for Solaris with GCC. | |
| 2 | +# Copy this file as config.mk in the Fossil root directory to use. | |
| 3 | +# | |
| 3 | 4 | |
| 5 | +#### OS-specific configuration for building Fossil on Solaris systems. | |
| 6 | +# | |
| 7 | + | |
| 8 | +#### The suffix to add to executable files. ".exe" for windows. | |
| 9 | +# Nothing for unix. | |
| 10 | +# | |
| 11 | +E = | |
| 12 | + | |
| 13 | +#### The directory into which object code files should be written. | |
| 14 | +# | |
| 15 | +OBJDIR = ./obj | |
| 16 | + | |
| 17 | +#### The following variable definitions decide which features are turned on or | |
| 18 | +# of when building Fossil. Comment out the features which are not needed by | |
| 19 | +# this platform. | |
| 20 | +# | |
| 21 | +#ENABLE_STATIC = 1 # we want a static build | |
| 22 | +ENABLE_SSL = 1 # we are using SSL | |
| 23 | +ENABLE_SOCKET = 1 # we are using libsocket (OpenSolaris and Solaris) | |
| 24 | +ENABLE_NSL = 1 # we are using libnsl library (Solaris) | |
| 25 | +ENABLE_I18N = 1 # we are using i18n settings | |
| 26 | + | |
| 27 | +#### Compiler-specific configuration for users of the GCC compiler suite. | |
| 28 | +# | |
| 29 | + | |
| 30 | +#### C Compiler and options for use in building executables that | |
| 31 | +# will run on the platform that is doing the build. This is used | |
| 32 | +# to compile code-generator programs as part of the build process. | |
| 33 | +# See TCC below for the C compiler for building the finished binary. | |
| 34 | +# | |
| 35 | +BCC = gcc -g -O2 | |
| 36 | + | |
| 37 | +#### C Compile and options for use in building executables that | |
| 38 | +# will run on the target platform. This is usually the same | |
| 39 | +# as BCC, unless you are cross-compiling. This C compiler builds | |
| 40 | +# the finished binary for fossil. The BCC compiler above is used | |
| 41 | +# for building intermediate code-generator tools. | |
| 42 | +# | |
| 43 | +TCC = gcc -g -Os -Wall | |
| 44 | + | |
| 45 | +#### Compiler options. | |
| 46 | +# The variables tested are defined in the make/PLATFORM-fragment.mk files. | |
| 47 | +# | |
| 48 | +ifdef ENABLE_SSL | |
| 49 | + TCC += -DFOSSIL_ENABLE_SSL=1 | |
| 50 | +endif | |
| 51 | +ifndef ENABLE_I18N | |
| 52 | + TCC += -DFOSSIL_I18N=0 | |
| 53 | +endif | |
| 54 | + | |
| 55 | +#### Linker dependencies. Fossil only requires libz as an external dependency. | |
| 56 | +# All other library settings are optional and toggled in platform-specific | |
| 57 | +# make fragments. | |
| 58 | +# | |
| 59 | +LIB = -lz $(LDFLAGS) | |
| 60 | + | |
| 61 | +#### Linker options. | |
| 62 | +# The variables tested are defined in the make/PLATFORM-fragment.mk files. | |
| 63 | +# | |
| 64 | +ifdef ENABLE_STATIC | |
| 65 | + LIB += -static | |
| 66 | +endif | |
| 67 | +ifdef ENABLE_SSL | |
| 68 | + LIB += -lcrypto -lssl | |
| 69 | +endif | |
| 70 | +ifdef ENABLE_SOCKET | |
| 71 | + LIB += -lsocket | |
| 72 | +endif | |
| 73 | +ifdef ENABLE_NSL | |
| 74 | + LIB += -lnsl | |
| 75 | +endif | |
| 76 | + | |
| 77 | +#### Signal that we've used a config.mk file. | |
| 78 | +# | |
| 79 | +CONFIG_MK_COMPLETE=1 | |
| 80 | + |
| --- a/make/solaris-gcc-config.mk | |
| +++ b/make/solaris-gcc-config.mk | |
| @@ -1,3 +1,80 @@ | |
| 1 | #### Sample pre-config.mk file for Solaris with Gpre-config.mk in the FossiPLATFORM=solaris |
| 2 | COMPILER=gcc |
| 3 | |
| --- a/make/solaris-gcc-config.mk | |
| +++ b/make/solaris-gcc-config.mk | |
| @@ -1,3 +1,80 @@ | |
| 1 | #### config.mk file for Solaris with GCC. |
| 2 | # Copy this file as config.mk in the Fossil root directory to use. |
| 3 | # |
| 4 | |
| 5 | #### OS-specific configuration for building Fossil on Solaris systems. |
| 6 | # |
| 7 | |
| 8 | #### The suffix to add to executable files. ".exe" for windows. |
| 9 | # Nothing for unix. |
| 10 | # |
| 11 | E = |
| 12 | |
| 13 | #### The directory into which object code files should be written. |
| 14 | # |
| 15 | OBJDIR = ./obj |
| 16 | |
| 17 | #### The following variable definitions decide which features are turned on or |
| 18 | # of when building Fossil. Comment out the features which are not needed by |
| 19 | # this platform. |
| 20 | # |
| 21 | #ENABLE_STATIC = 1 # we want a static build |
| 22 | ENABLE_SSL = 1 # we are using SSL |
| 23 | ENABLE_SOCKET = 1 # we are using libsocket (OpenSolaris and Solaris) |
| 24 | ENABLE_NSL = 1 # we are using libnsl library (Solaris) |
| 25 | ENABLE_I18N = 1 # we are using i18n settings |
| 26 | |
| 27 | #### Compiler-specific configuration for users of the GCC compiler suite. |
| 28 | # |
| 29 | |
| 30 | #### C Compiler and options for use in building executables that |
| 31 | # will run on the platform that is doing the build. This is used |
| 32 | # to compile code-generator programs as part of the build process. |
| 33 | # See TCC below for the C compiler for building the finished binary. |
| 34 | # |
| 35 | BCC = gcc -g -O2 |
| 36 | |
| 37 | #### C Compile and options for use in building executables that |
| 38 | # will run on the target platform. This is usually the same |
| 39 | # as BCC, unless you are cross-compiling. This C compiler builds |
| 40 | # the finished binary for fossil. The BCC compiler above is used |
| 41 | # for building intermediate code-generator tools. |
| 42 | # |
| 43 | TCC = gcc -g -Os -Wall |
| 44 | |
| 45 | #### Compiler options. |
| 46 | # The variables tested are defined in the make/PLATFORM-fragment.mk files. |
| 47 | # |
| 48 | ifdef ENABLE_SSL |
| 49 | TCC += -DFOSSIL_ENABLE_SSL=1 |
| 50 | endif |
| 51 | ifndef ENABLE_I18N |
| 52 | TCC += -DFOSSIL_I18N=0 |
| 53 | endif |
| 54 | |
| 55 | #### Linker dependencies. Fossil only requires libz as an external dependency. |
| 56 | # All other library settings are optional and toggled in platform-specific |
| 57 | # make fragments. |
| 58 | # |
| 59 | LIB = -lz $(LDFLAGS) |
| 60 | |
| 61 | #### Linker options. |
| 62 | # The variables tested are defined in the make/PLATFORM-fragment.mk files. |
| 63 | # |
| 64 | ifdef ENABLE_STATIC |
| 65 | LIB += -static |
| 66 | endif |
| 67 | ifdef ENABLE_SSL |
| 68 | LIB += -lcrypto -lssl |
| 69 | endif |
| 70 | ifdef ENABLE_SOCKET |
| 71 | LIB += -lsocket |
| 72 | endif |
| 73 | ifdef ENABLE_NSL |
| 74 | LIB += -lnsl |
| 75 | endif |
| 76 | |
| 77 | #### Signal that we've used a config.mk file. |
| 78 | # |
| 79 | CONFIG_MK_COMPLETE=1 |
| 80 |
D
make/solarisgcc-pre-config.mk
-3
| --- a/make/solarisgcc-pre-config.mk | ||
| +++ b/make/solarisgcc-pre-config.mk | ||
| @@ -1,3 +0,0 @@ | ||
| 1 | -#### Sample pre-config.mk file for Solaris with Gpre-config.mk in the FossiPLATFORM=solaris | |
| 2 | -COMPILER=gcc | |
| 3 | - |
| --- a/make/solarisgcc-pre-config.mk | |
| +++ b/make/solarisgcc-pre-config.mk | |
| @@ -1,3 +0,0 @@ | |
| 1 | #### Sample pre-config.mk file for Solaris with Gpre-config.mk in the FossiPLATFORM=solaris |
| 2 | COMPILER=gcc |
| 3 |
| --- a/make/solarisgcc-pre-config.mk | |
| +++ b/make/solarisgcc-pre-config.mk | |
| @@ -1,3 +0,0 @@ | |