aboutsummaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorGuenter Knauf <lists@gknw.net>2010-08-02 12:24:54 +0200
committerGuenter Knauf <lists@gknw.net>2010-08-02 12:24:54 +0200
commitf97a7eb400f014011c036230787926171b88527a (patch)
tree8ed6f70054fa37c4dd0a7e285d20ad0b9073dfd6 /src
parent3cf658fc24629d2ea067d1f9dd6204f1a4e59f67 (diff)
Rename CURL_SOURCES macro; revert previous rename of curl_SOURCES macro.
Diffstat (limited to 'src')
-rw-r--r--src/CMakeLists.txt4
-rw-r--r--src/Makefile.Watcom2
-rw-r--r--src/Makefile.b322
-rw-r--r--src/Makefile.inc4
-rw-r--r--src/Makefile.m322
-rw-r--r--src/Makefile.netware5
-rw-r--r--src/makefile.dj2
7 files changed, 12 insertions, 9 deletions
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 3072667db..faea09676 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -17,11 +17,11 @@ endif()
add_executable(
${EXE_NAME}
- ${CURL_ALLFILES}
+ ${curl_SOURCES}
)
source_group("cURLX source files" FILES ${CURLX_ONES})
-source_group("cURL source files" FILES ${CURL_SOURCES})
+source_group("cURL source files" FILES ${CURL_CFILES})
source_group("cURL header files" FILES ${CURL_HFILES})
include_directories(
diff --git a/src/Makefile.Watcom b/src/Makefile.Watcom
index 6ee51abf9..1ab1aa569 100644
--- a/src/Makefile.Watcom
+++ b/src/Makefile.Watcom
@@ -71,7 +71,7 @@ LINK_ARG = $(OBJ_DIR)\wlink.arg
# to split off the prefixed path.
CURLX_SOURCES = rawstr.c nonblock.c
-OBJS = $(CURL_SOURCES:.c=.obj)
+OBJS = $(CURL_CFILES:.c=.obj)
!ifdef %curl_static
CFLAGS += -DCURL_STATICLIB
!else
diff --git a/src/Makefile.b32 b/src/Makefile.b32
index 5406c738d..7408dd2d9 100644
--- a/src/Makefile.b32
+++ b/src/Makefile.b32
@@ -65,7 +65,7 @@ LINKLIB = $(LINKLIB) $(OPENSSL_PATH)/out32/ssleay32.lib $(OPENSSL_PATH)/out32/l
top_srcdir = ..
!include Makefile.inc
-CSOURCES = $(CURL_SOURCES) $(CURLX_ONES)
+CSOURCES = $(CURL_CFILES) $(CURLX_ONES)
OBJECTS = $(CSOURCES:.c=.obj)
.c.obj:
diff --git a/src/Makefile.inc b/src/Makefile.inc
index 4ecb104c7..34dfd45a0 100644
--- a/src/Makefile.inc
+++ b/src/Makefile.inc
@@ -14,12 +14,12 @@ CURLX_ONES = $(top_srcdir)/lib/strtoofft.c \
$(top_srcdir)/lib/rawstr.c \
$(top_srcdir)/lib/nonblock.c
-CURL_SOURCES = main.c hugehelp.c urlglob.c writeout.c writeenv.c \
+CURL_CFILES = main.c hugehelp.c urlglob.c writeout.c writeenv.c \
getpass.c homedir.c curlutil.c os-specific.c
CURL_HFILES = hugehelp.h setup.h config-win32.h config-mac.h \
config-riscos.h urlglob.h version.h os-specific.h \
writeout.h writeenv.h getpass.h homedir.h curlutil.h
-CURL_ALLFILES = $(CURL_SOURCES) $(CURLX_ONES) $(CURL_HFILES)
+curl_SOURCES = $(CURL_CFILES) $(CURLX_ONES) $(CURL_HFILES)
diff --git a/src/Makefile.m32 b/src/Makefile.m32
index 799df9600..689494258 100644
--- a/src/Makefile.m32
+++ b/src/Makefile.m32
@@ -121,7 +121,7 @@ COMPILE = $(CC) $(INCLUDES) $(CFLAGS)
# Makefile.inc provides the CSOURCES and HHEADERS defines
include Makefile.inc
-curl_OBJECTS := $(patsubst %.c,%.o,$(strip $(CURL_SOURCES)))
+curl_OBJECTS := $(patsubst %.c,%.o,$(strip $(CURL_CFILES)))
ifdef DYN
curlx_OBJECTS := $(patsubst %.c,%.o,$(notdir $(strip $(CURLX_ONES))))
curl_OBJECTS += $(curlx_OBJECTS)
diff --git a/src/Makefile.netware b/src/Makefile.netware
index 1c428edea..a49898606 100644
--- a/src/Makefile.netware
+++ b/src/Makefile.netware
@@ -232,7 +232,10 @@ endif
include Makefile.inc
OBJX := $(patsubst %.c,$(OBJDIR)/%.o,$(notdir $(strip $(CURLX_ONES))))
-OBJS := $(patsubst %.c,$(OBJDIR)/%.o,$(strip $(CURL_SOURCES))) $(OBJX)
+OBJS := $(patsubst %.c,$(OBJDIR)/%.o,$(strip $(CURL_CFILES)))
+ifndef LINK_STATIC
+OBJS += $(OBJX)
+endif
vpath %.c $(CURL_LIB)
diff --git a/src/makefile.dj b/src/makefile.dj
index 7f997f338..fc3ae16d8 100644
--- a/src/makefile.dj
+++ b/src/makefile.dj
@@ -12,7 +12,7 @@ TOPDIR = ..
include ../packages/DOS/common.dj
include Makefile.inc
-CSOURCES = $(CURL_SOURCES)
+CSOURCES = $(CURL_CFILES)
ifeq ($(USE_SSL),1)
EX_LIBS += $(OPENSSL_ROOT)/lib/libssl.a $(OPENSSL_ROOT)/lib/libcrypt.a