From 7702edf793ed47effbb26050d66cb2acfcde2b96 Mon Sep 17 00:00:00 2001 From: Werner Lemberg Date: Mon, 7 May 2018 08:54:34 +0200 Subject: [PATCH] [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. --- ChangeLog | 15 +++++++++++++++ builds/dos/detect.mk | 20 +++++++++++++++----- builds/os2/detect.mk | 16 ++++++++++++---- builds/unix/detect.mk | 12 +++++++++--- builds/windows/detect.mk | 36 +++++++++++++++++++++++++++--------- 5 files changed, 78 insertions(+), 21 deletions(-) diff --git a/ChangeLog b/ChangeLog index 3401f91dc..2397f6700 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,18 @@ +2018-05-07 Werner Lemberg + + [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 Support symbol visibility features of Sun / Oracle C compilers. diff --git a/builds/dos/detect.mk b/builds/dos/detect.mk index 0201f7b46..14d8c037b 100644 --- a/builds/dos/detect.mk +++ b/builds/dos/detect.mk @@ -80,36 +80,46 @@ ifeq ($(PLATFORM),dos) ifneq ($(findstring emx,$(MAKECMDGOALS)),) # EMX gcc CONFIG_FILE := dos-emx.mk CC := gcc - emx: setup + .PHONY: emx + emx: setup + @cd . endif ifneq ($(findstring turboc,$(MAKECMDGOALS)),) # Turbo C CONFIG_FILE := dos-tcc.mk CC := tcc - turboc: setup + .PHONY: turboc + turboc: setup + @cd . endif ifneq ($(findstring watcom,$(MAKECMDGOALS)),) # Watcom C/C++ CONFIG_FILE := dos-wat.mk CC := wcc386 - watcom: setup + .PHONY: watcom + watcom: setup + @cd . endif ifneq ($(findstring borlandc,$(MAKECMDGOALS)),) # Borland C/C++ 32-bit CONFIG_FILE := dos-bcc.mk CC := bcc32 - borlandc: setup + .PHONY: borlandc + borlandc: setup + @cd . endif ifneq ($(findstring borlandc16,$(MAKECMDGOALS)),) # Borland C/C++ 16-bit CONFIG_FILE := dos-bcc.mk CC := bcc - borlandc16: setup + .PHONY: borlandc16 + borlandc16: setup + @cd . endif ifneq ($(findstring bash,$(SHELL)),) # check for bash diff --git a/builds/os2/detect.mk b/builds/os2/detect.mk index aaf78488b..5a80a2200 100644 --- a/builds/os2/detect.mk +++ b/builds/os2/detect.mk @@ -40,29 +40,37 @@ ifeq ($(PLATFORM),os2) ifneq ($(findstring visualage,$(MAKECMDGOALS)),) # Visual Age C++ CONFIG_FILE := os2-icc.mk CC := icc - visualage: setup + .PHONY: visualage + visualage: setup + @cd . endif ifneq ($(findstring watcom,$(MAKECMDGOALS)),) # Watcom C/C++ CONFIG_FILE := os2-wat.mk CC := wcc386 - watcom: setup + .PHONY: watcom + watcom: setup + @cd . endif ifneq ($(findstring borlandc,$(MAKECMDGOALS)),) # Borland C++ 32-bit CONFIG_FILE := os2-bcc.mk CC := bcc32 - borlandc: setup + .PHONY: borlandc + borlandc: setup + @cd . endif ifneq ($(findstring devel,$(MAKECMDGOALS)),) # development target CONFIG_FILE := os2-dev.mk CC := gcc - devel: setup + .PHONY: devel + devel: setup + @cd . endif setup: std_setup diff --git a/builds/unix/detect.mk b/builds/unix/detect.mk index 54daa0786..5f9b9e26e 100644 --- a/builds/unix/detect.mk +++ b/builds/unix/detect.mk @@ -40,8 +40,10 @@ ifeq ($(PLATFORM),unix) ifneq ($(findstring devel,$(MAKECMDGOALS)),) CONFIG_FILE := unix-dev.mk CC := gcc - devel: setup + .PHONY: devel + devel: setup + @: else # If `lcc' is the requested target, we use a special configuration @@ -50,8 +52,10 @@ ifeq ($(PLATFORM),unix) ifneq ($(findstring lcc,$(MAKECMDGOALS)),) CONFIG_FILE := unix-lcc.mk CC := lcc - lcc: setup + .PHONY: lcc + lcc: setup + @: else # If a Unix platform is detected, the configure script is called and @@ -68,9 +72,11 @@ ifeq ($(PLATFORM),unix) # platform). # CONFIG_FILE := unix.mk - unix: setup must_configure := 1 + .PHONY: unix + unix: setup + @: endif endif diff --git a/builds/windows/detect.mk b/builds/windows/detect.mk index dd5669ca5..05b0e6a16 100644 --- a/builds/windows/detect.mk +++ b/builds/windows/detect.mk @@ -118,64 +118,82 @@ ifeq ($(PLATFORM),windows) ifneq ($(findstring visualc,$(MAKECMDGOALS)),) # Visual C/C++ CONFIG_FILE := w32-vcc.mk CC := cl - visualc: setup + .PHONY: visualc + visualc: setup + @cd . endif ifneq ($(findstring intelc,$(MAKECMDGOALS)),) # Intel C/C++ CONFIG_FILE := w32-intl.mk CC := cl - visualc: setup + .PHONY: intelc + visualc: setup + @cd . endif ifneq ($(findstring watcom,$(MAKECMDGOALS)),) # Watcom C/C++ CONFIG_FILE := w32-wat.mk CC := wcc386 - watcom: setup + .PHONY: watcom + watcom: setup + @cd . endif ifneq ($(findstring visualage,$(MAKECMDGOALS)),) # Visual Age C++ CONFIG_FILE := w32-icc.mk CC := icc - visualage: setup + .PHONY: visualage + visualage: setup + @cd . endif ifneq ($(findstring lcc,$(MAKECMDGOALS)),) # LCC-Win32 CONFIG_FILE := w32-lcc.mk CC := lcc - lcc: setup + .PHONY: lcc + lcc: setup + @cd . endif ifneq ($(findstring mingw32,$(MAKECMDGOALS)),) # mingw32 CONFIG_FILE := w32-mingw32.mk CC := gcc - mingw32: setup + .PHONY: mingw32 + mingw32: setup + @cd . endif ifneq ($(findstring bcc32,$(MAKECMDGOALS)),) # Borland C++ CONFIG_FILE := w32-bcc.mk CC := bcc32 - bcc32: setup + .PHONY: bcc32 + bcc32: setup + @cd . endif ifneq ($(findstring devel-bcc,$(MAKECMDGOALS)),) # development target CONFIG_FILE := w32-bccd.mk CC := bcc32 - devel-bcc: setup + .PHONY: devel-bcc + devel-bcc: setup + @cd . endif ifneq ($(findstring devel-gcc,$(MAKECMDGOALS)),) # development target CONFIG_FILE := w32-dev.mk CC := gcc - devel-gcc: setup + .PHONY: devel-gcc + devel-gcc: setup + @cd . endif endif # test PLATFORM windows