You are viewing a plain text version of this content. The canonical link for it is here.
Posted to cvs@httpd.apache.org by pc...@hyperreal.org on 1998/01/04 14:20:42 UTC
cvs commit: apachen/src/modules/proxy ApacheModuleProxy.dsp ApacheModuleProxy.mak
pcs 98/01/04 05:20:42
Modified: src/modules/proxy ApacheModuleProxy.dsp
ApacheModuleProxy.mak
Log:
Remove dependencies on ODBC and OLE libraries (Win32)
Revision Changes Path
1.5 +2 -2 apachen/src/modules/proxy/ApacheModuleProxy.dsp
Index: ApacheModuleProxy.dsp
===================================================================
RCS file: /export/home/cvs/apachen/src/modules/proxy/ApacheModuleProxy.dsp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- ApacheModuleProxy.dsp 1997/09/13 23:10:52 1.4
+++ ApacheModuleProxy.dsp 1998/01/04 13:20:41 1.5
@@ -55,7 +55,7 @@
# 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 /machine:I386
-# ADD LINK32 ..\..\CoreR\ApacheCore.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib wsock32.lib /nologo /subsystem:windows /dll /machine:I386
+# ADD LINK32 ..\..\CoreR\ApacheCore.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib wsock32.lib /nologo /subsystem:windows /dll /machine:I386
!ELSEIF "$(CFG)" == "ApacheModuleProxy - Win32 Debug"
@@ -81,7 +81,7 @@
# 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 ..\..\CoreD\ApacheCore.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib wsock32.lib /nologo /subsystem:windows /dll /debug /machine:I386
+# ADD LINK32 ..\..\CoreD\ApacheCore.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib wsock32.lib /nologo /subsystem:windows /dll /debug /machine:I386
!ENDIF
1.6 +56 -9 apachen/src/modules/proxy/ApacheModuleProxy.mak
Index: ApacheModuleProxy.mak
===================================================================
RCS file: /export/home/cvs/apachen/src/modules/proxy/ApacheModuleProxy.mak,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- ApacheModuleProxy.mak 1997/09/05 19:39:21 1.5
+++ ApacheModuleProxy.mak 1998/01/04 13:20:41 1.6
@@ -79,10 +79,9 @@
LINK32=link.exe
LINK32_FLAGS=..\..\CoreR\ApacheCore.lib kernel32.lib user32.lib gdi32.lib\
- winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib\
- uuid.lib odbc32.lib odbccp32.lib wsock32.lib /nologo /subsystem:windows /dll\
- /incremental:no /pdb:"$(OUTDIR)\ApacheModuleProxy.pdb" /machine:I386\
- /out:"$(OUTDIR)\ApacheModuleProxy.dll"\
+ winspool.lib comdlg32.lib advapi32.lib shell32.lib wsock32.lib /nologo\
+ /subsystem:windows /dll /incremental:no /pdb:"$(OUTDIR)\ApacheModuleProxy.pdb"\
+ /machine:I386 /out:"$(OUTDIR)\ApacheModuleProxy.dll"\
/implib:"$(OUTDIR)\ApacheModuleProxy.lib"
LINK32_OBJS= \
"$(INTDIR)\mod_proxy.obj" \
@@ -133,7 +132,7 @@
"$(OUTDIR)" :
if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
-CPP_PROJ=/nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\main" /I "..\..\regex" /D\
+CPP_PROJ=/nologo /MDd /W4 /Gm /GX /Zi /Od /I "..\..\main" /I "..\..\regex" /D\
"WIN32" /D "_DEBUG" /D "_WINDOWS" /Fp"$(INTDIR)\ApacheModuleProxy.pch" /YX\
/Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c
CPP_OBJS=.\Debug/
@@ -145,10 +144,9 @@
LINK32=link.exe
LINK32_FLAGS=..\..\CoreD\ApacheCore.lib kernel32.lib user32.lib gdi32.lib\
- winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib\
- uuid.lib odbc32.lib odbccp32.lib wsock32.lib /nologo /subsystem:windows /dll\
- /incremental:yes /pdb:"$(OUTDIR)\ApacheModuleProxy.pdb" /debug /machine:I386\
- /out:"$(OUTDIR)\ApacheModuleProxy.dll"\
+ winspool.lib comdlg32.lib advapi32.lib shell32.lib wsock32.lib /nologo\
+ /subsystem:windows /dll /incremental:yes /pdb:"$(OUTDIR)\ApacheModuleProxy.pdb"\
+ /debug /machine:I386 /out:"$(OUTDIR)\ApacheModuleProxy.dll"\
/implib:"$(OUTDIR)\ApacheModuleProxy.lib"
LINK32_OBJS= \
"$(INTDIR)\mod_proxy.obj" \
@@ -211,6 +209,7 @@
"..\..\main\http_log.h"\
"..\..\main\http_protocol.h"\
"..\..\main\httpd.h"\
+ "..\..\os\win32\os.h"\
"..\..\os\win32\readdir.h"\
"..\..\regex\regex.h"\
".\mod_proxy.h"\
@@ -230,9 +229,16 @@
"..\..\main\http_log.h"\
"..\..\main\http_protocol.h"\
"..\..\main\httpd.h"\
+ "..\..\os\win32\os.h"\
"..\..\os\win32\readdir.h"\
"..\..\regex\regex.h"\
".\mod_proxy.h"\
+ {$(INCLUDE)}"sys\stat.h"\
+ {$(INCLUDE)}"sys\types.h"\
+
+NODEP_CPP_MOD_P=\
+ "..\..\main\os.h"\
+ "..\..\main\sfio.h"\
"$(INTDIR)\mod_proxy.obj" : $(SOURCE) $(DEP_CPP_MOD_P) "$(INTDIR)"
@@ -257,6 +263,7 @@
"..\..\main\md5.h"\
"..\..\main\multithread.h"\
"..\..\main\util_date.h"\
+ "..\..\os\win32\os.h"\
"..\..\os\win32\readdir.h"\
"..\..\regex\regex.h"\
".\mod_proxy.h"\
@@ -280,9 +287,17 @@
"..\..\main\md5.h"\
"..\..\main\multithread.h"\
"..\..\main\util_date.h"\
+ "..\..\os\win32\os.h"\
"..\..\os\win32\readdir.h"\
"..\..\regex\regex.h"\
".\mod_proxy.h"\
+ {$(INCLUDE)}"sys\stat.h"\
+ {$(INCLUDE)}"sys\types.h"\
+ {$(INCLUDE)}"sys\utime.h"\
+
+NODEP_CPP_PROXY=\
+ "..\..\main\os.h"\
+ "..\..\main\sfio.h"\
"$(INTDIR)\proxy_cache.obj" : $(SOURCE) $(DEP_CPP_PROXY) "$(INTDIR)"
@@ -304,6 +319,7 @@
"..\..\main\http_main.h"\
"..\..\main\http_protocol.h"\
"..\..\main\httpd.h"\
+ "..\..\os\win32\os.h"\
"..\..\os\win32\readdir.h"\
"..\..\regex\regex.h"\
".\mod_proxy.h"\
@@ -324,9 +340,16 @@
"..\..\main\http_main.h"\
"..\..\main\http_protocol.h"\
"..\..\main\httpd.h"\
+ "..\..\os\win32\os.h"\
"..\..\os\win32\readdir.h"\
"..\..\regex\regex.h"\
".\mod_proxy.h"\
+ {$(INCLUDE)}"sys\stat.h"\
+ {$(INCLUDE)}"sys\types.h"\
+
+NODEP_CPP_PROXY_=\
+ "..\..\main\os.h"\
+ "..\..\main\sfio.h"\
"$(INTDIR)\proxy_connect.obj" : $(SOURCE) $(DEP_CPP_PROXY_) "$(INTDIR)"
@@ -347,6 +370,7 @@
"..\..\main\http_main.h"\
"..\..\main\http_protocol.h"\
"..\..\main\httpd.h"\
+ "..\..\os\win32\os.h"\
"..\..\os\win32\readdir.h"\
"..\..\regex\regex.h"\
"..\standard\mod_mime.h"\
@@ -367,10 +391,17 @@
"..\..\main\http_main.h"\
"..\..\main\http_protocol.h"\
"..\..\main\httpd.h"\
+ "..\..\os\win32\os.h"\
"..\..\os\win32\readdir.h"\
"..\..\regex\regex.h"\
"..\standard\mod_mime.h"\
".\mod_proxy.h"\
+ {$(INCLUDE)}"sys\stat.h"\
+ {$(INCLUDE)}"sys\types.h"\
+
+NODEP_CPP_PROXY_F=\
+ "..\..\main\os.h"\
+ "..\..\main\sfio.h"\
"$(INTDIR)\proxy_ftp.obj" : $(SOURCE) $(DEP_CPP_PROXY_F) "$(INTDIR)"
@@ -393,6 +424,7 @@
"..\..\main\http_protocol.h"\
"..\..\main\httpd.h"\
"..\..\main\util_date.h"\
+ "..\..\os\win32\os.h"\
"..\..\os\win32\readdir.h"\
"..\..\regex\regex.h"\
".\mod_proxy.h"\
@@ -414,9 +446,16 @@
"..\..\main\http_protocol.h"\
"..\..\main\httpd.h"\
"..\..\main\util_date.h"\
+ "..\..\os\win32\os.h"\
"..\..\os\win32\readdir.h"\
"..\..\regex\regex.h"\
".\mod_proxy.h"\
+ {$(INCLUDE)}"sys\stat.h"\
+ {$(INCLUDE)}"sys\types.h"\
+
+NODEP_CPP_PROXY_H=\
+ "..\..\main\os.h"\
+ "..\..\main\sfio.h"\
"$(INTDIR)\proxy_http.obj" : $(SOURCE) $(DEP_CPP_PROXY_H) "$(INTDIR)"
@@ -440,6 +479,7 @@
"..\..\main\httpd.h"\
"..\..\main\md5.h"\
"..\..\main\multithread.h"\
+ "..\..\os\win32\os.h"\
"..\..\os\win32\readdir.h"\
"..\..\regex\regex.h"\
".\mod_proxy.h"\
@@ -462,9 +502,16 @@
"..\..\main\httpd.h"\
"..\..\main\md5.h"\
"..\..\main\multithread.h"\
+ "..\..\os\win32\os.h"\
"..\..\os\win32\readdir.h"\
"..\..\regex\regex.h"\
".\mod_proxy.h"\
+ {$(INCLUDE)}"sys\stat.h"\
+ {$(INCLUDE)}"sys\types.h"\
+
+NODEP_CPP_PROXY_U=\
+ "..\..\main\os.h"\
+ "..\..\main\sfio.h"\
"$(INTDIR)\proxy_util.obj" : $(SOURCE) $(DEP_CPP_PROXY_U) "$(INTDIR)"