diff options
| -rw-r--r-- | lib/Makefile.m32 | 46 | ||||
| -rw-r--r-- | src/Makefile.m32 | 21 |
2 files changed, 28 insertions, 39 deletions
diff --git a/lib/Makefile.m32 b/lib/Makefile.m32 index 7ec1ee16b..ec7bf9085 100644 --- a/lib/Makefile.m32 +++ b/lib/Makefile.m32 @@ -1,19 +1,26 @@ ############################################################# +# $Id$ # ## Makefile for building libcurl.a with MingW32 (GCC-3.2) and ## optionally OpenSSL (0.9.7) +## ## Use: make -f Makefile.m32 ## ## Comments to: Troy Engel <tengel@sonic.net> or ## Joern Hartroth <hartroth@acm.org> +ifndef OPENSSL_PATH +OPENSSL_PATH = ../../openssl-0.9.7d +endif +ifndef ZLIB_PATH +ZLIB_PATH = ../../zlib-1.2.1 +endif + CC = gcc AR = ar RM = rm -f RANLIB = ranlib STRIP = strip -g -OPENSSL_PATH = ../../openssl-0.9.7d -ZLIB_PATH = ../../zlib-1.2.1 ######################################################## ## Nothing more to do below this line! @@ -32,38 +39,13 @@ ifdef ZLIB endif COMPILE = $(CC) $(INCLUDES) $(CFLAGS) -libcurl_a_LIBRARIES = libcurl.a +# Makefile.inc provides the CSOURCES and HHEADERS defines +include Makefile.inc -libcurl_a_SOURCES = arpa_telnet.h file.c netrc.h timeval.c base64.c \ - file.h hostip.c progress.c timeval.h base64.h formdata.c hostip.h \ - progress.h cookie.c formdata.h http.c sendf.c cookie.h ftp.c \ - http.h sendf.h url.c dict.c ftp.h if2ip.c speedcheck.c url.h \ - dict.h getdate.c if2ip.h speedcheck.h urldata.h transfer.c getdate.h \ - ldap.c ssluse.c version.c transfer.h getenv.c \ - ldap.h ssluse.h escape.c getenv.h mprintf.c telnet.c escape.h \ - netrc.c telnet.h getinfo.c strequal.c strequal.h easy.c \ - security.h security.c krb4.h krb4.c memdebug.h memdebug.c \ - inet_ntoa_r.h http_chunks.h http_chunks.c \ - strtok.c connect.c hash.c llist.c multi.c share.c share.h \ - content_encoding.h content_encoding.c http_digest.h http_digest.c \ - http_negotiate.c http_negotiate.h http_ntlm.c http_ntlm.h md5.h \ - md5.c strtoofft.c inet_pton.c strerror.c hostares.c hostasyn.c \ - hostip4.c hostip6.c hostsyn.c hostthre.c inet_ntop.c - -libcurl_a_OBJECTS = file.o timeval.o base64.o hostip.o progress.o \ - formdata.o cookie.o http.o sendf.o ftp.o url.o dict.o if2ip.o \ - speedcheck.o getdate.o transfer.o ldap.o ssluse.o version.o \ - getenv.o escape.o mprintf.o telnet.o netrc.o getinfo.o \ - strequal.o easy.o security.o krb4.o memdebug.o http_chunks.o \ - strtok.o connect.o hash.o llist.o multi.o share.o \ - content_encoding.o http_digest.o http_negotiate.o http_ntlm.o md5.o \ - strtoofft.o inet_pton.o strerror.o hostares.o hostasyn.o hostip4.o \ - hostip6.o hostsyn.o hostthre.o inet_ntop.o - -LIBRARIES = $(libcurl_a_LIBRARIES) -SOURCES = $(libcurl_a_SOURCES) -OBJECTS = $(libcurl_a_OBJECTS) +libcurl_a_OBJECTS := $(patsubst %.c,%.o,$(strip $(CSOURCES))) +libcurl_a_LIBRARIES = libcurl.a +libcurl_a_DEPENDENCIES = $(strip $(CSOURCES) $(HHEADERS)) all: libcurl.a libcurl.dll libcurldll.a diff --git a/src/Makefile.m32 b/src/Makefile.m32 index f5eb1fee0..517faae07 100644 --- a/src/Makefile.m32 +++ b/src/Makefile.m32 @@ -9,11 +9,16 @@ ## Comments to: Troy Engel <tengel@sonic.net> or ## Joern Hartroth <hartroth@acm.org> +ifndef OPENSSL_PATH +OPENSSL_PATH = ../../openssl-0.9.7d +endif +ifndef ZLIB_PATH +ZLIB_PATH = ../../zlib-1.2.1 +endif + CC = gcc RM = rm -f STRIP = strip -s -OPENSSL_PATH = ../../openssl-0.9.7d -ZLIB_PATH = ../../zlib-1.2.1 # We may need these someday # PERL = perl @@ -32,8 +37,6 @@ COMPILE = $(CC) $(INCLUDES) $(CFLAGS) LINK = $(CC) $(CFLAGS) $(LDFLAGS) -o $@ curl_PROGRAMS = curl.exe -curl_OBJECTS = main.o hugehelp.o urlglob.o writeout.o getpass.o homedir.o -curl_SOURCES = main.c hugehelp.c urlglob.c writeout.c getpass.c homedir.c ifdef DYN curl_DEPENDENCIES = ../lib/libcurldll.a ../lib/libcurl.dll curl_LDADD = -L../lib -lcurldll @@ -46,9 +49,13 @@ ifdef SSL curl_LDADD += -L$(OPENSSL_PATH)/out -leay32 -lssl32 endif -PROGRAMS = $(curl_PROGRAMS) -SOURCES = $(curl_SOURCES) -OBJECTS = $(curl_OBJECTS) +# Makefile.inc provides the CSOURCES and HHEADERS defines +include Makefile.inc + +curl_OBJECTS := $(patsubst %.c,%.o,$(strip $(CURL_SOURCES))) +# curlx_OBJECTS := $(patsubst %.c,%.o,$(notdir $(strip $(CURLX_ONES)))) +# vpath %.c ../lib + all: curl.exe |