Commit e837110a authored by Guenter Knauf's avatar Guenter Knauf
Browse files

Added TOUCH macro to kill Win32 dependency on external touch command. 


git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.2.x@1087563 13f79535-47bb-0310-9956-ffa450edef68
parent da9af9c5

build/NWGNUenvironment.inc

+2 −1
Original line number Diff line number Diff line
@@ -132,7 +132,6 @@ WIN_CC = mwcc 


# Setup build tools

AWK	= awk

TOUCH	= touch



# Setup distribution tools

ZIP	= zip -qr9
@@ -149,6 +148,7 @@ MKDIR = mkdir -p $1 
COPY	= -cp -afv $1 $2

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

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

TOUCH	= -touch $1

ECHONL	= echo ""

DL	= '

CAT	= cat
@@ -164,6 +164,7 @@ ECHONL = $(ComSpec) /c echo. 
MKDIR	= $(shell if not exist $(subst /,\,$1)\NUL md 2>NUL $(subst /,\,$1))

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

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

TOUCH	= -copy /b 2>NUL $1 +,,

CAT	= type

endif

modules/ssl/NWGNUmakefile

+5 −5
Original line number Diff line number Diff line
@@ -279,14 +279,14 @@ install :: nlms FORCE 
vpath %.c $(AP_WORK)/modules/arch/netware



# Make sure that the build doesn't attempt to regenerate the shipping files.

# This requires a 'touch' utility.  Can be downloaded from 'coreutils' at

#  http://sourceforge.net/projects/gnuwin32/

ssl_expr_parse.h : ssl_expr_parse.y

	$(TOUCH) touch ssl_expr_parse.h

	$(call TOUCH, $@)



ssl_expr_parse.c : ssl_expr_parse.y

	$(TOUCH) ssl_expr_parse.c

	$(call TOUCH, $@)



ssl_expr_scan.c : ssl_expr_scan.l

	$(TOUCH) ssl_expr_scan.c

	$(call TOUCH, $@)



#

# Include the 'tail' makefile that has targets that depend on variables defined