Fossil

Check-in [6b83b517df]
Login

Check-in [6b83b517df]

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

Overview
Comment:Fixed up a naming problem for MinGW32 and made a more flexible mechanism for site-specific enhancements.
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | newbuild | ttmrichter
Files: files | file ages | folders
SHA1: 6b83b517df35aa2e9626609a29e54bead4c82fb4
User & Date: michael 2010-07-09 17:41:12
Context
2010-07-10
10:43
Added some (as yet untested) fragments for FreeBSD, Solaris and OpenSolaris. FreeBSD and OpenSolaris testing are due soon. ... (check-in: ffcd314afc user: michael tags: newbuild, ttmrichter)
2010-07-09
17:41
Fixed up a naming problem for MinGW32 and made a more flexible mechanism for site-specific enhancements. ... (check-in: 6b83b517df user: michael tags: newbuild, ttmrichter)
17:23
Cleaned up the platform fragments. Corrected two compiler settings. ... (check-in: 81e4477e90 user: michael tags: newbuild, ttmrichter)
Changes
Hide Diffs Unified Diffs Ignore Whitespace Patch

Changes to Makefile. 

1
2
3
4
5





6
7
8
9
10
11
12

#!/usr/bin/make
#
#### The directory in which Makefile fragments are stored.
#
MAKEDIR = ./make






#### Set up our compiler if it hasn't already been defined.

ifndef COMPILER
  COMPILER = gcc
endif







>
>
>
>
>








1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17

#!/usr/bin/make
#
#### The directory in which Makefile fragments are stored.
#
MAKEDIR = ./make

#### Any site-specific pre-defined settings go here.  Settings in this file are
#    intended to direct the compilation below.
#
-include pre-config.mk

#### Set up our compiler if it hasn't already been defined.

ifndef COMPILER
  COMPILER = gcc
endif
︙︙
27
28
29
30
31
32
33
34
35
36

37
38
39
40
41
42
43
44

SRCDIR = ./src

#### Include the fragments we need from our specific environment.
#
include $(MAKEDIR)/$(PLATFORM)-fragment.mk
include $(MAKEDIR)/$(COMPILER)-fragment.mk

#### Include a locale-specific configuration make fragment if present.
#    Any modification to the platforms' generic setups should be made in this
#    file where possible.

-include config.mk

#### The following section beginning after #+++ and ending before #--- is used
#    inside the $(PLATFORM)-fragment.mk files to turn on the features required
#    or desired by builds on that platform.  They are replicated here for
#    documentation purposes only and should not be set in this file.
#+++
#### The following variable definitions decide which features are turned on or








|
<
|
>
|








32
33
34
35
36
37
38
39

40
41
42
43
44
45
46
47
48
49

SRCDIR = ./src

#### Include the fragments we need from our specific environment.
#
include $(MAKEDIR)/$(PLATFORM)-fragment.mk
include $(MAKEDIR)/$(COMPILER)-fragment.mk

#### Any site-specific post-defined settings go here.  Settings in this file are

#    intended to override the settings already established.
#
-include post-config.mk

#### The following section beginning after #+++ and ending before #--- is used
#    inside the $(PLATFORM)-fragment.mk files to turn on the features required
#    or desired by builds on that platform.  They are replicated here for
#    documentation purposes only and should not be set in this file.
#+++
#### The following variable definitions decide which features are turned on or
︙︙

Changes to make/mingw32-fragment.mk.

︙︙
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36

#ENABLE_SSL = 1		# we are using SSL
#ENABLE_SOCKET = 1	# we are using libsocket (OpenSolaris and Solaris)
#ENABLE_NSL = 1		# we are using libnsl library (Solaris)
#ENABLE_I18N = 1	# we are using i18n settings

#### The following features must be added to the GCC and LD builds respectively.
#
ifndef MING32_GCC
PLATFORM_SPECIFIC_GCC = -L/mingw/lib -I/mingw/include
else
PLATFORM_SPECIFIC_GCC = $(MING32_GCC)
endif

ifndef MING32_LIB
PLATFORM_SPECIFIC_LIB = -lmingwex -lws2_32
else
PLATFORM_SPECIFIC_LIB = $(MING32_LIB)
endif









|


|


|


|



18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36

#ENABLE_SSL = 1		# we are using SSL
#ENABLE_SOCKET = 1	# we are using libsocket (OpenSolaris and Solaris)
#ENABLE_NSL = 1		# we are using libnsl library (Solaris)
#ENABLE_I18N = 1	# we are using i18n settings

#### The following features must be added to the GCC and LD builds respectively.
#
ifndef MINGW32_GCC
PLATFORM_SPECIFIC_GCC = -L/mingw/lib -I/mingw/include
else
PLATFORM_SPECIFIC_GCC = $(MINGW32_GCC)
endif

ifndef MINGW32_LIB
PLATFORM_SPECIFIC_LIB = -lmingwex -lws2_32
else
PLATFORM_SPECIFIC_LIB = $(MINGW32_LIB)
endif