moparisthebest
/
curl
mirror of https://github.com/moparisthebest/curl
1
0
Fork 0
Code Issues Releases Wiki Activity

build: Renamed CURLX_ONES file list definition to CURLX_CFILES 

Renamed the CURLX_ONES file list definition in order to a) try and be
consistent with other file lists and b) to allow for the addition of
the curlx header files, which will assist with Visual Studio project
files generation rather than hard coding those files.
This commit is contained in:
Steve Holme 2014-05-21 22:51:03 +01:00
parent ddf4719694
commit e8b7431305
9 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
packages/Android/Android.mk
View File

@ -104,7 +104,7 @@ LOCAL_SYSTEM_SHARED_LIBRARIES := libc
LOCAL_C_INCLUDES += $(LOCAL_PATH)/include $(LOCAL_PATH)/lib LOCAL_C_INCLUDES += $(LOCAL_PATH)/include $(LOCAL_PATH)/lib
# This may also need to include $(CURLX_ONES) in order to correctly link # This may also need to include $(CURLX_CFILES) in order to correctly link
# if libcurl is changed to be built as a dynamic library # if libcurl is changed to be built as a dynamic library
LOCAL_CFLAGS += $(common_CFLAGS) LOCAL_CFLAGS += $(common_CFLAGS)

2
src/CMakeLists.txt
View File

@ -20,7 +20,7 @@ add_executable(
${curl_SOURCES} ${curl_SOURCES}
) )
source_group("cURLX source files" FILES ${CURLX_ONES}) source_group("cURLX source files" FILES ${CURLX_CFILES})
source_group("cURL source files" FILES ${CURL_CFILES}) source_group("cURL source files" FILES ${CURL_CFILES})
source_group("cURL header files" FILES ${CURL_HFILES}) source_group("cURL header files" FILES ${CURL_HFILES})

2
src/Makefile.Watcom
View File

@ -124,7 +124,7 @@ LINK_ARG = $(OBJ_DIR)/wlink.arg
OBJS1 = $(OBJ_DIR)/$(CURL_CFILES) OBJS1 = $(OBJ_DIR)/$(CURL_CFILES)
!ifndef %curl_static !ifndef %curl_static
OBJS1 += $(CURLX_ONES:../lib/=) OBJS1 += $(CURLX_CFILES:../lib/=)
!endif !endif
OBJS2 = $(OBJS1: = $(OBJ_DIR)/) OBJS2 = $(OBJS1: = $(OBJ_DIR)/)
OBJS = $(OBJS2:.c=.obj) OBJS = $(OBJS2:.c=.obj)

2
src/Makefile.b32
View File

@ -81,7 +81,7 @@ LINKLIB = $(LINKLIB) $(OPENSSL_PATH)\out32\ssleay32.lib $(OPENSSL_PATH)\out32\l
# Makefile.inc provides the CSOURCES and HHEADERS defines # Makefile.inc provides the CSOURCES and HHEADERS defines
!include Makefile.inc !include Makefile.inc
CSOURCES = $(CURL_CFILES) $(CURLX_ONES:../lib/=) CSOURCES = $(CURL_CFILES) $(CURLX_CFILES:../lib/=)
OBJECTS = $(CSOURCES:.c=.obj) OBJECTS = $(CSOURCES:.c=.obj)
PREPROCESSED = $(CSOURCES:.c=.int) PREPROCESSED = $(CSOURCES:.c=.int)

4
src/Makefile.inc
View File

@ -9,7 +9,7 @@
# libcurl has sources that provide functions named curlx_* that aren't part of # libcurl has sources that provide functions named curlx_* that aren't part of
# the official API, but we re-use the code here to avoid duplication. # the official API, but we re-use the code here to avoid duplication.
CURLX_ONES = \ CURLX_CFILES = \
../lib/strtoofft.c \ ../lib/strtoofft.c \
../lib/strdup.c \ ../lib/strdup.c \
../lib/rawstr.c \ ../lib/rawstr.c \
@ -101,5 +101,5 @@ CURL_HFILES = \
CURL_RCFILES = curl.rc CURL_RCFILES = curl.rc
curl_SOURCES = $(CURL_CFILES) $(CURLX_ONES) $(CURL_HFILES) curl_SOURCES = $(CURL_CFILES) $(CURLX_CFILES) $(CURL_HFILES)

2
src/Makefile.m32
View File

@ -287,7 +287,7 @@ include Makefile.inc
curl_PROGRAMS = curl.exe curl_PROGRAMS = curl.exe
curl_OBJECTS := $(patsubst %.c,%.o,$(strip $(CURL_CFILES))) curl_OBJECTS := $(patsubst %.c,%.o,$(strip $(CURL_CFILES)))
curlx_OBJECTS := $(patsubst %.c,%.o,$(notdir $(strip $(CURLX_ONES)))) curlx_OBJECTS := $(patsubst %.c,%.o,$(notdir $(strip $(CURLX_CFILES))))
ifdef DYN ifdef DYN
curl_OBJECTS += $(curlx_OBJECTS) curl_OBJECTS += $(curlx_OBJECTS)
vpath %.c $(PROOT)/lib vpath %.c $(PROOT)/lib

2
src/Makefile.netware
View File

@ -353,7 +353,7 @@ endif
# Makefile.inc provides the CSOURCES and HHEADERS defines # Makefile.inc provides the CSOURCES and HHEADERS defines
include Makefile.inc include Makefile.inc
OBJX := $(patsubst %.c,$(OBJDIR)/%.o,$(notdir $(strip $(CURLX_ONES)))) OBJX := $(patsubst %.c,$(OBJDIR)/%.o,$(notdir $(strip $(CURLX_CFILES))))
OBJS := $(patsubst %.c,$(OBJDIR)/%.o,$(strip $(CURL_CFILES))) OBJS := $(patsubst %.c,$(OBJDIR)/%.o,$(strip $(CURL_CFILES)))
ifndef LINK_STATIC ifndef LINK_STATIC
OBJS += $(OBJX) OBJS += $(OBJX)

2
src/makefile.amiga
View File

@ -16,7 +16,7 @@ MKHELP = ../src/mkhelp.pl
include Makefile.inc include Makefile.inc
OBJS = $(CURL_CFILES:.c=.o) $(CURLX_ONES:.c=.o) OBJS = $(CURL_CFILES:.c=.o) $(CURLX_CFILES:.c=.o)
all: tool_hugehelp.c $(OBJS) all: tool_hugehelp.c $(OBJS)
$(CC) $(CFLAGS) -o cURL $(OBJS) $(LIBS) -Wl,-Map,cURL.map,--cref $(CC) $(CFLAGS) -o cURL $(OBJS) $(LIBS) -Wl,-Map,cURL.map,--cref

2
winbuild/Makefile.vc
View File

@ -199,4 +199,4 @@ $(MODE):
copy_from_lib: copy_from_lib:
echo copying .c... echo copying .c...
FOR %%i IN ($(CURLX_ONES:/=\)) DO copy %%i ..\src\ FOR %%i IN ($(CURLX_CFILES:/=\)) DO copy %%i ..\src\