pcs 97/10/20 13:19:31
Modified: src Apache.dsp Apache.mak ApacheCore.dsp ApacheCore.mak
src/os/win32 ApacheModuleAuthAnon.dsp
ApacheModuleAuthAnon.mak ApacheModuleCERNMeta.dsp
ApacheModuleCERNMeta.mak ApacheModuleDigest.dsp
ApacheModuleDigest.mak ApacheModuleExpires.dsp
ApacheModuleExpires.mak ApacheModuleHeaders.dsp
ApacheModuleHeaders.mak ApacheModuleInfo.dsp
ApacheModuleInfo.mak ApacheModuleRewrite.dsp
ApacheModuleRewrite.mak ApacheModuleStatus.dsp
ApacheModuleStatus.mak ApacheModuleUserTrack.dsp
ApacheModuleUserTrack.mak
Log:
Do not link with unnecessary libraries (OLE, ODBC). Avoids link errors
on systems where this libraries have not been installed.
PR: 1260
Revision Changes Path
1.6 +2 -2 apachen/src/Apache.dsp
Index: Apache.dsp
===================================================================
RCS file: /export/home/cvs/apachen/src/Apache.dsp,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- Apache.dsp 1997/08/24 16:12:26 1.5
+++ Apache.dsp 1997/10/20 20:19:07 1.6
@@ -49,7 +49,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:console /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 /nologo /subsystem:console /machine:I386
+# ADD LINK32 CoreR\ApacheCore.lib kernel32.lib user32.lib gdi32.lib
winspool.lib comdlg32.lib advapi32.lib shell32.lib /nologo /subsystem:console
/machine:I386
!ELSEIF "$(CFG)" == "Apache - Win32 Debug"
@@ -73,7 +73,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:console /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 /nologo /subsystem:console /debug /machine:I386
+# ADD LINK32 CoreD\ApacheCore.lib kernel32.lib user32.lib gdi32.lib
winspool.lib comdlg32.lib advapi32.lib shell32.lib /nologo /subsystem:console
/debug /machine:I386
!ENDIF
1.6 +6 -6 apachen/src/Apache.mak
Index: Apache.mak
===================================================================
RCS file: /export/home/cvs/apachen/src/Apache.mak,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- Apache.mak 1997/08/23 04:00:16 1.5
+++ Apache.mak 1997/10/20 20:19:08 1.6
@@ -64,9 +64,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 /nologo /subsystem:console /incremental:no\
- /pdb:"$(OUTDIR)\Apache.pdb" /machine:I386 /out:"$(OUTDIR)\Apache.exe"
+ winspool.lib comdlg32.lib advapi32.lib shell32.lib /nologo
/subsystem:console\
+ /incremental:no /pdb:"$(OUTDIR)\Apache.pdb" /machine:I386\
+ /out:"$(OUTDIR)\Apache.exe"
LINK32_OBJS= \
"$(INTDIR)\dummy.obj"
@@ -114,9 +114,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 /nologo /subsystem:console
/incremental:yes\
- /pdb:"$(OUTDIR)\Apache.pdb" /debug /machine:I386
/out:"$(OUTDIR)\Apache.exe"
+ winspool.lib comdlg32.lib advapi32.lib shell32.lib /nologo
/subsystem:console\
+ /incremental:yes /pdb:"$(OUTDIR)\Apache.pdb" /debug /machine:I386\
+ /out:"$(OUTDIR)\Apache.exe"
LINK32_OBJS= \
"$(INTDIR)\dummy.obj"
1.13 +2 -2 apachen/src/ApacheCore.dsp
Index: ApacheCore.dsp
===================================================================
RCS file: /export/home/cvs/apachen/src/ApacheCore.dsp,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- ApacheCore.dsp 1997/10/10 08:57:59 1.12
+++ ApacheCore.dsp 1997/10/20 20:19:09 1.13
@@ -54,7 +54,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 os\win32\ApacheOSR\ApacheOS.lib regex\release\regex.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 os\win32\ApacheOSR\ApacheOS.lib regex\release\regex.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)" == "ApacheCore - Win32 Debug"
@@ -80,7 +80,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 os\win32\ApacheOSD\ApacheOS.lib regex\debug\regex.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 os\win32\ApacheOSD\ApacheOS.lib regex\debug\regex.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.20 +50 -360 apachen/src/ApacheCore.mak
Index: ApacheCore.mak
===================================================================
RCS file: /export/home/cvs/apachen/src/ApacheCore.mak,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- ApacheCore.mak 1997/10/10 08:58:00 1.19
+++ ApacheCore.mak 1997/10/20 20:19:11 1.20
@@ -28,6 +28,10 @@
NULL=nul
!ENDIF
+CPP=cl.exe
+MTL=midl.exe
+RSC=rc.exe
+
!IF "$(CFG)" == "ApacheCore - Win32 Release"
OUTDIR=.\CoreR
@@ -98,46 +102,12 @@
"$(OUTDIR)" :
if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
-CPP=cl.exe
CPP_PROJ=/nologo /MD /W3 /GX /O2 /I ".\regex" /I ".\main" /D "WIN32" /D\
"NDEBUG" /D "_WINDOWS" /Fp"$(INTDIR)\ApacheCore.pch" /YX /Fo"$(INTDIR)\\"\
/Fd"$(INTDIR)\\" /FD /c
CPP_OBJS=.\CoreR/
CPP_SBRS=.
-
-.c{$(CPP_OBJS)}.obj::
- $(CPP) @<<
- $(CPP_PROJ) $<
-<<
-
-.cpp{$(CPP_OBJS)}.obj::
- $(CPP) @<<
- $(CPP_PROJ) $<
-<<
-
-.cxx{$(CPP_OBJS)}.obj::
- $(CPP) @<<
- $(CPP_PROJ) $<
-<<
-
-.c{$(CPP_SBRS)}.sbr::
- $(CPP) @<<
- $(CPP_PROJ) $<
-<<
-
-.cpp{$(CPP_SBRS)}.sbr::
- $(CPP) @<<
- $(CPP_PROJ) $<
-<<
-
-.cxx{$(CPP_SBRS)}.sbr::
- $(CPP) @<<
- $(CPP_PROJ) $<
-<<
-
-MTL=midl.exe
MTL_PROJ=/nologo /D "NDEBUG" /mktyplib203 /win32
-RSC=rc.exe
BSC32=bscmake.exe
BSC32_FLAGS=/nologo /o"$(OUTDIR)\ApacheCore.bsc"
BSC32_SBRS= \
@@ -145,10 +115,9 @@
LINK32=link.exe
LINK32_FLAGS=os\win32\ApacheOSR\ApacheOS.lib regex\release\regex.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)\ApacheCore.pdb"\
- /machine:I386 /def:".\ApacheCore.def" /out:"$(OUTDIR)\ApacheCore.dll"\
- /implib:"$(OUTDIR)\ApacheCore.lib"
+ shell32.lib wsock32.lib /nologo /subsystem:windows /dll /incremental:no\
+ /pdb:"$(OUTDIR)\ApacheCore.pdb" /machine:I386 /def:".\ApacheCore.def"\
+ /out:"$(OUTDIR)\ApacheCore.dll" /implib:"$(OUTDIR)\ApacheCore.lib"
DEF_FILE= \
".\ApacheCore.def"
LINK32_OBJS= \
@@ -318,46 +287,12 @@
"$(OUTDIR)" :
if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
-CPP=cl.exe
CPP_PROJ=/nologo /MDd /W3 /Gm /GX /Zi /Od /I ".\regex" /I ".\main" /D
"WIN32"\
/D "_DEBUG" /D "_WINDOWS" /FR"$(INTDIR)\\" /Fp"$(INTDIR)\ApacheCore.pch"
/YX\
/Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c
CPP_OBJS=.\CoreD/
CPP_SBRS=.\CoreD/
-
-.c{$(CPP_OBJS)}.obj::
- $(CPP) @<<
- $(CPP_PROJ) $<
-<<
-
-.cpp{$(CPP_OBJS)}.obj::
- $(CPP) @<<
- $(CPP_PROJ) $<
-<<
-
-.cxx{$(CPP_OBJS)}.obj::
- $(CPP) @<<
- $(CPP_PROJ) $<
-<<
-
-.c{$(CPP_SBRS)}.sbr::
- $(CPP) @<<
- $(CPP_PROJ) $<
-<<
-
-.cpp{$(CPP_SBRS)}.sbr::
- $(CPP) @<<
- $(CPP_PROJ) $<
-<<
-
-.cxx{$(CPP_SBRS)}.sbr::
- $(CPP) @<<
- $(CPP_PROJ) $<
-<<
-
-MTL=midl.exe
MTL_PROJ=/nologo /D "_DEBUG" /mktyplib203 /win32
-RSC=rc.exe
BSC32=bscmake.exe
BSC32_FLAGS=/nologo /o"$(OUTDIR)\ApacheCore.bsc"
BSC32_SBRS= \
@@ -413,10 +348,9 @@
LINK32=link.exe
LINK32_FLAGS=os\win32\ApacheOSD\ApacheOS.lib regex\debug\regex.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)\ApacheCore.pdb"
/debug\
- /machine:I386 /def:".\ApacheCore.def" /out:"$(OUTDIR)\ApacheCore.dll"\
- /implib:"$(OUTDIR)\ApacheCore.lib"
+ wsock32.lib /nologo /subsystem:windows /dll /incremental:yes\
+ /pdb:"$(OUTDIR)\ApacheCore.pdb" /debug /machine:I386
/def:".\ApacheCore.def"\
+ /out:"$(OUTDIR)\ApacheCore.dll" /implib:"$(OUTDIR)\ApacheCore.lib"
DEF_FILE= \
".\ApacheCore.def"
LINK32_OBJS= \
@@ -471,6 +405,36 @@
!ENDIF
+.c{$(CPP_OBJS)}.obj::
+ $(CPP) @<<
+ $(CPP_PROJ) $<
+<<
+
+.cpp{$(CPP_OBJS)}.obj::
+ $(CPP) @<<
+ $(CPP_PROJ) $<
+<<
+
+.cxx{$(CPP_OBJS)}.obj::
+ $(CPP) @<<
+ $(CPP_PROJ) $<
+<<
+
+.c{$(CPP_SBRS)}.sbr::
+ $(CPP) @<<
+ $(CPP_PROJ) $<
+<<
+
+.cpp{$(CPP_SBRS)}.sbr::
+ $(CPP) @<<
+ $(CPP_PROJ) $<
+<<
+
+.cxx{$(CPP_SBRS)}.sbr::
+ $(CPP) @<<
+ $(CPP_PROJ) $<
+<<
+
!IF "$(CFG)" == "ApacheCore - Win32 Release" || "$(CFG)" ==\
"ApacheCore - Win32 Debug"
@@ -499,18 +463,12 @@
".\main\alloc.h"\
".\main\buff.h"\
".\main\conf.h"\
+ ".\main\http_log.h"\
".\main\httpd.h"\
".\main\multithread.h"\
- ".\main\os-inline.c"\
- ".\main\os.h"\
".\os\win32\os.h"\
".\os\win32\readdir.h"\
".\regex\regex.h"\
- {$(INCLUDE)}"sys\stat.h"\
- {$(INCLUDE)}"sys\types.h"\
-
-NODEP_CPP_ALLOC=\
- ".\main\sfio.h"\
"$(INTDIR)\alloc.obj" "$(INTDIR)\alloc.sbr" : $(SOURCE)
$(DEP_CPP_ALLOC)\
@@ -547,16 +505,9 @@
".\main\conf.h"\
".\main\http_main.h"\
".\main\httpd.h"\
- ".\main\os-inline.c"\
- ".\main\os.h"\
".\os\win32\os.h"\
".\os\win32\readdir.h"\
".\regex\regex.h"\
- {$(INCLUDE)}"sys\stat.h"\
- {$(INCLUDE)}"sys\types.h"\
-
-NODEP_CPP_BUFF_=\
- ".\main\sfio.h"\
"$(INTDIR)\buff.obj" "$(INTDIR)\buff.sbr" : $(SOURCE) $(DEP_CPP_BUFF_)\
@@ -653,16 +604,9 @@
".\main\buff.h"\
".\main\conf.h"\
".\main\httpd.h"\
- ".\main\os-inline.c"\
- ".\main\os.h"\
".\os\win32\os.h"\
".\os\win32\readdir.h"\
".\regex\regex.h"\
- {$(INCLUDE)}"sys\stat.h"\
- {$(INCLUDE)}"sys\types.h"\
-
-NODEP_CPP_HTTP_=\
- ".\main\sfio.h"\
"$(INTDIR)\http_bprintf.obj" "$(INTDIR)\http_bprintf.sbr" : $(SOURCE)\
@@ -711,16 +655,9 @@
".\main\http_request.h"\
".\main\http_vhost.h"\
".\main\httpd.h"\
- ".\main\os-inline.c"\
- ".\main\os.h"\
".\os\win32\os.h"\
".\os\win32\readdir.h"\
".\regex\regex.h"\
- {$(INCLUDE)}"sys\stat.h"\
- {$(INCLUDE)}"sys\types.h"\
-
-NODEP_CPP_HTTP_C=\
- ".\main\sfio.h"\
"$(INTDIR)\http_config.obj" "$(INTDIR)\http_config.sbr" : $(SOURCE)\
@@ -778,19 +715,12 @@
".\main\http_vhost.h"\
".\main\httpd.h"\
".\main\md5.h"\
- ".\main\os-inline.c"\
- ".\main\os.h"\
".\main\rfc1413.h"\
".\main\scoreboard.h"\
".\main\util_md5.h"\
".\os\win32\os.h"\
".\os\win32\readdir.h"\
".\regex\regex.h"\
- {$(INCLUDE)}"sys\stat.h"\
- {$(INCLUDE)}"sys\types.h"\
-
-NODEP_CPP_HTTP_CO=\
- ".\main\sfio.h"\
"$(INTDIR)\http_core.obj" "$(INTDIR)\http_core.sbr" : $(SOURCE)\
@@ -833,16 +763,9 @@
".\main\http_log.h"\
".\main\http_main.h"\
".\main\httpd.h"\
- ".\main\os-inline.c"\
- ".\main\os.h"\
".\os\win32\os.h"\
".\os\win32\readdir.h"\
".\regex\regex.h"\
- {$(INCLUDE)}"sys\stat.h"\
- {$(INCLUDE)}"sys\types.h"\
-
-NODEP_CPP_HTTP_L=\
- ".\main\sfio.h"\
"$(INTDIR)\http_log.obj" "$(INTDIR)\http_log.sbr" : $(SOURCE)
$(DEP_CPP_HTTP_L)\
@@ -900,19 +823,12 @@
".\main\http_vhost.h"\
".\main\httpd.h"\
".\main\multithread.h"\
- ".\main\os-inline.c"\
- ".\main\os.h"\
".\main\scoreboard.h"\
".\os\win32\getopt.h"\
".\os\win32\os.h"\
".\os\win32\readdir.h"\
".\os\win32\service.h"\
".\regex\regex.h"\
- {$(INCLUDE)}"sys\stat.h"\
- {$(INCLUDE)}"sys\types.h"\
-
-NODEP_CPP_HTTP_M=\
- ".\main\sfio.h"\
"$(INTDIR)\http_main.obj" "$(INTDIR)\http_main.sbr" : $(SOURCE)\
@@ -964,17 +880,10 @@
".\main\http_request.h"\
".\main\http_vhost.h"\
".\main\httpd.h"\
- ".\main\os-inline.c"\
- ".\main\os.h"\
".\main\util_date.h"\
".\os\win32\os.h"\
".\os\win32\readdir.h"\
".\regex\regex.h"\
- {$(INCLUDE)}"sys\stat.h"\
- {$(INCLUDE)}"sys\types.h"\
-
-NODEP_CPP_HTTP_P=\
- ".\main\sfio.h"\
"$(INTDIR)\http_protocol.obj" "$(INTDIR)\http_protocol.sbr" :
$(SOURCE)\
@@ -1024,17 +933,10 @@
".\main\http_protocol.h"\
".\main\http_request.h"\
".\main\httpd.h"\
- ".\main\os-inline.c"\
- ".\main\os.h"\
".\main\scoreboard.h"\
".\os\win32\os.h"\
".\os\win32\readdir.h"\
".\regex\regex.h"\
- {$(INCLUDE)}"sys\stat.h"\
- {$(INCLUDE)}"sys\types.h"\
-
-NODEP_CPP_HTTP_R=\
- ".\main\sfio.h"\
"$(INTDIR)\http_request.obj" "$(INTDIR)\http_request.sbr" : $(SOURCE)\
@@ -1079,16 +981,9 @@
".\main\http_protocol.h"\
".\main\http_vhost.h"\
".\main\httpd.h"\
- ".\main\os-inline.c"\
- ".\main\os.h"\
".\os\win32\os.h"\
".\os\win32\readdir.h"\
".\regex\regex.h"\
- {$(INCLUDE)}"sys\stat.h"\
- {$(INCLUDE)}"sys\types.h"\
-
-NODEP_CPP_HTTP_V=\
- ".\main\sfio.h"\
"$(INTDIR)\http_vhost.obj" "$(INTDIR)\http_vhost.sbr" : $(SOURCE)\
@@ -1118,12 +1013,8 @@
DEP_CPP_MD5C_=\
".\main\conf.h"\
".\main\md5.h"\
- ".\main\os-inline.c"\
- ".\main\os.h"\
".\os\win32\os.h"\
".\regex\regex.h"\
- {$(INCLUDE)}"sys\stat.h"\
- {$(INCLUDE)}"sys\types.h"\
"$(INTDIR)\md5c.obj" "$(INTDIR)\md5c.sbr" : $(SOURCE) $(DEP_CPP_MD5C_)\
@@ -1166,16 +1057,9 @@
".\main\http_log.h"\
".\main\http_request.h"\
".\main\httpd.h"\
- ".\main\os-inline.c"\
- ".\main\os.h"\
".\os\win32\os.h"\
".\os\win32\readdir.h"\
".\regex\regex.h"\
- {$(INCLUDE)}"sys\stat.h"\
- {$(INCLUDE)}"sys\types.h"\
-
-NODEP_CPP_MOD_A=\
- ".\main\sfio.h"\
"$(INTDIR)\mod_access.obj" "$(INTDIR)\mod_access.sbr" : $(SOURCE)\
@@ -1223,17 +1107,10 @@
".\main\http_protocol.h"\
".\main\http_request.h"\
".\main\httpd.h"\
- ".\main\os-inline.c"\
- ".\main\os.h"\
".\main\util_script.h"\
".\os\win32\os.h"\
".\os\win32\readdir.h"\
".\regex\regex.h"\
- {$(INCLUDE)}"sys\stat.h"\
- {$(INCLUDE)}"sys\types.h"\
-
-NODEP_CPP_MOD_AC=\
- ".\main\sfio.h"\
"$(INTDIR)\mod_actions.obj" "$(INTDIR)\mod_actions.sbr" : $(SOURCE)\
@@ -1270,16 +1147,9 @@
".\main\conf.h"\
".\main\http_config.h"\
".\main\httpd.h"\
- ".\main\os-inline.c"\
- ".\main\os.h"\
".\os\win32\os.h"\
".\os\win32\readdir.h"\
".\regex\regex.h"\
- {$(INCLUDE)}"sys\stat.h"\
- {$(INCLUDE)}"sys\types.h"\
-
-NODEP_CPP_MOD_AL=\
- ".\main\sfio.h"\
"$(INTDIR)\mod_alias.obj" "$(INTDIR)\mod_alias.sbr" : $(SOURCE)\
@@ -1325,17 +1195,10 @@
".\main\http_protocol.h"\
".\main\http_request.h"\
".\main\httpd.h"\
- ".\main\os-inline.c"\
- ".\main\os.h"\
".\main\util_script.h"\
".\os\win32\os.h"\
".\os\win32\readdir.h"\
".\regex\regex.h"\
- {$(INCLUDE)}"sys\stat.h"\
- {$(INCLUDE)}"sys\types.h"\
-
-NODEP_CPP_MOD_AS=\
- ".\main\sfio.h"\
"$(INTDIR)\mod_asis.obj" "$(INTDIR)\mod_asis.sbr" : $(SOURCE)
$(DEP_CPP_MOD_AS)\
@@ -1378,16 +1241,9 @@
".\main\http_log.h"\
".\main\http_protocol.h"\
".\main\httpd.h"\
- ".\main\os-inline.c"\
- ".\main\os.h"\
".\os\win32\os.h"\
".\os\win32\readdir.h"\
".\regex\regex.h"\
- {$(INCLUDE)}"sys\stat.h"\
- {$(INCLUDE)}"sys\types.h"\
-
-NODEP_CPP_MOD_AU=\
- ".\main\sfio.h"\
"$(INTDIR)\mod_auth.obj" "$(INTDIR)\mod_auth.sbr" : $(SOURCE)
$(DEP_CPP_MOD_AU)\
@@ -1435,17 +1291,10 @@
".\main\http_protocol.h"\
".\main\http_request.h"\
".\main\httpd.h"\
- ".\main\os-inline.c"\
- ".\main\os.h"\
".\main\util_script.h"\
".\os\win32\os.h"\
".\os\win32\readdir.h"\
".\regex\regex.h"\
- {$(INCLUDE)}"sys\stat.h"\
- {$(INCLUDE)}"sys\types.h"\
-
-NODEP_CPP_MOD_AUT=\
- ".\main\sfio.h"\
"$(INTDIR)\mod_autoindex.obj" "$(INTDIR)\mod_autoindex.sbr" :
$(SOURCE)\
@@ -1495,17 +1344,10 @@
".\main\http_protocol.h"\
".\main\http_request.h"\
".\main\httpd.h"\
- ".\main\os-inline.c"\
- ".\main\os.h"\
".\main\util_script.h"\
".\os\win32\os.h"\
".\os\win32\readdir.h"\
".\regex\regex.h"\
- {$(INCLUDE)}"sys\stat.h"\
- {$(INCLUDE)}"sys\types.h"\
-
-NODEP_CPP_MOD_C=\
- ".\main\sfio.h"\
"$(INTDIR)\mod_cgi.obj" "$(INTDIR)\mod_cgi.sbr" : $(SOURCE)
$(DEP_CPP_MOD_C)\
@@ -1553,17 +1395,10 @@
".\main\http_protocol.h"\
".\main\http_request.h"\
".\main\httpd.h"\
- ".\main\os-inline.c"\
- ".\main\os.h"\
".\main\util_script.h"\
".\os\win32\os.h"\
".\os\win32\readdir.h"\
".\regex\regex.h"\
- {$(INCLUDE)}"sys\stat.h"\
- {$(INCLUDE)}"sys\types.h"\
-
-NODEP_CPP_MOD_D=\
- ".\main\sfio.h"\
"$(INTDIR)\mod_dir.obj" "$(INTDIR)\mod_dir.sbr" : $(SOURCE)
$(DEP_CPP_MOD_D)\
@@ -1600,16 +1435,9 @@
".\main\conf.h"\
".\main\http_config.h"\
".\main\httpd.h"\
- ".\main\os-inline.c"\
- ".\main\os.h"\
".\os\win32\os.h"\
".\os\win32\readdir.h"\
".\regex\regex.h"\
- {$(INCLUDE)}"sys\stat.h"\
- {$(INCLUDE)}"sys\types.h"\
-
-NODEP_CPP_MOD_DL=\
- ".\main\sfio.h"\
"$(INTDIR)\mod_dll.obj" "$(INTDIR)\mod_dll.sbr" : $(SOURCE)
$(DEP_CPP_MOD_DL)\
@@ -1646,16 +1474,9 @@
".\main\conf.h"\
".\main\http_config.h"\
".\main\httpd.h"\
- ".\main\os-inline.c"\
- ".\main\os.h"\
".\os\win32\os.h"\
".\os\win32\readdir.h"\
".\regex\regex.h"\
- {$(INCLUDE)}"sys\stat.h"\
- {$(INCLUDE)}"sys\types.h"\
-
-NODEP_CPP_MOD_E=\
- ".\main\sfio.h"\
"$(INTDIR)\mod_env.obj" "$(INTDIR)\mod_env.sbr" : $(SOURCE)
$(DEP_CPP_MOD_E)\
@@ -1703,17 +1524,10 @@
".\main\http_protocol.h"\
".\main\http_request.h"\
".\main\httpd.h"\
- ".\main\os-inline.c"\
- ".\main\os.h"\
".\main\util_script.h"\
".\os\win32\os.h"\
".\os\win32\readdir.h"\
".\regex\regex.h"\
- {$(INCLUDE)}"sys\stat.h"\
- {$(INCLUDE)}"sys\types.h"\
-
-NODEP_CPP_MOD_I=\
- ".\main\sfio.h"\
"$(INTDIR)\mod_imap.obj" "$(INTDIR)\mod_imap.sbr" : $(SOURCE)
$(DEP_CPP_MOD_I)\
@@ -1761,19 +1575,10 @@
".\main\http_protocol.h"\
".\main\http_request.h"\
".\main\httpd.h"\
- ".\main\os-inline.c"\
- ".\main\os.h"\
".\main\util_script.h"\
".\os\win32\os.h"\
".\os\win32\readdir.h"\
".\regex\regex.h"\
- {$(INCLUDE)}"sys\stat.h"\
- {$(INCLUDE)}"sys\types.h"\
-
-NODEP_CPP_MOD_IN=\
- ".\main\sfio.h"\
- ".\modules\standard\config.h"\
- ".\modules\standard\modules\perl\mod_perl.h"\
"$(INTDIR)\mod_include.obj" "$(INTDIR)\mod_include.sbr" : $(SOURCE)\
@@ -1819,17 +1624,10 @@
".\main\http_protocol.h"\
".\main\http_request.h"\
".\main\httpd.h"\
- ".\main\os-inline.c"\
- ".\main\os.h"\
".\main\util_script.h"\
".\os\win32\os.h"\
".\os\win32\readdir.h"\
".\regex\regex.h"\
- {$(INCLUDE)}"sys\stat.h"\
- {$(INCLUDE)}"sys\types.h"\
-
-NODEP_CPP_MOD_IS=\
- ".\main\sfio.h"\
"$(INTDIR)\mod_isapi.obj" "$(INTDIR)\mod_isapi.sbr" : $(SOURCE)\
@@ -1870,16 +1668,9 @@
".\main\http_core.h"\
".\main\http_log.h"\
".\main\httpd.h"\
- ".\main\os-inline.c"\
- ".\main\os.h"\
".\os\win32\os.h"\
".\os\win32\readdir.h"\
".\regex\regex.h"\
- {$(INCLUDE)}"sys\stat.h"\
- {$(INCLUDE)}"sys\types.h"\
-
-NODEP_CPP_MOD_L=\
- ".\main\sfio.h"\
"$(INTDIR)\mod_log_config.obj" "$(INTDIR)\mod_log_config.sbr" :
$(SOURCE)\
@@ -1917,17 +1708,10 @@
".\main\conf.h"\
".\main\http_config.h"\
".\main\httpd.h"\
- ".\main\os-inline.c"\
- ".\main\os.h"\
".\modules\standard\mod_mime.h"\
".\os\win32\os.h"\
".\os\win32\readdir.h"\
".\regex\regex.h"\
- {$(INCLUDE)}"sys\stat.h"\
- {$(INCLUDE)}"sys\types.h"\
-
-NODEP_CPP_MOD_M=\
- ".\main\sfio.h"\
"$(INTDIR)\mod_mime.obj" "$(INTDIR)\mod_mime.sbr" : $(SOURCE)
$(DEP_CPP_MOD_M)\
@@ -1971,17 +1755,10 @@
".\main\http_log.h"\
".\main\http_request.h"\
".\main\httpd.h"\
- ".\main\os-inline.c"\
- ".\main\os.h"\
".\main\util_script.h"\
".\os\win32\os.h"\
".\os\win32\readdir.h"\
".\regex\regex.h"\
- {$(INCLUDE)}"sys\stat.h"\
- {$(INCLUDE)}"sys\types.h"\
-
-NODEP_CPP_MOD_N=\
- ".\main\sfio.h"\
"$(INTDIR)\mod_negotiation.obj" "$(INTDIR)\mod_negotiation.sbr" :
$(SOURCE)\
@@ -2022,16 +1799,9 @@
".\main\http_core.h"\
".\main\http_log.h"\
".\main\httpd.h"\
- ".\main\os-inline.c"\
- ".\main\os.h"\
".\os\win32\os.h"\
".\os\win32\readdir.h"\
".\regex\regex.h"\
- {$(INCLUDE)}"sys\stat.h"\
- {$(INCLUDE)}"sys\types.h"\
-
-NODEP_CPP_MOD_S=\
- ".\main\sfio.h"\
"$(INTDIR)\mod_setenvif.obj" "$(INTDIR)\mod_setenvif.sbr" : $(SOURCE)\
@@ -2068,16 +1838,9 @@
".\main\conf.h"\
".\main\http_config.h"\
".\main\httpd.h"\
- ".\main\os-inline.c"\
- ".\main\os.h"\
".\os\win32\os.h"\
".\os\win32\readdir.h"\
".\regex\regex.h"\
- {$(INCLUDE)}"sys\stat.h"\
- {$(INCLUDE)}"sys\types.h"\
-
-NODEP_CPP_MOD_U=\
- ".\main\sfio.h"\
"$(INTDIR)\mod_userdir.obj" "$(INTDIR)\mod_userdir.sbr" : $(SOURCE)\
@@ -2114,16 +1877,9 @@
".\main\conf.h"\
".\main\http_config.h"\
".\main\httpd.h"\
- ".\main\os-inline.c"\
- ".\main\os.h"\
".\os\win32\os.h"\
".\os\win32\readdir.h"\
".\regex\regex.h"\
- {$(INCLUDE)}"sys\stat.h"\
- {$(INCLUDE)}"sys\types.h"\
-
-NODEP_CPP_MODUL=\
- ".\main\sfio.h"\
"$(INTDIR)\modules.obj" "$(INTDIR)\modules.sbr" : $(SOURCE)
$(DEP_CPP_MODUL)\
@@ -2153,12 +1909,8 @@
DEP_CPP_MULTI=\
".\main\conf.h"\
".\main\multithread.h"\
- ".\main\os-inline.c"\
- ".\main\os.h"\
".\os\win32\os.h"\
".\regex\regex.h"\
- {$(INCLUDE)}"sys\stat.h"\
- {$(INCLUDE)}"sys\types.h"\
"$(INTDIR)\multithread.obj" "$(INTDIR)\multithread.sbr" : $(SOURCE)\
@@ -2169,23 +1921,19 @@
!ENDIF
SOURCE=.\os\win32\readdir.c
-
-!IF "$(CFG)" == "ApacheCore - Win32 Release"
-
DEP_CPP_READD=\
".\os\win32\readdir.h"\
+!IF "$(CFG)" == "ApacheCore - Win32 Release"
+
+
"$(INTDIR)\readdir.obj" : $(SOURCE) $(DEP_CPP_READD) "$(INTDIR)"
$(CPP) $(CPP_PROJ) $(SOURCE)
!ELSEIF "$(CFG)" == "ApacheCore - Win32 Debug"
-DEP_CPP_READD=\
- ".\os\win32\readdir.h"\
- {$(INCLUDE)}"sys\types.h"\
-
"$(INTDIR)\readdir.obj" "$(INTDIR)\readdir.sbr" : $(SOURCE)
$(DEP_CPP_READD)\
"$(INTDIR)"
@@ -2224,17 +1972,10 @@
".\main\http_log.h"\
".\main\http_main.h"\
".\main\httpd.h"\
- ".\main\os-inline.c"\
- ".\main\os.h"\
".\main\rfc1413.h"\
".\os\win32\os.h"\
".\os\win32\readdir.h"\
".\regex\regex.h"\
- {$(INCLUDE)}"sys\stat.h"\
- {$(INCLUDE)}"sys\types.h"\
-
-NODEP_CPP_RFC14=\
- ".\main\sfio.h"\
"$(INTDIR)\rfc1413.obj" "$(INTDIR)\rfc1413.sbr" : $(SOURCE)
$(DEP_CPP_RFC14)\
@@ -2265,13 +2006,9 @@
DEP_CPP_SERVI=\
".\main\conf.h"\
".\main\multithread.h"\
- ".\main\os-inline.c"\
- ".\main\os.h"\
".\os\win32\os.h"\
".\os\win32\service.h"\
".\regex\regex.h"\
- {$(INCLUDE)}"sys\stat.h"\
- {$(INCLUDE)}"sys\types.h"\
"$(INTDIR)\service.obj" "$(INTDIR)\service.sbr" : $(SOURCE)
$(DEP_CPP_SERVI)\
@@ -2308,16 +2045,9 @@
".\main\conf.h"\
".\main\http_conf_globals.h"\
".\main\httpd.h"\
- ".\main\os-inline.c"\
- ".\main\os.h"\
".\os\win32\os.h"\
".\os\win32\readdir.h"\
".\regex\regex.h"\
- {$(INCLUDE)}"sys\stat.h"\
- {$(INCLUDE)}"sys\types.h"\
-
-NODEP_CPP_UTIL_=\
- ".\main\sfio.h"\
"$(INTDIR)\util.obj" "$(INTDIR)\util.sbr" : $(SOURCE) $(DEP_CPP_UTIL_)\
@@ -2328,9 +2058,6 @@
!ENDIF
SOURCE=.\main\util_date.c
-
-!IF "$(CFG)" == "ApacheCore - Win32 Release"
-
DEP_CPP_UTIL_D=\
".\main\conf.h"\
".\main\util_date.h"\
@@ -2338,22 +2065,15 @@
".\regex\regex.h"\
+!IF "$(CFG)" == "ApacheCore - Win32 Release"
+
+
"$(INTDIR)\util_date.obj" : $(SOURCE) $(DEP_CPP_UTIL_D) "$(INTDIR)"
$(CPP) $(CPP_PROJ) $(SOURCE)
!ELSEIF "$(CFG)" == "ApacheCore - Win32 Debug"
-DEP_CPP_UTIL_D=\
- ".\main\conf.h"\
- ".\main\os-inline.c"\
- ".\main\os.h"\
- ".\main\util_date.h"\
- ".\os\win32\os.h"\
- ".\regex\regex.h"\
- {$(INCLUDE)}"sys\stat.h"\
- {$(INCLUDE)}"sys\types.h"\
-
"$(INTDIR)\util_date.obj" "$(INTDIR)\util_date.sbr" : $(SOURCE)\
$(DEP_CPP_UTIL_D) "$(INTDIR)"
@@ -2390,17 +2110,10 @@
".\main\conf.h"\
".\main\httpd.h"\
".\main\md5.h"\
- ".\main\os-inline.c"\
- ".\main\os.h"\
".\main\util_md5.h"\
".\os\win32\os.h"\
".\os\win32\readdir.h"\
".\regex\regex.h"\
- {$(INCLUDE)}"sys\stat.h"\
- {$(INCLUDE)}"sys\types.h"\
-
-NODEP_CPP_UTIL_M=\
- ".\main\sfio.h"\
"$(INTDIR)\util_md5.obj" "$(INTDIR)\util_md5.sbr" : $(SOURCE)
$(DEP_CPP_UTIL_M)\
@@ -2451,18 +2164,11 @@
".\main\http_protocol.h"\
".\main\http_request.h"\
".\main\httpd.h"\
- ".\main\os-inline.c"\
- ".\main\os.h"\
".\main\util_date.h"\
".\main\util_script.h"\
".\os\win32\os.h"\
".\os\win32\readdir.h"\
".\regex\regex.h"\
- {$(INCLUDE)}"sys\stat.h"\
- {$(INCLUDE)}"sys\types.h"\
-
-NODEP_CPP_UTIL_S=\
- ".\main\sfio.h"\
"$(INTDIR)\util_script.obj" "$(INTDIR)\util_script.sbr" : $(SOURCE)\
@@ -2473,30 +2179,21 @@
!ENDIF
SOURCE=.\main\util_snprintf.c
-
-!IF "$(CFG)" == "ApacheCore - Win32 Release"
-
DEP_CPP_UTIL_SN=\
".\main\conf.h"\
".\os\win32\os.h"\
".\regex\regex.h"\
+!IF "$(CFG)" == "ApacheCore - Win32 Release"
+
+
"$(INTDIR)\util_snprintf.obj" : $(SOURCE) $(DEP_CPP_UTIL_SN) "$(INTDIR)"
$(CPP) $(CPP_PROJ) $(SOURCE)
!ELSEIF "$(CFG)" == "ApacheCore - Win32 Debug"
-DEP_CPP_UTIL_SN=\
- ".\main\conf.h"\
- ".\main\os-inline.c"\
- ".\main\os.h"\
- ".\os\win32\os.h"\
- ".\regex\regex.h"\
- {$(INCLUDE)}"sys\stat.h"\
- {$(INCLUDE)}"sys\types.h"\
-
"$(INTDIR)\util_snprintf.obj" "$(INTDIR)\util_snprintf.sbr" :
$(SOURCE)\
$(DEP_CPP_UTIL_SN) "$(INTDIR)"
@@ -2530,16 +2227,9 @@
".\main\buff.h"\
".\main\conf.h"\
".\main\httpd.h"\
- ".\main\os-inline.c"\
- ".\main\os.h"\
".\os\win32\os.h"\
".\os\win32\readdir.h"\
".\regex\regex.h"\
- {$(INCLUDE)}"sys\stat.h"\
- {$(INCLUDE)}"sys\types.h"\
-
-NODEP_CPP_UTIL_W=\
- ".\main\sfio.h"\
"$(INTDIR)\util_win32.obj" "$(INTDIR)\util_win32.sbr" : $(SOURCE)\
1.4 +2 -2 apachen/src/os/win32/ApacheModuleAuthAnon.dsp
Index: ApacheModuleAuthAnon.dsp
===================================================================
RCS file: /export/home/cvs/apachen/src/os/win32/ApacheModuleAuthAnon.dsp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- ApacheModuleAuthAnon.dsp 1997/08/23 14:12:44 1.3
+++ ApacheModuleAuthAnon.dsp 1997/10/20 20:19:13 1.4
@@ -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 /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 /nologo /subsystem:windows
/dll /machine:I386
!ELSEIF "$(CFG)" == "ApacheModuleAuthAnon - 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 /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 /nologo /subsystem:windows
/dll /debug /machine:I386
!ENDIF
1.7 +7 -7 apachen/src/os/win32/ApacheModuleAuthAnon.mak
Index: ApacheModuleAuthAnon.mak
===================================================================
RCS file: /export/home/cvs/apachen/src/os/win32/ApacheModuleAuthAnon.mak,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- ApacheModuleAuthAnon.mak 1997/08/30 14:27:29 1.6
+++ ApacheModuleAuthAnon.mak 1997/10/20 20:19:14 1.7
@@ -74,9 +74,8 @@
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 /nologo /subsystem:windows /dll\
- /incremental:no /pdb:"$(OUTDIR)\ApacheModuleAuthAnon.pdb" /machine:I386\
+ winspool.lib comdlg32.lib advapi32.lib shell32.lib /nologo
/subsystem:windows\
+ /dll /incremental:no /pdb:"$(OUTDIR)\ApacheModuleAuthAnon.pdb"
/machine:I386\
/out:"$(OUTDIR)\ApacheModuleAuthAnon.dll"\
/implib:"$(OUTDIR)\ApacheModuleAuthAnon.lib"
LINK32_OBJS= \
@@ -130,10 +129,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 /nologo /subsystem:windows /dll\
- /incremental:yes /pdb:"$(OUTDIR)\ApacheModuleAuthAnon.pdb" /debug
/machine:I386\
- /out:"$(OUTDIR)\ApacheModuleAuthAnon.dll"\
+ winspool.lib comdlg32.lib advapi32.lib shell32.lib /nologo
/subsystem:windows\
+ /dll /incremental:yes /pdb:"$(OUTDIR)\ApacheModuleAuthAnon.pdb" /debug\
+ /machine:I386 /out:"$(OUTDIR)\ApacheModuleAuthAnon.dll"\
/implib:"$(OUTDIR)\ApacheModuleAuthAnon.lib"
LINK32_OBJS= \
"$(INTDIR)\mod_auth_anon.obj"
@@ -193,6 +191,7 @@
"..\..\main\http_request.h"\
"..\..\main\httpd.h"\
"..\..\regex\regex.h"\
+ ".\os.h"\
".\readdir.h"\
@@ -213,6 +212,7 @@
"..\..\main\http_request.h"\
"..\..\main\httpd.h"\
"..\..\regex\regex.h"\
+ ".\os.h"\
".\readdir.h"\
1.4 +2 -2 apachen/src/os/win32/ApacheModuleCERNMeta.dsp
Index: ApacheModuleCERNMeta.dsp
===================================================================
RCS file: /export/home/cvs/apachen/src/os/win32/ApacheModuleCERNMeta.dsp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- ApacheModuleCERNMeta.dsp 1997/08/23 14:12:44 1.3
+++ ApacheModuleCERNMeta.dsp 1997/10/20 20:19:16 1.4
@@ -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 /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 /nologo /subsystem:windows
/dll /machine:I386
!ELSEIF "$(CFG)" == "ApacheModuleCERNMeta - 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 /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 /nologo /subsystem:windows
/dll /debug /machine:I386
!ENDIF
1.7 +7 -7 apachen/src/os/win32/ApacheModuleCERNMeta.mak
Index: ApacheModuleCERNMeta.mak
===================================================================
RCS file: /export/home/cvs/apachen/src/os/win32/ApacheModuleCERNMeta.mak,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- ApacheModuleCERNMeta.mak 1997/08/30 14:27:29 1.6
+++ ApacheModuleCERNMeta.mak 1997/10/20 20:19:17 1.7
@@ -74,9 +74,8 @@
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 /nologo /subsystem:windows /dll\
- /incremental:no /pdb:"$(OUTDIR)\ApacheModuleCERNMeta.pdb" /machine:I386\
+ winspool.lib comdlg32.lib advapi32.lib shell32.lib /nologo
/subsystem:windows\
+ /dll /incremental:no /pdb:"$(OUTDIR)\ApacheModuleCERNMeta.pdb"
/machine:I386\
/out:"$(OUTDIR)\ApacheModuleCERNMeta.dll"\
/implib:"$(OUTDIR)\ApacheModuleCERNMeta.lib"
LINK32_OBJS= \
@@ -130,10 +129,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 /nologo /subsystem:windows /dll\
- /incremental:yes /pdb:"$(OUTDIR)\ApacheModuleCERNMeta.pdb" /debug
/machine:I386\
- /out:"$(OUTDIR)\ApacheModuleCERNMeta.dll"\
+ winspool.lib comdlg32.lib advapi32.lib shell32.lib /nologo
/subsystem:windows\
+ /dll /incremental:yes /pdb:"$(OUTDIR)\ApacheModuleCERNMeta.pdb" /debug\
+ /machine:I386 /out:"$(OUTDIR)\ApacheModuleCERNMeta.dll"\
/implib:"$(OUTDIR)\ApacheModuleCERNMeta.lib"
LINK32_OBJS= \
"$(INTDIR)\mod_cern_meta.obj"
@@ -192,6 +190,7 @@
"..\..\main\httpd.h"\
"..\..\main\util_script.h"\
"..\..\regex\regex.h"\
+ ".\os.h"\
".\readdir.h"\
@@ -211,6 +210,7 @@
"..\..\main\httpd.h"\
"..\..\main\util_script.h"\
"..\..\regex\regex.h"\
+ ".\os.h"\
".\readdir.h"\
1.4 +2 -2 apachen/src/os/win32/ApacheModuleDigest.dsp
Index: ApacheModuleDigest.dsp
===================================================================
RCS file: /export/home/cvs/apachen/src/os/win32/ApacheModuleDigest.dsp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- ApacheModuleDigest.dsp 1997/08/23 14:12:45 1.3
+++ ApacheModuleDigest.dsp 1997/10/20 20:19:18 1.4
@@ -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 /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 /nologo /subsystem:windows
/dll /machine:I386
!ELSEIF "$(CFG)" == "ApacheModuleDigest - 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 /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 /nologo /subsystem:windows
/dll /debug /machine:I386
!ENDIF
1.7 +7 -7 apachen/src/os/win32/ApacheModuleDigest.mak
Index: ApacheModuleDigest.mak
===================================================================
RCS file: /export/home/cvs/apachen/src/os/win32/ApacheModuleDigest.mak,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- ApacheModuleDigest.mak 1997/08/30 14:27:29 1.6
+++ ApacheModuleDigest.mak 1997/10/20 20:19:18 1.7
@@ -74,9 +74,8 @@
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 /nologo /subsystem:windows /dll\
- /incremental:no /pdb:"$(OUTDIR)\ApacheModuleDigest.pdb" /machine:I386\
+ winspool.lib comdlg32.lib advapi32.lib shell32.lib /nologo
/subsystem:windows\
+ /dll /incremental:no /pdb:"$(OUTDIR)\ApacheModuleDigest.pdb" /machine:I386\
/out:"$(OUTDIR)\ApacheModuleDigest.dll"\
/implib:"$(OUTDIR)\ApacheModuleDigest.lib"
LINK32_OBJS= \
@@ -130,10 +129,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 /nologo /subsystem:windows /dll\
- /incremental:yes /pdb:"$(OUTDIR)\ApacheModuleDigest.pdb" /debug
/machine:I386\
- /out:"$(OUTDIR)\ApacheModuleDigest.dll"\
+ winspool.lib comdlg32.lib advapi32.lib shell32.lib /nologo
/subsystem:windows\
+ /dll /incremental:yes /pdb:"$(OUTDIR)\ApacheModuleDigest.pdb" /debug\
+ /machine:I386 /out:"$(OUTDIR)\ApacheModuleDigest.dll"\
/implib:"$(OUTDIR)\ApacheModuleDigest.lib"
LINK32_OBJS= \
"$(INTDIR)\mod_digest.obj"
@@ -194,6 +192,7 @@
"..\..\main\md5.h"\
"..\..\main\util_md5.h"\
"..\..\regex\regex.h"\
+ ".\os.h"\
".\readdir.h"\
@@ -215,6 +214,7 @@
"..\..\main\md5.h"\
"..\..\main\util_md5.h"\
"..\..\regex\regex.h"\
+ ".\os.h"\
".\readdir.h"\
1.4 +2 -2 apachen/src/os/win32/ApacheModuleExpires.dsp
Index: ApacheModuleExpires.dsp
===================================================================
RCS file: /export/home/cvs/apachen/src/os/win32/ApacheModuleExpires.dsp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- ApacheModuleExpires.dsp 1997/08/23 14:12:45 1.3
+++ ApacheModuleExpires.dsp 1997/10/20 20:19:19 1.4
@@ -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 /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 /nologo /subsystem:windows
/dll /machine:I386
!ELSEIF "$(CFG)" == "ApacheModuleExpires - 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 /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 /nologo /subsystem:windows
/dll /debug /machine:I386
!ENDIF
1.7 +7 -7 apachen/src/os/win32/ApacheModuleExpires.mak
Index: ApacheModuleExpires.mak
===================================================================
RCS file: /export/home/cvs/apachen/src/os/win32/ApacheModuleExpires.mak,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- ApacheModuleExpires.mak 1997/08/30 14:27:29 1.6
+++ ApacheModuleExpires.mak 1997/10/20 20:19:20 1.7
@@ -74,9 +74,8 @@
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 /nologo /subsystem:windows /dll\
- /incremental:no /pdb:"$(OUTDIR)\ApacheModuleExpires.pdb" /machine:I386\
+ winspool.lib comdlg32.lib advapi32.lib shell32.lib /nologo
/subsystem:windows\
+ /dll /incremental:no /pdb:"$(OUTDIR)\ApacheModuleExpires.pdb" /machine:I386\
/out:"$(OUTDIR)\ApacheModuleExpires.dll"\
/implib:"$(OUTDIR)\ApacheModuleExpires.lib"
LINK32_OBJS= \
@@ -130,10 +129,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 /nologo /subsystem:windows /dll\
- /incremental:yes /pdb:"$(OUTDIR)\ApacheModuleExpires.pdb" /debug
/machine:I386\
- /out:"$(OUTDIR)\ApacheModuleExpires.dll"\
+ winspool.lib comdlg32.lib advapi32.lib shell32.lib /nologo
/subsystem:windows\
+ /dll /incremental:yes /pdb:"$(OUTDIR)\ApacheModuleExpires.pdb" /debug\
+ /machine:I386 /out:"$(OUTDIR)\ApacheModuleExpires.dll"\
/implib:"$(OUTDIR)\ApacheModuleExpires.lib"
LINK32_OBJS= \
"$(INTDIR)\mod_expires.obj"
@@ -190,6 +188,7 @@
"..\..\main\http_log.h"\
"..\..\main\httpd.h"\
"..\..\regex\regex.h"\
+ ".\os.h"\
".\readdir.h"\
@@ -207,6 +206,7 @@
"..\..\main\http_log.h"\
"..\..\main\httpd.h"\
"..\..\regex\regex.h"\
+ ".\os.h"\
".\readdir.h"\
1.4 +2 -2 apachen/src/os/win32/ApacheModuleHeaders.dsp
Index: ApacheModuleHeaders.dsp
===================================================================
RCS file: /export/home/cvs/apachen/src/os/win32/ApacheModuleHeaders.dsp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- ApacheModuleHeaders.dsp 1997/08/23 14:12:46 1.3
+++ ApacheModuleHeaders.dsp 1997/10/20 20:19:22 1.4
@@ -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 /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 /nologo /subsystem:windows
/dll /machine:I386
!ELSEIF "$(CFG)" == "ApacheModuleHeaders - 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 /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 /nologo /subsystem:windows
/dll /debug /machine:I386
!ENDIF
1.7 +7 -7 apachen/src/os/win32/ApacheModuleHeaders.mak
Index: ApacheModuleHeaders.mak
===================================================================
RCS file: /export/home/cvs/apachen/src/os/win32/ApacheModuleHeaders.mak,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- ApacheModuleHeaders.mak 1997/08/30 14:27:30 1.6
+++ ApacheModuleHeaders.mak 1997/10/20 20:19:23 1.7
@@ -74,9 +74,8 @@
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 /nologo /subsystem:windows /dll\
- /incremental:no /pdb:"$(OUTDIR)\ApacheModuleHeaders.pdb" /machine:I386\
+ winspool.lib comdlg32.lib advapi32.lib shell32.lib /nologo
/subsystem:windows\
+ /dll /incremental:no /pdb:"$(OUTDIR)\ApacheModuleHeaders.pdb" /machine:I386\
/out:"$(OUTDIR)\ApacheModuleHeaders.dll"\
/implib:"$(OUTDIR)\ApacheModuleHeaders.lib"
LINK32_OBJS= \
@@ -130,10 +129,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 /nologo /subsystem:windows /dll\
- /incremental:yes /pdb:"$(OUTDIR)\ApacheModuleHeaders.pdb" /debug
/machine:I386\
- /out:"$(OUTDIR)\ApacheModuleHeaders.dll"\
+ winspool.lib comdlg32.lib advapi32.lib shell32.lib /nologo
/subsystem:windows\
+ /dll /incremental:yes /pdb:"$(OUTDIR)\ApacheModuleHeaders.pdb" /debug\
+ /machine:I386 /out:"$(OUTDIR)\ApacheModuleHeaders.dll"\
/implib:"$(OUTDIR)\ApacheModuleHeaders.lib"
LINK32_OBJS= \
"$(INTDIR)\mod_headers.obj"
@@ -189,6 +187,7 @@
"..\..\main\http_config.h"\
"..\..\main\httpd.h"\
"..\..\regex\regex.h"\
+ ".\os.h"\
".\readdir.h"\
@@ -205,6 +204,7 @@
"..\..\main\http_config.h"\
"..\..\main\httpd.h"\
"..\..\regex\regex.h"\
+ ".\os.h"\
".\readdir.h"\
1.4 +2 -2 apachen/src/os/win32/ApacheModuleInfo.dsp
Index: ApacheModuleInfo.dsp
===================================================================
RCS file: /export/home/cvs/apachen/src/os/win32/ApacheModuleInfo.dsp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- ApacheModuleInfo.dsp 1997/08/23 14:12:46 1.3
+++ ApacheModuleInfo.dsp 1997/10/20 20:19:24 1.4
@@ -54,7 +54,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 /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 /nologo /subsystem:windows
/dll /machine:I386
!ELSEIF "$(CFG)" == "ApacheModuleInfo - Win32 Debug"
@@ -80,7 +80,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 /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 /nologo /subsystem:windows
/dll /debug /machine:I386
!ENDIF
1.4 +9 -34 apachen/src/os/win32/ApacheModuleInfo.mak
Index: ApacheModuleInfo.mak
===================================================================
RCS file: /export/home/cvs/apachen/src/os/win32/ApacheModuleInfo.mak,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- ApacheModuleInfo.mak 1997/08/23 14:12:46 1.3
+++ ApacheModuleInfo.mak 1997/10/20 20:19:24 1.4
@@ -73,9 +73,8 @@
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 /nologo /subsystem:windows /dll\
- /incremental:no /pdb:"$(OUTDIR)\ApacheModuleInfo.pdb" /machine:I386\
+ winspool.lib comdlg32.lib advapi32.lib shell32.lib /nologo
/subsystem:windows\
+ /dll /incremental:no /pdb:"$(OUTDIR)\ApacheModuleInfo.pdb" /machine:I386\
/out:"$(OUTDIR)\ApacheModuleInfo.dll"
/implib:"$(OUTDIR)\ApacheModuleInfo.lib"
LINK32_OBJS= \
"$(INTDIR)\mod_info.obj"
@@ -128,10 +127,10 @@
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 /nologo /subsystem:windows /dll\
- /incremental:yes /pdb:"$(OUTDIR)\ApacheModuleInfo.pdb" /debug /machine:I386\
- /out:"$(OUTDIR)\ApacheModuleInfo.dll"
/implib:"$(OUTDIR)\ApacheModuleInfo.lib"
+ winspool.lib comdlg32.lib advapi32.lib shell32.lib /nologo
/subsystem:windows\
+ /dll /incremental:yes /pdb:"$(OUTDIR)\ApacheModuleInfo.pdb" /debug\
+ /machine:I386 /out:"$(OUTDIR)\ApacheModuleInfo.dll"\
+ /implib:"$(OUTDIR)\ApacheModuleInfo.lib"
LINK32_OBJS= \
"$(INTDIR)\mod_info.obj"
@@ -176,31 +175,6 @@
!IF "$(CFG)" == "ApacheModuleInfo - Win32 Release" || "$(CFG)" ==\
"ApacheModuleInfo - Win32 Debug"
SOURCE=..\..\modules\standard\mod_info.c
-
-!IF "$(CFG)" == "ApacheModuleInfo - Win32 Release"
-
-DEP_CPP_MOD_I=\
- "..\..\main\alloc.h"\
- "..\..\main\buff.h"\
- "..\..\main\conf.h"\
- "..\..\main\http_conf_globals.h"\
- "..\..\main\http_config.h"\
- "..\..\main\http_core.h"\
- "..\..\main\http_log.h"\
- "..\..\main\http_main.h"\
- "..\..\main\http_protocol.h"\
- "..\..\main\httpd.h"\
- "..\..\main\util_script.h"\
- "..\..\regex\regex.h"\
- ".\readdir.h"\
-
-
-"$(INTDIR)\mod_info.obj" : $(SOURCE) $(DEP_CPP_MOD_I) "$(INTDIR)"
- $(CPP) $(CPP_PROJ) $(SOURCE)
-
-
-!ELSEIF "$(CFG)" == "ApacheModuleInfo - Win32 Debug"
-
DEP_CPP_MOD_I=\
"..\..\main\alloc.h"\
"..\..\main\buff.h"\
@@ -212,8 +186,11 @@
"..\..\main\http_main.h"\
"..\..\main\http_protocol.h"\
"..\..\main\httpd.h"\
+ "..\..\main\os-inline.c"\
+ "..\..\main\os.h"\
"..\..\main\util_script.h"\
"..\..\regex\regex.h"\
+ ".\os.h"\
".\readdir.h"\
{$(INCLUDE)}"sys\stat.h"\
{$(INCLUDE)}"sys\types.h"\
@@ -225,8 +202,6 @@
"$(INTDIR)\mod_info.obj" : $(SOURCE) $(DEP_CPP_MOD_I) "$(INTDIR)"
$(CPP) $(CPP_PROJ) $(SOURCE)
-
-!ENDIF
!ENDIF
1.6 +2 -2 apachen/src/os/win32/ApacheModuleRewrite.dsp
Index: ApacheModuleRewrite.dsp
===================================================================
RCS file: /export/home/cvs/apachen/src/os/win32/ApacheModuleRewrite.dsp,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- ApacheModuleRewrite.dsp 1997/09/05 19:38:40 1.5
+++ ApacheModuleRewrite.dsp 1997/10/20 20:19:25 1.6
@@ -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 wsock32.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 /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)" == "ApacheModuleRewrite - 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 +9 -7 apachen/src/os/win32/ApacheModuleRewrite.mak
Index: ApacheModuleRewrite.mak
===================================================================
RCS file: /export/home/cvs/apachen/src/os/win32/ApacheModuleRewrite.mak,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- ApacheModuleRewrite.mak 1997/09/05 19:22:02 1.5
+++ ApacheModuleRewrite.mak 1997/10/20 20:19:25 1.6
@@ -74,10 +74,10 @@
BSC32_SBRS= \
LINK32=link.exe
-LINK32_FLAGS=..\..\CoreR\ApacheCore.lib wsock32.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 /nologo /subsystem:windows
/dll\
- /incremental:no /pdb:"$(OUTDIR)\ApacheModuleRewrite.pdb" /machine:I386\
+LINK32_FLAGS=..\..\CoreR\ApacheCore.lib kernel32.lib user32.lib gdi32.lib\
+ winspool.lib comdlg32.lib advapi32.lib shell32.lib wsock32.lib /nologo\
+ /subsystem:windows /dll /incremental:no\
+ /pdb:"$(OUTDIR)\ApacheModuleRewrite.pdb" /machine:I386\
/out:"$(OUTDIR)\ApacheModuleRewrite.dll"\
/implib:"$(OUTDIR)\ApacheModuleRewrite.lib"
LINK32_OBJS= \
@@ -133,9 +133,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)\ApacheModuleRewrite.pdb" /debug
/machine:I386\
+ winspool.lib comdlg32.lib advapi32.lib shell32.lib wsock32.lib /nologo\
+ /subsystem:windows /dll /incremental:yes\
+ /pdb:"$(OUTDIR)\ApacheModuleRewrite.pdb" /debug /machine:I386\
/out:"$(OUTDIR)\ApacheModuleRewrite.dll"\
/implib:"$(OUTDIR)\ApacheModuleRewrite.lib"
LINK32_OBJS= \
@@ -197,6 +197,7 @@
"..\..\main\httpd.h"\
"..\..\modules\standard\mod_rewrite.h"\
"..\..\regex\regex.h"\
+ ".\os.h"\
".\passwd.h"\
".\readdir.h"\
@@ -218,6 +219,7 @@
"..\..\main\httpd.h"\
"..\..\modules\standard\mod_rewrite.h"\
"..\..\regex\regex.h"\
+ ".\os.h"\
".\passwd.h"\
".\readdir.h"\
1.4 +2 -2 apachen/src/os/win32/ApacheModuleStatus.dsp
Index: ApacheModuleStatus.dsp
===================================================================
RCS file: /export/home/cvs/apachen/src/os/win32/ApacheModuleStatus.dsp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- ApacheModuleStatus.dsp 1997/08/23 14:12:47 1.3
+++ ApacheModuleStatus.dsp 1997/10/20 20:19:26 1.4
@@ -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 /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 /nologo /subsystem:windows
/dll /machine:I386
!ELSEIF "$(CFG)" == "ApacheModuleStatus - 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 /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 /nologo /subsystem:windows
/dll /debug /machine:I386
!ENDIF
1.7 +7 -7 apachen/src/os/win32/ApacheModuleStatus.mak
Index: ApacheModuleStatus.mak
===================================================================
RCS file: /export/home/cvs/apachen/src/os/win32/ApacheModuleStatus.mak,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- ApacheModuleStatus.mak 1997/08/30 14:27:30 1.6
+++ ApacheModuleStatus.mak 1997/10/20 20:19:27 1.7
@@ -74,9 +74,8 @@
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 /nologo /subsystem:windows /dll\
- /incremental:no /pdb:"$(OUTDIR)\ApacheModuleStatus.pdb" /machine:I386\
+ winspool.lib comdlg32.lib advapi32.lib shell32.lib /nologo
/subsystem:windows\
+ /dll /incremental:no /pdb:"$(OUTDIR)\ApacheModuleStatus.pdb" /machine:I386\
/out:"$(OUTDIR)\ApacheModuleStatus.dll"\
/implib:"$(OUTDIR)\ApacheModuleStatus.lib"
LINK32_OBJS= \
@@ -130,10 +129,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 /nologo /subsystem:windows /dll\
- /incremental:yes /pdb:"$(OUTDIR)\ApacheModuleStatus.pdb" /debug
/machine:I386\
- /out:"$(OUTDIR)\ApacheModuleStatus.dll"\
+ winspool.lib comdlg32.lib advapi32.lib shell32.lib /nologo
/subsystem:windows\
+ /dll /incremental:yes /pdb:"$(OUTDIR)\ApacheModuleStatus.pdb" /debug\
+ /machine:I386 /out:"$(OUTDIR)\ApacheModuleStatus.dll"\
/implib:"$(OUTDIR)\ApacheModuleStatus.lib"
LINK32_OBJS= \
"$(INTDIR)\mod_status.obj"
@@ -195,6 +193,7 @@
"..\..\main\scoreboard.h"\
"..\..\main\util_script.h"\
"..\..\regex\regex.h"\
+ ".\os.h"\
".\readdir.h"\
@@ -217,6 +216,7 @@
"..\..\main\scoreboard.h"\
"..\..\main\util_script.h"\
"..\..\regex\regex.h"\
+ ".\os.h"\
".\readdir.h"\
1.4 +2 -2 apachen/src/os/win32/ApacheModuleUserTrack.dsp
Index: ApacheModuleUserTrack.dsp
===================================================================
RCS file: /export/home/cvs/apachen/src/os/win32/ApacheModuleUserTrack.dsp,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- ApacheModuleUserTrack.dsp 1997/08/23 14:12:48 1.3
+++ ApacheModuleUserTrack.dsp 1997/10/20 20:19:27 1.4
@@ -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 /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 /nologo /subsystem:windows
/dll /machine:I386
!ELSEIF "$(CFG)" == "ApacheModuleUserTrack - 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 /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 /nologo /subsystem:windows
/dll /debug /machine:I386
!ENDIF
1.7 +6 -6 apachen/src/os/win32/ApacheModuleUserTrack.mak
Index: ApacheModuleUserTrack.mak
===================================================================
RCS file: /export/home/cvs/apachen/src/os/win32/ApacheModuleUserTrack.mak,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- ApacheModuleUserTrack.mak 1997/08/30 14:27:30 1.6
+++ ApacheModuleUserTrack.mak 1997/10/20 20:19:27 1.7
@@ -74,9 +74,8 @@
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 /nologo /subsystem:windows /dll\
- /incremental:no /pdb:"$(OUTDIR)\ApacheModuleUserTrack.pdb" /machine:I386\
+ winspool.lib comdlg32.lib advapi32.lib shell32.lib /nologo
/subsystem:windows\
+ /dll /incremental:no /pdb:"$(OUTDIR)\ApacheModuleUserTrack.pdb"
/machine:I386\
/out:"$(OUTDIR)\ApacheModuleUserTrack.dll"\
/implib:"$(OUTDIR)\ApacheModuleUserTrack.lib"
LINK32_OBJS= \
@@ -130,9 +129,8 @@
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 /nologo /subsystem:windows /dll\
- /incremental:yes /pdb:"$(OUTDIR)\ApacheModuleUserTrack.pdb" /debug\
+ winspool.lib comdlg32.lib advapi32.lib shell32.lib /nologo
/subsystem:windows\
+ /dll /incremental:yes /pdb:"$(OUTDIR)\ApacheModuleUserTrack.pdb" /debug\
/machine:I386 /out:"$(OUTDIR)\ApacheModuleUserTrack.dll"\
/implib:"$(OUTDIR)\ApacheModuleUserTrack.lib"
LINK32_OBJS= \
@@ -190,6 +188,7 @@
"..\..\main\http_core.h"\
"..\..\main\httpd.h"\
"..\..\regex\regex.h"\
+ ".\os.h"\
".\readdir.h"\
@@ -207,6 +206,7 @@
"..\..\main\http_core.h"\
"..\..\main\httpd.h"\
"..\..\regex\regex.h"\
+ ".\os.h"\
".\readdir.h"\