mirror of
https://github.com/curl/curl.git
synced 2025-09-17 01:22:41 +03:00
Makefile.mk: address minor issues
- Fix `NROFF` auto-detection with certain shell/make-build combinations: When a non-MSYS2 GNU Make runs inside an MSYS2 shell, Make executes the detection command as-is via `CreateProcess()`. It fails because `command` is an `sh` built-in. Ensure to explicitly invoke the shell. - Initialize user-customizable variables: Silences a list of warnings when running GNU Make with the option `--warn-undefined-variables`. Another benefit is that it's now easy to look up all user-customizable `Makefile.mk` variables by grepping for ` ?=` in the curl source tree. Suggested-by: Gisle Vanem Ref: https://github.com/curl/curl/pull/9764#issuecomment-1330674433 - Fix `MKDIR` invocation: Avoid a warning and potential issue in envs without forward-slash support. Closes #10000
This commit is contained in:
parent
73c4f9696a
commit
8fc2423338
|
@ -27,10 +27,7 @@
|
||||||
# Usage: [mingw32-]make -f Makefile.mk CFG=-feat1[-feat2][-feat3][...]
|
# Usage: [mingw32-]make -f Makefile.mk CFG=-feat1[-feat2][-feat3][...]
|
||||||
# Example: [mingw32-]make -f Makefile.mk CFG=-zlib-ssl-libssh2-ipv6
|
# Example: [mingw32-]make -f Makefile.mk CFG=-zlib-ssl-libssh2-ipv6
|
||||||
#
|
#
|
||||||
# Set component roots via envvar <feature>_PATH. Also available for
|
# Look for ' ?=' to find all accepted customization variables.
|
||||||
# customization: CC, AR, RC, CPPFLAGS, LDFLAGS, LIBS, CFLAGS, RCFLAGS,
|
|
||||||
# TRIPLET, CROSSPREFIX, CURL_LDFLAGS_BIN, CURL_LDFLAGS_LIB, CURL_DLL_SUFFIX,
|
|
||||||
# and more for individual components (see below).
|
|
||||||
|
|
||||||
# This script is reused by 'src' and 'docs/examples' Makefile.mk scripts.
|
# This script is reused by 'src' and 'docs/examples' Makefile.mk scripts.
|
||||||
|
|
||||||
|
@ -41,6 +38,16 @@ endif
|
||||||
|
|
||||||
### Common
|
### Common
|
||||||
|
|
||||||
|
CFLAGS ?=
|
||||||
|
CPPFLAGS ?=
|
||||||
|
RCFLAGS ?=
|
||||||
|
LDFLAGS ?=
|
||||||
|
CURL_LDFLAGS_BIN ?=
|
||||||
|
CURL_LDFLAGS_LIB ?=
|
||||||
|
LIBS ?=
|
||||||
|
|
||||||
|
CROSSPREFIX ?=
|
||||||
|
|
||||||
ifeq ($(CC),cc)
|
ifeq ($(CC),cc)
|
||||||
CC := gcc
|
CC := gcc
|
||||||
endif
|
endif
|
||||||
|
@ -49,6 +56,7 @@ AR := $(CROSSPREFIX)$(AR)
|
||||||
RC ?= $(CROSSPREFIX)windres
|
RC ?= $(CROSSPREFIX)windres
|
||||||
|
|
||||||
# For compatibility
|
# For compatibility
|
||||||
|
ARCH ?=
|
||||||
ifeq ($(ARCH),w64)
|
ifeq ($(ARCH),w64)
|
||||||
TRIPLET := x86_64-w64-mingw32
|
TRIPLET := x86_64-w64-mingw32
|
||||||
CFLAGS += -m64
|
CFLAGS += -m64
|
||||||
|
@ -334,19 +342,19 @@ DEL = rm -f $1
|
||||||
COPY = -cp -afv $1 $2
|
COPY = -cp -afv $1 $2
|
||||||
MKDIR = mkdir -p $1
|
MKDIR = mkdir -p $1
|
||||||
RMDIR = rm -fr $1
|
RMDIR = rm -fr $1
|
||||||
WHICH = command -v
|
WHICH = $(SHELL) -c "command -v $1"
|
||||||
else
|
else
|
||||||
DEL = -del 2>NUL /q /f $(subst /,\,$1)
|
DEL = -del 2>NUL /q /f $(subst /,\,$1)
|
||||||
COPY = -copy 2>NUL /y $(subst /,\,$1) $(subst /,\,$2)
|
COPY = -copy 2>NUL /y $(subst /,\,$1) $(subst /,\,$2)
|
||||||
MKDIR = -md 2>NUL $(subst /,\,$1)
|
MKDIR = -md 2>NUL $(subst /,\,$1)
|
||||||
RMDIR = -rd 2>NUL /q /s $(subst /,\,$1)
|
RMDIR = -rd 2>NUL /q /s $(subst /,\,$1)
|
||||||
WHICH = where
|
WHICH = where $1
|
||||||
endif
|
endif
|
||||||
|
|
||||||
all: $(TARGETS)
|
all: $(TARGETS)
|
||||||
|
|
||||||
$(OBJ_DIR):
|
$(OBJ_DIR):
|
||||||
-$(MKDIR) $(OBJ_DIR)
|
-$(call MKDIR, $(OBJ_DIR))
|
||||||
|
|
||||||
$(OBJ_DIR)/%.o: %.c
|
$(OBJ_DIR)/%.o: %.c
|
||||||
$(CC) -W -Wall $(CFLAGS) $(CPPFLAGS) -c $< -o $@
|
$(CC) -W -Wall $(CFLAGS) $(CPPFLAGS) -c $< -o $@
|
||||||
|
@ -376,6 +384,7 @@ vpath %.c vauth vquic vssh vtls
|
||||||
|
|
||||||
libcurl_a_LIBRARY := libcurl.a
|
libcurl_a_LIBRARY := libcurl.a
|
||||||
ifdef WIN32
|
ifdef WIN32
|
||||||
|
CURL_DLL_SUFFIX ?=
|
||||||
libcurl_dll_LIBRARY := libcurl$(CURL_DLL_SUFFIX).dll
|
libcurl_dll_LIBRARY := libcurl$(CURL_DLL_SUFFIX).dll
|
||||||
libcurl_dll_a_LIBRARY := libcurl.dll.a
|
libcurl_dll_a_LIBRARY := libcurl.dll.a
|
||||||
ifdef MAP
|
ifdef MAP
|
||||||
|
|
|
@ -84,7 +84,7 @@ NROFF ?= groff
|
||||||
|
|
||||||
TOCLEAN += tool_hugehelp.c
|
TOCLEAN += tool_hugehelp.c
|
||||||
|
|
||||||
ifneq ($(shell $(WHICH) $(NROFF)),)
|
ifneq ($(shell $(call WHICH, $(NROFF))),)
|
||||||
$(PROOT)/docs/curl.1: $(wildcard $(PROOT)/docs/cmdline-opts/*.d)
|
$(PROOT)/docs/curl.1: $(wildcard $(PROOT)/docs/cmdline-opts/*.d)
|
||||||
cd $(PROOT)/docs/cmdline-opts && \
|
cd $(PROOT)/docs/cmdline-opts && \
|
||||||
$(PERL) gen.pl mainpage $(notdir $^) > ../curl.1
|
$(PERL) gen.pl mainpage $(notdir $^) > ../curl.1
|
||||||
|
|
Loading…
Reference in New Issue
Block a user