Commit f97a7eb4 authored by Guenter Knauf's avatar Guenter Knauf
Browse files

Rename CURL_SOURCES macro; revert previous rename of curl_SOURCES macro.

parent 3cf658fc
Loading
Loading
Loading
Loading
+1 −1
Original line number Diff line number Diff line
@@ -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
+2 −2
Original line number Diff line number Diff line
@@ -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(
+1 −1
Original line number Diff line number Diff line
@@ -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
+1 −1
Original line number Diff line number Diff line
@@ -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:
+2 −2
Original line number Diff line number Diff line
@@ -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)
Loading