Return-Path: Delivered-To: apmail-apache-cvs-archive@apache.org Received: (qmail 99031 invoked by uid 500); 28 Apr 2000 07:56:09 -0000 Mailing-List: contact apache-cvs-help@apache.org; run by ezmlm Precedence: bulk X-No-Archive: yes Reply-To: new-httpd@apache.org list-help: list-unsubscribe: list-post: Delivered-To: mailing list apache-cvs@apache.org Received: (qmail 99020 invoked by uid 500); 28 Apr 2000 07:56:08 -0000 Delivered-To: apmail-apache-2.0-cvs@apache.org Date: 28 Apr 2000 07:56:07 -0000 Message-ID: <20000428075607.99016.qmail@locus.apache.org> From: wrowe@locus.apache.org To: apache-2.0-cvs@apache.org Subject: cvs commit: apache-2.0/src Makefile.win wrowe 00/04/28 00:56:07 Modified: src Makefile.win Log: Following constructive advise of Ralf, and comments of JLW: Consitify use of $(MAKE) directive, and add $(MAKEOPT) dependent on make tool used. Clearly just a start twords bcc compatibility, but hopefully a good one. In the process, we make the build just a little less noisy. Also a test to see if Manoj wrangled my cvs update mail list access to broadcast correctly. Revision Changes Path 1.15 +47 -35 apache-2.0/src/Makefile.win Index: Makefile.win =================================================================== RCS file: /home/cvs/apache-2.0/src/Makefile.win,v retrieving revision 1.14 retrieving revision 1.15 diff -u -r1.14 -r1.15 --- Makefile.win 2000/04/25 22:13:16 1.14 +++ Makefile.win 2000/04/28 07:56:06 1.15 @@ -8,6 +8,7 @@ # clean - remove (most) generated files # _cleanr - remove (most) files generated by a Release build # _cleand - remove (most) files generated by a Debug build +# installdll - build the InstallShield helper dll (Release only) # # The default installation directory is \Apache. This can be changed # with the INSTDIR macro, for example: @@ -21,75 +22,86 @@ !MESSAGE Using default install directory \Apache !ENDIF +!IFNDEF MAKEOPT +# Only default the behavior if MAKEOPT= is omitted +!IF "$(MAKE)" == "NMAKE" +# Microsoft NMake options +MAKEOPT=-nologo +!ELSEIF "($MAKE)" == "make" +# Borland make options? Not really supported (yet) +MAKEOPT=-s -N +!ENDIF +!ENDIF + default: _apacher _apacher: - $(MAKE) /f Makefile.win SHORT=R LONG=Release _build + $(MAKE) $(MAKEOPT) -f Makefile.win SHORT=R LONG=Release _build _apached: - $(MAKE) /f Makefile.win SHORT=D LONG=Debug _build + $(MAKE) $(MAKEOPT) -f Makefile.win SHORT=D LONG=Debug _build installr: - $(MAKE) /f Makefile.win SHORT=R LONG=Release _build _install + $(MAKE) $(MAKEOPT) -f Makefile.win SHORT=R LONG=Release _build _install installd: - $(MAKE) /f Makefile.win SHORT=D LONG=Debug _build _install + $(MAKE) $(MAKEOPT) -f Makefile.win SHORT=D LONG=Debug _build _install _cleanr: - $(MAKE) /f Makefile.win SHORT=R LONG=Release CTARGET=CLEAN _build + $(MAKE) $(MAKEOPT) -f Makefile.win SHORT=R LONG=Release CTARGET=CLEAN _build _cleand: - $(MAKE) /f Makefile.win SHORT=D LONG=Debug CTARGET=CLEAN _build + $(MAKE) $(MAKEOPT) -f Makefile.win SHORT=D LONG=Debug CTARGET=CLEAN _build clean: - $(MAKE) /f Makefile.win SHORT=R LONG=Release CTARGET=CLEAN _build - $(MAKE) /f Makefile.win SHORT=D LONG=Debug CTARGET=CLEAN _build - $(MAKE) /f Makefile.win SHORT=R LONG=Release CTARGET=CLEAN _installdll + $(MAKE) $(MAKEOPT) -f Makefile.win SHORT=R LONG=Release CTARGET=CLEAN _build + $(MAKE) $(MAKEOPT) -f Makefile.win SHORT=D LONG=Debug CTARGET=CLEAN _build + $(MAKE) $(MAKEOPT) -f Makefile.win SHORT=R LONG=Release CTARGET=CLEAN _installdll installdll: - $(MAKE) /f Makefile.win SHORT=R LONG=Release _installdll + $(MAKE) $(MAKEOPT) -f Makefile.win SHORT=R LONG=Release _installdll _build: echo Building Win32 $(LONG) targets ($(SHORT) suffixes) cd lib\apr # aprlibdll creates the dynamic aprlib.dll from the static library project aprlib.dsp - nmake /nologo CFG="aprlib - Win32 $(LONG)" -f aprlib.mak RECURSE=0 $(CTARGET) - nmake /nologo CFG="aprlibdll - Win32 $(LONG)" -f aprlibdll.mak RECURSE=0 $(CTARGET) + $(MAKE) $(MAKEOPT) -f aprlib.mak CFG="aprlib - Win32 $(LONG)" RECURSE=0 $(CTARGET) + $(MAKE) $(MAKEOPT) -f aprlibdll.mak CFG="aprlibdll - Win32 $(LONG)" RECURSE=0 $(CTARGET) cd ..\.. cd regex - nmake /nologo CFG="regex - Win32 $(LONG)" -f regex.mak RECURSE=0 $(CTARGET) + $(MAKE) $(MAKEOPT) -f regex.mak CFG="regex - Win32 $(LONG)" RECURSE=0 $(CTARGET) cd .. cd ap - nmake /nologo CFG="ap - Win32 $(LONG)" -f ap.mak RECURSE=0 $(CTARGET) + $(MAKE) $(MAKEOPT) -f ap.mak CFG="ap - Win32 $(LONG)" RECURSE=0 $(CTARGET) cd .. cd support - nmake /nologo CFG="htpasswd - Win32 $(LONG)" -f htpasswd.mak RECURSE=0 $(CTARGET) - nmake /nologo CFG="htdigest - Win32 $(LONG)" -f htdigest.mak RECURSE=0 $(CTARGET) - nmake /nologo CFG="logresolve - Win32 $(LONG)" -f logresolve.mak RECURSE=0 $(CTARGET) - nmake /nologo CFG="rotatelogs - Win32 $(LONG)" -f rotatelogs.mak RECURSE=0 $(CTARGET) + $(MAKE) $(MAKEOPT) -f htpasswd.mak CFG="htpasswd - Win32 $(LONG)" RECURSE=0 $(CTARGET) + $(MAKE) $(MAKEOPT) -f htdigest.mak CFG="htdigest - Win32 $(LONG)" RECURSE=0 $(CTARGET) + $(MAKE) $(MAKEOPT) -f logresolve.mak CFG="logresolve - Win32 $(LONG)" RECURSE=0 $(CTARGET) + $(MAKE) $(MAKEOPT) -f rotatelogs.mak CFG="rotatelogs - Win32 $(LONG)" RECURSE=0 $(CTARGET) cd .. cd main - nmake /nologo CFG="gen_uri_delims - Win32 $(LONG)" -f gen_uri_delims.mak RECURSE=0 $(CTARGET) - nmake /nologo CFG="gen_test_char - Win32 $(LONG)" -f gen_test_char.mak RECURSE=0 $(CTARGET) + $(MAKE) $(MAKEOPT) -f gen_uri_delims.mak CFG="gen_uri_delims - Win32 $(LONG)" RECURSE=0 $(CTARGET) + $(MAKE) $(MAKEOPT) -f gen_test_char.mak CFG="gen_test_char - Win32 $(LONG)" RECURSE=0 $(CTARGET) cd .. -del Core$(SHORT)\buildmark.obj - nmake /nologo CFG="ApacheCore - Win32 $(LONG)" -f ApacheCore.mak RECURSE=0 $(CTARGET) - nmake /nologo CFG="Apache - Win32 $(LONG)" -f Apache.mak RECURSE=0 $(CTARGET) + $(MAKE) $(MAKEOPT) -f ApacheCore.mak CFG="ApacheCore - Win32 $(LONG)" RECURSE=0 $(CTARGET) + $(MAKE) $(MAKEOPT) -f Apache.mak CFG="Apache - Win32 $(LONG)" RECURSE=0 $(CTARGET) cd os\win32 - nmake /nologo CFG="ApacheModuleStatus - Win32 $(LONG)" -f ApacheModuleStatus.mak RECURSE=0 $(CTARGET) -# nmake /nologo CFG"=ApacheModuleInfo - Win32 $(LONG)" -f ApacheModuleInfo.mak RECURSE=0 $(CTARGET) - nmake /nologo CFG="ApacheModuleAuthAnon - Win32 $(LONG)" -f ApacheModuleAuthAnon.mak RECURSE=0 $(CTARGET) - nmake /nologo CFG="ApacheModuleAuthDigest - Win32 $(LONG)" -f ApacheModuleAuthDigest.mak RECURSE=0 $(CTARGET) - nmake /nologo CFG="ApacheModuleCERNMeta - Win32 $(LONG)" -f ApacheModuleCERNMeta.mak RECURSE=0 $(CTARGET) - nmake /nologo CFG="ApacheModuleExpires - Win32 $(LONG)" -f ApacheModuleExpires.mak RECURSE=0 $(CTARGET) - nmake /nologo CFG="ApacheModuleFileCache - Win32 $(LONG)" -f ApacheModuleFileCache.mak RECURSE=0 $(CTARGET) - nmake /nologo CFG="ApacheModuleHeaders - Win32 $(LONG)" -f ApacheModuleHeaders.mak RECURSE=0 $(CTARGET) - nmake /nologo CFG="ApacheModuleSpeling - Win32 $(LONG)" -f ApacheModuleSpeling.mak RECURSE=0 $(CTARGET) - nmake /nologo CFG="ApacheModuleUserTrack - Win32 $(LONG)" -f ApacheModuleUserTrack.mak RECURSE=0 $(CTARGET) - nmake /nologo CFG="ApacheModuleRewrite - Win32 $(LONG)" -f ApacheModuleRewrite.mak RECURSE=0 $(CTARGET) + $(MAKE) $(MAKEOPT) -f ApacheModuleStatus.mak CFG="ApacheModuleStatus - Win32 $(LONG)" RECURSE=0 $(CTARGET) +# $(MAKE) $(MAKEOPT) -f ApacheModuleInfo.mak CFG"=ApacheModuleInfo - Win32 $(LONG)" RECURSE=0 $(CTARGET) + $(MAKE) $(MAKEOPT) -f ApacheModuleAuthAnon.mak CFG="ApacheModuleAuthAnon - Win32 $(LONG)" RECURSE=0 $(CTARGET) + $(MAKE) $(MAKEOPT) -f ApacheModuleAuthDigest.mak CFG="ApacheModuleAuthDigest - Win32 $(LONG)" RECURSE=0 $(CTARGET) + $(MAKE) $(MAKEOPT) -f ApacheModuleCERNMeta.mak CFG="ApacheModuleCERNMeta - Win32 $(LONG)" RECURSE=0 $(CTARGET) + $(MAKE) $(MAKEOPT) -f ApacheModuleExpires.mak CFG="ApacheModuleExpires - Win32 $(LONG)" RECURSE=0 $(CTARGET) + $(MAKE) $(MAKEOPT) -f ApacheModuleFileCache.mak CFG="ApacheModuleFileCache - Win32 $(LONG)" RECURSE=0 $(CTARGET) + $(MAKE) $(MAKEOPT) -f ApacheModuleHeaders.mak CFG="ApacheModuleHeaders - Win32 $(LONG)" RECURSE=0 $(CTARGET) + $(MAKE) $(MAKEOPT) -f ApacheModuleSpeling.mak CFG="ApacheModuleSpeling - Win32 $(LONG)" RECURSE=0 $(CTARGET) + $(MAKE) $(MAKEOPT) -f ApacheModuleUserTrack.mak CFG="ApacheModuleUserTrack - Win32 $(LONG)" RECURSE=0 $(CTARGET) + $(MAKE) $(MAKEOPT) -f ApacheModuleRewrite.mak CFG="ApacheModuleRewrite - Win32 $(LONG)" RECURSE=0 $(CTARGET) cd ..\.. # cd modules\proxy -# nmake /nologo CFG="ApacheModuleProxy - Win32 $(LONG)" -f ApacheModuleProxy.mak RECURSE=0 $(CTARGET) +# $(MAKE) $(MAKEOPT) -f ApacheModuleProxy.mak CFG="ApacheModuleProxy - Win32 $(LONG)" RECURSE=0 $(CTARGET) # cd ..\.. _install: @@ -120,5 +132,5 @@ _installdll: cd os\win32\installer\installdll - nmake /nologo CFG="install - Win32 $(LONG)" -f install.mak RECURSE=0 $(CTARGET) + $(MAKE) $(MAKEOPT) -f install.mak CFG="install - Win32 $(LONG)" RECURSE=0 $(CTARGET) cd ..\..\..