diff options
| author | Yang Tse <yangsita@gmail.com> | 2008-07-15 05:46:49 +0000 |
|---|---|---|
| committer | Yang Tse <yangsita@gmail.com> | 2008-07-15 05:46:49 +0000 |
| commit | 1e7125ae7b7e83fc5f86fa6d0ac7038865eacf1f (patch) | |
| tree | b1a493326b67606e90dcb4fc6109bab756fe7a36 /tests | |
| parent | aa4a7471dd159d7a3b7cfc8dd3e706e0223afa9b (diff) | |
add comment for include paths
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/libtest/Makefile.am | 18 | ||||
| -rw-r--r-- | tests/libtest/lib506.c | 2 | ||||
| -rw-r--r-- | tests/libtest/test.h | 2 | ||||
| -rw-r--r-- | tests/server/Makefile.am | 14 |
4 files changed, 22 insertions, 14 deletions
diff --git a/tests/libtest/Makefile.am b/tests/libtest/Makefile.am index 52e49b944..8efeef13f 100644 --- a/tests/libtest/Makefile.am +++ b/tests/libtest/Makefile.am @@ -22,14 +22,16 @@ ########################################################################### AUTOMAKE_OPTIONS = foreign nostdinc -# $(top_srcdir)/include/curl is for the main curl include files, to make it -# easier to include this specific set of curl headers, and NOT the ones -# possibly already installed in the system. -# -I$(top_srcdir)/lib is for the setup.h file, included by test.h -# -I$(top_builddir)/lib is for the config.h file, possibly included by the -# setup.h file - -INCLUDES = -I$(top_srcdir)/include/curl \ +# Specify our include paths here, and do it relative to $(top_srcdir) and +# $(top_builddir), to ensure that these paths which belong to the library +# being currently built and tested are searched before the library which +# might possibly already be installed in the system. +# +# $(top_srcdir)/include is for libcurl's external include files +# $(top_builddir)/lib is for libcurl's generated lib/config.h file +# $(top_srcdir)/lib is for libcurl's lib/setup.h and other "borrowed" files + +INCLUDES = -I$(top_srcdir)/include \ -I$(top_builddir)/lib \ -I$(top_srcdir)/lib diff --git a/tests/libtest/lib506.c b/tests/libtest/lib506.c index cadd2ee63..0fc59591a 100644 --- a/tests/libtest/lib506.c +++ b/tests/libtest/lib506.c @@ -13,7 +13,7 @@ #include <ctype.h> #include <errno.h> -#include <mprintf.h> +#include <curl/mprintf.h> const char *HOSTHEADER = "Host: www.host.foo.com"; const char *JAR = "log/jar506"; diff --git a/tests/libtest/test.h b/tests/libtest/test.h index 50c3a7959..ef85c346f 100644 --- a/tests/libtest/test.h +++ b/tests/libtest/test.h @@ -15,7 +15,7 @@ #include "setup.h" -#include <curl.h> +#include <curl/curl.h> #include <stdio.h> #include <string.h> #include <stdlib.h> diff --git a/tests/server/Makefile.am b/tests/server/Makefile.am index f2a6a48a3..d7536cfe3 100644 --- a/tests/server/Makefile.am +++ b/tests/server/Makefile.am @@ -5,7 +5,7 @@ # | (__| |_| | _ <| |___ # \___|\___/|_| \_\_____| # -# Copyright (C) 1998 - 2007, Daniel Stenberg, <daniel@haxx.se>, et al. +# Copyright (C) 1998 - 2008, 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 @@ -20,10 +20,16 @@ # # $Id$ ########################################################################### +AUTOMAKE_OPTIONS = foreign nostdinc - - -AUTOMAKE_OPTIONS = foreign +# Specify our include paths here, and do it relative to $(top_srcdir) and +# $(top_builddir), to ensure that these paths which belong to the library +# being currently built and tested are searched before the library which +# might possibly already be installed in the system. +# +# $(top_srcdir)/include is for libcurl's external include files +# $(top_builddir)/lib is for libcurl's generated lib/config.h file +# $(top_srcdir)/lib is for libcurl's lib/setup.h and other "borrowed" files INCLUDES = -I$(top_srcdir)/include \ -I$(top_builddir)/lib \ |