minhngoc25a
/
freetype2
mirror of git://git.savannah.gnu.org/freetype/freetype2.git
2
1
Fork 2
Code Issues 4 Releases Wiki Activity

[build] Suppress configure's `nothing to be done' message. 

This is due to calling the configure script via `make' (within the
top-level `configure' wrapper script).  The same can happen for all
other secondary make targets that are used to only modify the
primary one, e.g., `make setup devel'.

* builds/dos/detect.mk (emx, turboc, watcom, borlandc, borlandc16),
builds/os2/detect (visualage, watcom, borlandc, devel),
builds/unix/detect.mk (devel, lcc, unix), builds/windows/detect.mk
(visualc, watcom, visualage, lcc, mingw32, bcc32, devel-bcc,
devel-gcc): Use no-op recipe.
This commit is contained in:
Werner Lemberg 2018-05-07 08:54:34 +02:00
parent 2b3e0ef6c0
commit 7702edf793
5 changed files with 78 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
ChangeLog
View File

@ -1,3 +1,18 @@
2018-05-07 Werner Lemberg <wl@gnu.org>
[build] Suppress configure's `nothing to be done' message.
This is due to calling the configure script via `make' (within the
top-level `configure' wrapper script). The same can happen for all
other secondary make targets that are used to only modify the
primary one, e.g., `make setup devel'.
* builds/dos/detect.mk (emx, turboc, watcom, borlandc, borlandc16),
builds/os2/detect (visualage, watcom, borlandc, devel),
builds/unix/detect.mk (devel, lcc, unix), builds/windows/detect.mk
(visualc, watcom, visualage, lcc, mingw32, bcc32, devel-bcc,
devel-gcc): Use no-op recipe.
2018-05-04 suzuki toshiya <mpsuzuki@hiroshima-u.ac.jp> 2018-05-04 suzuki toshiya <mpsuzuki@hiroshima-u.ac.jp>
Support symbol visibility features of Sun / Oracle C compilers. Support symbol visibility features of Sun / Oracle C compilers.

20
builds/dos/detect.mk
View File

@ -80,36 +80,46 @@ ifeq ($(PLATFORM),dos)
ifneq ($(findstring emx,$(MAKECMDGOALS)),) # EMX gcc ifneq ($(findstring emx,$(MAKECMDGOALS)),) # EMX gcc
CONFIG_FILE := dos-emx.mk CONFIG_FILE := dos-emx.mk
CC := gcc CC := gcc
emx: setup
.PHONY: emx .PHONY: emx
emx: setup
@cd .
endif endif
ifneq ($(findstring turboc,$(MAKECMDGOALS)),) # Turbo C ifneq ($(findstring turboc,$(MAKECMDGOALS)),) # Turbo C
CONFIG_FILE := dos-tcc.mk CONFIG_FILE := dos-tcc.mk
CC := tcc CC := tcc
turboc: setup
.PHONY: turboc .PHONY: turboc
turboc: setup
@cd .
endif endif
ifneq ($(findstring watcom,$(MAKECMDGOALS)),) # Watcom C/C++ ifneq ($(findstring watcom,$(MAKECMDGOALS)),) # Watcom C/C++
CONFIG_FILE := dos-wat.mk CONFIG_FILE := dos-wat.mk
CC := wcc386 CC := wcc386
watcom: setup
.PHONY: watcom .PHONY: watcom
watcom: setup
@cd .
endif endif
ifneq ($(findstring borlandc,$(MAKECMDGOALS)),) # Borland C/C++ 32-bit ifneq ($(findstring borlandc,$(MAKECMDGOALS)),) # Borland C/C++ 32-bit
CONFIG_FILE := dos-bcc.mk CONFIG_FILE := dos-bcc.mk
CC := bcc32 CC := bcc32
borlandc: setup
.PHONY: borlandc .PHONY: borlandc
borlandc: setup
@cd .
endif endif
ifneq ($(findstring borlandc16,$(MAKECMDGOALS)),) # Borland C/C++ 16-bit ifneq ($(findstring borlandc16,$(MAKECMDGOALS)),) # Borland C/C++ 16-bit
CONFIG_FILE := dos-bcc.mk CONFIG_FILE := dos-bcc.mk
CC := bcc CC := bcc
borlandc16: setup
.PHONY: borlandc16 .PHONY: borlandc16
borlandc16: setup
@cd .
endif endif
ifneq ($(findstring bash,$(SHELL)),) # check for bash ifneq ($(findstring bash,$(SHELL)),) # check for bash

16
builds/os2/detect.mk
View File

@ -40,29 +40,37 @@ ifeq ($(PLATFORM),os2)
ifneq ($(findstring visualage,$(MAKECMDGOALS)),) # Visual Age C++ ifneq ($(findstring visualage,$(MAKECMDGOALS)),) # Visual Age C++
CONFIG_FILE := os2-icc.mk CONFIG_FILE := os2-icc.mk
CC := icc CC := icc
visualage: setup
.PHONY: visualage .PHONY: visualage
visualage: setup
@cd .
endif endif
ifneq ($(findstring watcom,$(MAKECMDGOALS)),) # Watcom C/C++ ifneq ($(findstring watcom,$(MAKECMDGOALS)),) # Watcom C/C++
CONFIG_FILE := os2-wat.mk CONFIG_FILE := os2-wat.mk
CC := wcc386 CC := wcc386
watcom: setup
.PHONY: watcom .PHONY: watcom
watcom: setup
@cd .
endif endif
ifneq ($(findstring borlandc,$(MAKECMDGOALS)),) # Borland C++ 32-bit ifneq ($(findstring borlandc,$(MAKECMDGOALS)),) # Borland C++ 32-bit
CONFIG_FILE := os2-bcc.mk CONFIG_FILE := os2-bcc.mk
CC := bcc32 CC := bcc32
borlandc: setup
.PHONY: borlandc .PHONY: borlandc
borlandc: setup
@cd .
endif endif
ifneq ($(findstring devel,$(MAKECMDGOALS)),) # development target ifneq ($(findstring devel,$(MAKECMDGOALS)),) # development target
CONFIG_FILE := os2-dev.mk CONFIG_FILE := os2-dev.mk
CC := gcc CC := gcc
devel: setup
.PHONY: devel .PHONY: devel
devel: setup
@cd .
endif endif
setup: std_setup setup: std_setup

12
builds/unix/detect.mk
View File

@ -40,8 +40,10 @@ ifeq ($(PLATFORM),unix)
ifneq ($(findstring devel,$(MAKECMDGOALS)),) ifneq ($(findstring devel,$(MAKECMDGOALS)),)
CONFIG_FILE := unix-dev.mk CONFIG_FILE := unix-dev.mk
CC := gcc CC := gcc
devel: setup
.PHONY: devel .PHONY: devel
devel: setup
@:
else else
# If `lcc' is the requested target, we use a special configuration # If `lcc' is the requested target, we use a special configuration
@ -50,8 +52,10 @@ ifeq ($(PLATFORM),unix)
ifneq ($(findstring lcc,$(MAKECMDGOALS)),) ifneq ($(findstring lcc,$(MAKECMDGOALS)),)
CONFIG_FILE := unix-lcc.mk CONFIG_FILE := unix-lcc.mk
CC := lcc CC := lcc
lcc: setup
.PHONY: lcc .PHONY: lcc
lcc: setup
@:
else else
# If a Unix platform is detected, the configure script is called and # If a Unix platform is detected, the configure script is called and
@ -68,9 +72,11 @@ ifeq ($(PLATFORM),unix)
# platform). # platform).
# #
CONFIG_FILE := unix.mk CONFIG_FILE := unix.mk
unix: setup
must_configure := 1 must_configure := 1
.PHONY: unix .PHONY: unix
unix: setup
@:
endif endif
endif endif

36
builds/windows/detect.mk
View File

@ -118,64 +118,82 @@ ifeq ($(PLATFORM),windows)
ifneq ($(findstring visualc,$(MAKECMDGOALS)),) # Visual C/C++ ifneq ($(findstring visualc,$(MAKECMDGOALS)),) # Visual C/C++
CONFIG_FILE := w32-vcc.mk CONFIG_FILE := w32-vcc.mk
CC := cl CC := cl
visualc: setup
.PHONY: visualc .PHONY: visualc
visualc: setup
@cd .
endif endif
ifneq ($(findstring intelc,$(MAKECMDGOALS)),) # Intel C/C++ ifneq ($(findstring intelc,$(MAKECMDGOALS)),) # Intel C/C++
CONFIG_FILE := w32-intl.mk CONFIG_FILE := w32-intl.mk
CC := cl CC := cl
visualc: setup
.PHONY: intelc .PHONY: intelc
visualc: setup
@cd .
endif endif
ifneq ($(findstring watcom,$(MAKECMDGOALS)),) # Watcom C/C++ ifneq ($(findstring watcom,$(MAKECMDGOALS)),) # Watcom C/C++
CONFIG_FILE := w32-wat.mk CONFIG_FILE := w32-wat.mk
CC := wcc386 CC := wcc386
watcom: setup
.PHONY: watcom .PHONY: watcom
watcom: setup
@cd .
endif endif
ifneq ($(findstring visualage,$(MAKECMDGOALS)),) # Visual Age C++ ifneq ($(findstring visualage,$(MAKECMDGOALS)),) # Visual Age C++
CONFIG_FILE := w32-icc.mk CONFIG_FILE := w32-icc.mk
CC := icc CC := icc
visualage: setup
.PHONY: visualage .PHONY: visualage
visualage: setup
@cd .
endif endif
ifneq ($(findstring lcc,$(MAKECMDGOALS)),) # LCC-Win32 ifneq ($(findstring lcc,$(MAKECMDGOALS)),) # LCC-Win32
CONFIG_FILE := w32-lcc.mk CONFIG_FILE := w32-lcc.mk
CC := lcc CC := lcc
lcc: setup
.PHONY: lcc .PHONY: lcc
lcc: setup
@cd .
endif endif
ifneq ($(findstring mingw32,$(MAKECMDGOALS)),) # mingw32 ifneq ($(findstring mingw32,$(MAKECMDGOALS)),) # mingw32
CONFIG_FILE := w32-mingw32.mk CONFIG_FILE := w32-mingw32.mk
CC := gcc CC := gcc
mingw32: setup
.PHONY: mingw32 .PHONY: mingw32
mingw32: setup
@cd .
endif endif
ifneq ($(findstring bcc32,$(MAKECMDGOALS)),) # Borland C++ ifneq ($(findstring bcc32,$(MAKECMDGOALS)),) # Borland C++
CONFIG_FILE := w32-bcc.mk CONFIG_FILE := w32-bcc.mk
CC := bcc32 CC := bcc32
bcc32: setup
.PHONY: bcc32 .PHONY: bcc32
bcc32: setup
@cd .
endif endif
ifneq ($(findstring devel-bcc,$(MAKECMDGOALS)),) # development target ifneq ($(findstring devel-bcc,$(MAKECMDGOALS)),) # development target
CONFIG_FILE := w32-bccd.mk CONFIG_FILE := w32-bccd.mk
CC := bcc32 CC := bcc32
devel-bcc: setup
.PHONY: devel-bcc .PHONY: devel-bcc
devel-bcc: setup
@cd .
endif endif
ifneq ($(findstring devel-gcc,$(MAKECMDGOALS)),) # development target ifneq ($(findstring devel-gcc,$(MAKECMDGOALS)),) # development target
CONFIG_FILE := w32-dev.mk CONFIG_FILE := w32-dev.mk
CC := gcc CC := gcc
devel-gcc: setup
.PHONY: devel-gcc .PHONY: devel-gcc
devel-gcc: setup
@cd .
endif endif
endif # test PLATFORM windows endif # test PLATFORM windows