Commit bfe6f1f7 authored by Daniel Stenberg's avatar Daniel Stenberg
Browse files

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
parent a464f338

src/CMakeLists.txt

+2 −1
Original line number Diff line number Diff line
@@ -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})

src/Makefile.am

+3 −0
Original line number Diff line number Diff line
@@ -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@

src/Makefile.inc

+2 −2
Original line number Diff line number Diff line
@@ -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)