diff options
| author | Daniel Stenberg <daniel@haxx.se> | 2017-05-22 09:05:10 +0200 |
|---|---|---|
| committer | Daniel Stenberg <daniel@haxx.se> | 2017-06-14 11:07:33 +0200 |
| commit | 73a2fcea0b4adea6ba342cd7ed1149782c214ae3 (patch) | |
| tree | 096ddd19a67c16bf788c3b8743f11de9dd5fba92 /src | |
| parent | 54b636f14546d3fde9f9c67c3b32701d78563161 (diff) | |
| download | gnurl-73a2fcea0b4adea6ba342cd7ed1149782c214ae3.tar.gz gnurl-73a2fcea0b4adea6ba342cd7ed1149782c214ae3.tar.bz2 gnurl-73a2fcea0b4adea6ba342cd7ed1149782c214ae3.zip | |
includes: remove curl/curlbuild.h and curl/curlrules.h
Rely entirely on curl/system.h now.
Introduced in Aug 2008 with commit 14240e9e109f. Now gone.
Fixes #1456
Diffstat (limited to 'src')
| -rw-r--r-- | src/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | src/Makefile.am | 6 |
2 files changed, 2 insertions, 6 deletions
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index e6004ceae..de188be66 100644 --- a/src/CMakeLists.txt +++ b/src/CMakeLists.txt @@ -56,7 +56,7 @@ source_group("curl header files" FILES ${CURL_HFILES}) include_directories( ${CURL_SOURCE_DIR}/lib # To be able to reach "curl_setup_once.h" ${CURL_BINARY_DIR}/lib # To be able to reach "curl_config.h" - ${CURL_BINARY_DIR}/include # To be able to reach "curl/curlbuild.h" + ${CURL_BINARY_DIR}/include # To be able to reach "curl/curl.h" # This is needed as tool_hugehelp.c is generated in the binary dir ${CURL_SOURCE_DIR}/src # To be able to reach "tool_hugehelp.h" ) diff --git a/src/Makefile.am b/src/Makefile.am index 950a7ba22..9c20e3445 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -29,17 +29,13 @@ AUTOMAKE_OPTIONS = foreign nostdinc # being currently built and tested are searched before the library which # might possibly already be installed in the system. # -# $(top_builddir)/include/curl for generated curlbuild.h included from curl.h -# $(top_builddir)/include for generated curlbuild.h inc. from lib/curl_setup.h # $(top_srcdir)/include is for libcurl's external include files # $(top_builddir)/lib is for libcurl's generated lib/curl_config.h file # $(top_builddir)/src is for curl's generated src/curl_config.h file # $(top_srcdir)/lib for libcurl's lib/curl_setup.h and other "borrowed" files # $(top_srcdir)/src is for curl's src/tool_setup.h and "curl-private" files -AM_CPPFLAGS = -I$(top_builddir)/include/curl \ - -I$(top_builddir)/include \ - -I$(top_srcdir)/include \ +AM_CPPFLAGS = -I$(top_srcdir)/include \ -I$(top_builddir)/lib \ -I$(top_builddir)/src \ -I$(top_srcdir)/lib \ |