From de6f82d09432dd6e04fe8e36a9e065140df3d7c8 Mon Sep 17 00:00:00 2001 From: Gisle Vanem Date: Sat, 17 Mar 2007 17:56:21 +0000 Subject: Added a hack to work around the circular dependency when CURL_DEBUG is defined. --- ares/Makefile.dj | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/ares/Makefile.dj b/ares/Makefile.dj index c215abf03..aa1220c7a 100644 --- a/ares/Makefile.dj +++ b/ares/Makefile.dj @@ -26,7 +26,10 @@ CFLAGS += -DWATT32 -DHAVE_AF_INET6 -DHAVE_PF_INET6 -DHAVE_FIONBIO \ LDFLAGS = -s ifeq ($(USE_DEBUG),1) - EX_LIBS = ../lib/libcurl.a + EX_LIBS = ../lib/libcurl.a + OBJ_HACK = $(OBJECTS) +else + OBJ_HACK = libcares.a endif ifeq ($(USE_SSL),1) @@ -52,10 +55,10 @@ all: $(OBJ_DIR) libcares.a ahost.exe adig.exe libcares.a: $(OBJECTS) ar rs $@ $? -ahost.exe: ahost.c libcares.a +ahost.exe: ahost.c $(OBJ_HACK) $(CC) $(LDFLAGS) $(CFLAGS) -o $@ $^ $(EX_LIBS) -adig.exe: adig.c libcares.a +adig.exe: adig.c $(OBJ_HACK) $(CC) $(LDFLAGS) $(CFLAGS) -o $@ $^ $(EX_LIBS) clean: -- cgit v1.2.3