diff options
| author | Yang Tse <yangsita@gmail.com> | 2009-06-06 13:20:39 +0000 |
|---|---|---|
| committer | Yang Tse <yangsita@gmail.com> | 2009-06-06 13:20:39 +0000 |
| commit | 8d581f7fe404eaad2defdeeeae456eb8463bbc56 (patch) | |
| tree | 3867cd175bbec287143f10aa2db0e44f44b09b0b /tests/libtest | |
| parent | 262907d0a3e2ca77343eca3e9b10e7c5d5ffca12 (diff) | |
Revert delegating c-ares linking magic on libtool and auto-makefiles when using
the uninstalled c-ares libtool archive built from the CVS embedded tree.
This embedded c-ares linking is again handled from the configure script.
Diffstat (limited to 'tests/libtest')
| -rw-r--r-- | tests/libtest/Makefile.am | 12 |
1 files changed, 2 insertions, 10 deletions
diff --git a/tests/libtest/Makefile.am b/tests/libtest/Makefile.am index a4ce4b14e..c5b8762cf 100644 --- a/tests/libtest/Makefile.am +++ b/tests/libtest/Makefile.am @@ -48,20 +48,12 @@ INCLUDES = -I$(top_builddir)/include \ -I$(top_srcdir)/lib endif -LIBDIR = $(top_builddir)/lib - EXTRA_DIST = test75.pl test307.pl test610.pl test613.pl test1013.pl \ test1022.pl Makefile.inc -if USE_EMBEDDED_ARES -EMBEDDEDARES = $(top_builddir)/ares/libcares.la -else -EMBEDDEDARES = -endif - # Dependencies (may need to be overriden) -LDADD = $(LIBDIR)/libcurl.la $(EMBEDDEDARES) -DEPENDENCIES = $(LIBDIR)/libcurl.la $(EMBEDDEDARES) +LDADD = $(top_builddir)/lib/libcurl.la +DEPENDENCIES = $(top_builddir)/lib/libcurl.la # Makefile.inc provides the source defines (TESTUTIL, SUPPORTFILES, noinst_PROGRAMS, lib*_SOURCES, and lib*_CFLAGS) include Makefile.inc |