Commit e8b74313 authored by Steve Holme's avatar Steve Holme
Browse files

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.
parent ddf47196

packages/Android/Android.mk

+1 −1
Original line number Diff line number Diff line
@@ -104,7 +104,7 @@ LOCAL_SYSTEM_SHARED_LIBRARIES := libc 


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

LOCAL_CFLAGS += $(common_CFLAGS)

src/CMakeLists.txt

+1 −1
Original line number Diff line number Diff line
@@ -20,7 +20,7 @@ add_executable( 
  ${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 header files" FILES ${CURL_HFILES})

src/Makefile.Watcom

+1 −1
Original line number Diff line number Diff line
@@ -124,7 +124,7 @@ LINK_ARG = $(OBJ_DIR)/wlink.arg 


OBJS1 = $(OBJ_DIR)/$(CURL_CFILES)

!ifndef %curl_static

OBJS1 += $(CURLX_ONES:../lib/=)

OBJS1 += $(CURLX_CFILES:../lib/=)

!endif

OBJS2 = $(OBJS1: = $(OBJ_DIR)/)

OBJS = $(OBJS2:.c=.obj)

src/Makefile.b32

+1 −1
Original line number Diff line number Diff line
@@ -81,7 +81,7 @@ LINKLIB = $(LINKLIB) $(OPENSSL_PATH)\out32\ssleay32.lib $(OPENSSL_PATH)\out32\l 
# Makefile.inc provides the CSOURCES and HHEADERS defines

!include Makefile.inc



CSOURCES = $(CURL_CFILES) $(CURLX_ONES:../lib/=)

CSOURCES = $(CURL_CFILES) $(CURLX_CFILES:../lib/=)

OBJECTS  = $(CSOURCES:.c=.obj)

PREPROCESSED = $(CSOURCES:.c=.int)

src/Makefile.inc

+2 −2
Original line number Diff line number Diff line
@@ -9,7 +9,7 @@ 


# 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.

CURLX_ONES = \

CURLX_CFILES = \

	../lib/strtoofft.c \

	../lib/strdup.c \

	../lib/rawstr.c \
@@ -101,5 +101,5 @@ CURL_HFILES = \ 


CURL_RCFILES = curl.rc



curl_SOURCES = $(CURL_CFILES) $(CURLX_ONES) $(CURL_HFILES)

curl_SOURCES = $(CURL_CFILES) $(CURLX_CFILES) $(CURL_HFILES)