httpd-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From Jeff Trawick <trawi...@bellsouth.net>
Subject [Patch] for Compilation on Win9x
Date Sat, 18 Mar 2000 23:50:08 GMT
Let's try again...

I bet you were using Makefile.nt instead of Makefile_win32.txt,
right?

Makefile.nt does not work on Win9x because of the problem
you encountered.  There is some setting and expansion of environment
variables in Makefile.nt which doesn't work on Win9x.  For that
reason, Makefile_win32.txt and Makefile_win32_debug.txt are provided.  

[If we have to maintain these two files anyway, what is the need to
have Makefile.nt?  If the two Bills are forced to use the ones that
work on both Win9x and NT/2K, we're o.k., right?]

Unfortunately, it isn't so easy as switching makefiles because the two 
makefiles for Win9x are a bit out of date...  Here are some required
changes which (a) build/install APR and (b) avoid building
targets which won't currently build (htpasswd, htdigest, 
mod_status/ApacheModuleStatus, mod_rewrite/ApacheModuleRewrite, 
mod_proxy/ApacheModuleProxy).

For all I know these makefiles are generated automatically from 
???, but maybe these changes will help somebody anyway.

Index: Makefile_win32_debug.txt
===================================================================
RCS file: /cvs/apache/apache-2.0/src/Makefile_win32_debug.txt,v
retrieving revision 1.1
diff -u -r1.1 Makefile_win32_debug.txt
--- Makefile_win32_debug.txt	1999/08/24 05:34:14	1.1
+++ Makefile_win32_debug.txt	2000/03/18 23:43:47
@@ -24,6 +24,9 @@
 install: _build _install
 
 _build:
+	cd lib\apr
+	 nmake /nologo CFG="aprlib - Win32 Debug" -f aprlib.mak
+	cd ..\..
 	cd os\win32
 	 nmake /nologo CFG="ApacheOS - Win32 Debug" -f ApacheOS.mak
 	cd ..\..
@@ -34,8 +37,8 @@
 	 nmake /nologo CFG="ap - Win32 Debug" -f ap.mak
 	cd ..
 	cd support
-	 nmake /nologo CFG="htpasswd - Win32 Debug" -f htpasswd.mak
-	 nmake /nologo CFG="htdigest - Win32 Debug" -f htdigest.mak
+#	 nmake /nologo CFG="htpasswd - Win32 Debug" -f htpasswd.mak
+#	 nmake /nologo CFG="htdigest - Win32 Debug" -f htdigest.mak
 	cd ..
 	cd main
 	 nmake /nologo CFG="gen_uri_delims - Win32 Debug" -f gen_uri_delims.mak
@@ -46,7 +49,7 @@
 	 nmake /nologo CFG="Apache - Win32 Debug" -f Apache.mak
 	cd os\win32
 	 set CFG=ApacheModuleStatus - Win32 Debug
-	 nmake /nologo CFG="ApacheModuleStatus - Win32 Debug" -f ApacheModuleStatus.mak
+#	 nmake /nologo CFG="ApacheModuleStatus - Win32 Debug" -f ApacheModuleStatus.mak
 #	 nmake /nologo CFG ""/nologo -f ApacheModuleStatus.mak"=ApacheModuleInfo - Win32 Debug"
-f ApacheModuleInfo.mak
 	 nmake /nologo CFG="ApacheModuleAuthAnon - Win32 Debug" -f ApacheModuleAuthAnon.mak
 	 nmake /nologo CFG="ApacheModuleDigest - Win32 Debug" -f ApacheModuleDigest.mak
@@ -55,10 +58,10 @@
 	 nmake /nologo CFG="ApacheModuleHeaders - Win32 Debug" -f ApacheModuleHeaders.mak
 	 nmake /nologo CFG="ApacheModuleSpeling - Win32 Debug" -f ApacheModuleSpeling.mak
 	 nmake /nologo CFG="ApacheModuleUserTrack - Win32 Debug" -f ApacheModuleUserTrack.mak
-	 nmake /nologo CFG="ApacheModuleRewrite - Win32 Debug" -f ApacheModuleRewrite.mak
+#	 nmake /nologo CFG="ApacheModuleRewrite - Win32 Debug" -f ApacheModuleRewrite.mak
 	cd ..\..
 	cd modules\proxy
-	 nmake /nologo CFG="ApacheModuleProxy - Win32 Debug" -f ApacheModuleProxy.mak
+#	 nmake /nologo CFG="ApacheModuleProxy - Win32 Debug" -f ApacheModuleProxy.mak
 	cd ..\..
 
 _install:
@@ -69,6 +72,7 @@
 	-mkdir $(INSTDIR)\bin
 	copy ApacheD\Apache.exe $(INSTDIR)
 	copy CoreD\ApacheCore.dll $(INSTDIR)
+	copy lib\apr\Debug\aprlib.dll $(INSTDIR)
 	copy os\win32\ApacheModuleStatusD\ApacheModuleStatus.dll $(INSTDIR)\modules
 #       copy os\win32\ApacheModuleInfoD\ApacheModuleInfo.dll $(INSTDIR)\modules
 	copy os\win32\ApacheModuleAuthAnonD\ApacheModuleAuthAnon.dll $(INSTDIR)\modules
@@ -84,6 +88,9 @@
 	copy support\Debug\htdigest.exe $(INSTDIR)\bin
 
 clean:
+	cd lib\apr
+	 nmake /nologo CFG="aprlib - Win32 Debug" -f aprlib.mak clean
+	cd ..\..
 	cd os\win32
 	 nmake /nologo CFG="ApacheOS - Win32 Debug" -f ApacheOS.mak clean
 	cd ..\..

Index: Makefile_win32.txt
===================================================================
RCS file: /cvs/apache/apache-2.0/src/Makefile_win32.txt,v
retrieving revision 1.1
diff -u -r1.1 Makefile_win32.txt
--- Makefile_win32.txt	1999/08/24 05:34:14	1.1
+++ Makefile_win32.txt	2000/03/18 23:43:55
@@ -24,6 +24,9 @@
 install: _build _install
 
 _build:
+	cd lib\apr
+	 nmake /nologo CFG="aprlib - Win32 Release" -f aprlib.mak
+	cd ..\..
 	cd os\win32
 	 nmake /nologo CFG="ApacheOS - Win32 Release" -f ApacheOS.mak
 	cd ..\..
@@ -34,8 +37,8 @@
 	 nmake /nologo CFG="ap - Win32 Release" -f ap.mak
 	cd ..
 	cd support
-	 nmake /nologo CFG="htpasswd - Win32 Release" -f htpasswd.mak
-	 nmake /nologo CFG="htdigest - Win32 Release" -f htdigest.mak
+#	 nmake /nologo CFG="htpasswd - Win32 Release" -f htpasswd.mak
+#	 nmake /nologo CFG="htdigest - Win32 Release" -f htdigest.mak
 	cd ..
 	cd main
 	 nmake /nologo CFG="gen_uri_delims - Win32 Release" -f gen_uri_delims.mak
@@ -46,7 +49,7 @@
 	 nmake /nologo CFG="Apache - Win32 Release" -f Apache.mak
 	cd os\win32
 	 set CFG=ApacheModuleStatus - Win32 Release
-	 nmake /nologo CFG="ApacheModuleStatus - Win32 Release" -f ApacheModuleStatus.mak
+#	 nmake /nologo CFG="ApacheModuleStatus - Win32 Release" -f ApacheModuleStatus.mak
 #	 nmake /nologo CFG ""/nologo -f ApacheModuleStatus.mak"=ApacheModuleInfo - Win32 Release"
-f ApacheModuleInfo.mak
 	 nmake /nologo CFG="ApacheModuleAuthAnon - Win32 Release" -f ApacheModuleAuthAnon.mak
 	 nmake /nologo CFG="ApacheModuleDigest - Win32 Release" -f ApacheModuleDigest.mak
@@ -55,10 +58,10 @@
 	 nmake /nologo CFG="ApacheModuleHeaders - Win32 Release" -f ApacheModuleHeaders.mak
 	 nmake /nologo CFG="ApacheModuleSpeling - Win32 Release" -f ApacheModuleSpeling.mak
 	 nmake /nologo CFG="ApacheModuleUserTrack - Win32 Release" -f ApacheModuleUserTrack.mak
-	 nmake /nologo CFG="ApacheModuleRewrite - Win32 Release" -f ApacheModuleRewrite.mak
+#	 nmake /nologo CFG="ApacheModuleRewrite - Win32 Release" -f ApacheModuleRewrite.mak
 	cd ..\..
 	cd modules\proxy
-	 nmake /nologo CFG="ApacheModuleProxy - Win32 Release" -f ApacheModuleProxy.mak
+#	 nmake /nologo CFG="ApacheModuleProxy - Win32 Release" -f ApacheModuleProxy.mak
 	cd ..\..
 
 _install:
@@ -69,6 +72,7 @@
 	-mkdir $(INSTDIR)\bin
 	copy ApacheR\Apache.exe $(INSTDIR)
 	copy CoreR\ApacheCore.dll $(INSTDIR)
+	copy lib\apr\Release\aprlib.dll $(INSTDIR)
 	copy os\win32\ApacheModuleStatusR\ApacheModuleStatus.dll $(INSTDIR)\modules
 #       copy os\win32\ApacheModuleInfoR\ApacheModuleInfo.dll $(INSTDIR)\modules
 	copy os\win32\ApacheModuleAuthAnonR\ApacheModuleAuthAnon.dll $(INSTDIR)\modules
@@ -84,6 +88,9 @@
 	copy support\Release\htdigest.exe $(INSTDIR)\bin
 
 clean:
+	cd lib\apr
+	 nmake /nologo CFG="aprlib - Win32 Release" -f aprlib.mak clean
+	cd ..\..
 	cd os\win32
 	 nmake /nologo CFG="ApacheOS - Win32 Release" -f ApacheOS.mak clean
 	cd ..\..

-- 
Jeff Trawick | trawick@ibm.net | PGP public key at web site:
     http://www.geocities.com/SiliconValley/Park/9289/
          Born in Roswell... married an alien...

Mime
View raw message