You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by st...@locus.apache.org on 2000/03/21 03:00:42 UTC
cvs commit: apache-2.0/src Makefile.win CHANGES
stoddard 00/03/20 18:00:41
Modified: src CHANGES
Added: src Makefile.win
Log:
Create one makefile for all win32 distributions.
Submitted by: Jeff Trawick
Reviewed by: Bill Stoddard
Revision Changes Path
1.33 +5 -1 apache-2.0/src/CHANGES
Index: CHANGES
===================================================================
RCS file: /home/cvs/apache-2.0/src/CHANGES,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- CHANGES 2000/03/20 22:30:33 1.32
+++ CHANGES 2000/03/21 02:00:41 1.33
@@ -1,4 +1,8 @@
-Changes with Apache 2.0a2-dev
+Changes with Apache 2.0a2-dev\
+ *) Create one makefile for all Win32 distributions (NT/2000/95/98).
+ Makefile.win includes the same user interface as the old
+ Makefile.nt [Jeff Trawick <tr...@us.ibm.com>]
+
*) Win32 exec now uses COMSPEC environment string for command
shell path resolution.
[William Rowe <wr...@lnd.com>] PR#3715
1.1 apache-2.0/src/Makefile.win
Index: Makefile.win
===================================================================
# Makefile for Windows NT and Windows 95/98
# Targets are:
# _apacher - build Apache in Release mode
# _apached - build Apache in Debug mode
# installr - build and install a Release build
# installd - build and install a Debug build
# clean - remove (most) generated files
# _cleanr - remove (most) files generated by a Release build
# _cleand - remove (most) files generated by a Debug build
#
# The default installation directory is \Apache. This can be changed
# with the INSTDIR macro, for example:
#
# nmake /f Makefile.win INSTDIR="d:\Program Files\Apache" installr
#
# Note: this does *NOT* change the compiled in default "server root"
!IF "$(INSTDIR)" == ""
INSTDIR=\Apache
!MESSAGE Using default install directory \Apache
!ENDIF
default: _apacher
_apacher:
$(MAKE) /f Makefile.win SHORT=R LONG=Release _build
_apached:
$(MAKE) /f Makefile.win SHORT=D LONG=Debug _build
installr:
$(MAKE) /f Makefile.win SHORT=R LONG=Release _build _install
installd:
$(MAKE) /f Makefile.win SHORT=D LONG=Debug _build _install
_cleanr:
$(MAKE) /f Makefile.win SHORT=R LONG=Release _clean
_cleand:
$(MAKE) /f Makefile.win SHORT=D LONG=Debug _clean
clean:
$(MAKE) /f Makefile.win _cleanr
$(MAKE) /f Makefile.win _cleand
installdll:
$(MAKE) /f Makefile.win SHORT=R LONG=Release _installdll
_build:
echo Building Win32 $(LONG) targets ($(SHORT) suffixes)
cd lib\apr
nmake /nologo CFG="aprlib - Win32 $(LONG)" -f aprlib.mak
cd ..\..
cd os\win32
nmake /nologo CFG="ApacheOS - Win32 $(LONG)" -f ApacheOS.mak
cd ..\..
cd regex
nmake /nologo CFG="regex - Win32 $(LONG)" -f regex.mak
cd ..
cd ap
nmake /nologo CFG="ap - Win32 $(LONG)" -f ap.mak
cd ..
cd support
# nmake /nologo CFG="htpasswd - Win32 $(LONG)" -f htpasswd.mak
# nmake /nologo CFG="htdigest - Win32 $(LONG)" -f htdigest.mak
nmake /nologo CFG="rotatelogs - Win32 $(LONG)" -f rotatelogs.mak
cd ..
cd main
nmake /nologo CFG="gen_uri_delims - Win32 $(LONG)" -f gen_uri_delims.mak
nmake /nologo CFG="gen_test_char - Win32 $(LONG)" -f gen_test_char.mak
cd ..
-del Core$(SHORT)\buildmark.obj
nmake /nologo CFG="ApacheCore - Win32 $(LONG)" -f ApacheCore.mak
nmake /nologo CFG="Apache - Win32 $(LONG)" -f Apache.mak
cd os\win32
# set CFG=ApacheModuleStatus - Win32 $(LONG)
# nmake /nologo CFG="ApacheModuleStatus - Win32 $(LONG)" -f ApacheModuleStatus.mak
# nmake /nologo CFG"=ApacheModuleInfo - Win32 $(LONG)" -f ApacheModuleInfo.mak
nmake /nologo CFG="ApacheModuleAuthAnon - Win32 $(LONG)" -f ApacheModuleAuthAnon.mak
nmake /nologo CFG="ApacheModuleDigest - Win32 $(LONG)" -f ApacheModuleDigest.mak
nmake /nologo CFG="ApacheModuleCERNMeta - Win32 $(LONG)" -f ApacheModuleCERNMeta.mak
nmake /nologo CFG="ApacheModuleExpires - Win32 $(LONG)" -f ApacheModuleExpires.mak
nmake /nologo CFG="ApacheModuleHeaders - Win32 $(LONG)" -f ApacheModuleHeaders.mak
nmake /nologo CFG="ApacheModuleSpeling - Win32 $(LONG)" -f ApacheModuleSpeling.mak
nmake /nologo CFG="ApacheModuleUserTrack - Win32 $(LONG)" -f ApacheModuleUserTrack.mak
# nmake /nologo CFG="ApacheModuleRewrite - Win32 $(LONG)" -f ApacheModuleRewrite.mak
cd ..\..
# cd modules\proxy
# nmake /nologo CFG="ApacheModuleProxy - Win32 $(LONG)" -f ApacheModuleProxy.mak
# cd ..\..
_install:
-mkdir $(INSTDIR)
-mkdir $(INSTDIR)\modules
-mkdir $(INSTDIR)\logs
-mkdir $(INSTDIR)\conf
-mkdir $(INSTDIR)\bin
copy Apache$(SHORT)\Apache.exe $(INSTDIR)
copy Core$(SHORT)\ApacheCore.dll $(INSTDIR)
copy lib\apr\$(LONG)\aprlib.dll $(INSTDIR)
# copy os\win32\ApacheModuleStatus$(SHORT)\ApacheModuleStatus.dll $(INSTDIR)\modules
# copy os\win32\ApacheModuleInfo$(SHORT)\ApacheModuleInfo.dll $(INSTDIR)\modules
copy os\win32\ApacheModuleAuthAnon$(SHORT)\ApacheModuleAuthAnon.dll $(INSTDIR)\modules
copy os\win32\ApacheModuleDigest$(SHORT)\ApacheModuleDigest.dll $(INSTDIR)\modules
copy os\win32\ApacheModuleCERNMeta$(SHORT)\ApacheModuleCERNMeta.dll $(INSTDIR)\modules
copy os\win32\ApacheModuleExpires$(SHORT)\ApacheModuleExpires.dll $(INSTDIR)\modules
copy os\win32\ApacheModuleHeaders$(SHORT)\ApacheModuleHeaders.dll $(INSTDIR)\modules
# copy os\win32\ApacheModuleRewrite$(SHORT)\ApacheModuleRewrite.dll $(INSTDIR)\modules
copy os\win32\ApacheModuleSpeling$(SHORT)\ApacheModuleSpeling.dll $(INSTDIR)\modules
copy os\win32\ApacheModuleUserTrack$(SHORT)\ApacheModuleUserTrack.dll $(INSTDIR)\modules
# copy modules\proxy\$(LONG)\ApacheModuleProxy.dll $(INSTDIR)\modules
# copy support\$(LONG)\htpasswd.exe $(INSTDIR)\bin
# copy support\$(LONG)\htdigest.exe $(INSTDIR)\bin
copy support\$(LONG)\rotatelogs.exe $(INSTDIR)\bin
_clean:
cd lib\apr
nmake /nologo CFG="aprlib - Win32 $(LONG)" -f aprlib.mak clean
cd ..\..
cd os\win32
nmake /nologo CFG="ApacheOS - Win32 $(LONG)" -f ApacheOS.mak clean
cd ..\..
cd regex
nmake /nologo CFG="regex - Win32 $(LONG)" -f regex.mak clean
cd ..
cd ap
nmake /nologo CFG="ap - Win32 $(LONG)" -f ap.mak clean
cd ..
cd support
nmake /nologo CFG="htpasswd - Win32 $(LONG)" -f htpasswd.mak clean
nmake /nologo CFG="htdigest - Win32 $(LONG)" -f htdigest.mak clean
nmake /nologo CFG="rotatelogs - Win32 $(LONG)" -f rotatelogs.mak clean
cd ..
cd main
nmake /nologo CFG="gen_uri_delims - Win32 $(LONG)" -f gen_uri_delims.mak clean
del uri_delims.h
nmake /nologo CFG="gen_test_char - Win32 $(LONG)" -f gen_test_char.mak clean
del test_char.h
cd ..
nmake /nologo CFG="ApacheCore - Win32 $(LONG)" -f ApacheCore.mak clean
nmake /nologo CFG="Apache - Win32 $(LONG)" -f Apache.mak clean
cd os\win32
# nmake /nologo CFG="ApacheModuleStatus - Win32 $(LONG)" -f ApacheModuleStatus.mak clean
# nmake /nologo CFG="ApacheModuleInfo - Win32 $(LONG)" -f ApacheModuleInfo.mak clean
nmake /nologo CFG="ApacheModuleAuthAnon - Win32 $(LONG)" -f ApacheModuleAuthAnon.mak clean
nmake /nologo CFG="ApacheModuleDigest - Win32 $(LONG)" -f ApacheModuleDigest.mak clean
nmake /nologo CFG="ApacheModuleCERNMeta - Win32 $(LONG)" -f ApacheModuleCERNMeta.mak clean
nmake /nologo CFG="ApacheModuleExpires - Win32 $(LONG)" -f ApacheModuleExpires.mak clean
nmake /nologo CFG="ApacheModuleHeaders - Win32 $(LONG)" -f ApacheModuleHeaders.mak clean
nmake /nologo CFG="ApacheModuleSpeling - Win32 $(LONG)" -f ApacheModuleSpeling.mak clean
nmake /nologo CFG="ApacheModuleUserTrack - Win32 $(LONG)" -f ApacheModuleUserTrack.mak clean
# nmake /nologo CFG="ApacheModuleRewrite - Win32 $(LONG)" -f ApacheModuleRewrite.mak clean
cd ..\..
# cd modules\proxy
# nmake /nologo CFG="ApacheModuleProxy - Win32 $(LONG)" -f ApacheModuleProxy.mak clean
# cd ..\..
cd os\win32\installer\installdll
nmake /nologo CFG="install - Win32 $(LONG)" -f install.mak clean
cd ..\..\..
_installdll:
cd os\win32\installer\installdll
nmake /nologo CFG="install - Win32 $(LONG)" -f install.mak
cd ..\..\..