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.

diff --git a/packages/Android/Android.mk b/packages/Android/Android.mk
index 3e94b80..301ab9e 100644 (file)
--- a/packages/Android/Android.mk
+++ b/packages/Android/Android.mk
@@ -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)
 

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 0b4556f..2822c5b 100644 (file)
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -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})
 

diff --git a/src/Makefile.Watcom b/src/Makefile.Watcom
index b0c6566..8d9754f 100644 (file)
--- a/src/Makefile.Watcom
+++ b/src/Makefile.Watcom
@@ -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)

diff --git a/src/Makefile.b32 b/src/Makefile.b32
index b0ee5b6..9f9885a 100644 (file)
--- a/src/Makefile.b32
+++ b/src/Makefile.b32
@@ -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)
 

diff --git a/src/Makefile.inc b/src/Makefile.inc
index 3f9044d..4137ad2 100644 (file)
--- a/src/Makefile.inc
+++ b/src/Makefile.inc
@@ -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)
 

diff --git a/src/Makefile.m32 b/src/Makefile.m32
index b4b1b0b..1c22dd0 100644 (file)
--- a/src/Makefile.m32
+++ b/src/Makefile.m32
@@ -287,7 +287,7 @@ include Makefile.inc
 
 curl_PROGRAMS = curl.exe
 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
 curl_OBJECTS += $(curlx_OBJECTS)
 vpath %.c $(PROOT)/lib

diff --git a/src/Makefile.netware b/src/Makefile.netware
index 0ecc753..85a1173 100644 (file)
--- a/src/Makefile.netware
+++ b/src/Makefile.netware
@@ -353,7 +353,7 @@ endif
 # Makefile.inc provides the CSOURCES and HHEADERS defines
 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)))
 ifndef LINK_STATIC
 OBJS   += $(OBJX)

diff --git a/src/makefile.amiga b/src/makefile.amiga
index 7b9b1c0..25449a6 100644 (file)
--- a/src/makefile.amiga
+++ b/src/makefile.amiga
@@ -16,7 +16,7 @@ MKHELP        =       ../src/mkhelp.pl
 
 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)
        $(CC) $(CFLAGS) -o cURL $(OBJS) $(LIBS) -Wl,-Map,cURL.map,--cref

diff --git a/winbuild/Makefile.vc b/winbuild/Makefile.vc
index 2bfc17a..16235de 100644 (file)
--- a/winbuild/Makefile.vc
+++ b/winbuild/Makefile.vc
@@ -199,4 +199,4 @@ $(MODE):
 \r
 copy_from_lib:\r
        echo copying .c...\r
-       FOR %%i IN ($(CURLX_ONES:/=\)) DO copy %%i ..\src\\r
+       FOR %%i IN ($(CURLX_CFILES:/=\)) DO copy %%i ..\src\\r