Commit 658de409 authored by Guenter Knauf's avatar Guenter Knauf
Browse files

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

removed obsolete wsock32 link lib.
parent 2c06e7f8

lib/Makefile.m32

+9 −2
Original line number Diff line number Diff line
@@ -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

src/Makefile.m32

+11 −1
Original line number Diff line number Diff line
@@ -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)