Index: docs/examples/Makefile.am =================================================================== RCS file: /cvsroot/curl/curl/docs/examples/Makefile.am,v retrieving revision 1.52 diff -u -r1.52 Makefile.am --- docs/examples/Makefile.am 7 Aug 2008 00:29:08 -0000 1.52 +++ docs/examples/Makefile.am 23 Oct 2009 08:21:09 -0000 @@ -12,10 +12,12 @@ # being currently built and tested are searched before the library which # might possibly already be installed in the system. # -# $(top_builddir)/include is for libcurl's generated curl/curlbuild.h file +# $(top_builddir)/include/curl for generated curlbuild.h included from curl.h +# $(top_builddir)/include for generated curlbuild.h included from lib/setup.h # $(top_srcdir)/include is for libcurl's external include files -INCLUDES = -I$(top_builddir)/include \ +INCLUDES = -I$(top_builddir)/include/curl \ + -I$(top_builddir)/include \ -I$(top_srcdir)/include LIBDIR = $(top_builddir)/lib Index: include/curl/curl.h =================================================================== RCS file: /cvsroot/curl/curl/include/curl/curl.h,v retrieving revision 1.396 diff -u -r1.396 curl.h --- include/curl/curl.h 16 Oct 2009 13:30:31 -0000 1.396 +++ include/curl/curl.h 23 Oct 2009 08:21:12 -0000 @@ -31,16 +31,8 @@ * http://cool.haxx.se/mailman/listinfo/curl-library/ */ -/* - * Leading 'curl' path on the 'curlbuild.h' include statement is - * required to properly allow building outside of the source tree, - * due to the fact that in this case 'curlbuild.h' is generated in - * a subdirectory of the build tree while 'curl.h actually remains - * in a subdirectory of the source tree. - */ - #include "curlver.h" /* libcurl version defines */ -#include "curl/curlbuild.h" /* libcurl build definitions */ +#include "curlbuild.h" /* libcurl build definitions */ #include "curlrules.h" /* libcurl rules enforcement */ /* Index: lib/Makefile.am =================================================================== RCS file: /cvsroot/curl/curl/lib/Makefile.am,v retrieving revision 1.152 diff -u -r1.152 Makefile.am --- lib/Makefile.am 17 Oct 2009 18:31:57 -0000 1.152 +++ lib/Makefile.am 23 Oct 2009 08:21:12 -0000 @@ -50,7 +50,8 @@ # being currently built and tested are searched before the library which # might possibly already be installed in the system. # -# $(top_builddir)/include is for libcurl's generated curl/curlbuild.h file +# $(top_builddir)/include/curl for generated curlbuild.h included from curl.h +# $(top_builddir)/include for generated curlbuild.h included from lib/setup.h # $(top_srcdir)/include is for libcurl's external include files # $(top_builddir)/lib is for libcurl's generated lib/curl_config.h file # $(top_srcdir)/lib is for libcurl's lib/setup.h and other "private" files @@ -58,16 +59,18 @@ # $(top_srcdir)/ares is for in-tree c-ares's external include files if USE_EMBEDDED_ARES -INCLUDES = -I$(top_builddir)/include \ - -I$(top_srcdir)/include \ - -I$(top_builddir)/lib \ - -I$(top_srcdir)/lib \ - -I$(top_builddir)/ares \ +INCLUDES = -I$(top_builddir)/include/curl \ + -I$(top_builddir)/include \ + -I$(top_srcdir)/include \ + -I$(top_builddir)/lib \ + -I$(top_srcdir)/lib \ + -I$(top_builddir)/ares \ -I$(top_srcdir)/ares else -INCLUDES = -I$(top_builddir)/include \ - -I$(top_srcdir)/include \ - -I$(top_builddir)/lib \ +INCLUDES = -I$(top_builddir)/include/curl \ + -I$(top_builddir)/include \ + -I$(top_srcdir)/include \ + -I$(top_builddir)/lib \ -I$(top_srcdir)/lib endif Index: src/Makefile.am =================================================================== RCS file: /cvsroot/curl/curl/src/Makefile.am,v retrieving revision 1.64 diff -u -r1.64 Makefile.am --- src/Makefile.am 14 Jul 2009 13:25:14 -0000 1.64 +++ src/Makefile.am 23 Oct 2009 08:21:13 -0000 @@ -27,18 +27,20 @@ # being currently built and tested are searched before the library which # might possibly already be installed in the system. # -# $(top_builddir)/include is for libcurl's generated curl/curlbuild.h file +# $(top_builddir)/include/curl for generated curlbuild.h included from curl.h +# $(top_builddir)/include for generated curlbuild.h included from lib/setup.h # $(top_srcdir)/include is for libcurl's external include files # $(top_builddir)/lib is for libcurl's generated lib/curl_config.h file # $(top_builddir)/src is for curl's generated src/curl_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_builddir)/include \ - -I$(top_srcdir)/include \ - -I$(top_builddir)/lib \ - -I$(top_builddir)/src \ - -I$(top_srcdir)/lib \ +INCLUDES = -I$(top_builddir)/include/curl \ + -I$(top_builddir)/include \ + -I$(top_srcdir)/include \ + -I$(top_builddir)/lib \ + -I$(top_builddir)/src \ + -I$(top_srcdir)/lib \ -I$(top_srcdir)/src bin_PROGRAMS = curl Index: tests/libtest/Makefile.am =================================================================== RCS file: /cvsroot/curl/curl/tests/libtest/Makefile.am,v retrieving revision 1.84 diff -u -r1.84 Makefile.am --- tests/libtest/Makefile.am 14 Jul 2009 13:25:15 -0000 1.84 +++ tests/libtest/Makefile.am 23 Oct 2009 08:21:13 -0000 @@ -27,7 +27,8 @@ # being currently built and tested are searched before the library which # might possibly already be installed in the system. # -# $(top_builddir)/include is for libcurl's generated curl/curlbuild.h file +# $(top_builddir)/include/curl for generated curlbuild.h included from curl.h +# $(top_builddir)/include for generated curlbuild.h included from lib/setup.h # $(top_srcdir)/include is for libcurl's external include files # $(top_builddir)/lib is for libcurl's generated lib/curl_config.h file # $(top_srcdir)/lib is for libcurl's lib/setup.h and other "borrowed" files @@ -35,16 +36,18 @@ # $(top_srcdir)/ares is for in-tree c-ares's external include files if USE_EMBEDDED_ARES -INCLUDES = -I$(top_builddir)/include \ - -I$(top_srcdir)/include \ - -I$(top_builddir)/lib \ - -I$(top_srcdir)/lib \ - -I$(top_builddir)/ares \ +INCLUDES = -I$(top_builddir)/include/curl \ + -I$(top_builddir)/include \ + -I$(top_srcdir)/include \ + -I$(top_builddir)/lib \ + -I$(top_srcdir)/lib \ + -I$(top_builddir)/ares \ -I$(top_srcdir)/ares else -INCLUDES = -I$(top_builddir)/include \ - -I$(top_srcdir)/include \ - -I$(top_builddir)/lib \ +INCLUDES = -I$(top_builddir)/include/curl \ + -I$(top_builddir)/include \ + -I$(top_srcdir)/include \ + -I$(top_builddir)/lib \ -I$(top_srcdir)/lib endif Index: tests/server/Makefile.am =================================================================== RCS file: /cvsroot/curl/curl/tests/server/Makefile.am,v retrieving revision 1.28 diff -u -r1.28 Makefile.am --- tests/server/Makefile.am 14 Jul 2009 13:25:15 -0000 1.28 +++ tests/server/Makefile.am 23 Oct 2009 08:21:13 -0000 @@ -27,7 +27,8 @@ # being currently built and tested are searched before the library which # might possibly already be installed in the system. # -# $(top_builddir)/include is for libcurl's generated curl/curlbuild.h file +# $(top_builddir)/include/curl for generated curlbuild.h included from curl.h +# $(top_builddir)/include for generated curlbuild.h included from lib/setup.h # $(top_srcdir)/include is for libcurl's external include files # $(top_builddir)/lib is for libcurl's generated lib/curl_config.h file # $(top_srcdir)/lib is for libcurl's lib/setup.h and other "borrowed" files @@ -35,16 +36,18 @@ # $(top_srcdir)/ares is for in-tree c-ares's external include files if USE_EMBEDDED_ARES -INCLUDES = -I$(top_builddir)/include \ - -I$(top_srcdir)/include \ - -I$(top_builddir)/lib \ - -I$(top_srcdir)/lib \ - -I$(top_builddir)/ares \ +INCLUDES = -I$(top_builddir)/include/curl \ + -I$(top_builddir)/include \ + -I$(top_srcdir)/include \ + -I$(top_builddir)/lib \ + -I$(top_srcdir)/lib \ + -I$(top_builddir)/ares \ -I$(top_srcdir)/ares else -INCLUDES = -I$(top_builddir)/include \ - -I$(top_srcdir)/include \ - -I$(top_builddir)/lib \ +INCLUDES = -I$(top_builddir)/include/curl \ + -I$(top_builddir)/include \ + -I$(top_srcdir)/include \ + -I$(top_builddir)/lib \ -I$(top_srcdir)/lib endif