diff options
Diffstat (limited to 'src')
| -rw-r--r-- | src/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | src/Makefile.Watcom | 2 | ||||
| -rw-r--r-- | src/Makefile.b32 | 2 | ||||
| -rw-r--r-- | src/Makefile.inc | 4 | ||||
| -rw-r--r-- | src/Makefile.m32 | 2 | ||||
| -rw-r--r-- | src/Makefile.netware | 2 | ||||
| -rw-r--r-- | src/makefile.amiga | 2 |
7 files changed, 8 insertions, 8 deletions
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 0b4556f2c..2822c5bc2 100644 --- 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 b0c656619..8d9754f0d 100644 --- 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 b0ee5b610..9f9885a7f 100644 --- 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 3f9044d65..4137ad2c0 100644 --- 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 b4b1b0b60..1c22dd074 100644 --- 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 0ecc753b0..85a117368 100644 --- 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 7b9b1c0be..25449a6dc 100644 --- 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 |