diff options
| author | Yang Tse <yangsita@gmail.com> | 2009-06-04 04:13:39 +0000 |
|---|---|---|
| committer | Yang Tse <yangsita@gmail.com> | 2009-06-04 04:13:39 +0000 |
| commit | 13fdb9d8a56deff52eb16bce6b78e6710a42958a (patch) | |
| tree | 65a10baf856c67c1f1ec7f1464e6d6ec37193e3f /tests | |
| parent | 52b2bc4109e890094901140614880f6a5c5aa8be (diff) | |
| download | curl-13fdb9d8a56deff52eb16bce6b78e6710a42958a.tar.gz | |
c-ares embbeded builds header include paths fully defined in makefiles
Diffstat (limited to 'tests')
| -rw-r--r-- | tests/libtest/Makefile.am | 11 | ||||
| -rw-r--r-- | tests/server/Makefile.am | 7 |
2 files changed, 18 insertions, 0 deletions
diff --git a/tests/libtest/Makefile.am b/tests/libtest/Makefile.am index 228ae6b49..a4ce4b14e 100644 --- a/tests/libtest/Makefile.am +++ b/tests/libtest/Makefile.am @@ -31,11 +31,22 @@ AUTOMAKE_OPTIONS = foreign nostdinc # $(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 +# $(top_builddir)/ares is for in-tree c-ares's generated ares_build.h file +# $(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 \ + -I$(top_srcdir)/ares +else INCLUDES = -I$(top_builddir)/include \ -I$(top_srcdir)/include \ -I$(top_builddir)/lib \ -I$(top_srcdir)/lib +endif LIBDIR = $(top_builddir)/lib diff --git a/tests/server/Makefile.am b/tests/server/Makefile.am index 7c520ae04..c8863c265 100644 --- a/tests/server/Makefile.am +++ b/tests/server/Makefile.am @@ -34,12 +34,19 @@ AUTOMAKE_OPTIONS = foreign nostdinc # $(top_builddir)/ares is for in-tree c-ares's generated ares_build.h file # $(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 \ -I$(top_srcdir)/ares +else +INCLUDES = -I$(top_builddir)/include \ + -I$(top_srcdir)/include \ + -I$(top_builddir)/lib \ + -I$(top_srcdir)/lib +endif # Makefile.inc provides the source defines (noinst_PROGRAMS, useful, *_SOURCES, and *_LDADD) include Makefile.inc |