moparisthebest/curl
1
0
Fork 0
mirror of https://github.com/moparisthebest/curl synced 2024-12-22 08:08:50 -05:00
Code Issues Releases Wiki Activity

some more makefile fixes/changes.

Browse Source
This commit is contained in:
Gunter Knauf 2007-08-03 14:30:02 +00:00
parent e7a50e37d6
commit 4aabbc5ac2
2 changed files with 31 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

25
lib/Makefile.m32
View File

@ -4,7 +4,7 @@
## Makefile for building libcurl.a with MingW32 (GCC-3.2) and ## Makefile for building libcurl.a with MingW32 (GCC-3.2) and
## optionally OpenSSL (0.9.8) ## optionally OpenSSL (0.9.8)
## ##
## Use: make -f Makefile.m32 [SSL=1] [SSH2=1] [DYN=1] ## Use: mingw32-make -f Makefile.m32 [SSL=1] [SSH2=1] [DYN=1]
## ##
## Comments to: Troy Engel <tengel@sonic.net> or ## Comments to: Troy Engel <tengel@sonic.net> or
## Joern Hartroth <hartroth@acm.org> ## Joern Hartroth <hartroth@acm.org>
@ -23,8 +23,12 @@ ARES_LIB = ../ares
CC = gcc CC = gcc
AR = ar AR = ar
RM = del /f # comment LDFLAGS below to keep debug info
LDFLAGS = -s
RANLIB = ranlib RANLIB = ranlib
RC = windres
RCFLAGS = --include-dir=../include -DCURLDEBUG=0 -O COFF -i
RM = del /q /f
STRIP = strip -g STRIP = strip -g
######################################################## ########################################################
@ -60,6 +64,7 @@ endif
ifdef IPV6 ifdef IPV6
CFLAGS += -DENABLE_IPV6 CFLAGS += -DENABLE_IPV6
endif endif
DLL_LIBS += -lws2_32 -lwinmm
COMPILE = $(CC) $(INCLUDES) $(CFLAGS) COMPILE = $(CC) $(INCLUDES) $(CFLAGS)
# Makefile.inc provides the CSOURCES and HHEADERS defines # Makefile.inc provides the CSOURCES and HHEADERS defines
@ -70,6 +75,10 @@ libcurl_a_OBJECTS := $(patsubst %.c,%.o,$(strip $(CSOURCES)))
libcurl_a_LIBRARIES = libcurl.a libcurl_a_LIBRARIES = libcurl.a
libcurl_a_DEPENDENCIES = $(strip $(CSOURCES) $(HHEADERS)) libcurl_a_DEPENDENCIES = $(strip $(CSOURCES) $(HHEADERS))
RESOURCE = libcurl.res
.SUFFIXES: .rc .res
all: libcurl.a libcurl.dll libcurldll.a all: libcurl.a libcurl.dll libcurldll.a
libcurl.a: $(libcurl_a_OBJECTS) $(libcurl_a_DEPENDENCIES) libcurl.a: $(libcurl_a_OBJECTS) $(libcurl_a_DEPENDENCIES)
@ -78,22 +87,18 @@ libcurl.a: $(libcurl_a_OBJECTS) $(libcurl_a_DEPENDENCIES)
$(RANLIB) libcurl.a $(RANLIB) libcurl.a
$(STRIP) $@ $(STRIP) $@
RESOURCE = libcurl.res
# 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 libcurldll.a: $(libcurl_a_OBJECTS) $(RESOURCE)
$(RM) $@ $(RM) $@
$(CC) -s -shared -Wl,--out-implib,libcurldll.a -o libcurl.dll \ $(CC) $(LDFLAGS) -shared -Wl,--out-implib,libcurldll.a -o libcurl.dll \
$(libcurl_a_OBJECTS) $(RESOURCE) $(DLL_LIBS) -lws2_32 -lwinmm $(libcurl_a_OBJECTS) $(RESOURCE) $(DLL_LIBS)
# remove the above '-s' to keep debug info
.c.o: .c.o:
$(COMPILE) -c $< $(COMPILE) -c $<
libcurl.res: libcurl.rc .rc.res:
windres -DCURLDEBUG=0 -O COFF -o $@ -i $^ $(RC) $(RCFLAGS) $< -o $@
clean: clean:
$(RM) $(libcurl_a_OBJECTS) $(RESOURCE) $(RM) $(libcurl_a_OBJECTS) $(RESOURCE)

28
src/Makefile.m32
View File

@ -4,7 +4,7 @@
## Makefile for building curl.exe with MingW32 (GCC-3.2) and ## Makefile for building curl.exe with MingW32 (GCC-3.2) and
## optionally OpenSSL (0.9.8) ## optionally OpenSSL (0.9.8)
## ##
## Use: make -f Makefile.m32 [SSL=1] [SSH2=1] [DYN=1] ## Use: mingw32-make -f Makefile.m32 [SSL=1] [SSH2=1] [DYN=1]
## ##
## Comments to: Troy Engel <tengel@sonic.net> or ## Comments to: Troy Engel <tengel@sonic.net> or
## Joern Hartroth <hartroth@acm.org> ## Joern Hartroth <hartroth@acm.org>
@ -23,11 +23,11 @@ ARES_LIB = ../ares
CC = gcc CC = gcc
CFLAGS = -g -O2 CFLAGS = -g -O2
LDFLAGS = # comment LDFLAGS below to keep debug info
LDFLAGS = -s
RC = windres RC = windres
RCFLAGS = --include-dir=../include -O COFF -i RCFLAGS = --include-dir=../include -O COFF -i
RM = del /f RM = del /q /f
STRIP = strip -s
# We may need these someday # We may need these someday
# PERL = perl # PERL = perl
@ -36,8 +36,7 @@ STRIP = strip -s
######################################################## ########################################################
## Nothing more to do below this line! ## Nothing more to do below this line!
INCLUDES = -I. -I.. -I../include -I../lib -I$(ZLIB_PATH) INCLUDES = -I. -I.. -I../include -I../lib
COMPILE = $(CC) $(INCLUDES) $(CFLAGS)
LINK = $(CC) $(LDFLAGS) -o $@ LINK = $(CC) $(LDFLAGS) -o $@
curl_PROGRAMS = curl.exe curl_PROGRAMS = curl.exe
@ -61,13 +60,19 @@ ifdef SSL
CFLAGS += -DUSE_SSLEAY -DHAVE_OPENSSL_ENGINE_H CFLAGS += -DUSE_SSLEAY -DHAVE_OPENSSL_ENGINE_H
curl_LDADD += -L$(OPENSSL_PATH)/out -leay32 -lssl32 curl_LDADD += -L$(OPENSSL_PATH)/out -leay32 -lssl32
endif endif
ifdef ZLIB
INCLUDES += -I"$(ZLIB_PATH)"
CFLAGS += -DHAVE_LIBZ -DHAVE_ZLIB_H
curl_LDADD += -L$(ZLIB_PATH) -lz
endif
ifdef SSPI ifdef SSPI
CFLAGS += -DUSE_WINDOWS_SSPI CFLAGS += -DUSE_WINDOWS_SSPI
endif endif
ifdef IPV6 ifdef IPV6
CFLAGS += -DENABLE_IPV6 CFLAGS += -DENABLE_IPV6
endif endif
curl_LDADD += -lwsock32 -lws2_32 -lwinmm -L$(ZLIB_PATH) -lz curl_LDADD += -lwsock32 -lws2_32 -lwinmm
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
@ -83,16 +88,12 @@ all: curl.exe
curl.exe: curl.res $(curl_OBJECTS) $(curl_DEPENDENCIES) curl.exe: curl.res $(curl_OBJECTS) $(curl_DEPENDENCIES)
$(RM) $@ $(RM) $@
$(LINK) $< $(curl_OBJECTS) $(curl_LDADD) $(LINK) $< $(curl_OBJECTS) $(curl_LDADD)
$(STRIP) $@
# 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
# $(NROFF) -man ../curl.1 | $(PERL) mkhelp.pl ../README.curl > hugehelp.c # $(NROFF) -man ../curl.1 | $(PERL) mkhelp.pl ../README.curl > hugehelp.c
.rc.res:
$(RC) $(RCFLAGS) $< -o $@
.c.o: .c.o:
$(COMPILE) -c $< $(COMPILE) -c $<
@ -102,8 +103,11 @@ curl.exe: curl.res $(curl_OBJECTS) $(curl_DEPENDENCIES)
.S.o: .S.o:
$(COMPILE) -c $< $(COMPILE) -c $<
.rc.res:
$(RC) $(RCFLAGS) $< -o $@
clean: clean:
$(RM) $(curl_OBJECTS) curl.exe $(RM) $(curl_OBJECTS)
distrib: clean distrib: clean
$(RM) $(curl_PROGRAMS) $(RM) $(curl_PROGRAMS)