Commit 88d312fa authored by William A. Rowe Jr's avatar William A. Rowe Jr
Browse files 

  Test _NMAKE_VER define to determine nmake -nologo behavior,
  and use $(MAKEOPT) -f syntax throughout to avoid problems
  on mingw, borland, etc.

Backport 357226 from trunk
Claiming platform maintainer privs to just fix this for VS2005



git-svn-id: https://svn.apache.org/repos/asf/httpd/httpd/branches/2.0.x@357228 13f79535-47bb-0310-9956-ffa450edef68
parent 12eb8fde

Makefile.win

+8 −8
Changes for Makefile.win: 8 added lines, 8 removed lines.
Original line number Diff line number Diff line
@@ -19,7 +19,7 @@ 
#

# For example;

#

#   nmake /f Makefile.win PORT=80 INSTDIR="d:\Program Files\Apache" installr

#   nmake -f Makefile.win PORT=80 INSTDIR="d:\Program Files\Apache" installr

#

# Be aware that certain awk's will not accept backslahed names,

# so the server root should be given in forward slashes (quoted),
@@ -119,15 +119,15 @@ PORT=80 
!MESSAGE SERVERNAME = $(SERVERNAME)

!MESSAGE PORT       = $(PORT)

!MESSAGE

!MESSAGE To change these options use 'nmake /f Makefile.win [option=value]'

!MESSAGE Example: nmake /f Makefile.win PORT=8080

!MESSAGE To change these options use 'nmake -f Makefile.win [option=value]'

!MESSAGE Example: nmake -f Makefile.win PORT=8080

!MESSAGE

!MESSAGE

!ENDIF



!IFNDEF MAKEOPT

# Only default the behavior if MAKEOPT= is omitted

!IF "$(MAKE)" == "NMAKE"

!IFDEF _NMAKE_VER

# Microsoft NMake options

MAKEOPT=-nologo

!ELSEIF "$(MAKE)" == "make"
@@ -178,14 +178,14 @@ _build: 
	 $(MAKE) $(MAKEOPT) -f apriconv.mak  CFG="apriconv - Win32 $(LONG)" RECURSE=0 $(CTARGET)

	 $(MAKE) $(MAKEOPT) -f libapriconv.mak  CFG="libapriconv - Win32 $(LONG)" RECURSE=0 $(CTARGET)

!IF "$(CTARGET)" == "CLEAN"

	$(MAKE) $(MAKEOPT) /f build\modules.mk.win clean \

	$(MAKE) $(MAKEOPT) -f build\modules.mk.win clean \

		BUILD_MODE=$(LONG) BIND_MODE=shared API_SOURCE=.

!ELSE

	cd ccs

	$(MAKE) /nologo /f Makefile.win all \

	$(MAKE) $(MAKEOPT) -f Makefile.win all \

		BUILD_MODE=$(LONG) BIND_MODE=shared

	cd ..\ces

	$(MAKE) /nologo /f Makefile.win all \

	$(MAKE) $(MAKEOPT) -f Makefile.win all \

		BUILD_MODE=$(LONG) BIND_MODE=shared

	cd ..

!ENDIF
@@ -340,7 +340,7 @@ _build: 
		"BuildBin - Win32 $(LONG)" $(CTARGET)

!IF "$(CTARGET)" == "/CLEAN"

	@cd srclib\apr-iconv

	@$(MAKE) $(MAKEOPT) /f build\modules.mk.win clean \

	@$(MAKE) $(MAKEOPT) -f build\modules.mk.win clean \

		BUILD_MODE=$(LONG) BIND_MODE=shared API_SOURCE=.

	@cd ..\..

!ENDIF