moparisthebest/curl
1
0
Fork 0
mirror of https://github.com/moparisthebest/curl synced 2024-11-10 11:35:07 -05:00
Code Issues Releases Wiki Activity

added targets to create the files missing in CVS which makes calling buildconf.bat obsolete;

Browse Source 
removed obsolete wsock32 link lib.
This commit is contained in:
Gunter Knauf 2007-08-21 02:42:29 +00:00
parent 2c06e7f8ef
commit 658de40930
2 changed files with 20 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
lib/Makefile.m32
View File

@ -103,7 +103,7 @@ RESOURCE = libcurl.res
.SUFFIXES: .rc .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) $(libcurl_a_LIBRARY): $(libcurl_a_OBJECTS) $(libcurl_a_DEPENDENCIES)
-$(RM) $@ -$(RM) $@
@ -125,11 +125,18 @@ $(libcurl_dll_LIBRARY): $(libcurl_a_OBJECTS) $(RESOURCE) $(libcurl_dll_DEPENDENC
$(RC) $(RCFLAGS) $< -o $@ $(RC) $(RCFLAGS) $< -o $@
clean: clean:
-$(RM) $(libcurl_a_OBJECTS) $(RESOURCE) -$(RM) $(libcurl_a_OBJECTS) $(RESOURCE) ca-bundle.h
distrib: clean distrib: clean
-$(RM) $(libcurl_a_LIBRARY) $(libcurl_dll_LIBRARY) $(libcurl_dll_a_LIBRARY) -$(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: $(ARES_LIB)/libcares.a:
$(MAKE) -C $(ARES_LIB) -f Makefile.m32 $(MAKE) -C $(ARES_LIB) -f Makefile.m32

12
src/Makefile.m32
View File

@ -41,6 +41,7 @@ LDFLAGS = -s
RC = windres RC = windres
RCFLAGS = --include-dir=../include -O COFF -i RCFLAGS = --include-dir=../include -O COFF -i
RM = del /q /f RM = del /q /f
CP = copy
# We may need these someday # We may need these someday
# PERL = perl # PERL = perl
@ -95,7 +96,7 @@ ifdef LDAPS
curl_LDADD += -L"$(LDAP_SDK)/lib/mscvc" -lldapsdk -lldapssl -lldapx curl_LDADD += -L"$(LDAP_SDK)/lib/mscvc" -lldapsdk -lldapssl -lldapx
endif endif
endif endif
curl_LDADD += -lwsock32 -lws2_32 -lwinmm -lwldap32 curl_LDADD += -lws2_32 -lwinmm -lwldap32
COMPILE = $(CC) $(INCLUDES) $(CFLAGS) COMPILE = $(CC) $(INCLUDES) $(CFLAGS)
# Makefile.inc provides the CSOURCES and HHEADERS defines # Makefile.inc provides the CSOURCES and HHEADERS defines
@ -118,6 +119,10 @@ curl.exe: curl.res $(curl_OBJECTS) $(curl_DEPENDENCIES)
# -$(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
hugehelp.c:
@echo Creating $@
@$(CP) hugehelp.c.cvs $@
.c.o: .c.o:
$(COMPILE) -c $< $(COMPILE) -c $<
@ -125,7 +130,12 @@ curl.exe: curl.res $(curl_OBJECTS) $(curl_DEPENDENCIES)
$(RC) $(RCFLAGS) $< -o $@ $(RC) $(RCFLAGS) $< -o $@
clean: clean:
ifeq "$(wildcard hugehelp.c.cvs)" "hugehelp.c.cvs"
-$(RM) hugehelp.c
endif
-$(RM) $(curl_OBJECTS) -$(RM) $(curl_OBJECTS)
distrib: clean distrib: clean
-$(RM) $(curl_PROGRAMS) -$(RM) $(curl_PROGRAMS)