generic-library/curl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Allow again proper compilation outside of the source tree

Browse Source
This commit is contained in:
Yang Tse
2006-08-07 18:06:37 +00:00
parent 7ba5e098a3
commit b33f47804d
4 changed files with 18 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
lib/Makefile.am
View File

@@ -43,7 +43,10 @@ lib_LTLIBRARIES = libcurl.la
# we use srcdir/include for the static global include files # 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 builddir/lib for the generated lib/config.h file to get found
# we use srcdir/lib for the lib-private header files # we use srcdir/lib for the lib-private header files
INCLUDES = -I$(top_srcdir)/include -I$(top_builddir)/lib -I$(top_srcdir)/lib
INCLUDES = -I$(top_srcdir)/include \
-I$(top_builddir)/lib \
-I$(top_srcdir)/lib
VERSION=-version-info 3:0:0 VERSION=-version-info 3:0:0

8
src/Makefile.am
View File

@@ -26,8 +26,12 @@ AUTOMAKE_OPTIONS = foreign nostdinc
# we use srcdir/include for the static global include files # we use srcdir/include for the static global include files
# we use builddir/src for the generated include files to get found # 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 # we use srcdir/lib for the header files we "borrow" from the lib
INCLUDES = -I$(top_srcdir)/src -I$(top_srcdir)/include -I$(top_builddir)/src \
-I$(top_srcdir)/lib INCLUDES = -I$(top_srcdir)/include \
-I$(top_builddir)/lib \
-I$(top_builddir)/src \
-I$(top_srcdir)/lib \
-I$(top_srcdir)/src
bin_PROGRAMS = curl bin_PROGRAMS = curl

5
tests/libtest/Makefile.am
View File

@@ -28,9 +28,10 @@ AUTOMAKE_OPTIONS = foreign nostdinc
# -I$(top_srcdir)/lib is for the setup.h file, included by test.h # -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 # -I$(top_builddir)/lib is for the config.h file, possibly included by the
# setup.h file # setup.h file
INCLUDES = -I$(top_srcdir)/include/curl \ INCLUDES = -I$(top_srcdir)/include/curl \
-I$(top_srcdir)/lib \ -I$(top_builddir)/lib \
-I$(top_builddir)/lib -I$(top_srcdir)/lib
LIBDIR = $(top_builddir)/lib LIBDIR = $(top_builddir)/lib

6
tests/server/Makefile.am
View File

@@ -21,9 +21,13 @@
# $Id$ # $Id$
########################################################################### ###########################################################################
AUTOMAKE_OPTIONS = foreign AUTOMAKE_OPTIONS = foreign
INCLUDES = -I$(top_srcdir)/lib -I$(top_srcdir)/include INCLUDES = -I$(top_srcdir)/include \
-I$(top_builddir)/lib \
-I$(top_srcdir)/lib
noinst_PROGRAMS = sws getpart sockfilt resolve tftpd noinst_PROGRAMS = sws getpart sockfilt resolve tftpd