stoddard 99/10/04 19:24:39
Modified: src Makefile.nt
Log:
Add APR to Makefile.nt
Revision Changes Path
1.4 +47 -39 apache-2.0/src/Makefile.nt
Index: Makefile.nt
===================================================================
RCS file: /home/cvs/apache-2.0/src/Makefile.nt,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- Makefile.nt 1999/08/30 16:48:35 1.3
+++ Makefile.nt 1999/10/05 02:24:38 1.4
@@ -46,6 +46,9 @@
_build:
# echo LONG %LONG% SHORT %SHORT% x
+ 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 ..\..
@@ -54,11 +57,11 @@
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
cd ..
+# cd support
+# nmake /nologo CFG="htpasswd - Win32 %LONG%" -f htpasswd.mak
+# nmake /nologo CFG="htdigest - Win32 %LONG%" -f htdigest.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
@@ -66,22 +69,22 @@
-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%
+# cd os\win32
+# set CFG=ApacheModuleStatus - Win32 %LONG%
# nmake /nologo CFG="ApacheModuleStatus - Win32 %LONG%" -f
ApacheModuleStatus.mak
# nmake /nologo CFG ""/nologo -f
ApacheModuleStatus.mak"=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="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
+# cd ..\..
+# cd modules\proxy
# nmake /nologo CFG="ApacheModuleProxy - Win32 %LONG%" -f
ApacheModuleProxy.mak
- cd ..\..
+# cd ..\..
_install:
-mkdir $(INSTDIR)
@@ -91,30 +94,35 @@
-mkdir $(INSTDIR)\bin
copy Apache%SHORT%\Apache.exe $(INSTDIR)
copy Core%SHORT%\ApacheCore.dll $(INSTDIR)
+ copy lib\apr\%LONG%\aprlib.dll $(INSTDIR)\bin
# 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\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 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%\htpasswd.exe $(INSTDIR)\bin
+# copy support\%LONG%\htdigest.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 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
@@ -127,21 +135,21 @@
cd ..
nmake /nologo CFG="ApacheCore - Win32 %LONG%" -f ApacheCore.mak clean
nmake /nologo CFG="Apache - Win32 %LONG%" -f Apache.mak clean
- cd os\win32
+# 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="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
+# cd ..\..
+# cd modules\proxy
# nmake /nologo CFG="ApacheModuleProxy - Win32 %LONG%" -f
ApacheModuleProxy.mak clean
- cd ..\..
+# cd ..\..
cd os\win32\installer\installdll
nmake /nologo CFG="install - Win32 %LONG%" -f install.mak clean
cd ..\..\..
