httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From wr...@apache.org
Subject svn commit: r357226 - /httpd/httpd/trunk/Makefile.win
Date Fri, 16 Dec 2005 20:54:30 GMT
Author: wrowe
Date: Fri Dec 16 12:54:27 2005
New Revision: 357226

URL: http://svn.apache.org/viewcvs?rev=357226&view=rev
Log:

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

Modified:
    httpd/httpd/trunk/Makefile.win

Modified: httpd/httpd/trunk/Makefile.win
URL: http://svn.apache.org/viewcvs/httpd/httpd/trunk/Makefile.win?rev=357226&r1=357225&r2=357226&view=diff
==============================================================================
--- httpd/httpd/trunk/Makefile.win (original)
+++ httpd/httpd/trunk/Makefile.win Fri Dec 16 12:54:27 2005
@@ -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,21 @@
 !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
+!IFDEF _NMAKE_VER
+# Microsoft NMake options
 MAKEOPT=-nologo
+!ELSEIF "$(MAKE)" == "make"
+# Borland make options?  Not really supported (yet)
+MAKEOPT=-s -N
+!ENDIF
 !ENDIF
 
 _dummy:
@@ -172,14 +178,14 @@
 	 $(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
@@ -354,7 +360,7 @@
 		"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



Mime
View raw message