generic-library/curl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

added a dependency for libcares if build with ares support;

Browse Source 
other minor makefile tweaks.
This commit is contained in:
Gunter Knauf
2007-08-14 18:39:26 +00:00
parent 7b5d148b1f
commit 46c92c0b80
2 changed files with 22 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
lib/Makefile.m32
View File

@@ -40,6 +40,7 @@ ifdef ARES
INCLUDES += -I$(ARES_LIB) INCLUDES += -I$(ARES_LIB)
CFLAGS += -DUSE_ARES CFLAGS += -DUSE_ARES
DLL_LIBS += -L$(ARES_LIB) -lcares DLL_LIBS += -L$(ARES_LIB) -lcares
libcurl_dll_DEPENDENCIES = $(ARES_LIB)/libcares.a
endif endif
ifdef SSH2 ifdef SSH2
INCLUDES += -I"$(LIBSSH2_PATH)/include" -I"$(LIBSSH2_PATH)/win32" INCLUDES += -I"$(LIBSSH2_PATH)/include" -I"$(LIBSSH2_PATH)/win32"
@@ -70,29 +71,31 @@ COMPILE = $(CC) $(INCLUDES) $(CFLAGS)
# Makefile.inc provides the CSOURCES and HHEADERS defines # Makefile.inc provides the CSOURCES and HHEADERS defines
include Makefile.inc include Makefile.inc
libcurl_a_OBJECTS := $(patsubst %.c,%.o,$(strip $(CSOURCES))) libcurl_dll_LIBRARY = libcurl.dll
libcurl_dll_a_LIBRARY = libcurldll.a
libcurl_a_LIBRARY = libcurl.a
libcurl_a_LIBRARIES = libcurl.a libcurl_a_OBJECTS := $(patsubst %.c,%.o,$(strip $(CSOURCES)))
libcurl_a_DEPENDENCIES = $(strip $(CSOURCES) $(HHEADERS)) libcurl_a_DEPENDENCIES := $(strip $(CSOURCES) $(HHEADERS))
RESOURCE = libcurl.res RESOURCE = libcurl.res
.SUFFIXES: .rc .res .SUFFIXES: .rc .res
all: libcurl.a libcurl.dll libcurldll.a all: $(libcurl_a_LIBRARY) $(libcurl_dll_LIBRARY)
libcurl.a: $(libcurl_a_OBJECTS) $(libcurl_a_DEPENDENCIES) $(libcurl_a_LIBRARY): $(libcurl_a_OBJECTS) $(libcurl_a_DEPENDENCIES)
$(RM) libcurl.a $(RM) $@
$(AR) cru libcurl.a $(libcurl_a_OBJECTS) $(AR) cru $@ $(libcurl_a_OBJECTS)
$(RANLIB) libcurl.a $(RANLIB) $@
$(STRIP) $@ $(STRIP) $@
# remove the last line above to keep debug info # remove the last line above to keep debug info
libcurl.dll libcurldll.a: $(libcurl_a_OBJECTS) $(RESOURCE) $(libcurl_dll_LIBRARY): $(libcurl_a_OBJECTS) $(RESOURCE) $(libcurl_dll_DEPENDENCIES)
$(RM) $@ $(RM) $@
$(CC) $(LDFLAGS) -shared -Wl,--out-implib,libcurldll.a -o libcurl.dll \ $(CC) $(LDFLAGS) -shared -Wl,--out-implib,$(libcurl_dll_a_LIBRARY) \
$(libcurl_a_OBJECTS) $(RESOURCE) $(DLL_LIBS) -o $@ $(libcurl_a_OBJECTS) $(RESOURCE) $(DLL_LIBS)
.c.o: .c.o:
$(COMPILE) -c $< $(COMPILE) -c $<
@@ -104,5 +107,9 @@ clean:
$(RM) $(libcurl_a_OBJECTS) $(RESOURCE) $(RM) $(libcurl_a_OBJECTS) $(RESOURCE)
distrib: clean distrib: clean
$(RM) $(libcurl_a_LIBRARIES) $(RM) $(libcurl_a_LIBRARY) $(libcurl_dll_LIBRARY) $(libcurl_dll_a_LIBRARY)
$(ARES_LIB)/libcares.a:
$(MAKE) -C $(ARES_LIB) -f Makefile.m32

3
src/Makefile.m32
View File

@@ -49,6 +49,9 @@ else
CFLAGS += -DCURL_STATICLIB CFLAGS += -DCURL_STATICLIB
endif endif
ifdef ARES ifdef ARES
ifndef DYN
curl_DEPENDENCIES += $(ARES_LIB)/libcares.a
endif
CFLAGS += -DUSE_ARES CFLAGS += -DUSE_ARES
curl_LDADD += -L$(ARES_LIB) -lcares curl_LDADD += -L$(ARES_LIB) -lcares
endif endif