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/unit | |
| 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/unit')
| -rw-r--r-- | tests/unit/CMakeLists.txt | 2 | ||||
| -rw-r--r-- | tests/unit/Makefile.am | 12 |
2 files changed, 4 insertions, 10 deletions
diff --git a/tests/unit/CMakeLists.txt b/tests/unit/CMakeLists.txt index 14589d68d..a29991215 100644 --- a/tests/unit/CMakeLists.txt +++ b/tests/unit/CMakeLists.txt @@ -29,7 +29,7 @@ include_directories( ${CURL_SOURCE_DIR}/tests/libtest ${CURL_SOURCE_DIR}/src ${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" ) foreach(_testfile ${UT_SRC}) diff --git a/tests/unit/Makefile.am b/tests/unit/Makefile.am index 6dc2a17c1..61b72c0db 100644 --- a/tests/unit/Makefile.am +++ b/tests/unit/Makefile.am @@ -5,7 +5,7 @@ # | (__| |_| | _ <| |___ # \___|\___/|_| \_\_____| # -# Copyright (C) 1998 - 2016, Daniel Stenberg, <daniel@haxx.se>, et al. +# Copyright (C) 1998 - 2017, Daniel Stenberg, <daniel@haxx.se>, et al. # # This software is licensed as described in the file COPYING, which # you should have received as part of this distribution. The terms @@ -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,9 +33,7 @@ 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_srcdir)/src \ @@ -45,9 +41,7 @@ AM_CPPFLAGS = -I$(top_builddir)/include/curl \ -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 \ -I$(top_srcdir)/src \ |