ben 98/03/14 13:09:57
Modified: src ApacheCore.dsp ApacheCore.mak
src/modules/proxy ApacheModuleProxy.mak
Log:
Make Windows work again.
Revision Changes Path
1.24 +2 -1 apache-1.3/src/ApacheCore.dsp
Index: ApacheCore.dsp
===================================================================
RCS file: /export/home/cvs/apache-1.3/src/ApacheCore.dsp,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- ApacheCore.dsp 1998/03/09 22:42:50 1.23
+++ ApacheCore.dsp 1998/03/14 21:09:54 1.24
@@ -80,7 +80,8 @@
# ADD BSC32 /nologo
LINK32=link.exe
# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib
comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib
odbc32.lib odbccp32.lib /nologo /subsystem:windows /dll /debug /machine:I386
-# ADD LINK32 os\win32\ApacheOSD\ApacheOS.lib regex\debug\regex.lib
ap\Debug\ap.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib
advapi32.lib shell32.lib wsock32.lib /nologo /subsystem:windows /dll /map
/debug /machine:I386
+# ADD LINK32 os\win32\ApacheOSD\ApacheOS.lib regex\debug\regex.lib
ap\Debug\ap.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib
advapi32.lib shell32.lib wsock32.lib /nologo /subsystem:windows /dll /debug
/machine:I386
+# SUBTRACT LINK32 /map
!ENDIF
1.34 +3 -2 apache-1.3/src/ApacheCore.mak
Index: ApacheCore.mak
===================================================================
RCS file: /export/home/cvs/apache-1.3/src/ApacheCore.mak,v
retrieving revision 1.33
retrieving revision 1.34
diff -u -r1.33 -r1.34
--- ApacheCore.mak 1998/03/09 22:42:51 1.33
+++ ApacheCore.mak 1998/03/14 21:09:54 1.34
@@ -1993,7 +1993,6 @@
".\include\http_config.h"\
".\include\httpd.h"\
".\include\util_uri.h"\
- ".\modules\standard\mod_mime.h"\
".\os\win32\os.h"\
".\os\win32\readdir.h"\
{$(INCLUDE)}"sys\stat.h"\
@@ -2020,9 +2019,11 @@
".\include\http_config.h"\
".\include\httpd.h"\
".\include\util_uri.h"\
- ".\modules\standard\mod_mime.h"\
".\os\win32\os.h"\
".\os\win32\readdir.h"\
+
+NODEP_CPP_MOD_M=\
+ ".\modules\standard\mod_mime.h"\
"$(INTDIR)\mod_mime.obj" "$(INTDIR)\mod_mime.sbr" : $(SOURCE)
$(DEP_CPP_MOD_M)\
1.9 +67 -46 apache-1.3/src/modules/proxy/ApacheModuleProxy.mak
Index: ApacheModuleProxy.mak
===================================================================
RCS file:
/export/home/cvs/apache-1.3/src/modules/proxy/ApacheModuleProxy.mak,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -r1.8 -r1.9
--- ApacheModuleProxy.mak 1998/02/05 13:01:44 1.8
+++ ApacheModuleProxy.mak 1998/03/14 21:09:56 1.9
@@ -132,7 +132,7 @@
"$(OUTDIR)" :
if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
-CPP_PROJ=/nologo /MDd /W4 /Gm /GX /Zi /Od /I "..\..\include" /D "WIN32" /D\
+CPP_PROJ=/nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\include" /D "WIN32" /D\
"_DEBUG" /D "_WINDOWS" /Fp"$(INTDIR)\ApacheModuleProxy.pch" /YX\
/Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c
CPP_OBJS=.\Debug/
@@ -206,14 +206,24 @@
"..\..\include\buff.h"\
"..\..\include\conf.h"\
"..\..\include\explain.h"\
+ "..\..\include\hide.h"\
"..\..\include\hsregex.h"\
"..\..\include\http_config.h"\
"..\..\include\http_log.h"\
"..\..\include\http_protocol.h"\
+ "..\..\include\http_vhost.h"\
"..\..\include\httpd.h"\
+ "..\..\include\util_uri.h"\
"..\..\os\win32\os.h"\
"..\..\os\win32\readdir.h"\
".\mod_proxy.h"\
+ {$(INCLUDE)}"sys\stat.h"\
+ {$(INCLUDE)}"sys\types.h"\
+
+NODEP_CPP_MOD_P=\
+ "..\..\include\ebcdic.h"\
+ "..\..\include\os.h"\
+ "..\..\include\sfio.h"\
"$(INTDIR)\mod_proxy.obj" : $(SOURCE) $(DEP_CPP_MOD_P) "$(INTDIR)"
@@ -231,17 +241,12 @@
"..\..\include\http_config.h"\
"..\..\include\http_log.h"\
"..\..\include\http_protocol.h"\
+ "..\..\include\http_vhost.h"\
"..\..\include\httpd.h"\
+ "..\..\include\util_uri.h"\
"..\..\os\win32\os.h"\
"..\..\os\win32\readdir.h"\
".\mod_proxy.h"\
- {$(INCLUDE)}"sys\stat.h"\
- {$(INCLUDE)}"sys\types.h"\
-
-NODEP_CPP_MOD_P=\
- "..\..\include\ebcdic.h"\
- "..\..\include\os.h"\
- "..\..\include\sfio.h"\
"$(INTDIR)\mod_proxy.obj" : $(SOURCE) $(DEP_CPP_MOD_P) "$(INTDIR)"
@@ -259,6 +264,7 @@
"..\..\include\buff.h"\
"..\..\include\conf.h"\
"..\..\include\explain.h"\
+ "..\..\include\hide.h"\
"..\..\include\hsregex.h"\
"..\..\include\http_config.h"\
"..\..\include\http_log.h"\
@@ -268,9 +274,18 @@
"..\..\include\md5.h"\
"..\..\include\multithread.h"\
"..\..\include\util_date.h"\
+ "..\..\include\util_uri.h"\
"..\..\os\win32\os.h"\
"..\..\os\win32\readdir.h"\
".\mod_proxy.h"\
+ {$(INCLUDE)}"sys\stat.h"\
+ {$(INCLUDE)}"sys\types.h"\
+ {$(INCLUDE)}"sys\utime.h"\
+
+NODEP_CPP_PROXY=\
+ "..\..\include\ebcdic.h"\
+ "..\..\include\os.h"\
+ "..\..\include\sfio.h"\
"$(INTDIR)\proxy_cache.obj" : $(SOURCE) $(DEP_CPP_PROXY) "$(INTDIR)"
@@ -293,17 +308,10 @@
"..\..\include\md5.h"\
"..\..\include\multithread.h"\
"..\..\include\util_date.h"\
+ "..\..\include\util_uri.h"\
"..\..\os\win32\os.h"\
"..\..\os\win32\readdir.h"\
".\mod_proxy.h"\
- {$(INCLUDE)}"sys\stat.h"\
- {$(INCLUDE)}"sys\types.h"\
- {$(INCLUDE)}"sys\utime.h"\
-
-NODEP_CPP_PROXY=\
- "..\..\include\ebcdic.h"\
- "..\..\include\os.h"\
- "..\..\include\sfio.h"\
"$(INTDIR)\proxy_cache.obj" : $(SOURCE) $(DEP_CPP_PROXY) "$(INTDIR)"
@@ -321,15 +329,24 @@
"..\..\include\buff.h"\
"..\..\include\conf.h"\
"..\..\include\explain.h"\
+ "..\..\include\hide.h"\
"..\..\include\hsregex.h"\
"..\..\include\http_config.h"\
"..\..\include\http_log.h"\
"..\..\include\http_main.h"\
"..\..\include\http_protocol.h"\
"..\..\include\httpd.h"\
+ "..\..\include\util_uri.h"\
"..\..\os\win32\os.h"\
"..\..\os\win32\readdir.h"\
".\mod_proxy.h"\
+ {$(INCLUDE)}"sys\stat.h"\
+ {$(INCLUDE)}"sys\types.h"\
+
+NODEP_CPP_PROXY_=\
+ "..\..\include\ebcdic.h"\
+ "..\..\include\os.h"\
+ "..\..\include\sfio.h"\
"$(INTDIR)\proxy_connect.obj" : $(SOURCE) $(DEP_CPP_PROXY_) "$(INTDIR)"
@@ -349,16 +366,10 @@
"..\..\include\http_main.h"\
"..\..\include\http_protocol.h"\
"..\..\include\httpd.h"\
+ "..\..\include\util_uri.h"\
"..\..\os\win32\os.h"\
"..\..\os\win32\readdir.h"\
".\mod_proxy.h"\
- {$(INCLUDE)}"sys\stat.h"\
- {$(INCLUDE)}"sys\types.h"\
-
-NODEP_CPP_PROXY_=\
- "..\..\include\ebcdic.h"\
- "..\..\include\os.h"\
- "..\..\include\sfio.h"\
"$(INTDIR)\proxy_connect.obj" : $(SOURCE) $(DEP_CPP_PROXY_) "$(INTDIR)"
@@ -376,15 +387,24 @@
"..\..\include\buff.h"\
"..\..\include\conf.h"\
"..\..\include\explain.h"\
+ "..\..\include\hide.h"\
"..\..\include\hsregex.h"\
"..\..\include\http_config.h"\
+ "..\..\include\http_log.h"\
"..\..\include\http_main.h"\
"..\..\include\http_protocol.h"\
"..\..\include\httpd.h"\
+ "..\..\include\util_uri.h"\
"..\..\os\win32\os.h"\
"..\..\os\win32\readdir.h"\
- "..\standard\mod_mime.h"\
".\mod_proxy.h"\
+ {$(INCLUDE)}"sys\stat.h"\
+ {$(INCLUDE)}"sys\types.h"\
+
+NODEP_CPP_PROXY_F=\
+ "..\..\include\ebcdic.h"\
+ "..\..\include\os.h"\
+ "..\..\include\sfio.h"\
"$(INTDIR)\proxy_ftp.obj" : $(SOURCE) $(DEP_CPP_PROXY_F) "$(INTDIR)"
@@ -403,17 +423,10 @@
"..\..\include\http_main.h"\
"..\..\include\http_protocol.h"\
"..\..\include\httpd.h"\
+ "..\..\include\util_uri.h"\
"..\..\os\win32\os.h"\
"..\..\os\win32\readdir.h"\
- "..\standard\mod_mime.h"\
".\mod_proxy.h"\
- {$(INCLUDE)}"sys\stat.h"\
- {$(INCLUDE)}"sys\types.h"\
-
-NODEP_CPP_PROXY_F=\
- "..\..\include\ebcdic.h"\
- "..\..\include\os.h"\
- "..\..\include\sfio.h"\
"$(INTDIR)\proxy_ftp.obj" : $(SOURCE) $(DEP_CPP_PROXY_F) "$(INTDIR)"
@@ -431,16 +444,26 @@
"..\..\include\buff.h"\
"..\..\include\conf.h"\
"..\..\include\explain.h"\
+ "..\..\include\hide.h"\
"..\..\include\hsregex.h"\
"..\..\include\http_config.h"\
+ "..\..\include\http_core.h"\
"..\..\include\http_log.h"\
"..\..\include\http_main.h"\
"..\..\include\http_protocol.h"\
"..\..\include\httpd.h"\
"..\..\include\util_date.h"\
+ "..\..\include\util_uri.h"\
"..\..\os\win32\os.h"\
"..\..\os\win32\readdir.h"\
".\mod_proxy.h"\
+ {$(INCLUDE)}"sys\stat.h"\
+ {$(INCLUDE)}"sys\types.h"\
+
+NODEP_CPP_PROXY_H=\
+ "..\..\include\ebcdic.h"\
+ "..\..\include\os.h"\
+ "..\..\include\sfio.h"\
"$(INTDIR)\proxy_http.obj" : $(SOURCE) $(DEP_CPP_PROXY_H) "$(INTDIR)"
@@ -456,21 +479,16 @@
"..\..\include\explain.h"\
"..\..\include\hsregex.h"\
"..\..\include\http_config.h"\
+ "..\..\include\http_core.h"\
"..\..\include\http_log.h"\
"..\..\include\http_main.h"\
"..\..\include\http_protocol.h"\
"..\..\include\httpd.h"\
"..\..\include\util_date.h"\
+ "..\..\include\util_uri.h"\
"..\..\os\win32\os.h"\
"..\..\os\win32\readdir.h"\
".\mod_proxy.h"\
- {$(INCLUDE)}"sys\stat.h"\
- {$(INCLUDE)}"sys\types.h"\
-
-NODEP_CPP_PROXY_H=\
- "..\..\include\ebcdic.h"\
- "..\..\include\os.h"\
- "..\..\include\sfio.h"\
"$(INTDIR)\proxy_http.obj" : $(SOURCE) $(DEP_CPP_PROXY_H) "$(INTDIR)"
@@ -488,6 +506,7 @@
"..\..\include\buff.h"\
"..\..\include\conf.h"\
"..\..\include\explain.h"\
+ "..\..\include\hide.h"\
"..\..\include\hsregex.h"\
"..\..\include\http_config.h"\
"..\..\include\http_log.h"\
@@ -496,9 +515,17 @@
"..\..\include\httpd.h"\
"..\..\include\md5.h"\
"..\..\include\multithread.h"\
+ "..\..\include\util_uri.h"\
"..\..\os\win32\os.h"\
"..\..\os\win32\readdir.h"\
".\mod_proxy.h"\
+ {$(INCLUDE)}"sys\stat.h"\
+ {$(INCLUDE)}"sys\types.h"\
+
+NODEP_CPP_PROXY_U=\
+ "..\..\include\ebcdic.h"\
+ "..\..\include\os.h"\
+ "..\..\include\sfio.h"\
"$(INTDIR)\proxy_util.obj" : $(SOURCE) $(DEP_CPP_PROXY_U) "$(INTDIR)"
@@ -520,16 +547,10 @@
"..\..\include\httpd.h"\
"..\..\include\md5.h"\
"..\..\include\multithread.h"\
+ "..\..\include\util_uri.h"\
"..\..\os\win32\os.h"\
"..\..\os\win32\readdir.h"\
".\mod_proxy.h"\
- {$(INCLUDE)}"sys\stat.h"\
- {$(INCLUDE)}"sys\types.h"\
-
-NODEP_CPP_PROXY_U=\
- "..\..\include\ebcdic.h"\
- "..\..\include\os.h"\
- "..\..\include\sfio.h"\
"$(INTDIR)\proxy_util.obj" : $(SOURCE) $(DEP_CPP_PROXY_U) "$(INTDIR)"
