Jrg's updated makefile

b900318d · Daniel Stenberg · c58dc8f8 · b900318d · b900318d
Commit b900318d authored 24 years ago by Daniel Stenberg
--- a/lib/Makefile.m32
+++ b/lib/Makefile.m32
 #############################################################
 ## Makefile for building libcurl.a with MingW32 (GCC-2.95) and
-## optionally OpenSSL (0.9.4)
+## optionally OpenSSL (0.9.6)
 ## Use: make -f Makefile.m32
 ##
 ## Comments to: Troy Engel <tengel@sonic.net> or
 ##              Joern Hartroth <hartroth@acm.org>
 CC = gcc
 AR = ar
 RANLIB = ranlib
-OPENSSL_PATH = ../../openssl-0.9.5a
+STRIP = strip -g
+OPENSSL_PATH = ../../openssl-0.9.6
-########################################################
-## Nothing more to do below this line!
+########################################################
+## Nothing more to do below this line!
-INCLUDES = -I. -I.. -I../include
-CFLAGS = -g -O2 -DMINGW32
+INCLUDES = -I. -I.. -I../include -I../src
-ifdef SSL
+CFLAGS = -g -O2 -DMINGW32
-  INCLUDES += -I"$(OPENSSL_PATH)/outinc" -I"$(OPENSSL_PATH)/outinc/openssl"
+ifdef SSL
-  CFLAGS += -DUSE_SSLEAY
+  INCLUDES += -I"$(OPENSSL_PATH)/outinc" -I"$(OPENSSL_PATH)/outinc/openssl"
-endif
+  CFLAGS += -DUSE_SSLEAY
-COMPILE = $(CC) $(INCLUDES) $(CFLAGS)
+  DLL_LIBS = -leay32 -lssl32 -lRSAglue
+endif
-libcurl_a_LIBRARIES = libcurl.a
+COMPILE = $(CC) $(INCLUDES) $(CFLAGS)
-libcurl_a_SOURCES =  base64.c getenv.c if2ip.h progress.h  \
+libcurl_a_LIBRARIES = libcurl.a
-base64.h getenv.h mprintf.c setup.h url.c download.c getpass.c \
-mprintf.h ssluse.c url.h download.h hostip.c netrc.c ssluse.h \
+libcurl_a_SOURCES = arpa_telnet.h file.c getpass.h netrc.h timeval.c base64.c \
-urldata.h formdata.c hostip.h netrc.h stdcheaders.h formdata.h \
+	file.h hostip.c progress.c timeval.h base64.h formdata.c hostip.h progress.h	\
-if2ip.c progress.c sendf.c sendf.h speedcheck.c speedcheck.h \
+	cookie.c formdata.h http.c sendf.c cookie.h ftp.c http.h sendf.h url.c dict.c	\
-ftp.c ftp.h getpass.h version.c timeval.c  timeval.h cookie.c \
+	ftp.h if2ip.c speedcheck.c url.h dict.h getdate.c if2ip.h speedcheck.h		\
-cookie.h escape.c escape.h getdate.c getdate.h dict.h dict.c http.c \
+	urldata.h download.c getdate.h ldap.c ssluse.c version.c download.h getenv.c	\
-http.h telnet.c telnet.h file.c file.h ldap.c ldap.h writeout.c writeout.h \
+	ldap.h ssluse.h escape.c getenv.h mprintf.c telnet.c escape.h getpass.c netrc.c	\
-highlevel.c strequal.c strequal.h easy.c
+	telnet.h getinfo.c highlevel.c strequal.c strequal.h easy.c security.h		\
+	security.c krb4.c
-libcurl_a_OBJECTS =  base64.o getenv.o mprintf.o url.o download.o \
-getpass.o ssluse.o hostip.o netrc.o formdata.o if2ip.o progress.o \
+libcurl_a_OBJECTS =  file.o timeval.o base64.o hostip.o progress.o \
-sendf.o speedcheck.o ftp.o version.o timeval.o \
+	formdata.o cookie.o http.o sendf.o ftp.o url.o dict.o if2ip.o \
-cookie.o escape.o getdate.o dict.o http.o telnet.o file.o ldap.o writeout.o \
+	speedcheck.o getdate.o download.o ldap.o ssluse.o version.o \
-highlevel.o strequal.o easy.o
+	getenv.o escape.o mprintf.o telnet.o getpass.o netrc.o getinfo.o \
+	highlevel.o strequal.o easy.o security.o krb4.o
-LIBRARIES =  $(libcurl_a_LIBRARIES)
-SOURCES = $(libcurl_a_SOURCES)
+LIBRARIES =  $(libcurl_a_LIBRARIES)
-OBJECTS = $(libcurl_a_OBJECTS)
+SOURCES = $(libcurl_a_SOURCES)
+OBJECTS = $(libcurl_a_OBJECTS)
-all: libcurl.a
+all: libcurl.a libcurl.dll libcurldll.a
-libcurl.a: $(libcurl_a_OBJECTS) $(libcurl_a_DEPENDENCIES)
-	-@erase libcurl.a
+libcurl.a: $(libcurl_a_OBJECTS) $(libcurl_a_DEPENDENCIES)
-	$(AR) cru libcurl.a $(libcurl_a_OBJECTS)
+	-@erase libcurl.a
-	$(RANLIB) libcurl.a
+	$(AR) cru libcurl.a $(libcurl_a_OBJECTS)
+	$(RANLIB) libcurl.a
-.c.o:
+	$(STRIP) $@
-	$(COMPILE) -c $<
+# remove the last line above to keep debug info
-.s.o:
-	$(COMPILE) -c $<
+libcurl.dll libcurldll.a: libcurl.a libcurl.def dllinit.o
+	-@erase $@
-.S.o:
+	dllwrap --dllname $@ --output-lib libcurldll.a --export-all --def libcurl.def $(libcurl_a_LIBRARIES) dllinit.o -L$(OPENSSL_PATH)/out $(DLL_LIBS) -lwsock32
-	$(COMPILE) -c $<
+	$(STRIP) $@
-clean:
+# remove the last line above to keep debug info
-	-@erase $(libcurl_a_OBJECTS)
+.c.o:
-distrib: clean
+	$(COMPILE) -c $<
-	-@erase $(libcurl_a_LIBRARIES)
+.s.o:
+	$(COMPILE) -c $<
+.S.o:
+	$(COMPILE) -c $<
+clean:
+	-@erase $(libcurl_a_OBJECTS)
+distrib: clean
+	-@erase $(libcurl_a_LIBRARIES)
--- a/src/Makefile.m32
+++ b/src/Makefile.m32
 #############################################################
 ## Makefile for building curl.exe with MingW32 (GCC-2.95) and
-## optionally OpenSSL (0.9.4)
+## optionally OpenSSL (0.9.6)
 ##
-## Use: make -f Makefile.m32 [SSL=1]
+## Use: make -f Makefile.m32 [SSL=1] [DYN=1]
 ##
 ## Comments to: Troy Engel <tengel@sonic.net> or
 ##              Joern Hartroth <hartroth@acm.org>
 CC = gcc
 STRIP = strip -s
-OPENSSL_PATH = ../../openssl-0.9.5a
+OPENSSL_PATH = ../../openssl-0.9.6
 # We may need these someday
 # PERL = perl
 # NROFF = nroff
 ########################################################
 ## Nothing more to do below this line!
 INCLUDES = -I. -I.. -I../include
 CFLAGS = -g -O2 -DMINGW32
 LDFLAGS = 
 COMPILE = $(CC) $(INCLUDES) $(CFLAGS)
 LINK = $(CC) $(CFLAGS) $(LDFLAGS) -o $@
 curl_PROGRAMS = curl.exe
-curl_OBJECTS =  main.o hugehelp.o urlglob.o
+curl_OBJECTS = main.o hugehelp.o urlglob.o writeout.o
-curl_SOURCES = main.c hugehelp.c urlglob.c
+curl_SOURCES = main.c hugehelp.c urlglob.c writeout.c
-curl_DEPENDENCIES = ../lib/libcurl.a
+ifdef DYN
-curl_LDADD = -L../lib -lcurl -lwsock32
+  curl_DEPENDENCIES = ../lib/libcurldll.a ../lib/libcurl.dll
-ifdef SSL
+  curl_LDADD = -L../lib -lcurldll
-  curl_LDADD += -L$(OPENSSL_PATH)/out -leay32 -lssl32 -lRSAglue
+else
-endif
+  curl_DEPENDENCIES = ../lib/libcurl.a
+  curl_LDADD = -L../lib -lcurl
-PROGRAMS = $(curl_PROGRAMS)
+endif
-SOURCES = $(curl_SOURCES)
+curl_LDADD += -lwsock32
-OBJECTS = $(curl_OBJECTS)
+ifdef SSL
+  curl_LDADD += -L$(OPENSSL_PATH)/out -leay32 -lssl32 -lRSAglue
-all: curl
+endif
-curl: $(curl_OBJECTS) $(curl_DEPENDENCIES)
+PROGRAMS = $(curl_PROGRAMS)
-	-@erase curl.exe
+SOURCES = $(curl_SOURCES)
-	$(LINK) $(curl_OBJECTS) $(curl_LDADD)
+OBJECTS = $(curl_OBJECTS)
-	$(STRIP) $(curl_PROGRAMS)
+all: curl.exe
-# We don't have nroff normally under win32
-# hugehelp.c: ../README.curl ../curl.1 mkhelp.pl
+curl.exe: $(curl_OBJECTS) $(curl_DEPENDENCIES)
-# 	-@erase hugehelp.c
+	-@erase $@
-# 	$(NROFF) -man ../curl.1 | $(PERL) mkhelp.pl ../README.curl > hugehelp.c
+	$(LINK) $(curl_OBJECTS) $(curl_LDADD)
+	$(STRIP) $@
-.c.o:
-	$(COMPILE) -c $<
+# We don't have nroff normally under win32
+# hugehelp.c: ../README.curl ../curl.1 mkhelp.pl
-.s.o:
+# 	-@erase hugehelp.c
-	$(COMPILE) -c $<
+# 	$(NROFF) -man ../curl.1 | $(PERL) mkhelp.pl ../README.curl > hugehelp.c
-.S.o:
+.c.o:
 	$(COMPILE) -c $<
-clean:
+.s.o:
-	-@erase $(curl_OBJECTS)
+	$(COMPILE) -c $<
-distrib: clean
+.S.o:
-	-@erase $(curl_PROGRAMS)
+	$(COMPILE) -c $<
+clean:
+	-@erase $(curl_OBJECTS)
+distrib: clean
+	-@erase $(curl_PROGRAMS)