curl/curl
1
1
Fork 0
mirror of https://github.com/curl/curl.git synced 2025-09-17 09:32:48 +03:00
Code Issues Packages Projects Releases Wiki Activity

Makefile.m32: fix regression with tool_hugehelp [ci skip]

Browse Source 
In a recent commit I mistakenly deleted this logic, after seeing a
reference to a filename ending with `.cvs` and thinking it must have
been long gone. Turns out this is an existing file. Restore the rule
and the necessary `COPY` definitions with it.

The restored logic is required for a successful build on a bare source
tree (as opposed to a source release tarball).

Also shorten an existing condition similar to the one added in this
patch.

Regression since 07a0047882

Closes #9645
This commit is contained in:
Viktor Szakats 2022-10-04 19:14:38 +00:00
parent 784400806c
commit 4d7372415d
No known key found for this signature in database
GPG Key ID: B5ABD165E2AEF201
2 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
lib/Makefile.m32
View File

@ -169,7 +169,7 @@ ifneq ($(findstring -ssl,$(CFG)),)
OPENSSL_LIBS ?= -lssl -lcrypto OPENSSL_LIBS ?= -lssl -lcrypto
LIBS += $(OPENSSL_LIBS) LIBS += $(OPENSSL_LIBS)
ifneq ($(findstring -srp,$(CFG)),) ifneq ($(findstring -srp,$(CFG)),)
ifeq "$(wildcard $(OPENSSL_INCLUDE)/openssl/srp.h)" "$(OPENSSL_INCLUDE)/openssl/srp.h" ifneq ($(wildcard $(OPENSSL_INCLUDE)/openssl/srp.h),)
# OpenSSL 1.0.1 and later, except BoringSSL # OpenSSL 1.0.1 and later, except BoringSSL
CPPFLAGS += -DHAVE_OPENSSL_SRP -DUSE_TLS_SRP CPPFLAGS += -DHAVE_OPENSSL_SRP -DUSE_TLS_SRP
endif endif
@ -249,9 +249,11 @@ RC ?= $(CROSSPREFIX)windres
AR ?= $(CROSSPREFIX)ar AR ?= $(CROSSPREFIX)ar
ifneq ($(findstring /sh,$(SHELL)),) ifneq ($(findstring /sh,$(SHELL)),)
DEL = rm -f $1 DEL = rm -f $1
COPY = -cp -afv $1 $2
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)
endif endif
all: $(TARGETS) all: $(TARGETS)

7
src/Makefile.m32
View File

@ -54,12 +54,19 @@ curl_OBJECTS += $(patsubst %.rc,%.res,$(strip $(CURL_RCFILES)))
vpath %.c $(PROOT)/lib vpath %.c $(PROOT)/lib
TOCLEAN := $(curl_OBJECTS) TOCLEAN := $(curl_OBJECTS)
ifneq ($(wildcard tool_hugehelp.c.cvs),)
TOCLEAN += tool_hugehelp.c
endif
### Local rules ### Local rules
$(TARGETS): $(curl_OBJECTS) $(curl_DEPENDENCIES) $(TARGETS): $(curl_OBJECTS) $(curl_DEPENDENCIES)
$(CC) $(LDFLAGS) $(CURL_LDFLAGS_BIN) -o $@ $(curl_OBJECTS) $(LIBS) $(CC) $(LDFLAGS) $(CURL_LDFLAGS_BIN) -o $@ $(curl_OBJECTS) $(LIBS)
tool_hugehelp.c:
@echo Creating $@
@$(call COPY, $@.cvs, $@)
### Global script ### Global script
include $(PROOT)/lib/Makefile.m32 include $(PROOT)/lib/Makefile.m32