Add "-DCURL_STATICLIB" for static build.

Add ../lib/timeval.c for objects.
This commit is contained in:
Gisle Vanem 2004-11-13 15:47:17 +00:00
parent 61599ceb7b
commit e53f139925
1 changed files with 6 additions and 2 deletions

View File

@ -32,7 +32,7 @@ CFLAGS = -g -O2 -DMINGW32
ifdef SSL ifdef SSL
CFLAGS += -DUSE_SSLEAY -DHAVE_OPENSSL_ENGINE_H CFLAGS += -DUSE_SSLEAY -DHAVE_OPENSSL_ENGINE_H
endif endif
LDFLAGS = LDFLAGS =
COMPILE = $(CC) $(INCLUDES) $(CFLAGS) COMPILE = $(CC) $(INCLUDES) $(CFLAGS)
LINK = $(CC) $(CFLAGS) $(LDFLAGS) -o $@ LINK = $(CC) $(CFLAGS) $(LDFLAGS) -o $@
@ -43,6 +43,7 @@ ifdef DYN
else else
curl_DEPENDENCIES = ../lib/libcurl.a curl_DEPENDENCIES = ../lib/libcurl.a
curl_LDADD = -L../lib -lcurl curl_LDADD = -L../lib -lcurl
COMPILE += -DCURL_STATICLIB
endif endif
curl_LDADD += -lwsock32 -lws2_32 -lwinmm -L$(ZLIB_PATH) -lz curl_LDADD += -lwsock32 -lws2_32 -lwinmm -L$(ZLIB_PATH) -lz
ifdef SSL ifdef SSL
@ -52,7 +53,7 @@ endif
# Makefile.inc provides the CSOURCES and HHEADERS defines # Makefile.inc provides the CSOURCES and HHEADERS defines
include Makefile.inc include Makefile.inc
curl_OBJECTS := $(patsubst %.c,%.o,$(strip $(CURL_SOURCES))) curl_OBJECTS := $(patsubst %.c,%.o,$(notdir $(strip $(CURL_SOURCES) ../lib/timeval.c)))
# curlx_OBJECTS := $(patsubst %.c,%.o,$(notdir $(strip $(CURLX_ONES)))) # curlx_OBJECTS := $(patsubst %.c,%.o,$(notdir $(strip $(CURLX_ONES))))
# vpath %.c ../lib # vpath %.c ../lib
@ -64,6 +65,9 @@ curl.exe: $(curl_OBJECTS) $(curl_DEPENDENCIES)
$(LINK) $(curl_OBJECTS) $(curl_LDADD) $(LINK) $(curl_OBJECTS) $(curl_LDADD)
$(STRIP) $@ $(STRIP) $@
timeval.o: ../lib/timeval.c
$(COMPILE) -c $<
# We don't have nroff normally under win32 # We don't have nroff normally under win32
# hugehelp.c: ../README.curl ../curl.1 mkhelp.pl # hugehelp.c: ../README.curl ../curl.1 mkhelp.pl
# $(RM) hugehelp.c # $(RM) hugehelp.c