From 658de40930028c8c47a76cda92f1cefd6094fd61 Mon Sep 17 00:00:00 2001
From: Gunter Knauf <gk@gknw.de>
Date: Tue, 21 Aug 2007 02:42:29 +0000
Subject: [PATCH] added targets to create the files missing in CVS which makes
calling buildconf.bat obsolete; removed obsolete wsock32 link lib.
---
lib/Makefile.m32 | 11 +++++++++--
src/Makefile.m32 | 12 +++++++++++-
2 files changed, 20 insertions(+), 3 deletions(-)
diff --git a/lib/Makefile.m32 b/lib/Makefile.m32
index 7d5b485d4d..aad3b35b95 100644
--- a/lib/Makefile.m32
+++ b/lib/Makefile.m32
@@ -103,7 +103,7 @@ RESOURCE = libcurl.res
.SUFFIXES: .rc .res
-all: $(libcurl_a_LIBRARY) $(libcurl_dll_LIBRARY)
+all: ca-bundle.h $(libcurl_a_LIBRARY) $(libcurl_dll_LIBRARY)
$(libcurl_a_LIBRARY): $(libcurl_a_OBJECTS) $(libcurl_a_DEPENDENCIES)
-$(RM) $@
@@ -125,11 +125,18 @@ $(libcurl_dll_LIBRARY): $(libcurl_a_OBJECTS) $(RESOURCE) $(libcurl_dll_DEPENDENC
$(RC) $(RCFLAGS) $< -o $@
clean:
- -$(RM) $(libcurl_a_OBJECTS) $(RESOURCE)
+ -$(RM) $(libcurl_a_OBJECTS) $(RESOURCE) ca-bundle.h
distrib: clean
-$(RM) $(libcurl_a_LIBRARY) $(libcurl_dll_LIBRARY) $(libcurl_dll_a_LIBRARY)
+FORCE: ;
+
+ca-bundle.h: FORCE Makefile.m32
+ @echo Creating $@
+ @echo $(DL)/* Do not edit this file - it is created by make!$(DL) > $@
+ @echo $(DL)*/$(DL) >> $@
+
$(ARES_LIB)/libcares.a:
$(MAKE) -C $(ARES_LIB) -f Makefile.m32
diff --git a/src/Makefile.m32 b/src/Makefile.m32
index 296d36fb76..a79ad05d7a 100644
--- a/src/Makefile.m32
+++ b/src/Makefile.m32
@@ -41,6 +41,7 @@ LDFLAGS = -s
RC = windres
RCFLAGS = --include-dir=../include -O COFF -i
RM = del /q /f
+CP = copy
# We may need these someday
# PERL = perl
@@ -95,7 +96,7 @@ ifdef LDAPS
curl_LDADD += -L"$(LDAP_SDK)/lib/mscvc" -lldapsdk -lldapssl -lldapx
endif
endif
-curl_LDADD += -lwsock32 -lws2_32 -lwinmm -lwldap32
+curl_LDADD += -lws2_32 -lwinmm -lwldap32
COMPILE = $(CC) $(INCLUDES) $(CFLAGS)
# Makefile.inc provides the CSOURCES and HHEADERS defines
@@ -118,6 +119,10 @@ curl.exe: curl.res $(curl_OBJECTS) $(curl_DEPENDENCIES)
# -$(RM) hugehelp.c
# $(NROFF) -man ../curl.1 | $(PERL) mkhelp.pl ../README.curl > hugehelp.c
+hugehelp.c:
+ @echo Creating $@
+ @$(CP) hugehelp.c.cvs $@
+
.c.o:
$(COMPILE) -c $<
@@ -125,7 +130,12 @@ curl.exe: curl.res $(curl_OBJECTS) $(curl_DEPENDENCIES)
$(RC) $(RCFLAGS) $< -o $@
clean:
+ifeq "$(wildcard hugehelp.c.cvs)" "hugehelp.c.cvs"
+ -$(RM) hugehelp.c
+endif
-$(RM) $(curl_OBJECTS)
distrib: clean
-$(RM) $(curl_PROGRAMS)
+
+
--
GitLab