diff options
| -rw-r--r-- | lib/Makefile.am | 5 | ||||
| -rw-r--r-- | src/Makefile.am | 8 | ||||
| -rw-r--r-- | tests/libtest/Makefile.am | 5 | ||||
| -rw-r--r-- | tests/server/Makefile.am | 6 |
4 files changed, 18 insertions, 6 deletions
diff --git a/lib/Makefile.am b/lib/Makefile.am index 3b0d0770f..ff531c8f4 100644 --- a/lib/Makefile.am +++ b/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 diff --git a/src/Makefile.am b/src/Makefile.am index 429d1b3fb..77f0abfd4 100644 --- a/src/Makefile.am +++ b/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 diff --git a/tests/libtest/Makefile.am b/tests/libtest/Makefile.am index 95cd9fb9f..e1b5cf1c3 100644 --- a/tests/libtest/Makefile.am +++ b/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 diff --git a/tests/server/Makefile.am b/tests/server/Makefile.am index efcff01de..9b20d5c99 100644 --- a/tests/server/Makefile.am +++ b/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 |