Commit 1e7125ae authored by Yang Tse's avatar Yang Tse
Browse files

add comment for include paths

parent aa4a7471

lib/Makefile.am

+9 −4
Original line number Diff line number Diff line
@@ -43,9 +43,14 @@ 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   \

src/Makefile.am

+11 −5
Original line number Diff line number Diff line
@@ -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   \

tests/libtest/Makefile.am

+10 −8
Original line number Diff line number Diff line
@@ -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

tests/libtest/lib506.c

+1 −1
Original line number Diff line number Diff line
@@ -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";

tests/libtest/test.h

+1 −1
Original line number Diff line number Diff line
@@ -15,7 +15,7 @@ 


#include "setup.h"



#include <curl.h>

#include <curl/curl.h>

#include <stdio.h>

#include <string.h>

#include <stdlib.h>