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

Makefile.inc: s/curl_SOURCES/CURL_FILES

Browse Source 
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
This commit is contained in:
Daniel Stenberg 2015-12-23 12:07:50 +01:00
parent a464f33843
commit bfe6f1f788
3 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/CMakeLists.txt
View File

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

3
src/Makefile.am
View File

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

4
src/Makefile.inc
View File

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