Makefile.inc: s/curl_SOURCES/CURL_FILES

This allows the root Makefile.am to include the Makefile.inc without
causing automake to warn on it (variables named *_SOURCES are
magic). curl_SOURCES is then instead assigned properly in
src/Makefile.am only.

Closes #577

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index bfb866bd9395fcf8e885e84161d313721f3c8530..cfcefb3962d09353c47cc1135a4eaa819e05f18a 100644 (file)
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -43,9 +43,10 @@ if(MSVC)
   list(APPEND CURL_SOURCE curl.rc)
 endif()
 
+# CURL_FILES comes from Makefile.inc
 add_executable(
   ${EXE_NAME}
-  ${curl_SOURCES}
+  ${CURL_FILES}
   )
 
 source_group("cURLX source files" FILES ${CURLX_CFILES})

diff --git a/src/Makefile.am b/src/Makefile.am
index f4bc6c9a214c77fed9fb2fa961b2fcc423c19708..c1280f7b8277117cf008a784a8c84674ebefee1f 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -53,6 +53,9 @@ endif
 
 include Makefile.inc
 
+# CURL_FILES comes from Makefile.inc
+curl_SOURCES = $(CURL_FILES)
+
 # This might hold -Werror
 CFLAGS += @CURL_CFLAG_EXTRAS@
 

diff --git a/src/Makefile.inc b/src/Makefile.inc
index bcc3d6153497b2237f925c5b9a6258fb074a348b..1aa153c8ca40d71cc441e62fe3edfa15359b30d5 100644 (file)
--- a/src/Makefile.inc
+++ b/src/Makefile.inc
@@ -111,5 +111,5 @@ CURL_HFILES = \
 
 CURL_RCFILES = curl.rc
 
-curl_SOURCES = $(CURL_CFILES) $(CURLX_CFILES) $(CURL_HFILES)
-
+# curl_SOURCES is special and gets assigned in src/Makefile.am
+CURL_FILES = $(CURL_CFILES) $(CURLX_CFILES) $(CURL_HFILES)