Fossil SCM
Fixed up a naming problem for MinGW32 and made a more flexible mechanism for site-specific enhancements.
Commit
6b83b517df35aa2e9626609a29e54bead4c82fb4
Parent
81e4477e90cf222…
2 files changed
+9
-4
+4
-4
M
Makefile
+9
-4
| --- Makefile | ||
| +++ Makefile | ||
| @@ -1,10 +1,15 @@ | ||
| 1 | 1 | #!/usr/bin/make |
| 2 | 2 | # |
| 3 | 3 | #### The directory in which Makefile fragments are stored. |
| 4 | 4 | # |
| 5 | 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 | |
| 6 | 11 | |
| 7 | 12 | #### Set up our compiler if it hasn't already been defined. |
| 8 | 13 | |
| 9 | 14 | ifndef COMPILER |
| 10 | 15 | COMPILER = gcc |
| @@ -29,14 +34,14 @@ | ||
| 29 | 34 | #### Include the fragments we need from our specific environment. |
| 30 | 35 | # |
| 31 | 36 | include $(MAKEDIR)/$(PLATFORM)-fragment.mk |
| 32 | 37 | include $(MAKEDIR)/$(COMPILER)-fragment.mk |
| 33 | 38 | |
| 34 | -#### Include a locale-specific configuration make fragment if present. | |
| 35 | -# Any modification to the platforms' generic setups should be made in this | |
| 36 | -# file where possible. | |
| 37 | --include config.mk | |
| 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 | |
| 38 | 43 | |
| 39 | 44 | #### The following section beginning after #+++ and ending before #--- is used |
| 40 | 45 | # inside the $(PLATFORM)-fragment.mk files to turn on the features required |
| 41 | 46 | # or desired by builds on that platform. They are replicated here for |
| 42 | 47 | # documentation purposes only and should not be set in this file. |
| 43 | 48 |
| --- Makefile | |
| +++ Makefile | |
| @@ -1,10 +1,15 @@ | |
| 1 | #!/usr/bin/make |
| 2 | # |
| 3 | #### The directory in which Makefile fragments are stored. |
| 4 | # |
| 5 | MAKEDIR = ./make |
| 6 | |
| 7 | #### Set up our compiler if it hasn't already been defined. |
| 8 | |
| 9 | ifndef COMPILER |
| 10 | COMPILER = gcc |
| @@ -29,14 +34,14 @@ | |
| 29 | #### Include the fragments we need from our specific environment. |
| 30 | # |
| 31 | include $(MAKEDIR)/$(PLATFORM)-fragment.mk |
| 32 | include $(MAKEDIR)/$(COMPILER)-fragment.mk |
| 33 | |
| 34 | #### Include a locale-specific configuration make fragment if present. |
| 35 | # Any modification to the platforms' generic setups should be made in this |
| 36 | # file where possible. |
| 37 | -include config.mk |
| 38 | |
| 39 | #### The following section beginning after #+++ and ending before #--- is used |
| 40 | # inside the $(PLATFORM)-fragment.mk files to turn on the features required |
| 41 | # or desired by builds on that platform. They are replicated here for |
| 42 | # documentation purposes only and should not be set in this file. |
| 43 |
| --- Makefile | |
| +++ Makefile | |
| @@ -1,10 +1,15 @@ | |
| 1 | #!/usr/bin/make |
| 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 |
| @@ -29,14 +34,14 @@ | |
| 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 |
+4
-4
| --- make/mingw32-fragment.mk | ||
| +++ make/mingw32-fragment.mk | ||
| @@ -20,17 +20,17 @@ | ||
| 20 | 20 | #ENABLE_NSL = 1 # we are using libnsl library (Solaris) |
| 21 | 21 | #ENABLE_I18N = 1 # we are using i18n settings |
| 22 | 22 | |
| 23 | 23 | #### The following features must be added to the GCC and LD builds respectively. |
| 24 | 24 | # |
| 25 | -ifndef MING32_GCC | |
| 25 | +ifndef MINGW32_GCC | |
| 26 | 26 | PLATFORM_SPECIFIC_GCC = -L/mingw/lib -I/mingw/include |
| 27 | 27 | else |
| 28 | -PLATFORM_SPECIFIC_GCC = $(MING32_GCC) | |
| 28 | +PLATFORM_SPECIFIC_GCC = $(MINGW32_GCC) | |
| 29 | 29 | endif |
| 30 | 30 | |
| 31 | -ifndef MING32_LIB | |
| 31 | +ifndef MINGW32_LIB | |
| 32 | 32 | PLATFORM_SPECIFIC_LIB = -lmingwex -lws2_32 |
| 33 | 33 | else |
| 34 | -PLATFORM_SPECIFIC_LIB = $(MING32_LIB) | |
| 34 | +PLATFORM_SPECIFIC_LIB = $(MINGW32_LIB) | |
| 35 | 35 | endif |
| 36 | 36 | |
| 37 | 37 |
| --- make/mingw32-fragment.mk | |
| +++ make/mingw32-fragment.mk | |
| @@ -20,17 +20,17 @@ | |
| 20 | #ENABLE_NSL = 1 # we are using libnsl library (Solaris) |
| 21 | #ENABLE_I18N = 1 # we are using i18n settings |
| 22 | |
| 23 | #### The following features must be added to the GCC and LD builds respectively. |
| 24 | # |
| 25 | ifndef MING32_GCC |
| 26 | PLATFORM_SPECIFIC_GCC = -L/mingw/lib -I/mingw/include |
| 27 | else |
| 28 | PLATFORM_SPECIFIC_GCC = $(MING32_GCC) |
| 29 | endif |
| 30 | |
| 31 | ifndef MING32_LIB |
| 32 | PLATFORM_SPECIFIC_LIB = -lmingwex -lws2_32 |
| 33 | else |
| 34 | PLATFORM_SPECIFIC_LIB = $(MING32_LIB) |
| 35 | endif |
| 36 | |
| 37 |
| --- make/mingw32-fragment.mk | |
| +++ make/mingw32-fragment.mk | |
| @@ -20,17 +20,17 @@ | |
| 20 | #ENABLE_NSL = 1 # we are using libnsl library (Solaris) |
| 21 | #ENABLE_I18N = 1 # we are using i18n settings |
| 22 | |
| 23 | #### The following features must be added to the GCC and LD builds respectively. |
| 24 | # |
| 25 | ifndef MINGW32_GCC |
| 26 | PLATFORM_SPECIFIC_GCC = -L/mingw/lib -I/mingw/include |
| 27 | else |
| 28 | PLATFORM_SPECIFIC_GCC = $(MINGW32_GCC) |
| 29 | endif |
| 30 | |
| 31 | ifndef MINGW32_LIB |
| 32 | PLATFORM_SPECIFIC_LIB = -lmingwex -lws2_32 |
| 33 | else |
| 34 | PLATFORM_SPECIFIC_LIB = $(MINGW32_LIB) |
| 35 | endif |
| 36 | |
| 37 |