build: drop explicit curlx from hdr paths, refer headers with `curlx/` prefix

To make all src and test code refer to curlx headers the same way.

Also:
- src: move `curlx.h` include to `tool_setup.h`.
- src/tool_setup.h: drop stray `curlx/timeval.h`.
- servers: de-duplicate `curlx.h` and `curl_setup.h` includes.
- libtests, units: drop stray curlx sub-headers in favor of
  `<curlx/curlx.h>`.
- tests: include `curlx.h` with `<>` instead of `""`. To match
  other parts of the codebase.

Closes #17680

diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 1089b701487354c31f68cc3c1b456016988ff42a..b9a632959654dd85c44e91947bfb1e0f09738d25 100644 (file)
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -80,8 +80,7 @@ endif()
 
 set_property(DIRECTORY APPEND PROPERTY INCLUDE_DIRECTORIES
   "${PROJECT_BINARY_DIR}/lib"        # for "curl_config.h"
-  "${PROJECT_SOURCE_DIR}/lib"        # for "curl_setup.h"
-  "${PROJECT_SOURCE_DIR}/lib/curlx"  # for curlx functions
+  "${PROJECT_SOURCE_DIR}/lib"        # for "curl_setup.h", curlx
   "${CMAKE_CURRENT_SOURCE_DIR}"      # for "tool_hugehelp.c"
 )
 

diff --git a/src/Makefile.am b/src/Makefile.am
index bf7a44bed78f0f43f9fd042ca5f1525ff84f9b85..377d4b31a3e975a2c1156c63c27f2213761e7770 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -45,7 +45,6 @@ EXTRA_DIST = mk-file-embed.pl mkhelp.pl \
 AM_CPPFLAGS = -I$(top_srcdir)/include        \
               -I$(top_builddir)/lib          \
               -I$(top_srcdir)/lib            \
-              -I$(top_srcdir)/lib/curlx      \
               -I$(srcdir)
 
 bin_PROGRAMS = curl

diff --git a/src/terminal.c b/src/terminal.c
index 384afd8cb3bfc371fe076c7db6d288b9487b3bc9..ccd5bbf62a7d9cb14d35658f1a724329c0abb8b4 100644 (file)
--- a/src/terminal.c
+++ b/src/terminal.c
@@ -28,7 +28,6 @@
 #endif
 
 #include "terminal.h"
-#include <curlx.h>
 #include <memdebug.h> /* keep this as LAST include */
 
 #ifdef HAVE_TERMIOS_H

diff --git a/src/tool_cb_dbg.c b/src/tool_cb_dbg.c
index 2cf889c51cfeda48c633d33f9a6baeae9edd30e8..b9504f58252591f17594a2d4499097204abcfcf7 100644 (file)
--- a/src/tool_cb_dbg.c
+++ b/src/tool_cb_dbg.c
@@ -23,8 +23,6 @@
  ***************************************************************************/
 #include "tool_setup.h"
 
-#include <curlx.h>
-
 #include "tool_cfgable.h"
 #include "tool_msgs.h"
 #include "tool_cb_dbg.h"

diff --git a/src/tool_cb_hdr.c b/src/tool_cb_hdr.c
index 151fd5c0ffde86a7627b4c968c3ab65914ee25be..41d8b80d761e474791c2d427788821d1aac1938c 100644 (file)
--- a/src/tool_cb_hdr.c
+++ b/src/tool_cb_hdr.c
@@ -27,8 +27,6 @@
 #include <unistd.h>
 #endif
 
-#include <curlx.h>
-
 #include "tool_cfgable.h"
 #include "tool_doswin.h"
 #include "tool_msgs.h"

diff --git a/src/tool_cb_prg.c b/src/tool_cb_prg.c
index 108bf9536dce87ff040ae7d7dab0e7e777ce6be5..e4e3a709a08c26a6fc75ae3682b35aa6f257a9dd 100644 (file)
--- a/src/tool_cb_prg.c
+++ b/src/tool_cb_prg.c
@@ -23,8 +23,6 @@
  ***************************************************************************/
 #include "tool_setup.h"
 
-#include <curlx.h>
-
 #include "tool_cfgable.h"
 #include "tool_cb_prg.h"
 #include "tool_util.h"

diff --git a/src/tool_cb_rea.c b/src/tool_cb_rea.c
index 8fdd7db9d941feb414132398c19e176fc7157221..eb2717f71f3476d45e0e1f35136ed42960a9840b 100644 (file)
--- a/src/tool_cb_rea.c
+++ b/src/tool_cb_rea.c
@@ -27,8 +27,6 @@
 #include <sys/select.h>
 #endif
 
-#include <curlx.h>
-
 #include "tool_cfgable.h"
 #include "tool_cb_rea.h"
 #include "tool_operate.h"

diff --git a/src/tool_cb_see.c b/src/tool_cb_see.c
index dcd1f2537c66f9f0cd870d6cadc661a759e74360..ca6091f86bf0f41698004b3e7002a7eb4e348306 100644 (file)
--- a/src/tool_cb_see.c
+++ b/src/tool_cb_see.c
@@ -23,8 +23,6 @@
  ***************************************************************************/
 #include "tool_setup.h"
 
-#include <curlx.h>
-
 #include "tool_cfgable.h"
 #include "tool_operate.h"
 #include "tool_cb_see.h"

diff --git a/src/tool_cb_wrt.c b/src/tool_cb_wrt.c
index e0dbe2c9c7570359ad707e00a31f6657c7d85501..8f39cae1026783968538247c005a7214520c0401 100644 (file)
--- a/src/tool_cb_wrt.c
+++ b/src/tool_cb_wrt.c
@@ -30,8 +30,6 @@
 
 #include <sys/stat.h>
 
-#include <curlx.h>
-
 #include "tool_cfgable.h"
 #include "tool_msgs.h"
 #include "tool_cb_wrt.h"

diff --git a/src/tool_cfgable.c b/src/tool_cfgable.c
index 99fc91b097243bae3a4c601b49db3abb6f06ae38..0d2b80a1a7b86d9222ef186a939be7464919459e 100644 (file)
--- a/src/tool_cfgable.c
+++ b/src/tool_cfgable.c
@@ -27,7 +27,6 @@
 #include "tool_formparse.h"
 #include "tool_paramhlp.h"
 #include "tool_main.h"
-#include <curlx.h>
 #include <memdebug.h> /* keep this as LAST include */
 
 void config_init(struct OperationConfig *config)

diff --git a/src/tool_dirhie.c b/src/tool_dirhie.c
index 88e4daffb7b742b08657cdea180984e2a3d8e85e..6d0dac01c31b72fb7c78de6ad06f1837425abaa0 100644 (file)
--- a/src/tool_dirhie.c
+++ b/src/tool_dirhie.c
@@ -29,8 +29,6 @@
 #  include <direct.h>
 #endif
 
-#include <curlx.h>
-
 #include "tool_dirhie.h"
 #include "tool_msgs.h"
 

diff --git a/src/tool_doswin.c b/src/tool_doswin.c
index 82c8e9ae3c0b59426ccd5cae93676f6db6c0cb4b..58508603f1324e2052ec334d45ef422f38ca788b 100644 (file)
--- a/src/tool_doswin.c
+++ b/src/tool_doswin.c
@@ -40,7 +40,6 @@
 #include "tool_doswin.h"
 #include "tool_msgs.h"
 
-#include <curlx.h>
 #include <memdebug.h> /* keep this as LAST include */
 
 #ifdef _WIN32

diff --git a/src/tool_easysrc.c b/src/tool_easysrc.c
index fa264606fc59868dce479b564cb6250d9121ae2d..432e614d1c0a2ecccdfcc382c154afe01aa3ef17 100644 (file)
--- a/src/tool_easysrc.c
+++ b/src/tool_easysrc.c
@@ -27,8 +27,6 @@
 
 #ifndef CURL_DISABLE_LIBCURL_OPTION
 
-#include <curlx.h>
-
 #include "tool_cfgable.h"
 #include "tool_easysrc.h"
 #include "tool_msgs.h"

diff --git a/src/tool_filetime.c b/src/tool_filetime.c
index 44b23b9ad9babced225dbe45a4c0016870c12c76..1b62e7add7dddaaab4fd2bded01474ef87491831 100644 (file)
--- a/src/tool_filetime.c
+++ b/src/tool_filetime.c
@@ -24,7 +24,6 @@
 #include "tool_filetime.h"
 #include "tool_cfgable.h"
 #include "tool_msgs.h"
-#include <curlx.h>
 
 #ifdef HAVE_UTIME_H
 #  include <utime.h>

diff --git a/src/tool_findfile.c b/src/tool_findfile.c
index 02bdefea874ff2bf1df22d17c7dc541c936788fa..20d2c0bd93ddc4cfce7a0ca38b087f93920afe8f 100644 (file)
--- a/src/tool_findfile.c
+++ b/src/tool_findfile.c
@@ -36,8 +36,6 @@
 #include <fcntl.h>
 #endif
 
-#include <curlx.h>
-
 #include "tool_findfile.h"
 #include "tool_cfgable.h"
 

diff --git a/src/tool_formparse.c b/src/tool_formparse.c
index 748bcb29a280eb28b3266758e06e86726f45344e..b3a12edf2be2ed44034345b0adaa05ad8cbecbaf 100644 (file)
--- a/src/tool_formparse.c
+++ b/src/tool_formparse.c
@@ -23,8 +23,6 @@
  ***************************************************************************/
 #include "tool_setup.h"
 
-#include <curlx.h>
-
 #include "tool_cfgable.h"
 #include "tool_msgs.h"
 #include "tool_getparam.h"

diff --git a/src/tool_getparam.c b/src/tool_getparam.c
index cc1cd3f3b16dc3c26df684dcd6bc067843d6ad6e..f453d90b03a7266b0426b9d68da1fa5f2caf1144 100644 (file)
--- a/src/tool_getparam.c
+++ b/src/tool_getparam.c
@@ -23,7 +23,6 @@
  ***************************************************************************/
 #include "tool_setup.h"
 
-#include <curlx.h>
 #include "tool_cfgable.h"
 #include "tool_cb_prg.h"
 #include "tool_filetime.h"

diff --git a/src/tool_help.c b/src/tool_help.c
index 3d0336f22dd188b713a65a000aec4e5096adfe9b..3ccb15ab72a5384178e81a6d6933f5d7058c4ca8 100644 (file)
--- a/src/tool_help.c
+++ b/src/tool_help.c
@@ -23,8 +23,6 @@
  ***************************************************************************/
 #include "tool_setup.h"
 
-#include <curlx.h>
-
 #include "tool_help.h"
 #include "tool_libinfo.h"
 #include "tool_util.h"

diff --git a/src/tool_helpers.c b/src/tool_helpers.c
index 5026fcf1c6701fbe27c18182549002d5755d31d3..7a9ccb4d3589287813d09962243166cb7a0e0349 100644 (file)
--- a/src/tool_helpers.c
+++ b/src/tool_helpers.c
@@ -23,8 +23,6 @@
  ***************************************************************************/
 #include "tool_setup.h"
 
-#include <curlx.h>
-
 #include "tool_cfgable.h"
 #include "tool_msgs.h"
 #include "tool_getparam.h"

diff --git a/src/tool_ipfs.c b/src/tool_ipfs.c
index 0d870bef3087228c6eac2b61b201c94d30f9576d..b96a7e4dd6ef55a630b1f5536d4527a5536b937d 100644 (file)
--- a/src/tool_ipfs.c
+++ b/src/tool_ipfs.c
@@ -24,7 +24,6 @@
 #include "tool_setup.h"
 
 #ifndef CURL_DISABLE_IPFS
-#include <curlx.h>
 
 #include "tool_cfgable.h"
 #include "tool_msgs.h"

diff --git a/src/tool_libinfo.c b/src/tool_libinfo.c
index 4f9485350fcbe33370cdbba30a7405d632970d87..a1888c00a2c217f50cb4bd2d8fc01e643710bc6d 100644 (file)
--- a/src/tool_libinfo.c
+++ b/src/tool_libinfo.c
@@ -23,7 +23,6 @@
  ***************************************************************************/
 #include "tool_setup.h"
 
-#include <curlx.h>
 #include "tool_libinfo.h"
 #include <memdebug.h> /* keep this as LAST include */
 

diff --git a/src/tool_main.c b/src/tool_main.c
index b78fe28b50fb00fb7f1e6b1d098ba5dd9b78bd0f..5f453a32d783449176674443fdd55bc75d341453 100644 (file)
--- a/src/tool_main.c
+++ b/src/tool_main.c
@@ -37,8 +37,6 @@
 #include <fcntl.h>
 #endif
 
-#include <curlx.h>
-
 #include "tool_cfgable.h"
 #include "tool_doswin.h"
 #include "tool_msgs.h"

diff --git a/src/tool_msgs.c b/src/tool_msgs.c
index 520bb908727f8cd56c786d1d79422474bdf83f31..026c77a465b79e7f08f40524f273d904dfe78e8c 100644 (file)
--- a/src/tool_msgs.c
+++ b/src/tool_msgs.c
@@ -23,8 +23,6 @@
  ***************************************************************************/
 #include "tool_setup.h"
 
-#include <curlx.h>
-
 #include "tool_cfgable.h"
 #include "tool_msgs.h"
 #include "tool_cb_prg.h"

diff --git a/src/tool_operate.c b/src/tool_operate.c
index 467fd36ea54cbcc86720bab7cbf8b26dcba85e1a..3fbe85ee3bc2c8be84cacf82d6ca60d74d56fb6d 100644 (file)
--- a/src/tool_operate.c
+++ b/src/tool_operate.c
@@ -54,8 +54,6 @@
 #include <uv.h>
 #endif
 
-#include <curlx.h>
-
 #include "tool_cfgable.h"
 #include "tool_cb_dbg.h"
 #include "tool_cb_hdr.h"

diff --git a/src/tool_operhlp.c b/src/tool_operhlp.c
index 6a6cf202c8ba3901accab12b9d51c872fe0f6b79..a9571e881f101546033b21621482acc5869c0a90 100644 (file)
--- a/src/tool_operhlp.c
+++ b/src/tool_operhlp.c
@@ -24,7 +24,6 @@
 #include "tool_setup.h"
 #include "tool_operate.h"
 
-#include <curlx.h>
 #include "tool_cfgable.h"
 #include "tool_doswin.h"
 #include "tool_operhlp.h"

diff --git a/src/tool_paramhlp.c b/src/tool_paramhlp.c
index 0a3bc91fb93faea5601ac3d182543a828e90d8da..5b819a741358d76c495d20adc58b7ab7f8096ae3 100644 (file)
--- a/src/tool_paramhlp.c
+++ b/src/tool_paramhlp.c
@@ -23,8 +23,6 @@
  ***************************************************************************/
 #include "tool_setup.h"
 
-#include <curlx.h>
-
 #include "tool_cfgable.h"
 #include "tool_getparam.h"
 #include "tool_getpass.h"

diff --git a/src/tool_parsecfg.c b/src/tool_parsecfg.c
index d5f144274a3c9d74627e282b2f36933faab888ab..defadc0da0efda05e1c6df83c4dc214ec54b8164 100644 (file)
--- a/src/tool_parsecfg.c
+++ b/src/tool_parsecfg.c
@@ -23,7 +23,6 @@
  ***************************************************************************/
 #include "tool_setup.h"
 
-#include <curlx.h>
 #include "tool_cfgable.h"
 #include "tool_getparam.h"
 #include "tool_helpers.h"

diff --git a/src/tool_progress.c b/src/tool_progress.c
index 5c75e4e92c43d34d7ded3ba766bb7dcb2a6b519d..635f8e25ee0215d6bcfbe6d7aaa6e1c2ef8c1589 100644 (file)
--- a/src/tool_progress.c
+++ b/src/tool_progress.c
@@ -25,7 +25,6 @@
 #include "tool_operate.h"
 #include "tool_progress.h"
 #include "tool_util.h"
-#include <curlx.h>
 
 /* The point of this function would be to return a string of the input data,
    but never longer than 5 columns (+ one zero byte).

diff --git a/src/tool_setopt.c b/src/tool_setopt.c
index a782b33ea220ea0387957e60480bb3e11330ef50..f29183425cfdd700ba610ce2730d3c4d19fb874d 100644 (file)
--- a/src/tool_setopt.c
+++ b/src/tool_setopt.c
@@ -25,7 +25,6 @@
 
 #ifndef CURL_DISABLE_LIBCURL_OPTION
 
-#include <curlx.h>
 #include "tool_cfgable.h"
 #include "tool_easysrc.h"
 #include "tool_setopt.h"

diff --git a/src/tool_setup.h b/src/tool_setup.h
index d1d5ad9d79e258eeb971f33bbab7c7535db93ac3..c744ea6b72ee26d86a24300b23375e885fb5570d 100644 (file)
--- a/src/tool_setup.h
+++ b/src/tool_setup.h
@@ -47,7 +47,7 @@ extern FILE *tool_stderr;
 
 #include <curl/curl.h> /* external interface */
 
-#include "timeval.h"
+#include <curlx/curlx.h>
 
 /*
  * Platform specific stuff.

diff --git a/src/tool_ssls.c b/src/tool_ssls.c
index 20768ed54b99dc6431f1ae49cfebaea96e150bb8..e7ac3be4769622a5a2a13727ff558090b4cf24bc 100644 (file)
--- a/src/tool_ssls.c
+++ b/src/tool_ssls.c
@@ -23,7 +23,6 @@
  ***************************************************************************/
 #include "tool_setup.h"
 
-#include <curlx.h>
 #include "tool_cfgable.h"
 #include "tool_cb_dbg.h"
 #include "tool_msgs.h"

diff --git a/src/tool_urlglob.c b/src/tool_urlglob.c
index c8fa301b9943150d82377e9c68d38e8f78d02578..40d69a4b66052aa229190ecc3a10dc9b0dac74ea 100644 (file)
--- a/src/tool_urlglob.c
+++ b/src/tool_urlglob.c
@@ -23,7 +23,6 @@
  ***************************************************************************/
 #include "tool_setup.h"
 
-#include <curlx.h>
 #include "tool_cfgable.h"
 #include "tool_doswin.h"
 #include "tool_urlglob.h"

diff --git a/src/tool_util.c b/src/tool_util.c
index 27c2df1b6ce759adf7e213ed9c8485e5b4c21f90..e6188cecb0f147f8380a13f72de9dc586f370c2e 100644 (file)
--- a/src/tool_util.c
+++ b/src/tool_util.c
@@ -24,7 +24,6 @@
 #include "tool_setup.h"
 
 #include "tool_util.h"
-#include <curlx.h>
 #include <memdebug.h> /* keep this as LAST include */
 
 #ifdef _WIN32

diff --git a/src/tool_vms.c b/src/tool_vms.c
index 678892833938b9087e038bbce010c893ef7c6692..ecf01eb5b263569495dc1ba9b1c45cb4ca1a38ff 100644 (file)
--- a/src/tool_vms.c
+++ b/src/tool_vms.c
@@ -30,7 +30,6 @@
 #include <unixlib.h>
 #endif
 
-#include <curlx.h>
 #include "curlmsg_vms.h"
 #include "tool_vms.h"
 #include <memdebug.h> /* keep this as LAST include */

diff --git a/src/tool_writeout.c b/src/tool_writeout.c
index 3081b7082d057237770b12b9aa764b487f9d3f99..9036c140442d90d40dea03619bdb0c9d4f76fbb8 100644 (file)
--- a/src/tool_writeout.c
+++ b/src/tool_writeout.c
@@ -23,7 +23,6 @@
  ***************************************************************************/
 #include "tool_setup.h"
 
-#include <curlx.h>
 #include "tool_cfgable.h"
 #include "tool_writeout.h"
 #include "tool_writeout_json.h"

diff --git a/src/tool_writeout_json.c b/src/tool_writeout_json.c
index 1f10942378b43d6c4f85285f8bcd8324de802ba5..cfa2d1c9013d5a307483ff1dfcaee2607e8290c4 100644 (file)
--- a/src/tool_writeout_json.c
+++ b/src/tool_writeout_json.c
@@ -23,7 +23,6 @@
  ***************************************************************************/
 #include "tool_setup.h"
 
-#include <curlx.h>
 #include "tool_cfgable.h"
 #include "tool_writeout_json.h"
 #include "tool_writeout.h"

diff --git a/src/var.c b/src/var.c
index 9dba7e4c1a1e2faa4dee704b91e21d8cc4ddef78..01ea03918e12000acc8414788c78da802d9cc0cf 100644 (file)
--- a/src/var.c
+++ b/src/var.c
@@ -23,7 +23,6 @@
  ***************************************************************************/
 #include "tool_setup.h"
 
-#include <curlx.h>
 #include "tool_cfgable.h"
 #include "tool_getparam.h"
 #include "tool_helpers.h"

diff --git a/src/var.h b/src/var.h
index 8e5b68508576356013c6f3bfd989baa140394a90..4a304acbb97616cba0de562247808c584a91e628 100644 (file)
--- a/src/var.h
+++ b/src/var.h
@@ -25,7 +25,6 @@
  ***************************************************************************/
 
 #include "tool_getparam.h"
-#include <curlx.h>
 
 struct tool_var {
   struct tool_var *next;

diff --git a/tests/client/CMakeLists.txt b/tests/client/CMakeLists.txt
index a2a67eea677d504fb49e1a94122d3a26067a91fd..0aabacd70ef72e5cd53b0ba922f0659196b892e0 100644 (file)
--- a/tests/client/CMakeLists.txt
+++ b/tests/client/CMakeLists.txt
@@ -43,8 +43,7 @@ add_dependencies(testdeps ${BUNDLE})
 target_link_libraries(${BUNDLE} ${LIB_SELECTED} ${CURL_LIBS})
 target_include_directories(${BUNDLE} PRIVATE
   "${PROJECT_BINARY_DIR}/lib"            # for "curl_config.h"
-  "${PROJECT_SOURCE_DIR}/lib"            # for "curl_setup.h"
-  "${PROJECT_SOURCE_DIR}/lib/curlx"      # for curlx
+  "${PROJECT_SOURCE_DIR}/lib"            # for "curl_setup.h", curlx
   "${CMAKE_CURRENT_SOURCE_DIR}"          # for the generated bundle source to find included test sources
 )
 set_property(TARGET ${BUNDLE} APPEND PROPERTY COMPILE_DEFINITIONS "CURL_NO_OLDIES")

diff --git a/tests/client/Makefile.am b/tests/client/Makefile.am
index b9490dc7b22da7658808c0ab7cc7ffd4cb6aea46..26ecf866a7272d09a9a6ebb07abb3f535f0e6ae1 100644 (file)
--- a/tests/client/Makefile.am
+++ b/tests/client/Makefile.am
@@ -36,7 +36,6 @@ AUTOMAKE_OPTIONS = foreign nostdinc
 AM_CPPFLAGS = -I$(top_srcdir)/include        \
               -I$(top_builddir)/lib          \
               -I$(top_srcdir)/lib            \
-              -I$(top_srcdir)/lib/curlx      \
               -I$(srcdir)
 
 # Get BUNDLE, FIRSTFILES, CURLX_CFILES, TESTFILES variables

diff --git a/tests/client/first.h b/tests/client/first.h
index 3c1333829767676e7279ebcda94e636dc0502515..0785bc74606ea69257226241f9c6121c660cb664 100644 (file)
--- a/tests/client/first.h
+++ b/tests/client/first.h
@@ -36,7 +36,7 @@ extern const struct entry_s s_entries[];
 
 #include <curl/curl.h>
 
-#include "curlx.h"
+#include <curlx/curlx.h>
 
 #define ERR()                                                                 \
   do {                                                                        \

diff --git a/tests/libtest/CMakeLists.txt b/tests/libtest/CMakeLists.txt
index 7a7e919e33beb03a3b02cae10a75af27905f027a..bf7f9476f1f54080b0ddae304a40e8aa2b99af62 100644 (file)
--- a/tests/libtest/CMakeLists.txt
+++ b/tests/libtest/CMakeLists.txt
@@ -52,8 +52,7 @@ add_dependencies(testdeps ${BUNDLE})
 target_link_libraries(${BUNDLE} ${LIB_SELECTED} ${CURL_LIBS})
 target_include_directories(${BUNDLE} PRIVATE
   "${PROJECT_BINARY_DIR}/lib"            # for "curl_config.h"
-  "${PROJECT_SOURCE_DIR}/lib"            # for "curl_setup.h"
-  "${PROJECT_SOURCE_DIR}/lib/curlx"      # for curlx
+  "${PROJECT_SOURCE_DIR}/lib"            # for "curl_setup.h", curlx
   "${CMAKE_CURRENT_SOURCE_DIR}"          # for the generated bundle source to find included test sources
   "${PROJECT_SOURCE_DIR}/tests/unit"     # for "curlcheck.h"
 )

diff --git a/tests/libtest/Makefile.am b/tests/libtest/Makefile.am
index a0407f699009c05e7028408f64d5ec29fc76c07f..6b83ff8f2a539ab7113a10dacbbd5bb3351ab5be 100644 (file)
--- a/tests/libtest/Makefile.am
+++ b/tests/libtest/Makefile.am
@@ -36,7 +36,6 @@ AUTOMAKE_OPTIONS = foreign nostdinc
 AM_CPPFLAGS = -I$(top_srcdir)/include        \
               -I$(top_builddir)/lib          \
               -I$(top_srcdir)/lib            \
-              -I$(top_srcdir)/lib/curlx      \
               -I$(srcdir)                    \
               -I$(top_srcdir)/tests/unit
 

diff --git a/tests/libtest/first.h b/tests/libtest/first.h
index fcb623290c7cc8883513fe548d8e60dc919bb644..3a73d37094d18431d70557100602ec0fc2e65f39 100644 (file)
--- a/tests/libtest/first.h
+++ b/tests/libtest/first.h
@@ -34,6 +34,6 @@ struct entry_s {
 
 extern const struct entry_s s_entries[];
 
-#include "curlx.h"
+#include <curlx/curlx.h>
 
 #endif /* HEADER_LIBTEST_FIRST_H */

diff --git a/tests/server/CMakeLists.txt b/tests/server/CMakeLists.txt
index 9467a89c338903c0c775c4c45fbecbbfd1dc1e85..d8d48d42ffc4b561481940e26b81480139fb5125 100644 (file)
--- a/tests/server/CMakeLists.txt
+++ b/tests/server/CMakeLists.txt
@@ -39,8 +39,7 @@ add_dependencies(testdeps ${BUNDLE})
 target_link_libraries(${BUNDLE} ${CURL_LIBS})
 target_include_directories(${BUNDLE} PRIVATE
   "${PROJECT_BINARY_DIR}/lib"            # for "curl_config.h"
-  "${PROJECT_SOURCE_DIR}/lib"            # for "curl_setup.h"
-  "${PROJECT_SOURCE_DIR}/lib/curlx"      # for curlx
+  "${PROJECT_SOURCE_DIR}/lib"            # for "curl_setup.h", curlx
   "${CMAKE_CURRENT_SOURCE_DIR}"          # for the generated bundle source to find included test sources
 )
 set_property(TARGET ${BUNDLE} APPEND PROPERTY COMPILE_DEFINITIONS "WITHOUT_LIBCURL")

diff --git a/tests/server/Makefile.am b/tests/server/Makefile.am
index 190265b6a712dd5205fb94cb43a8f0d590784eee..2a4d20602bf9f8c5fe16b33ba27224af92259423 100644 (file)
--- a/tests/server/Makefile.am
+++ b/tests/server/Makefile.am
@@ -36,7 +36,6 @@ AUTOMAKE_OPTIONS = foreign nostdinc
 AM_CPPFLAGS = -I$(top_srcdir)/include        \
               -I$(top_builddir)/lib          \
               -I$(top_srcdir)/lib            \
-              -I$(top_srcdir)/lib/curlx      \
               -I$(srcdir)
 
 # Get BUNDLE, FIRSTFILES, UTILS, CURLX_CFILES, TESTFILES variables

diff --git a/tests/server/first.h b/tests/server/first.h
index 1fc31f8ebca10a32ee3904a34308abb52e166e97..4fb32c44bd3298ba6e6805f521655ccf1e739baa 100644 (file)
--- a/tests/server/first.h
+++ b/tests/server/first.h
@@ -50,7 +50,7 @@ extern const struct entry_s s_entries[];
 #include <netdb.h>
 #endif
 
-#include <curlx.h> /* from the private lib dir */
+#include <curlx/curlx.h>
 
 /* adjust for old MSVC */
 #if defined(_MSC_VER) && (_MSC_VER < 1900)

diff --git a/tests/server/sockfilt.c b/tests/server/sockfilt.c
index c611b9d3bc058fc080bdefcdc083c330e6671526..477e433f8ecc8fa1de7e41e10fece05eadf7edeb 100644 (file)
--- a/tests/server/sockfilt.c
+++ b/tests/server/sockfilt.c
@@ -85,9 +85,8 @@
  * it!
  */
 
-
 /* buffer is this excessively large only to be able to support things like
-  test 1003 which tests exceedingly large server response lines */
+   test 1003 which tests exceedingly large server response lines */
 #define BUFFER_SIZE 17010
 
 static bool verbose = FALSE;

diff --git a/tests/tunit/CMakeLists.txt b/tests/tunit/CMakeLists.txt
index 5a8ece4acfe443da3c2a81a5f69fd41cfa9f0d2b..03353a951953097b2e7e83ae53dd0e352ff0b5c5 100644 (file)
--- a/tests/tunit/CMakeLists.txt
+++ b/tests/tunit/CMakeLists.txt
@@ -39,8 +39,7 @@ add_dependencies(testdeps ${BUNDLE})
 target_link_libraries(${BUNDLE} curltool curlu)
 target_include_directories(${BUNDLE} PRIVATE
   "${PROJECT_BINARY_DIR}/lib"            # for "curl_config.h"
-  "${PROJECT_SOURCE_DIR}/lib"            # for "curl_setup.h"
-  "${PROJECT_SOURCE_DIR}/lib/curlx"      # for curlx
+  "${PROJECT_SOURCE_DIR}/lib"            # for "curl_setup.h", curlx
   "${PROJECT_SOURCE_DIR}/src"            # for tool headers
   "${PROJECT_SOURCE_DIR}/tests/libtest"  # for "first.h"
   "${PROJECT_SOURCE_DIR}/tests/unit"     # for "curlcheck.h"

diff --git a/tests/tunit/Makefile.am b/tests/tunit/Makefile.am
index 1b01b85a80c392626536275c25fea9ae623d740e..23472085edde6e61b89ef389dbb5928aaeded129 100644 (file)
--- a/tests/tunit/Makefile.am
+++ b/tests/tunit/Makefile.am
@@ -36,7 +36,6 @@ AUTOMAKE_OPTIONS = foreign nostdinc
 AM_CPPFLAGS = -I$(top_srcdir)/include        \
               -I$(top_builddir)/lib          \
               -I$(top_srcdir)/lib            \
-              -I$(top_srcdir)/lib/curlx      \
               -I$(top_srcdir)/src            \
               -I$(top_srcdir)/tests/libtest  \
               -I$(top_srcdir)/tests/unit     \

diff --git a/tests/unit/CMakeLists.txt b/tests/unit/CMakeLists.txt
index acad3fa388b40c3ad348168de829dde0f22e3f2a..39f1443cd9809587387cc90dd6b51236d2b11f85 100644 (file)
--- a/tests/unit/CMakeLists.txt
+++ b/tests/unit/CMakeLists.txt
@@ -39,8 +39,7 @@ add_dependencies(testdeps ${BUNDLE})
 target_link_libraries(${BUNDLE} curlu)
 target_include_directories(${BUNDLE} PRIVATE
   "${PROJECT_BINARY_DIR}/lib"            # for "curl_config.h"
-  "${PROJECT_SOURCE_DIR}/lib"            # for "curl_setup.h"
-  "${PROJECT_SOURCE_DIR}/lib/curlx"      # for curlx
+  "${PROJECT_SOURCE_DIR}/lib"            # for "curl_setup.h", curlx
   "${PROJECT_SOURCE_DIR}/tests/libtest"  # for "first.h"
   "${CMAKE_CURRENT_SOURCE_DIR}"          # for the generated bundle source to find included test sources
 )

diff --git a/tests/unit/Makefile.am b/tests/unit/Makefile.am
index 23a5cb68d56cdd4fbdf5de378389db2249b6f43c..20385016fc441b2802ed8f909f00c61b98f1b565 100644 (file)
--- a/tests/unit/Makefile.am
+++ b/tests/unit/Makefile.am
@@ -36,7 +36,6 @@ AUTOMAKE_OPTIONS = foreign nostdinc
 AM_CPPFLAGS = -I$(top_srcdir)/include        \
               -I$(top_builddir)/lib          \
               -I$(top_srcdir)/lib            \
-              -I$(top_srcdir)/lib/curlx      \
               -I$(top_srcdir)/tests/libtest  \
               -I$(srcdir)
 

diff --git a/tests/unit/unit1302.c b/tests/unit/unit1302.c
index 58b0e12518ccbe90fa10a89a44e1cddcde08afa5..f161cf29e3a6f9eb209272ca24c670bee7ef78e9 100644 (file)
--- a/tests/unit/unit1302.c
+++ b/tests/unit/unit1302.c
@@ -25,7 +25,7 @@
 
 #include "urldata.h"
 #include "url.h" /* for Curl_safefree */
-#include "curlx/base64.h"
+#include <curlx/base64.h>
 #include "memdebug.h" /* LAST include file */
 
 static CURLcode test_unit1302(char *arg)

diff --git a/tests/unit/unit1305.c b/tests/unit/unit1305.c
index cf8090c304d794dd0f5f6b7d91201b98962a1b2d..0ad1e00ee4a73dd50573d536e8b4f65d396d86e7 100644 (file)
--- a/tests/unit/unit1305.c
+++ b/tests/unit/unit1305.c
@@ -33,8 +33,6 @@
 #include <arpa/inet.h>
 #endif
 
-#include <curlx.h>
-
 #include "hash.h"
 #include "hostip.h"
 

diff --git a/tests/unit/unit1323.c b/tests/unit/unit1323.c
index a112e06c40a796dbdf1cfa3badfa3155b113f869..4717559f2efb88dc4ebbfe5f7354fda36dc8305e 100644 (file)
--- a/tests/unit/unit1323.c
+++ b/tests/unit/unit1323.c
@@ -23,7 +23,7 @@
  ***************************************************************************/
 #include "curlcheck.h"
 
-#include "timeval.h"
+#include <curlx/timeval.h>
 
 static CURLcode test_unit1323(char *arg)
 {

diff --git a/tests/unit/unit1602.c b/tests/unit/unit1602.c
index 020d57f458e88294032a1e9b9b249d0b93025ce6..126cf8d80656c7fef5e747155087e2eab1729086 100644 (file)
--- a/tests/unit/unit1602.c
+++ b/tests/unit/unit1602.c
@@ -23,8 +23,6 @@
  ***************************************************************************/
 #include "curlcheck.h"
 
-#include <curlx.h>
-
 #include "hash.h"
 
 #include <memdebug.h> /* LAST include file */

diff --git a/tests/unit/unit1603.c b/tests/unit/unit1603.c
index 37700af9b6409dd1f04bef92e8a08986ae62cd06..c3f99b6ca2705aad9e63d7a3176b7874ebd5d394 100644 (file)
--- a/tests/unit/unit1603.c
+++ b/tests/unit/unit1603.c
@@ -23,8 +23,8 @@
  ***************************************************************************/
 #include "curlcheck.h"
 
-#include <curlx.h>
 #include "hash.h"
+
 #include <memdebug.h> /* LAST include file */
 
 static const size_t slots = 3;

diff --git a/tests/unit/unit1616.c b/tests/unit/unit1616.c
index 67757fba098e8c85d3d1a720d641ec2935b063aa..8040809a3e88dcbda21ea2a064005e034615d23d 100644 (file)
--- a/tests/unit/unit1616.c
+++ b/tests/unit/unit1616.c
@@ -23,8 +23,8 @@
  ***************************************************************************/
 #include "curlcheck.h"
 
-#include <curlx.h>
-#include <uint-hash.h>
+#include "uint-hash.h"
+
 #include <memdebug.h> /* LAST include file */
 
 static void t1616_mydtor(unsigned int id, void *elem)

diff --git a/tests/unit/unit1650.c b/tests/unit/unit1650.c
index 0abcd99a51fd717b2084837fd7c4d977c178b989..ad5dfa190050d8708ccca81a108c989a5ec4263d 100644 (file)
--- a/tests/unit/unit1650.c
+++ b/tests/unit/unit1650.c
@@ -23,8 +23,9 @@
  ***************************************************************************/
 #include "curlcheck.h"
 
+#include <curlx/dynbuf.h>
+
 #include "doh.h"
-#include "dynbuf.h"
 
 static CURLcode test_unit1650(char *arg)
 {

diff --git a/tests/unit/unit1664.c b/tests/unit/unit1664.c
index b4e7e383f056cdf00a59b361c7ba2758dbd3fb79..49e00b3235b190c1d49e84a68e0ba6036ee712d6 100644 (file)
--- a/tests/unit/unit1664.c
+++ b/tests/unit/unit1664.c
@@ -30,7 +30,7 @@
 #include <netinet/in6.h>
 #endif
 
-#include "curlx/strparse.h"
+#include <curlx/strparse.h>
 
 #include "memdebug.h" /* LAST include file */
 

diff --git a/tests/unit/unit1979.c b/tests/unit/unit1979.c
index c1a53560c5bd029a992bbe0ce5e6a511b4448e29..d670364a3a61cb9d7ca4f3b567cc59cd2a56c044 100644 (file)
--- a/tests/unit/unit1979.c
+++ b/tests/unit/unit1979.c
@@ -23,8 +23,9 @@
  ***************************************************************************/
 #include "curlcheck.h"
 
+#include <curlx/dynbuf.h>
+
 #include "http_aws_sigv4.h"
-#include "dynbuf.h"
 
 static CURLcode test_unit1979(char *arg)
 {

diff --git a/tests/unit/unit1980.c b/tests/unit/unit1980.c
index 5cb81e99c1638a599ec707f11bd30e1195815a46..acb4b2f470006907e0600ad4ebf73cffbeb507f4 100644 (file)
--- a/tests/unit/unit1980.c
+++ b/tests/unit/unit1980.c
@@ -23,8 +23,9 @@
  ***************************************************************************/
 #include "curlcheck.h"
 
+#include <curlx/dynbuf.h>
+
 #include "http_aws_sigv4.h"
-#include "dynbuf.h"
 
 static CURLcode test_unit1980(char *arg)
 {

diff --git a/tests/unit/unit2600.c b/tests/unit/unit2600.c
index cc2c5922b5b0d454674663cbd1654b5a3e0fbf8a..47459477a4bd7addc0dc202f53123fdf5033b491 100644 (file)
--- a/tests/unit/unit2600.c
+++ b/tests/unit/unit2600.c
@@ -23,7 +23,7 @@
  ***************************************************************************/
 #include "curlcheck.h"
 
-#include <curlx.h>
+#include <curlx/curlx.h>
 
 #ifdef HAVE_NETINET_IN_H
 #include <netinet/in.h>

diff --git a/tests/unit/unit2602.c b/tests/unit/unit2602.c
index ee0cac08dac7b0a0ce09e5fb27ed01155b8c34b4..1834412e7365d2a8c79b61043ea4ee22a3e24251 100644 (file)
--- a/tests/unit/unit2602.c
+++ b/tests/unit/unit2602.c
@@ -23,8 +23,9 @@
  ***************************************************************************/
 #include "curlcheck.h"
 
+#include <curlx/dynbuf.h>
+
 #include "urldata.h"
-#include "dynbuf.h"
 #include "dynhds.h"
 #include "curl_trc.h"