diff options
| -rw-r--r-- | src/CMakeLists.txt | 3 | ||||
| -rw-r--r-- | src/Makefile.am | 3 | ||||
| -rw-r--r-- | src/Makefile.inc | 4 |
3 files changed, 7 insertions, 3 deletions
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index bfb866bd9..cfcefb396 100644 --- 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 f4bc6c9a2..c1280f7b8 100644 --- 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 bcc3d6153..1aa153c8c 100644 --- 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) |