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 /tests/server | |
| parent | 54b636f14546d3fde9f9c67c3b32701d78563161 (diff) | |
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 'tests/server')
| -rw-r--r-- | tests/server/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | tests/server/Makefile.am | 10 |
2 files changed, 3 insertions, 9 deletions
diff --git a/tests/server/CMakeLists.txt b/tests/server/CMakeLists.txt index 00f5242f9..e456a94df 100644 --- a/tests/server/CMakeLists.txt +++ b/tests/server/CMakeLists.txt @@ -7,7 +7,7 @@ function(SETUP_EXECUTABLE TEST_NAME) # ARGN are the files in the test 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" ) if(USE_ARES) include_directories(${CARES_INCLUDE_DIR}) diff --git a/tests/server/Makefile.am b/tests/server/Makefile.am index 620403815..f2067f2e2 100644 --- a/tests/server/Makefile.am +++ b/tests/server/Makefile.am @@ -26,8 +26,6 @@ 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_srcdir)/lib for libcurl's lib/curl_setup.h and other "borrowed" files @@ -35,17 +33,13 @@ AUTOMAKE_OPTIONS = foreign nostdinc # $(top_srcdir)/ares is for in-tree c-ares's external include files if USE_EMBEDDED_ARES -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_srcdir)/lib \ -I$(top_builddir)/ares \ -I$(top_srcdir)/ares else -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_srcdir)/lib endif |