From 1e7125ae7b7e83fc5f86fa6d0ac7038865eacf1f Mon Sep 17 00:00:00 2001
From: Yang Tse <yangsita@gmail.com>
Date: Tue, 15 Jul 2008 05:46:49 +0000
Subject: [PATCH] add comment for include paths
---
lib/Makefile.am | 13 +++++++++----
src/Makefile.am | 16 +++++++++++-----
tests/libtest/Makefile.am | 18 ++++++++++--------
tests/libtest/lib506.c | 2 +-
tests/libtest/test.h | 2 +-
tests/server/Makefile.am | 14 ++++++++++----
6 files changed, 42 insertions(+), 23 deletions(-)
diff --git a/lib/Makefile.am b/lib/Makefile.am
index ee77e76c4c..92a0497668 100644
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -43,13 +43,18 @@ CLEANFILES = $(DSP) $(VCPROJ)
lib_LTLIBRARIES = libcurl.la
LIBCURL_LIBS = @LIBCURL_LIBS@
-# we use srcdir/include for the static global include files
-# we use builddir/lib for the generated lib/config.h file to get found
-# we use srcdir/lib for the lib-private header files
+# 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 "private" files
INCLUDES = -I$(top_srcdir)/include \
-I$(top_builddir)/lib \
- -I$(top_srcdir)/lib
+ -I$(top_srcdir)/lib
VERSION=-version-info 5:0:1
diff --git a/src/Makefile.am b/src/Makefile.am
index cf806abe1f..1d0235a777 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -5,7 +5,7 @@
# | (__| |_| | _ <| |___
# \___|\___/|_| \_\_____|
#
-# Copyright (C) 1998 - 2005, 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
@@ -22,10 +22,16 @@
###########################################################################
AUTOMAKE_OPTIONS = foreign nostdinc
-# we use srcdir/src for "private" includes
-# we use srcdir/include for the static global include files
-# we use builddir/src for the generated include files to get found
-# we use srcdir/lib for the header files we "borrow" from the lib
+# 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_builddir)/src is for curl's generated src/config.h file
+# $(top_srcdir)/lib is for libcurl's lib/setup.h and other "borrowed" files
+# $(top_srcdir)/src is for curl's src/setup.h and "curl-private" files
INCLUDES = -I$(top_srcdir)/include \
-I$(top_builddir)/lib \
diff --git a/tests/libtest/Makefile.am b/tests/libtest/Makefile.am
index 52e49b9445..8efeef13f3 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 cadd2ee636..0fc59591a8 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 50c3a79596..ef85c346f2 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 f2a6a48a3e..d7536cfe3e 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 \
--
GitLab