diff options
| author | Gunter Knauf <gk@gknw.de> | 2007-08-03 14:30:02 +0000 |
|---|---|---|
| committer | Gunter Knauf <gk@gknw.de> | 2007-08-03 14:30:02 +0000 |
| commit | 4aabbc5ac2ed24f2c905855c8c83251f0ca47306 (patch) | |
| tree | d88f84db42970b9f67a4ed7724b2e20a8ae0cb83 /lib | |
| parent | e7a50e37d68f399b3b27edf04a34aa8690eda403 (diff) | |
some more makefile fixes/changes.
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/Makefile.m32 | 25 |
1 files changed, 15 insertions, 10 deletions
diff --git a/lib/Makefile.m32 b/lib/Makefile.m32 index d627c53e9..d2ccf02b2 100644 --- a/lib/Makefile.m32 +++ b/lib/Makefile.m32 @@ -4,7 +4,7 @@ ## Makefile for building libcurl.a with MingW32 (GCC-3.2) and ## 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 ## Joern Hartroth <hartroth@acm.org> @@ -23,8 +23,12 @@ ARES_LIB = ../ares CC = gcc AR = ar -RM = del /f +# comment LDFLAGS below to keep debug info +LDFLAGS = -s RANLIB = ranlib +RC = windres +RCFLAGS = --include-dir=../include -DCURLDEBUG=0 -O COFF -i +RM = del /q /f STRIP = strip -g ######################################################## @@ -60,6 +64,7 @@ endif ifdef IPV6 CFLAGS += -DENABLE_IPV6 endif +DLL_LIBS += -lws2_32 -lwinmm COMPILE = $(CC) $(INCLUDES) $(CFLAGS) # 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_DEPENDENCIES = $(strip $(CSOURCES) $(HHEADERS)) +RESOURCE = libcurl.res + +.SUFFIXES: .rc .res + all: libcurl.a libcurl.dll libcurldll.a libcurl.a: $(libcurl_a_OBJECTS) $(libcurl_a_DEPENDENCIES) @@ -78,22 +87,18 @@ libcurl.a: $(libcurl_a_OBJECTS) $(libcurl_a_DEPENDENCIES) $(RANLIB) libcurl.a $(STRIP) $@ -RESOURCE = libcurl.res - # remove the last line above to keep debug info libcurl.dll libcurldll.a: $(libcurl_a_OBJECTS) $(RESOURCE) $(RM) $@ - $(CC) -s -shared -Wl,--out-implib,libcurldll.a -o libcurl.dll \ - $(libcurl_a_OBJECTS) $(RESOURCE) $(DLL_LIBS) -lws2_32 -lwinmm - -# remove the above '-s' to keep debug info + $(CC) $(LDFLAGS) -shared -Wl,--out-implib,libcurldll.a -o libcurl.dll \ + $(libcurl_a_OBJECTS) $(RESOURCE) $(DLL_LIBS) .c.o: $(COMPILE) -c $< -libcurl.res: libcurl.rc - windres -DCURLDEBUG=0 -O COFF -o $@ -i $^ +.rc.res: + $(RC) $(RCFLAGS) $< -o $@ clean: $(RM) $(libcurl_a_OBJECTS) $(RESOURCE) |