generic-library/curl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Rename CURL_SOURCES macro; revert previous rename of curl_SOURCES macro.

Browse Source
This commit is contained in:
Guenter Knauf 2010-08-02 12:24:54 +02:00
parent 3cf658fc24
commit f97a7eb400
8 changed files with 13 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Android.mk
View File

@ -90,7 +90,7 @@ include $(BUILD_STATIC_LIBRARY)
include $(CLEAR_VARS)
include $(LOCAL_PATH)/src/Makefile.inc
LOCAL_SRC_FILES := $(addprefix src/,$(CURL_SOURCES))
LOCAL_SRC_FILES := $(addprefix src/,$(CURL_CFILES))
LOCAL_MODULE := curl
LOCAL_STATIC_LIBRARIES := libcurl

4
src/CMakeLists.txt
View File

@ -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(

2
src/Makefile.Watcom
View File

@ -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

2
src/Makefile.b32
View File

@ -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:

4
src/Makefile.inc
View File

@ -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)

2
src/Makefile.m32
View File

@ -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)

5
src/Makefile.netware
View File

@ -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)

2
src/makefile.dj
View File

@ -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