Added a hack to work around the circular dependency when

CURL_DEBUG is defined.
pull/1/head
Gisle Vanem 18 years ago
parent 207cde73e2
commit 131ef7148c
  1. 7
      Makefile.dj

@ -27,6 +27,9 @@ LDFLAGS = -s
ifeq ($(USE_DEBUG),1) ifeq ($(USE_DEBUG),1)
EX_LIBS = ../lib/libcurl.a EX_LIBS = ../lib/libcurl.a
OBJ_HACK = $(OBJECTS)
else
OBJ_HACK = libcares.a
endif endif
ifeq ($(USE_SSL),1) ifeq ($(USE_SSL),1)
@ -52,10 +55,10 @@ all: $(OBJ_DIR) libcares.a ahost.exe adig.exe
libcares.a: $(OBJECTS) libcares.a: $(OBJECTS)
ar rs $@ $? ar rs $@ $?
ahost.exe: ahost.c libcares.a ahost.exe: ahost.c $(OBJ_HACK)
$(CC) $(LDFLAGS) $(CFLAGS) -o $@ $^ $(EX_LIBS) $(CC) $(LDFLAGS) $(CFLAGS) -o $@ $^ $(EX_LIBS)
adig.exe: adig.c libcares.a adig.exe: adig.c $(OBJ_HACK)
$(CC) $(LDFLAGS) $(CFLAGS) -o $@ $^ $(EX_LIBS) $(CC) $(LDFLAGS) $(CFLAGS) -o $@ $^ $(EX_LIBS)
clean: clean:

Loading…
Cancel
Save