Commit 1ba5712f authored by Guenter Knauf's avatar Guenter Knauf
Browse files

MinGW makefile tweaks for running from sh. 

Added function macros to make path converting easier.
Added CROSSPREFIX to all compile tools.
parent 32b48961

docs/examples/Makefile.m32

+48 −11
Original line number Diff line number Diff line
@@ -75,7 +75,7 @@ ifndef ARCH 
ARCH = w32

endif



CC = gcc

CC	= $(CROSSPREFIX)gcc

CFLAGS	= -g -O2 -Wall

CFLAGS	+= -fno-strict-aliasing

ifeq ($(ARCH),w64)
@@ -83,11 +83,36 @@ CFLAGS += -D_AMD64_ 
endif

# comment LDFLAGS below to keep debug info

LDFLAGS	= -s

RC = windres

RC	= $(CROSSPREFIX)windres

RCFLAGS	= --include-dir=$(PROOT)/include -O COFF -i



RM = del /q /f 2>NUL

CP = copy

# Platform-dependent helper tool macros

ifeq ($(findstring /sh,$(SHELL)),/sh)

DEL	= rm -f $1

RMDIR	= rm -fr $1

MKDIR	= mkdir -p $1

COPY	= -cp -afv $1 $2

#COPYR	= -cp -afr $1/* $2

COPYR	= -rsync -aC $1/* $2

TOUCH	= touch $1

CAT	= cat

ECHONL	= echo ""

DL	= '

else

ifeq "$(OS)" "Windows_NT"

DEL	= -del 2>NUL /q /f $(subst /,\,$1)

RMDIR	= -rd 2>NUL /q /s $(subst /,\,$1)

else

DEL	= -del 2>NUL $(subst /,\,$1)

RMDIR	= -deltree 2>NUL /y $(subst /,\,$1)

endif

MKDIR	= -md 2>NUL $(subst /,\,$1)

COPY	= -copy 2>NUL /y $(subst /,\,$1) $(subst /,\,$2)

COPYR	= -xcopy 2>NUL /q /y /e $(subst /,\,$1) $(subst /,\,$2)

TOUCH	= copy 2>&1>NUL /b $(subst /,\,$1) +,,

CAT	= type

ECHONL	= $(ComSpec) /c echo.

endif



########################################################

## Nothing more to do below this line!
@@ -132,6 +157,13 @@ endif 
ifeq ($(findstring -ipv6,$(CFG)),-ipv6)

IPV6 = 1

endif

ifeq ($(findstring -metalink,$(CFG)),-metalink)

METALINK = 1

endif

ifeq ($(findstring -winssl,$(CFG)),-winssl)

SCHANNEL = 1

SSPI = 1

endif



INCLUDES = -I. -I$(PROOT) -I$(PROOT)/include -I$(PROOT)/lib
@@ -194,6 +226,9 @@ endif 
endif

ifdef SSPI

  CFLAGS += -DUSE_WINDOWS_SSPI

  ifdef SCHANNEL

    CFLAGS += -DUSE_SCHANNEL

  endif

endif

ifdef SPNEGO

  CFLAGS += -DHAVE_SPNEGO
@@ -225,6 +260,8 @@ include Makefile.inc 
check_PROGRAMS := $(patsubst %,%.exe,$(strip $(check_PROGRAMS)))

check_PROGRAMS += ftpuploadresume.exe synctime.exe



.PRECIOUS: %.o





all: $(check_PROGRAMS)
@@ -238,8 +275,8 @@ all: $(check_PROGRAMS) 
	$(RC) $(RCFLAGS) $< -o $@



clean:

	-$(RM) $(check_PROGRAMS:.exe=.o)

	@$(call DEL, $(check_PROGRAMS:.exe=.o))



distclean vclean: clean

	-$(RM) $(check_PROGRAMS)

	@$(call DEL, $(check_PROGRAMS))

lib/Makefile.m32

+50 −24
Original line number Diff line number Diff line
@@ -55,7 +55,7 @@ ifndef ARCH 
ARCH = w32

endif



CC = gcc

CC	= $(CROSSPREFIX)gcc

CFLAGS	= -g -O2 -Wall

CFLAGS	+= -fno-strict-aliasing

ifeq ($(ARCH),w64)
@@ -63,14 +63,39 @@ CFLAGS += -D_AMD64_ 
endif

# comment LDFLAGS below to keep debug info

LDFLAGS	= -s

AR = ar

RANLIB = ranlib

RC = windres

AR	= $(CROSSPREFIX)ar

RANLIB	= $(CROSSPREFIX)ranlib

RC	= $(CROSSPREFIX)windres

RCFLAGS	= --include-dir=$(PROOT)/include -DDEBUGBUILD=0 -O COFF -i

STRIP	= strip -g



RM = del /q /f 2>NUL

CP = copy

# Platform-dependent helper tool macros

ifeq ($(findstring /sh,$(SHELL)),/sh)

DEL	= rm -f $1

RMDIR	= rm -fr $1

MKDIR	= mkdir -p $1

COPY	= -cp -afv $1 $2

#COPYR	= -cp -afr $1/* $2

COPYR	= -rsync -aC $1/* $2

TOUCH	= touch $1

CAT	= cat

ECHONL	= echo ""

DL	= '

else

ifeq "$(OS)" "Windows_NT"

DEL	= -del 2>NUL /q /f $(subst /,\,$1)

RMDIR	= -rd 2>NUL /q /s $(subst /,\,$1)

else

DEL	= -del 2>NUL $(subst /,\,$1)

RMDIR	= -deltree 2>NUL /y $(subst /,\,$1)

endif

MKDIR	= -md 2>NUL $(subst /,\,$1)

COPY	= -copy 2>NUL /y $(subst /,\,$1) $(subst /,\,$2)

COPYR	= -xcopy 2>NUL /q /y /e $(subst /,\,$1) $(subst /,\,$2)

TOUCH	= copy 2>&1>NUL /b $(subst /,\,$1) +,,

CAT	= type

ECHONL	= $(ComSpec) /c echo.

endif



########################################################

## Nothing more to do below this line!
@@ -115,7 +140,7 @@ endif 
ifeq ($(findstring -ipv6,$(CFG)),-ipv6)

IPV6 = 1

endif

ifeq ($(findstring -schannel,$(CFG)),-schannel)

ifeq ($(findstring -winssl,$(CFG)),-winssl)

SCHANNEL = 1

SSPI = 1

endif
@@ -231,7 +256,7 @@ RESOURCE = libcurl.res 
all: $(libcurl_a_LIBRARY) $(libcurl_dll_LIBRARY)



$(libcurl_a_LIBRARY): $(libcurl_a_OBJECTS) $(libcurl_a_DEPENDENCIES)

	-$(RM) $@

	@$(call DEL, $@)

	$(AR) cru $@ $(libcurl_a_OBJECTS)

	$(RANLIB) $@

	$(STRIP) $@
@@ -239,7 +264,7 @@ $(libcurl_a_LIBRARY): $(libcurl_a_OBJECTS) $(libcurl_a_DEPENDENCIES) 
# remove the last line above to keep debug info



$(libcurl_dll_LIBRARY): $(libcurl_a_OBJECTS) $(RESOURCE) $(libcurl_dll_DEPENDENCIES)

	-$(RM) $@

	@$(call DEL, $@)

	$(CC) $(LDFLAGS) -shared -Wl,--out-implib,$(libcurl_dll_a_LIBRARY) \

	  -o $@ $(libcurl_a_OBJECTS) $(RESOURCE) $(DLL_LIBS)
@@ -251,17 +276,18 @@ $(libcurl_dll_LIBRARY): $(libcurl_a_OBJECTS) $(RESOURCE) $(libcurl_dll_DEPENDENC 


clean:

ifeq "$(wildcard $(PROOT)/include/curl/curlbuild.h.dist)" "$(PROOT)/include/curl/curlbuild.h.dist"

	-$(RM) $(subst /,\,$(PROOT)/include/curl/curlbuild.h)

	@$(call DEL, $(PROOT)/include/curl/curlbuild.h)

endif

	-$(RM) $(libcurl_a_OBJECTS) $(RESOURCE)

	@$(call DEL, $(libcurl_a_OBJECTS) $(RESOURCE))



distclean vclean: clean

	-$(RM) $(libcurl_a_LIBRARY) $(libcurl_dll_LIBRARY) $(libcurl_dll_a_LIBRARY)

	@$(call DEL, $(libcurl_a_LIBRARY) $(libcurl_dll_LIBRARY) $(libcurl_dll_a_LIBRARY))



$(PROOT)/include/curl/curlbuild.h:

	@echo Creating $@

	@$(call COPY, $@.dist, $@)



$(LIBCARES_PATH)/libcares.a:

	$(MAKE) -C $(LIBCARES_PATH) -f Makefile.m32



$(PROOT)/include/curl/curlbuild.h:

	@echo Creating $@

	@$(CP) $(subst /,\,$@).dist $(subst /,\,$@)

src/Makefile.m32

+44 −19
Original line number Diff line number Diff line
@@ -59,7 +59,7 @@ ifndef ARCH 
ARCH = w32

endif



CC = gcc

CC	= $(CROSSPREFIX)gcc

CFLAGS	= -g -O2 -Wall

CFLAGS	+= -fno-strict-aliasing

ifeq ($(ARCH),w64)
@@ -67,16 +67,41 @@ CFLAGS += -D_AMD64_ 
endif

# comment LDFLAGS below to keep debug info

LDFLAGS	= -s

RC = windres

RC	= $(CROSSPREFIX)windres

RCFLAGS	= --include-dir=$(PROOT)/include -O COFF -i



RM = del /q /f 2>NUL

CP = copy



# We may need these someday

# PERL = perl

# NROFF = nroff



# Platform-dependent helper tool macros

ifeq ($(findstring /sh,$(SHELL)),/sh)

DEL	= rm -f $1

RMDIR	= rm -fr $1

MKDIR	= mkdir -p $1

COPY	= -cp -afv $1 $2

#COPYR	= -cp -afr $1/* $2

COPYR	= -rsync -aC $1/* $2

TOUCH	= touch $1

CAT	= cat

ECHONL	= echo ""

DL	= '

else

ifeq "$(OS)" "Windows_NT"

DEL	= -del 2>NUL /q /f $(subst /,\,$1)

RMDIR	= -rd 2>NUL /q /s $(subst /,\,$1)

else

DEL	= -del 2>NUL $(subst /,\,$1)

RMDIR	= -deltree 2>NUL /y $(subst /,\,$1)

endif

MKDIR	= -md 2>NUL $(subst /,\,$1)

COPY	= -copy 2>NUL /y $(subst /,\,$1) $(subst /,\,$2)

COPYR	= -xcopy 2>NUL /q /y /e $(subst /,\,$1) $(subst /,\,$2)

TOUCH	= copy 2>&1>NUL /b $(subst /,\,$1) +,,

CAT	= type

ECHONL	= $(ComSpec) /c echo.

endif



########################################################

## Nothing more to do below this line!
@@ -123,7 +148,7 @@ endif 
ifeq ($(findstring -metalink,$(CFG)),-metalink)

METALINK = 1

endif

ifeq ($(findstring -schannel,$(CFG)),-schannel)

ifeq ($(findstring -winssl,$(CFG)),-winssl)

SCHANNEL = 1

SSPI = 1

endif
@@ -239,7 +264,7 @@ RESOURCE = curl.res 
all: $(curl_PROGRAMS)



curl.exe: $(RESOURCE) $(curl_OBJECTS) $(curl_DEPENDENCIES)

	-$(RM) $@

	$(call DEL, $@)

	$(CC) $(LDFLAGS) -o $@ $< $(curl_OBJECTS) $(curl_LDADD)



# We don't have nroff normally under win32
@@ -249,7 +274,7 @@ curl.exe: $(RESOURCE) $(curl_OBJECTS) $(curl_DEPENDENCIES) 


hugehelp.c:

	@echo Creating $@

	@$(CP) hugehelp.c.cvs $@

	@$(call COPY, $@.cvs, $@)



%.o: %.c

	$(CC) $(INCLUDES) $(CFLAGS) -c $<
@@ -259,10 +284,10 @@ hugehelp.c: 


clean:

ifeq "$(wildcard hugehelp.c.cvs)" "hugehelp.c.cvs"

	-$(RM) hugehelp.c

	@$(call DEL, hugehelp.c)

endif

	-$(RM) $(curl_OBJECTS) $(curlx_OBJECTS) $(RESOURCE)

	@$(call DEL, $(curl_OBJECTS) $(curlx_OBJECTS) $(RESOURCE))



distclean vclean: clean

	-$(RM) $(curl_PROGRAMS)

	@$(call DEL, $(curl_PROGRAMS))