romenskiy2012/curl
1
0
Fork 0
mirror of https://github.com/curl/curl.git synced 2026-06-27 15:15:40 +03:00
Code Issues Projects Releases Packages Wiki Activity

Revert delegating c-ares linking magic on libtool and auto-makefiles when using

Browse source 
the uninstalled c-ares libtool archive built from the CVS embedded tree.

This embedded c-ares linking is again handled from the configure script.
This commit is contained in:
Yang Tse 2009-06-06 13:20:39 +00:00
parent 262907d0a3
commit 8d581f7fe4
4 changed files with 9 additions and 31 deletions
Download patch file Download diff file Expand all files Collapse all files

12
tests/libtest/Makefile.am
View file

@ -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