Changes On Branch ttmrichter
Not logged in

Many hyperlinks are disabled.
Use anonymous login to enable hyperlinks.

Changes In Branch ttmrichter Excluding Merge-Ins

This is equivalent to a diff from 3332895df8 to 861a885c74

2010-09-16
14:00
Committing a merge. check-in: be5fd10aaf user: michael tags: ttmrichter-skins
2010-08-15
19:34
Recognize the HTTPS line in the HTTP header. Ticket [d83227cdda3d786d3743b2] check-in: 3dc62d54d0 user: drh tags: trunk
2010-08-13
07:07
Trying to figure out how to get merge conflicts to actually show up. check-in: d8f8932ff2 user: michael tags: ttmrichter-skins
03:49
Merged with trunk. Leaf check-in: 861a885c74 user: michael tags: ttmrichter
03:30
Added build for FreeBSD using clang. check-in: b775af5045 user: michael tags: ttmrichter
03:26
Merged with trunk. check-in: 7f61175d27 user: michael tags: ttmrichter
2010-08-12
19:39
Reimplement the reconstruct command that was removed in the GPL to BSD license change. This resolves ticket [dfe1fc608a]. check-in: 3332895df8 user: bcsmith tags: trunk
2010-08-11
07:00
Allow a checkin to be checked out again even if one of the files in that checkin has been shunned. check-in: 7e23178ba3 user: drh tags: trunk

Changes to Makefile.

     1      1   #!/usr/bin/make
     2      2   #
            3  +#### The directory in which Makefile fragments are stored.
            4  +#
            5  +MAKEDIR = ./make
            6  +
     3      7   #### The toplevel directory of the source tree.  Fossil can be built
     4      8   #    in a directory that is separate from the source tree.  Just change
     5      9   #    the following to point from the build directory to the src/ folder.
     6     10   #
     7     11   SRCDIR = ./src
     8     12   
     9         -#### The directory into which object code files should be written.
    10         -#
           13  +#### Any site-specific pre-defined settings go here.  Settings in this file are
           14  +#    intended to direct the compilation below.
    11     15   #
    12         -OBJDIR = ./obj
    13         -
    14         -#### C Compiler and options for use in building executables that
    15         -#    will run on the platform that is doing the build.  This is used
    16         -#    to compile code-generator programs as part of the build process.
    17         -#    See TCC below for the C compiler for building the finished binary.
    18         -#
    19         -BCC = gcc -g -O2
           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     20   
    21         -#### The suffix to add to executable files.  ".exe" for windows.
    22         -#    Nothing for unix.
    23         -#
    24         -E =
    25         -
    26         -#### C Compile and options for use in building executables that 
    27         -#    will run on the target platform.  This is usually the same
    28         -#    as BCC, unless you are cross-compiling.  This C compiler builds
    29         -#    the finished binary for fossil.  The BCC compiler above is used
    30         -#    for building intermediate code-generator tools.
    31         -#
    32         -#TCC = gcc -O6
    33         -#TCC = gcc -g -O0 -Wall -fprofile-arcs -ftest-coverage
    34         -TCC = gcc -g -Os -Wall
    35         -
    36         -# To add support for HTTPS
    37         -TCC += -DFOSSIL_ENABLE_SSL
    38         -
    39         -#### Extra arguments for linking the finished binary.  Fossil needs
    40         -#    to link against the Z-Lib compression library.  There are no
    41         -#    other dependencies.  We sometimes add the -static option here
    42         -#    so that we can build a static executable that will run in a
    43         -#    chroot jail.
    44         -#
    45         -LIB = -lz $(LDFLAGS)
    46         -# If you're on OpenSolaris:
    47         -# LIB += lsocket
    48         -# Solaris 10 needs:
    49         -# LIB += -lsocket -lnsl
    50         -# My assumption is that the Sol10 flags will work for Sol8/9 and possibly 11.
    51         -# 
    52         -# If using HTTPS:
    53         -LIB += -lcrypto -lssl
    54         -
    55         -#### Tcl shell for use in running the fossil testsuite.
           21  +#### The Tcl shell to run for test suites.
    56     22   #
    57     23   TCLSH = tclsh
    58     24   
    59     25   # You should not need to change anything below this line
    60     26   ###############################################################################
    61     27   include $(SRCDIR)/main.mk
           28  +

Deleted Makefile.w32.

     1         -#!/usr/bin/make
     2         -#
     3         -#### The toplevel directory of the source tree.  Fossil can be built
     4         -#    in a directory that is separate from the source tree.  Just change
     5         -#    the following to point from the build directory to the src/ folder.
     6         -#
     7         -SRCDIR = ./src
     8         -OBJDIR = ./wobj
     9         -
    10         -#### C Compiler and options for use in building executables that
    11         -#    will run on the platform that is doing the build.  This is used
    12         -#    to compile code-generator programs as part of the build process.
    13         -#    See TCC below for the C compiler for building the finished binary.
    14         -#
    15         -BCC = gcc -g -O2
    16         -
    17         -#### The suffix to add to executable files.  ".exe" for windows.
    18         -#    Nothing for unix.
    19         -#
    20         -E = .exe
    21         -
    22         -#### Enable HTTPS support via OpenSSL (links to libssl and libcrypto)
    23         -#
    24         -# FOSSIL_ENABLE_SSL=1
    25         -
    26         -#### Enable HTTPS support via OpenSSL (links to libssl and libcrypto)
    27         -#
    28         -# FOSSIL_ENABLE_SSL=1
    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         -#TCC = gcc -g -Os -Wall -DFOSSIL_I18N=0 -L/usr/local/lib -I/usr/local/include
    40         -TCC = gcc -Os -Wall -DFOSSIL_I18N=0 -L/mingw/lib -I/mingw/include
    41         -
    42         -# With HTTPS support
    43         -ifdef FOSSIL_ENABLE_SSL
    44         -TCC += -DFOSSIL_ENABLE_SSL=1
    45         -endif
    46         -
    47         -#### Extra arguments for linking the finished binary.  Fossil needs
    48         -#    to link against the Z-Lib compression library.  There are no
    49         -#    other dependencies.  We sometimes add the -static option here
    50         -#    so that we can build a static executable that will run in a
    51         -#    chroot jail.
    52         -#
    53         -#LIB = -lz
    54         -#LIB = -lz -lws2_32
    55         -LIB = -lmingwex -lz -lws2_32
    56         -# OpenSSL:
    57         -ifdef FOSSIL_ENABLE_SSL
    58         -LIB += -lcrypto -lssl
    59         -endif
    60         -
    61         -#### Tcl shell for use in running the fossil testsuite.
    62         -#
    63         -TCLSH = tclsh
    64         -
    65         -#### Include a configuration file that can override any one of these settings.
    66         -#
    67         --include config.w32
    68         -
    69         -# You should not need to change anything below this line
    70         -###############################################################################
    71         -include $(SRCDIR)/main.mk

Added make/README.wiki.

            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  +

Added make/freebsd-clang-config.mk.

            1  +#### config.mk file for FreeBSD with CLANG.
            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 = clang -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 = clang -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  +

Added make/freebsd-gcc-config.mk.

            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  +

Added make/linux-clang-config.mk.

            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  +

Added make/linux-gcc-config.mk.

            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  +

Added make/mingw32-gcc-config.mk.

            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  +

Added make/solaris-gcc-config.mk.

            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  +