Base code merged to SPIN 2.4

[platform/upstream/curl.git] / src / Makefile.inc

diff --git a/src/Makefile.inc b/src/Makefile.inc
index cd890ac..401a635 100644 (file)
--- a/src/Makefile.inc
+++ b/src/Makefile.inc
@@ -9,11 +9,18 @@
 
 # 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 \
-       ../lib/nonblock.c
+       ../lib/nonblock.c \
+       ../lib/warnless.c
+
+CURLX_HFILES = \
+       ../lib/curl_setup.h \
+       ../lib/strtoofft.h \
+       ../lib/rawstr.h \
+       ../lib/nonblock.h \
+       ../lib/warnless.h
 
 CURL_CFILES = \
        tool_binmode.c \
@@ -46,6 +53,7 @@ CURL_CFILES = \
        tool_panykey.c \
        tool_paramhlp.c \
        tool_parsecfg.c \
+       tool_strdup.c \
        tool_setopt.c \
        tool_sleep.c \
        tool_urlglob.c \
@@ -90,6 +98,7 @@ CURL_HFILES = \
        tool_setopt.h \
        tool_setup.h \
        tool_sleep.h \
+       tool_strdup.h \
        tool_urlglob.h \
        tool_util.h \
        tool_version.h \
@@ -98,5 +107,7 @@ CURL_HFILES = \
        tool_writeout.h \
        tool_xattr.h
 
-curl_SOURCES = $(CURL_CFILES) $(CURLX_ONES) $(CURL_HFILES)
+CURL_RCFILES = curl.rc
+
+curl_SOURCES = $(CURL_CFILES) $(CURLX_CFILES) $(CURL_HFILES)