Allow again proper compilation outside of the source tree

lib/Makefile.am

@@ -43,7 +43,10 @@ lib_LTLIBRARIES = libcurl.la
 # 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
-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
 

src/Makefile.am

@@ -26,8 +26,12 @@ AUTOMAKE_OPTIONS = foreign nostdinc
 # 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
-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
 

tests/libtest/Makefile.am

@@ -28,9 +28,10 @@ AUTOMAKE_OPTIONS = foreign nostdinc
 # -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 \
-           -I$(top_srcdir)/lib \
-           -I$(top_builddir)/lib
+           -I$(top_builddir)/lib   \
+           -I$(top_srcdir)/lib 
 
 LIBDIR = $(top_builddir)/lib
 

tests/server/Makefile.am

@@ -21,9 +21,13 @@
 # $Id$
 ###########################################################################
 
+
+
 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