pcs 97/08/13 01:37:43
Modified: src Apache.dsp Apache.mak ApacheCore.dsp ApacheCore.mak
Makefile.nt
src/core alloc.h http_main.c
src/modules/proxy ApacheModuleProxy.dsp
ApacheModuleProxy.mak proxy_ftp.c
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 mod_dll.c mod_isapi.c
modules.c multithread.c service.c
src/regex regex.mak
Log:
Make NT work after the re-org. The files in src/nt have moved in
the repository to src/os/win32. The other changes are to make it compile
again after this move.
Revision Changes Path
1.3 +2 -1 apachen/src/Apache.dsp
Index: Apache.dsp
===================================================================
RCS file: /export/home/cvs/apachen/src/Apache.dsp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- Apache.dsp 1997/07/20 15:30:00 1.2
+++ Apache.dsp 1997/08/13 08:37:12 1.3
@@ -38,6 +38,7 @@
# PROP Use_Debug_Libraries 0
# PROP Output_Dir ".\ApacheR"
# PROP Intermediate_Dir ".\ApacheR"
+# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX
/c
# ADD CPP /nologo /MD /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /YX
/FD /c
@@ -84,7 +85,7 @@
# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;hpj;bat;for;f90"
# Begin Source File
-SOURCE=.\dummy.c
+SOURCE=.\core\dummy.c
# End Source File
# End Group
# Begin Group "Header Files"
1.4 +2 -1 apachen/src/Apache.mak
Index: Apache.mak
===================================================================
RCS file: /export/home/cvs/apachen/src/Apache.mak,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- Apache.mak 1997/07/20 15:30:00 1.3
+++ Apache.mak 1997/08/13 08:37:13 1.4
@@ -159,9 +159,10 @@
!IF "$(CFG)" == "Apache - Win32 Release" || "$(CFG)" == "Apache - Win32
Debug"
-SOURCE=.\dummy.c
+SOURCE=.\core\dummy.c
"$(INTDIR)\dummy.obj" : $(SOURCE) "$(INTDIR)"
+ $(CPP) $(CPP_PROJ) $(SOURCE)
1.5 +43 -43 apachen/src/ApacheCore.dsp
Index: ApacheCore.dsp
===================================================================
RCS file: /export/home/cvs/apachen/src/ApacheCore.dsp,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- ApacheCore.dsp 1997/08/09 11:52:03 1.4
+++ ApacheCore.dsp 1997/08/13 08:37:13 1.5
@@ -44,7 +44,7 @@
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS"
/YX /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I ".\regex" /D "WIN32" /D "NDEBUG" /D
"_WINDOWS" /YX /FD /c
+# ADD CPP /nologo /MD /W3 /GX /O2 /I ".\regex" /I ".\core" /D "WIN32" /D
"NDEBUG" /D "_WINDOWS" /YX /FD /c
# ADD BASE MTL /nologo /D "NDEBUG" /win32
# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
# ADD BASE RSC /l 0x809 /d "NDEBUG"
@@ -70,7 +70,7 @@
# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D
"_WINDOWS" /YX /c
-# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I ".\regex" /D "WIN32" /D
"_DEBUG" /D "_WINDOWS" /FR /YX /FD /c
+# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I ".\regex" /I ".\core" /D
"WIN32" /D "_DEBUG" /D "_WINDOWS" /FR /YX /FD /c
# ADD BASE MTL /nologo /D "_DEBUG" /win32
# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
# ADD BASE RSC /l 0x809 /d "_DEBUG"
@@ -93,7 +93,7 @@
# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;hpj;bat;for;f90"
# Begin Source File
-SOURCE=.\alloc.c
+SOURCE=.\core\alloc.c
# End Source File
# Begin Source File
@@ -101,163 +101,163 @@
# End Source File
# Begin Source File
-SOURCE=.\buff.c
+SOURCE=.\core\buff.c
# End Source File
# Begin Source File
-SOURCE=.\explain.c
+SOURCE=.\core\explain.c
# End Source File
# Begin Source File
-SOURCE=.\fnmatch.c
+SOURCE=.\core\fnmatch.c
# End Source File
# Begin Source File
-SOURCE=.\nt\getopt.c
+SOURCE=.\os\win32\getopt.c
# End Source File
# Begin Source File
-SOURCE=.\http_bprintf.c
+SOURCE=.\core\http_bprintf.c
# End Source File
# Begin Source File
-SOURCE=.\http_config.c
+SOURCE=.\core\http_config.c
# End Source File
# Begin Source File
-SOURCE=.\http_core.c
+SOURCE=.\core\http_core.c
# End Source File
# Begin Source File
-SOURCE=.\http_log.c
+SOURCE=.\core\http_log.c
# End Source File
# Begin Source File
-SOURCE=.\http_main.c
+SOURCE=.\core\http_main.c
# End Source File
# Begin Source File
-SOURCE=.\http_protocol.c
+SOURCE=.\core\http_protocol.c
# End Source File
# Begin Source File
-SOURCE=.\http_request.c
+SOURCE=.\core\http_request.c
# End Source File
# Begin Source File
-SOURCE=.\md5c.c
+SOURCE=.\core\md5c.c
# End Source File
# Begin Source File
-SOURCE=.\mod_access.c
+SOURCE=.\modules\standard\mod_access.c
# End Source File
# Begin Source File
-SOURCE=.\mod_actions.c
+SOURCE=.\modules\standard\mod_actions.c
# End Source File
# Begin Source File
-SOURCE=.\mod_alias.c
+SOURCE=.\modules\standard\mod_alias.c
# End Source File
# Begin Source File
-SOURCE=.\mod_asis.c
+SOURCE=.\modules\standard\mod_asis.c
# End Source File
# Begin Source File
-SOURCE=.\mod_auth.c
+SOURCE=.\modules\standard\mod_auth.c
# End Source File
# Begin Source File
-SOURCE=.\mod_autoindex.c
+SOURCE=.\modules\standard\mod_autoindex.c
# End Source File
# Begin Source File
-SOURCE=.\mod_cgi.c
+SOURCE=.\modules\standard\mod_cgi.c
# End Source File
# Begin Source File
-SOURCE=.\mod_dir.c
+SOURCE=.\modules\standard\mod_dir.c
# End Source File
# Begin Source File
-SOURCE=.\nt\mod_dll.c
+SOURCE=.\os\win32\mod_dll.c
# End Source File
# Begin Source File
-SOURCE=.\mod_env.c
+SOURCE=.\modules\standard\mod_env.c
# End Source File
# Begin Source File
-SOURCE=.\mod_imap.c
+SOURCE=.\modules\standard\mod_imap.c
# End Source File
# Begin Source File
-SOURCE=.\mod_include.c
+SOURCE=.\modules\standard\mod_include.c
# End Source File
# Begin Source File
-SOURCE=.\nt\mod_isapi.c
+SOURCE=.\os\win32\mod_isapi.c
# End Source File
# Begin Source File
-SOURCE=.\mod_log_config.c
+SOURCE=.\modules\standard\mod_log_config.c
# End Source File
# Begin Source File
-SOURCE=.\mod_mime.c
+SOURCE=.\modules\standard\mod_mime.c
# End Source File
# Begin Source File
-SOURCE=.\mod_negotiation.c
+SOURCE=.\modules\standard\mod_negotiation.c
# End Source File
# Begin Source File
-SOURCE=.\mod_setenvif.c
+SOURCE=.\modules\standard\mod_setenvif.c
# End Source File
# Begin Source File
-SOURCE=.\mod_userdir.c
+SOURCE=.\modules\standard\mod_userdir.c
# End Source File
# Begin Source File
-SOURCE=.\nt\modules.c
+SOURCE=.\os\win32\modules.c
# End Source File
# Begin Source File
-SOURCE=.\nt\multithread.c
+SOURCE=.\os\win32\multithread.c
# End Source File
# Begin Source File
-SOURCE=.\nt\readdir.c
+SOURCE=.\os\win32\readdir.c
# End Source File
# Begin Source File
-SOURCE=.\rfc1413.c
+SOURCE=.\core\rfc1413.c
# End Source File
# Begin Source File
-SOURCE=.\nt\service.c
+SOURCE=.\os\win32\service.c
# End Source File
# Begin Source File
-SOURCE=.\util.c
+SOURCE=.\core\util.c
# End Source File
# Begin Source File
-SOURCE=.\util_date.c
+SOURCE=.\core\util_date.c
# End Source File
# Begin Source File
-SOURCE=.\util_md5.c
+SOURCE=.\core\util_md5.c
# End Source File
# Begin Source File
-SOURCE=.\util_script.c
+SOURCE=.\core\util_script.c
# End Source File
# Begin Source File
-SOURCE=.\util_snprintf.c
+SOURCE=.\core\util_snprintf.c
# End Source File
# End Group
# Begin Group "Header Files"
1.11 +907 -925 apachen/src/ApacheCore.mak
Index: ApacheCore.mak
===================================================================
RCS file: /export/home/cvs/apachen/src/ApacheCore.mak,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- ApacheCore.mak 1997/08/09 11:52:04 1.10
+++ ApacheCore.mak 1997/08/13 08:37:14 1.11
@@ -28,6 +28,10 @@
NULL=nul
!ENDIF
+CPP=cl.exe
+MTL=midl.exe
+RSC=rc.exe
+
!IF "$(CFG)" == "ApacheCore - Win32 Release"
OUTDIR=.\CoreR
@@ -96,46 +100,12 @@
"$(OUTDIR)" :
if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
-CPP=cl.exe
-CPP_PROJ=/nologo /MD /W3 /GX /O2 /I ".\regex" /D "WIN32" /D "NDEBUG" /D\
- "_WINDOWS" /Fp"$(INTDIR)\ApacheCore.pch" /YX /Fo"$(INTDIR)\\"
/Fd"$(INTDIR)\\"\
- /FD /c
+CPP_PROJ=/nologo /MD /W3 /GX /O2 /I ".\regex" /I ".\core" /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= \
@@ -310,46 +280,12 @@
"$(OUTDIR)" :
if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
-CPP=cl.exe
-CPP_PROJ=/nologo /MDd /W3 /Gm /GX /Zi /Od /I ".\regex" /D "WIN32" /D
"_DEBUG"\
- /D "_WINDOWS" /FR"$(INTDIR)\\" /Fp"$(INTDIR)\ApacheCore.pch" /YX\
+CPP_PROJ=/nologo /MDd /W3 /Gm /GX /Zi /Od /I ".\regex" /I ".\core" /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= \
@@ -459,98 +395,123 @@
!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"
-SOURCE=.\alloc.c
+SOURCE=.\core\alloc.c
!IF "$(CFG)" == "ApacheCore - Win32 Release"
DEP_CPP_ALLOC=\
- ".\alloc.h"\
- ".\buff.h"\
- ".\conf.h"\
- ".\httpd.h"\
- ".\multithread.h"\
- ".\nt\readdir.h"\
+ ".\core\alloc.h"\
+ ".\core\buff.h"\
+ ".\core\conf.h"\
+ ".\core\httpd.h"\
+ ".\core\multithread.h"\
+ ".\os\win32\readdir.h"\
".\regex\regex.h"\
- {$(INCLUDE)}"sys\stat.h"\
- {$(INCLUDE)}"sys\types.h"\
-
-NODEP_CPP_ALLOC=\
- ".\sfio.h"\
"$(INTDIR)\alloc.obj" : $(SOURCE) $(DEP_CPP_ALLOC) "$(INTDIR)"
+ $(CPP) $(CPP_PROJ) $(SOURCE)
!ELSEIF "$(CFG)" == "ApacheCore - Win32 Debug"
DEP_CPP_ALLOC=\
- ".\alloc.h"\
- ".\buff.h"\
- ".\conf.h"\
- ".\httpd.h"\
- ".\multithread.h"\
- ".\nt\readdir.h"\
+ ".\core\alloc.h"\
+ ".\core\buff.h"\
+ ".\core\conf.h"\
+ ".\core\httpd.h"\
+ ".\core\multithread.h"\
+ ".\os\win32\readdir.h"\
".\regex\regex.h"\
"$(INTDIR)\alloc.obj" "$(INTDIR)\alloc.sbr" : $(SOURCE)
$(DEP_CPP_ALLOC)\
"$(INTDIR)"
+ $(CPP) $(CPP_PROJ) $(SOURCE)
!ENDIF
-SOURCE=.\buff.c
+SOURCE=.\core\buff.c
!IF "$(CFG)" == "ApacheCore - Win32 Release"
DEP_CPP_BUFF_=\
- ".\alloc.h"\
- ".\buff.h"\
- ".\conf.h"\
- ".\http_main.h"\
- ".\httpd.h"\
- ".\nt\readdir.h"\
+ ".\core\alloc.h"\
+ ".\core\buff.h"\
+ ".\core\conf.h"\
+ ".\core\http_main.h"\
+ ".\core\httpd.h"\
+ ".\os\win32\readdir.h"\
".\regex\regex.h"\
- {$(INCLUDE)}"sys\stat.h"\
- {$(INCLUDE)}"sys\types.h"\
-
-NODEP_CPP_BUFF_=\
- ".\sfio.h"\
"$(INTDIR)\buff.obj" : $(SOURCE) $(DEP_CPP_BUFF_) "$(INTDIR)"
+ $(CPP) $(CPP_PROJ) $(SOURCE)
!ELSEIF "$(CFG)" == "ApacheCore - Win32 Debug"
DEP_CPP_BUFF_=\
- ".\alloc.h"\
- ".\buff.h"\
- ".\conf.h"\
- ".\http_main.h"\
- ".\httpd.h"\
- ".\nt\readdir.h"\
+ ".\core\alloc.h"\
+ ".\core\buff.h"\
+ ".\core\conf.h"\
+ ".\core\http_main.h"\
+ ".\core\httpd.h"\
+ ".\os\win32\readdir.h"\
".\regex\regex.h"\
"$(INTDIR)\buff.obj" "$(INTDIR)\buff.sbr" : $(SOURCE) $(DEP_CPP_BUFF_)\
"$(INTDIR)"
+ $(CPP) $(CPP_PROJ) $(SOURCE)
!ENDIF
-SOURCE=.\explain.c
+SOURCE=.\core\explain.c
DEP_CPP_EXPLA=\
- ".\explain.h"\
+ ".\core\explain.h"\
!IF "$(CFG)" == "ApacheCore - Win32 Release"
"$(INTDIR)\explain.obj" : $(SOURCE) $(DEP_CPP_EXPLA) "$(INTDIR)"
+ $(CPP) $(CPP_PROJ) $(SOURCE)
!ELSEIF "$(CFG)" == "ApacheCore - Win32 Debug"
@@ -558,19 +519,21 @@
"$(INTDIR)\explain.obj" "$(INTDIR)\explain.sbr" : $(SOURCE)
$(DEP_CPP_EXPLA)\
"$(INTDIR)"
+ $(CPP) $(CPP_PROJ) $(SOURCE)
!ENDIF
-SOURCE=.\fnmatch.c
+SOURCE=.\core\fnmatch.c
DEP_CPP_FNMAT=\
- ".\fnmatch.h"\
+ ".\core\fnmatch.h"\
!IF "$(CFG)" == "ApacheCore - Win32 Release"
"$(INTDIR)\fnmatch.obj" : $(SOURCE) $(DEP_CPP_FNMAT) "$(INTDIR)"
+ $(CPP) $(CPP_PROJ) $(SOURCE)
!ELSEIF "$(CFG)" == "ApacheCore - Win32 Debug"
@@ -578,11 +541,12 @@
"$(INTDIR)\fnmatch.obj" "$(INTDIR)\fnmatch.sbr" : $(SOURCE)
$(DEP_CPP_FNMAT)\
"$(INTDIR)"
+ $(CPP) $(CPP_PROJ) $(SOURCE)
!ENDIF
-SOURCE=.\nt\getopt.c
+SOURCE=.\os\win32\getopt.c
!IF "$(CFG)" == "ApacheCore - Win32 Release"
@@ -600,804 +564,789 @@
!ENDIF
-SOURCE=.\http_bprintf.c
+SOURCE=.\core\http_bprintf.c
!IF "$(CFG)" == "ApacheCore - Win32 Release"
DEP_CPP_HTTP_=\
- ".\alloc.h"\
- ".\buff.h"\
- ".\conf.h"\
- ".\httpd.h"\
- ".\nt\readdir.h"\
+ ".\core\alloc.h"\
+ ".\core\buff.h"\
+ ".\core\conf.h"\
+ ".\core\httpd.h"\
+ ".\os\win32\readdir.h"\
".\regex\regex.h"\
- {$(INCLUDE)}"sys\stat.h"\
- {$(INCLUDE)}"sys\types.h"\
-
-NODEP_CPP_HTTP_=\
- ".\sfio.h"\
"$(INTDIR)\http_bprintf.obj" : $(SOURCE) $(DEP_CPP_HTTP_) "$(INTDIR)"
+ $(CPP) $(CPP_PROJ) $(SOURCE)
!ELSEIF "$(CFG)" == "ApacheCore - Win32 Debug"
DEP_CPP_HTTP_=\
- ".\alloc.h"\
- ".\buff.h"\
- ".\conf.h"\
- ".\httpd.h"\
- ".\nt\readdir.h"\
+ ".\core\alloc.h"\
+ ".\core\buff.h"\
+ ".\core\conf.h"\
+ ".\core\httpd.h"\
+ ".\os\win32\readdir.h"\
".\regex\regex.h"\
"$(INTDIR)\http_bprintf.obj" "$(INTDIR)\http_bprintf.sbr" : $(SOURCE)\
$(DEP_CPP_HTTP_) "$(INTDIR)"
+ $(CPP) $(CPP_PROJ) $(SOURCE)
!ENDIF
-SOURCE=.\http_config.c
+SOURCE=.\core\http_config.c
!IF "$(CFG)" == "ApacheCore - Win32 Release"
DEP_CPP_HTTP_C=\
- ".\alloc.h"\
- ".\buff.h"\
- ".\conf.h"\
- ".\explain.h"\
- ".\http_conf_globals.h"\
- ".\http_config.h"\
- ".\http_core.h"\
- ".\http_log.h"\
- ".\http_request.h"\
- ".\httpd.h"\
- ".\nt\readdir.h"\
+ ".\core\alloc.h"\
+ ".\core\buff.h"\
+ ".\core\conf.h"\
+ ".\core\explain.h"\
+ ".\core\http_conf_globals.h"\
+ ".\core\http_config.h"\
+ ".\core\http_core.h"\
+ ".\core\http_log.h"\
+ ".\core\http_request.h"\
+ ".\core\httpd.h"\
+ ".\os\win32\readdir.h"\
".\regex\regex.h"\
- {$(INCLUDE)}"sys\stat.h"\
- {$(INCLUDE)}"sys\types.h"\
-
-NODEP_CPP_HTTP_C=\
- ".\sfio.h"\
"$(INTDIR)\http_config.obj" : $(SOURCE) $(DEP_CPP_HTTP_C) "$(INTDIR)"
+ $(CPP) $(CPP_PROJ) $(SOURCE)
!ELSEIF "$(CFG)" == "ApacheCore - Win32 Debug"
DEP_CPP_HTTP_C=\
- ".\alloc.h"\
- ".\buff.h"\
- ".\conf.h"\
- ".\explain.h"\
- ".\http_conf_globals.h"\
- ".\http_config.h"\
- ".\http_core.h"\
- ".\http_log.h"\
- ".\http_request.h"\
- ".\httpd.h"\
- ".\nt\readdir.h"\
+ ".\core\alloc.h"\
+ ".\core\buff.h"\
+ ".\core\conf.h"\
+ ".\core\explain.h"\
+ ".\core\http_conf_globals.h"\
+ ".\core\http_config.h"\
+ ".\core\http_core.h"\
+ ".\core\http_log.h"\
+ ".\core\http_request.h"\
+ ".\core\httpd.h"\
+ ".\os\win32\readdir.h"\
".\regex\regex.h"\
"$(INTDIR)\http_config.obj" "$(INTDIR)\http_config.sbr" : $(SOURCE)\
$(DEP_CPP_HTTP_C) "$(INTDIR)"
+ $(CPP) $(CPP_PROJ) $(SOURCE)
!ENDIF
-SOURCE=.\http_core.c
+SOURCE=.\core\http_core.c
!IF "$(CFG)" == "ApacheCore - Win32 Release"
DEP_CPP_HTTP_CO=\
- ".\alloc.h"\
- ".\buff.h"\
- ".\conf.h"\
- ".\fnmatch.h"\
- ".\http_conf_globals.h"\
- ".\http_config.h"\
- ".\http_core.h"\
- ".\http_log.h"\
- ".\http_main.h"\
- ".\http_protocol.h"\
- ".\httpd.h"\
- ".\md5.h"\
- ".\nt\readdir.h"\
- ".\regex\regex.h"\
- ".\rfc1413.h"\
- ".\scoreboard.h"\
- ".\util_md5.h"\
- {$(INCLUDE)}"sys\stat.h"\
- {$(INCLUDE)}"sys\types.h"\
-
-NODEP_CPP_HTTP_CO=\
- ".\sfio.h"\
+ ".\core\alloc.h"\
+ ".\core\buff.h"\
+ ".\core\conf.h"\
+ ".\core\fnmatch.h"\
+ ".\core\http_conf_globals.h"\
+ ".\core\http_config.h"\
+ ".\core\http_core.h"\
+ ".\core\http_log.h"\
+ ".\core\http_main.h"\
+ ".\core\http_protocol.h"\
+ ".\core\httpd.h"\
+ ".\core\md5.h"\
+ ".\core\rfc1413.h"\
+ ".\core\scoreboard.h"\
+ ".\core\util_md5.h"\
+ ".\os\win32\readdir.h"\
+ ".\regex\regex.h"\
"$(INTDIR)\http_core.obj" : $(SOURCE) $(DEP_CPP_HTTP_CO) "$(INTDIR)"
+ $(CPP) $(CPP_PROJ) $(SOURCE)
!ELSEIF "$(CFG)" == "ApacheCore - Win32 Debug"
DEP_CPP_HTTP_CO=\
- ".\alloc.h"\
- ".\buff.h"\
- ".\conf.h"\
- ".\fnmatch.h"\
- ".\http_conf_globals.h"\
- ".\http_config.h"\
- ".\http_core.h"\
- ".\http_log.h"\
- ".\http_main.h"\
- ".\http_protocol.h"\
- ".\httpd.h"\
- ".\md5.h"\
- ".\nt\readdir.h"\
- ".\regex\regex.h"\
- ".\rfc1413.h"\
- ".\scoreboard.h"\
- ".\util_md5.h"\
+ ".\core\alloc.h"\
+ ".\core\buff.h"\
+ ".\core\conf.h"\
+ ".\core\fnmatch.h"\
+ ".\core\http_conf_globals.h"\
+ ".\core\http_config.h"\
+ ".\core\http_core.h"\
+ ".\core\http_log.h"\
+ ".\core\http_main.h"\
+ ".\core\http_protocol.h"\
+ ".\core\httpd.h"\
+ ".\core\md5.h"\
+ ".\core\rfc1413.h"\
+ ".\core\scoreboard.h"\
+ ".\core\util_md5.h"\
+ ".\os\win32\readdir.h"\
+ ".\regex\regex.h"\
"$(INTDIR)\http_core.obj" "$(INTDIR)\http_core.sbr" : $(SOURCE)\
$(DEP_CPP_HTTP_CO) "$(INTDIR)"
+ $(CPP) $(CPP_PROJ) $(SOURCE)
!ENDIF
-SOURCE=.\http_log.c
+SOURCE=.\core\http_log.c
!IF "$(CFG)" == "ApacheCore - Win32 Release"
DEP_CPP_HTTP_L=\
- ".\alloc.h"\
- ".\buff.h"\
- ".\conf.h"\
- ".\http_config.h"\
- ".\http_core.h"\
- ".\http_log.h"\
- ".\httpd.h"\
- ".\nt\readdir.h"\
+ ".\core\alloc.h"\
+ ".\core\buff.h"\
+ ".\core\conf.h"\
+ ".\core\http_config.h"\
+ ".\core\http_core.h"\
+ ".\core\http_log.h"\
+ ".\core\httpd.h"\
+ ".\os\win32\readdir.h"\
".\regex\regex.h"\
- {$(INCLUDE)}"sys\stat.h"\
- {$(INCLUDE)}"sys\types.h"\
-
-NODEP_CPP_HTTP_L=\
- ".\sfio.h"\
"$(INTDIR)\http_log.obj" : $(SOURCE) $(DEP_CPP_HTTP_L) "$(INTDIR)"
+ $(CPP) $(CPP_PROJ) $(SOURCE)
!ELSEIF "$(CFG)" == "ApacheCore - Win32 Debug"
DEP_CPP_HTTP_L=\
- ".\alloc.h"\
- ".\buff.h"\
- ".\conf.h"\
- ".\http_config.h"\
- ".\http_core.h"\
- ".\http_log.h"\
- ".\httpd.h"\
- ".\nt\readdir.h"\
+ ".\core\alloc.h"\
+ ".\core\buff.h"\
+ ".\core\conf.h"\
+ ".\core\http_config.h"\
+ ".\core\http_core.h"\
+ ".\core\http_log.h"\
+ ".\core\httpd.h"\
+ ".\os\win32\readdir.h"\
".\regex\regex.h"\
"$(INTDIR)\http_log.obj" "$(INTDIR)\http_log.sbr" : $(SOURCE)
$(DEP_CPP_HTTP_L)\
"$(INTDIR)"
+ $(CPP) $(CPP_PROJ) $(SOURCE)
!ENDIF
-SOURCE=.\http_main.c
+SOURCE=.\core\http_main.c
!IF "$(CFG)" == "ApacheCore - Win32 Release"
DEP_CPP_HTTP_M=\
- ".\alloc.h"\
- ".\buff.h"\
- ".\conf.h"\
- ".\explain.h"\
- ".\http_conf_globals.h"\
- ".\http_config.h"\
- ".\http_core.h"\
- ".\http_log.h"\
- ".\http_main.h"\
- ".\http_protocol.h"\
- ".\http_request.h"\
- ".\httpd.h"\
- ".\multithread.h"\
- ".\nt\getopt.h"\
- ".\nt\readdir.h"\
- ".\nt\service.h"\
+ ".\core\alloc.h"\
+ ".\core\buff.h"\
+ ".\core\conf.h"\
+ ".\core\explain.h"\
+ ".\core\http_conf_globals.h"\
+ ".\core\http_config.h"\
+ ".\core\http_core.h"\
+ ".\core\http_log.h"\
+ ".\core\http_main.h"\
+ ".\core\http_protocol.h"\
+ ".\core\http_request.h"\
+ ".\core\httpd.h"\
+ ".\core\multithread.h"\
+ ".\core\scoreboard.h"\
+ ".\os\win32\getopt.h"\
+ ".\os\win32\readdir.h"\
+ ".\os\win32\service.h"\
".\regex\regex.h"\
- ".\scoreboard.h"\
- {$(INCLUDE)}"sys\stat.h"\
- {$(INCLUDE)}"sys\types.h"\
-
-NODEP_CPP_HTTP_M=\
- ".\sfio.h"\
"$(INTDIR)\http_main.obj" : $(SOURCE) $(DEP_CPP_HTTP_M) "$(INTDIR)"
+ $(CPP) $(CPP_PROJ) $(SOURCE)
!ELSEIF "$(CFG)" == "ApacheCore - Win32 Debug"
DEP_CPP_HTTP_M=\
- ".\alloc.h"\
- ".\buff.h"\
- ".\conf.h"\
- ".\explain.h"\
- ".\http_conf_globals.h"\
- ".\http_config.h"\
- ".\http_core.h"\
- ".\http_log.h"\
- ".\http_main.h"\
- ".\http_protocol.h"\
- ".\http_request.h"\
- ".\httpd.h"\
- ".\multithread.h"\
- ".\nt\getopt.h"\
- ".\nt\readdir.h"\
- ".\nt\service.h"\
+ ".\core\alloc.h"\
+ ".\core\buff.h"\
+ ".\core\conf.h"\
+ ".\core\explain.h"\
+ ".\core\http_conf_globals.h"\
+ ".\core\http_config.h"\
+ ".\core\http_core.h"\
+ ".\core\http_log.h"\
+ ".\core\http_main.h"\
+ ".\core\http_protocol.h"\
+ ".\core\http_request.h"\
+ ".\core\httpd.h"\
+ ".\core\multithread.h"\
+ ".\core\scoreboard.h"\
+ ".\os\win32\getopt.h"\
+ ".\os\win32\readdir.h"\
+ ".\os\win32\service.h"\
".\regex\regex.h"\
- ".\scoreboard.h"\
"$(INTDIR)\http_main.obj" "$(INTDIR)\http_main.sbr" : $(SOURCE)\
$(DEP_CPP_HTTP_M) "$(INTDIR)"
+ $(CPP) $(CPP_PROJ) $(SOURCE)
!ENDIF
-SOURCE=.\http_protocol.c
+SOURCE=.\core\http_protocol.c
!IF "$(CFG)" == "ApacheCore - Win32 Release"
DEP_CPP_HTTP_P=\
- ".\alloc.h"\
- ".\buff.h"\
- ".\conf.h"\
- ".\http_conf_globals.h"\
- ".\http_config.h"\
- ".\http_core.h"\
- ".\http_log.h"\
- ".\http_main.h"\
- ".\http_protocol.h"\
- ".\httpd.h"\
- ".\nt\readdir.h"\
+ ".\core\alloc.h"\
+ ".\core\buff.h"\
+ ".\core\conf.h"\
+ ".\core\http_conf_globals.h"\
+ ".\core\http_config.h"\
+ ".\core\http_core.h"\
+ ".\core\http_log.h"\
+ ".\core\http_main.h"\
+ ".\core\http_protocol.h"\
+ ".\core\httpd.h"\
+ ".\core\util_date.h"\
+ ".\os\win32\readdir.h"\
".\regex\regex.h"\
- ".\util_date.h"\
- {$(INCLUDE)}"sys\stat.h"\
- {$(INCLUDE)}"sys\types.h"\
-
-NODEP_CPP_HTTP_P=\
- ".\sfio.h"\
"$(INTDIR)\http_protocol.obj" : $(SOURCE) $(DEP_CPP_HTTP_P) "$(INTDIR)"
+ $(CPP) $(CPP_PROJ) $(SOURCE)
!ELSEIF "$(CFG)" == "ApacheCore - Win32 Debug"
DEP_CPP_HTTP_P=\
- ".\alloc.h"\
- ".\buff.h"\
- ".\conf.h"\
- ".\http_conf_globals.h"\
- ".\http_config.h"\
- ".\http_core.h"\
- ".\http_log.h"\
- ".\http_main.h"\
- ".\http_protocol.h"\
- ".\httpd.h"\
- ".\nt\readdir.h"\
+ ".\core\alloc.h"\
+ ".\core\buff.h"\
+ ".\core\conf.h"\
+ ".\core\http_conf_globals.h"\
+ ".\core\http_config.h"\
+ ".\core\http_core.h"\
+ ".\core\http_log.h"\
+ ".\core\http_main.h"\
+ ".\core\http_protocol.h"\
+ ".\core\httpd.h"\
+ ".\core\util_date.h"\
+ ".\os\win32\readdir.h"\
".\regex\regex.h"\
- ".\util_date.h"\
"$(INTDIR)\http_protocol.obj" "$(INTDIR)\http_protocol.sbr" :
$(SOURCE)\
$(DEP_CPP_HTTP_P) "$(INTDIR)"
+ $(CPP) $(CPP_PROJ) $(SOURCE)
!ENDIF
-SOURCE=.\http_request.c
+SOURCE=.\core\http_request.c
!IF "$(CFG)" == "ApacheCore - Win32 Release"
DEP_CPP_HTTP_R=\
- ".\alloc.h"\
- ".\buff.h"\
- ".\conf.h"\
- ".\fnmatch.h"\
- ".\http_config.h"\
- ".\http_core.h"\
- ".\http_log.h"\
- ".\http_main.h"\
- ".\http_protocol.h"\
- ".\http_request.h"\
- ".\httpd.h"\
- ".\nt\readdir.h"\
+ ".\core\alloc.h"\
+ ".\core\buff.h"\
+ ".\core\conf.h"\
+ ".\core\fnmatch.h"\
+ ".\core\http_config.h"\
+ ".\core\http_core.h"\
+ ".\core\http_log.h"\
+ ".\core\http_main.h"\
+ ".\core\http_protocol.h"\
+ ".\core\http_request.h"\
+ ".\core\httpd.h"\
+ ".\core\scoreboard.h"\
+ ".\os\win32\readdir.h"\
".\regex\regex.h"\
- ".\scoreboard.h"\
- {$(INCLUDE)}"sys\stat.h"\
- {$(INCLUDE)}"sys\types.h"\
-
-NODEP_CPP_HTTP_R=\
- ".\sfio.h"\
"$(INTDIR)\http_request.obj" : $(SOURCE) $(DEP_CPP_HTTP_R) "$(INTDIR)"
+ $(CPP) $(CPP_PROJ) $(SOURCE)
!ELSEIF "$(CFG)" == "ApacheCore - Win32 Debug"
DEP_CPP_HTTP_R=\
- ".\alloc.h"\
- ".\buff.h"\
- ".\conf.h"\
- ".\fnmatch.h"\
- ".\http_config.h"\
- ".\http_core.h"\
- ".\http_log.h"\
- ".\http_main.h"\
- ".\http_protocol.h"\
- ".\http_request.h"\
- ".\httpd.h"\
- ".\nt\readdir.h"\
+ ".\core\alloc.h"\
+ ".\core\buff.h"\
+ ".\core\conf.h"\
+ ".\core\fnmatch.h"\
+ ".\core\http_config.h"\
+ ".\core\http_core.h"\
+ ".\core\http_log.h"\
+ ".\core\http_main.h"\
+ ".\core\http_protocol.h"\
+ ".\core\http_request.h"\
+ ".\core\httpd.h"\
+ ".\core\scoreboard.h"\
+ ".\os\win32\readdir.h"\
".\regex\regex.h"\
- ".\scoreboard.h"\
"$(INTDIR)\http_request.obj" "$(INTDIR)\http_request.sbr" : $(SOURCE)\
$(DEP_CPP_HTTP_R) "$(INTDIR)"
+ $(CPP) $(CPP_PROJ) $(SOURCE)
!ENDIF
-SOURCE=.\md5c.c
-
-!IF "$(CFG)" == "ApacheCore - Win32 Release"
-
+SOURCE=.\core\md5c.c
DEP_CPP_MD5C_=\
- ".\conf.h"\
- ".\md5.h"\
+ ".\core\conf.h"\
+ ".\core\md5.h"\
".\regex\regex.h"\
- {$(INCLUDE)}"sys\stat.h"\
- {$(INCLUDE)}"sys\types.h"\
+!IF "$(CFG)" == "ApacheCore - Win32 Release"
+
+
"$(INTDIR)\md5c.obj" : $(SOURCE) $(DEP_CPP_MD5C_) "$(INTDIR)"
+ $(CPP) $(CPP_PROJ) $(SOURCE)
!ELSEIF "$(CFG)" == "ApacheCore - Win32 Debug"
-DEP_CPP_MD5C_=\
- ".\conf.h"\
- ".\md5.h"\
- ".\regex\regex.h"\
-
"$(INTDIR)\md5c.obj" "$(INTDIR)\md5c.sbr" : $(SOURCE) $(DEP_CPP_MD5C_)\
"$(INTDIR)"
+ $(CPP) $(CPP_PROJ) $(SOURCE)
!ENDIF
-SOURCE=.\mod_access.c
+SOURCE=.\modules\standard\mod_access.c
!IF "$(CFG)" == "ApacheCore - Win32 Release"
DEP_CPP_MOD_A=\
- ".\alloc.h"\
- ".\buff.h"\
- ".\conf.h"\
- ".\http_config.h"\
- ".\http_core.h"\
- ".\http_log.h"\
- ".\http_request.h"\
- ".\httpd.h"\
- ".\nt\readdir.h"\
+ ".\core\alloc.h"\
+ ".\core\buff.h"\
+ ".\core\conf.h"\
+ ".\core\http_config.h"\
+ ".\core\http_core.h"\
+ ".\core\http_log.h"\
+ ".\core\http_request.h"\
+ ".\core\httpd.h"\
+ ".\os\win32\readdir.h"\
".\regex\regex.h"\
- {$(INCLUDE)}"sys\stat.h"\
- {$(INCLUDE)}"sys\types.h"\
-
-NODEP_CPP_MOD_A=\
- ".\sfio.h"\
"$(INTDIR)\mod_access.obj" : $(SOURCE) $(DEP_CPP_MOD_A) "$(INTDIR)"
+ $(CPP) $(CPP_PROJ) $(SOURCE)
!ELSEIF "$(CFG)" == "ApacheCore - Win32 Debug"
DEP_CPP_MOD_A=\
- ".\alloc.h"\
- ".\buff.h"\
- ".\conf.h"\
- ".\http_config.h"\
- ".\http_core.h"\
- ".\http_log.h"\
- ".\http_request.h"\
- ".\httpd.h"\
- ".\nt\readdir.h"\
+ ".\core\alloc.h"\
+ ".\core\buff.h"\
+ ".\core\conf.h"\
+ ".\core\http_config.h"\
+ ".\core\http_core.h"\
+ ".\core\http_log.h"\
+ ".\core\http_request.h"\
+ ".\core\httpd.h"\
+ ".\os\win32\readdir.h"\
".\regex\regex.h"\
+ {$(INCLUDE)}"sys\stat.h"\
+ {$(INCLUDE)}"sys\types.h"\
+
+NODEP_CPP_MOD_A=\
+ ".\core\sfio.h"\
"$(INTDIR)\mod_access.obj" "$(INTDIR)\mod_access.sbr" : $(SOURCE)\
$(DEP_CPP_MOD_A) "$(INTDIR)"
+ $(CPP) $(CPP_PROJ) $(SOURCE)
!ENDIF
-SOURCE=.\mod_actions.c
+SOURCE=.\modules\standard\mod_actions.c
!IF "$(CFG)" == "ApacheCore - Win32 Release"
DEP_CPP_MOD_AC=\
- ".\alloc.h"\
- ".\buff.h"\
- ".\conf.h"\
- ".\http_config.h"\
- ".\http_core.h"\
- ".\http_log.h"\
- ".\http_main.h"\
- ".\http_protocol.h"\
- ".\http_request.h"\
- ".\httpd.h"\
- ".\nt\readdir.h"\
+ ".\core\alloc.h"\
+ ".\core\buff.h"\
+ ".\core\conf.h"\
+ ".\core\http_config.h"\
+ ".\core\http_core.h"\
+ ".\core\http_log.h"\
+ ".\core\http_main.h"\
+ ".\core\http_protocol.h"\
+ ".\core\http_request.h"\
+ ".\core\httpd.h"\
+ ".\core\util_script.h"\
+ ".\os\win32\readdir.h"\
".\regex\regex.h"\
- ".\util_script.h"\
- {$(INCLUDE)}"sys\stat.h"\
- {$(INCLUDE)}"sys\types.h"\
-
-NODEP_CPP_MOD_AC=\
- ".\sfio.h"\
"$(INTDIR)\mod_actions.obj" : $(SOURCE) $(DEP_CPP_MOD_AC) "$(INTDIR)"
+ $(CPP) $(CPP_PROJ) $(SOURCE)
!ELSEIF "$(CFG)" == "ApacheCore - Win32 Debug"
DEP_CPP_MOD_AC=\
- ".\alloc.h"\
- ".\buff.h"\
- ".\conf.h"\
- ".\http_config.h"\
- ".\http_core.h"\
- ".\http_log.h"\
- ".\http_main.h"\
- ".\http_protocol.h"\
- ".\http_request.h"\
- ".\httpd.h"\
- ".\nt\readdir.h"\
+ ".\core\alloc.h"\
+ ".\core\buff.h"\
+ ".\core\conf.h"\
+ ".\core\http_config.h"\
+ ".\core\http_core.h"\
+ ".\core\http_log.h"\
+ ".\core\http_main.h"\
+ ".\core\http_protocol.h"\
+ ".\core\http_request.h"\
+ ".\core\httpd.h"\
+ ".\core\util_script.h"\
+ ".\os\win32\readdir.h"\
".\regex\regex.h"\
- ".\util_script.h"\
+ {$(INCLUDE)}"sys\stat.h"\
+ {$(INCLUDE)}"sys\types.h"\
+
+NODEP_CPP_MOD_AC=\
+ ".\core\sfio.h"\
"$(INTDIR)\mod_actions.obj" "$(INTDIR)\mod_actions.sbr" : $(SOURCE)\
$(DEP_CPP_MOD_AC) "$(INTDIR)"
+ $(CPP) $(CPP_PROJ) $(SOURCE)
!ENDIF
-SOURCE=.\mod_alias.c
+SOURCE=.\modules\standard\mod_alias.c
!IF "$(CFG)" == "ApacheCore - Win32 Release"
DEP_CPP_MOD_AL=\
- ".\alloc.h"\
- ".\buff.h"\
- ".\conf.h"\
- ".\http_config.h"\
- ".\httpd.h"\
- ".\nt\readdir.h"\
+ ".\core\alloc.h"\
+ ".\core\buff.h"\
+ ".\core\conf.h"\
+ ".\core\http_config.h"\
+ ".\core\httpd.h"\
+ ".\os\win32\readdir.h"\
".\regex\regex.h"\
- {$(INCLUDE)}"sys\stat.h"\
- {$(INCLUDE)}"sys\types.h"\
-
-NODEP_CPP_MOD_AL=\
- ".\sfio.h"\
"$(INTDIR)\mod_alias.obj" : $(SOURCE) $(DEP_CPP_MOD_AL) "$(INTDIR)"
+ $(CPP) $(CPP_PROJ) $(SOURCE)
!ELSEIF "$(CFG)" == "ApacheCore - Win32 Debug"
DEP_CPP_MOD_AL=\
- ".\alloc.h"\
- ".\buff.h"\
- ".\conf.h"\
- ".\http_config.h"\
- ".\httpd.h"\
- ".\nt\readdir.h"\
+ ".\core\alloc.h"\
+ ".\core\buff.h"\
+ ".\core\conf.h"\
+ ".\core\http_config.h"\
+ ".\core\httpd.h"\
+ ".\os\win32\readdir.h"\
".\regex\regex.h"\
+ {$(INCLUDE)}"sys\stat.h"\
+ {$(INCLUDE)}"sys\types.h"\
+
+NODEP_CPP_MOD_AL=\
+ ".\core\sfio.h"\
"$(INTDIR)\mod_alias.obj" "$(INTDIR)\mod_alias.sbr" : $(SOURCE)\
$(DEP_CPP_MOD_AL) "$(INTDIR)"
+ $(CPP) $(CPP_PROJ) $(SOURCE)
!ENDIF
-SOURCE=.\mod_asis.c
+SOURCE=.\modules\standard\mod_asis.c
!IF "$(CFG)" == "ApacheCore - Win32 Release"
DEP_CPP_MOD_AS=\
- ".\alloc.h"\
- ".\buff.h"\
- ".\conf.h"\
- ".\http_config.h"\
- ".\http_log.h"\
- ".\http_main.h"\
- ".\http_protocol.h"\
- ".\http_request.h"\
- ".\httpd.h"\
- ".\nt\readdir.h"\
+ ".\core\alloc.h"\
+ ".\core\buff.h"\
+ ".\core\conf.h"\
+ ".\core\http_config.h"\
+ ".\core\http_log.h"\
+ ".\core\http_main.h"\
+ ".\core\http_protocol.h"\
+ ".\core\http_request.h"\
+ ".\core\httpd.h"\
+ ".\core\util_script.h"\
+ ".\os\win32\readdir.h"\
".\regex\regex.h"\
- ".\util_script.h"\
- {$(INCLUDE)}"sys\stat.h"\
- {$(INCLUDE)}"sys\types.h"\
-
-NODEP_CPP_MOD_AS=\
- ".\sfio.h"\
"$(INTDIR)\mod_asis.obj" : $(SOURCE) $(DEP_CPP_MOD_AS) "$(INTDIR)"
+ $(CPP) $(CPP_PROJ) $(SOURCE)
!ELSEIF "$(CFG)" == "ApacheCore - Win32 Debug"
DEP_CPP_MOD_AS=\
- ".\alloc.h"\
- ".\buff.h"\
- ".\conf.h"\
- ".\http_config.h"\
- ".\http_log.h"\
- ".\http_main.h"\
- ".\http_protocol.h"\
- ".\http_request.h"\
- ".\httpd.h"\
- ".\nt\readdir.h"\
+ ".\core\alloc.h"\
+ ".\core\buff.h"\
+ ".\core\conf.h"\
+ ".\core\http_config.h"\
+ ".\core\http_log.h"\
+ ".\core\http_main.h"\
+ ".\core\http_protocol.h"\
+ ".\core\http_request.h"\
+ ".\core\httpd.h"\
+ ".\core\util_script.h"\
+ ".\os\win32\readdir.h"\
".\regex\regex.h"\
- ".\util_script.h"\
+ {$(INCLUDE)}"sys\stat.h"\
+ {$(INCLUDE)}"sys\types.h"\
+
+NODEP_CPP_MOD_AS=\
+ ".\core\sfio.h"\
"$(INTDIR)\mod_asis.obj" "$(INTDIR)\mod_asis.sbr" : $(SOURCE)
$(DEP_CPP_MOD_AS)\
"$(INTDIR)"
+ $(CPP) $(CPP_PROJ) $(SOURCE)
!ENDIF
-SOURCE=.\mod_auth.c
+SOURCE=.\modules\standard\mod_auth.c
!IF "$(CFG)" == "ApacheCore - Win32 Release"
DEP_CPP_MOD_AU=\
- ".\alloc.h"\
- ".\buff.h"\
- ".\conf.h"\
- ".\http_config.h"\
- ".\http_core.h"\
- ".\http_log.h"\
- ".\http_protocol.h"\
- ".\httpd.h"\
- ".\nt\readdir.h"\
+ ".\core\alloc.h"\
+ ".\core\buff.h"\
+ ".\core\conf.h"\
+ ".\core\http_config.h"\
+ ".\core\http_core.h"\
+ ".\core\http_log.h"\
+ ".\core\http_protocol.h"\
+ ".\core\httpd.h"\
+ ".\os\win32\readdir.h"\
".\regex\regex.h"\
- {$(INCLUDE)}"sys\stat.h"\
- {$(INCLUDE)}"sys\types.h"\
-
-NODEP_CPP_MOD_AU=\
- ".\sfio.h"\
"$(INTDIR)\mod_auth.obj" : $(SOURCE) $(DEP_CPP_MOD_AU) "$(INTDIR)"
+ $(CPP) $(CPP_PROJ) $(SOURCE)
!ELSEIF "$(CFG)" == "ApacheCore - Win32 Debug"
DEP_CPP_MOD_AU=\
- ".\alloc.h"\
- ".\buff.h"\
- ".\conf.h"\
- ".\http_config.h"\
- ".\http_core.h"\
- ".\http_log.h"\
- ".\http_protocol.h"\
- ".\httpd.h"\
- ".\nt\readdir.h"\
+ ".\core\alloc.h"\
+ ".\core\buff.h"\
+ ".\core\conf.h"\
+ ".\core\http_config.h"\
+ ".\core\http_core.h"\
+ ".\core\http_log.h"\
+ ".\core\http_protocol.h"\
+ ".\core\httpd.h"\
+ ".\os\win32\readdir.h"\
".\regex\regex.h"\
+ {$(INCLUDE)}"sys\stat.h"\
+ {$(INCLUDE)}"sys\types.h"\
+
+NODEP_CPP_MOD_AU=\
+ ".\core\sfio.h"\
"$(INTDIR)\mod_auth.obj" "$(INTDIR)\mod_auth.sbr" : $(SOURCE)
$(DEP_CPP_MOD_AU)\
"$(INTDIR)"
+ $(CPP) $(CPP_PROJ) $(SOURCE)
!ENDIF
-SOURCE=.\mod_autoindex.c
+SOURCE=.\modules\standard\mod_autoindex.c
!IF "$(CFG)" == "ApacheCore - Win32 Release"
DEP_CPP_MOD_AUT=\
- ".\alloc.h"\
- ".\buff.h"\
- ".\conf.h"\
- ".\http_config.h"\
- ".\http_core.h"\
- ".\http_log.h"\
- ".\http_main.h"\
- ".\http_protocol.h"\
- ".\http_request.h"\
- ".\httpd.h"\
- ".\nt\readdir.h"\
+ ".\core\alloc.h"\
+ ".\core\buff.h"\
+ ".\core\conf.h"\
+ ".\core\http_config.h"\
+ ".\core\http_core.h"\
+ ".\core\http_log.h"\
+ ".\core\http_main.h"\
+ ".\core\http_protocol.h"\
+ ".\core\http_request.h"\
+ ".\core\httpd.h"\
+ ".\core\util_script.h"\
+ ".\os\win32\readdir.h"\
".\regex\regex.h"\
- ".\util_script.h"\
- {$(INCLUDE)}"sys\stat.h"\
- {$(INCLUDE)}"sys\types.h"\
-
-NODEP_CPP_MOD_AUT=\
- ".\sfio.h"\
"$(INTDIR)\mod_autoindex.obj" : $(SOURCE) $(DEP_CPP_MOD_AUT) "$(INTDIR)"
+ $(CPP) $(CPP_PROJ) $(SOURCE)
!ELSEIF "$(CFG)" == "ApacheCore - Win32 Debug"
DEP_CPP_MOD_AUT=\
- ".\alloc.h"\
- ".\buff.h"\
- ".\conf.h"\
- ".\http_config.h"\
- ".\http_core.h"\
- ".\http_log.h"\
- ".\http_main.h"\
- ".\http_protocol.h"\
- ".\http_request.h"\
- ".\httpd.h"\
- ".\nt\readdir.h"\
+ ".\core\alloc.h"\
+ ".\core\buff.h"\
+ ".\core\conf.h"\
+ ".\core\http_config.h"\
+ ".\core\http_core.h"\
+ ".\core\http_log.h"\
+ ".\core\http_main.h"\
+ ".\core\http_protocol.h"\
+ ".\core\http_request.h"\
+ ".\core\httpd.h"\
+ ".\core\util_script.h"\
+ ".\os\win32\readdir.h"\
".\regex\regex.h"\
- ".\util_script.h"\
+ {$(INCLUDE)}"sys\stat.h"\
+ {$(INCLUDE)}"sys\types.h"\
+
+NODEP_CPP_MOD_AUT=\
+ ".\core\sfio.h"\
"$(INTDIR)\mod_autoindex.obj" "$(INTDIR)\mod_autoindex.sbr" :
$(SOURCE)\
$(DEP_CPP_MOD_AUT) "$(INTDIR)"
+ $(CPP) $(CPP_PROJ) $(SOURCE)
!ENDIF
-SOURCE=.\mod_cgi.c
+SOURCE=.\modules\standard\mod_cgi.c
!IF "$(CFG)" == "ApacheCore - Win32 Release"
DEP_CPP_MOD_C=\
- ".\alloc.h"\
- ".\buff.h"\
- ".\conf.h"\
- ".\http_conf_globals.h"\
- ".\http_config.h"\
- ".\http_core.h"\
- ".\http_log.h"\
- ".\http_main.h"\
- ".\http_protocol.h"\
- ".\http_request.h"\
- ".\httpd.h"\
- ".\nt\readdir.h"\
+ ".\core\alloc.h"\
+ ".\core\buff.h"\
+ ".\core\conf.h"\
+ ".\core\http_conf_globals.h"\
+ ".\core\http_config.h"\
+ ".\core\http_core.h"\
+ ".\core\http_log.h"\
+ ".\core\http_main.h"\
+ ".\core\http_protocol.h"\
+ ".\core\http_request.h"\
+ ".\core\httpd.h"\
+ ".\core\util_script.h"\
+ ".\os\win32\readdir.h"\
".\regex\regex.h"\
- ".\util_script.h"\
- {$(INCLUDE)}"sys\stat.h"\
- {$(INCLUDE)}"sys\types.h"\
-
-NODEP_CPP_MOD_C=\
- ".\sfio.h"\
"$(INTDIR)\mod_cgi.obj" : $(SOURCE) $(DEP_CPP_MOD_C) "$(INTDIR)"
+ $(CPP) $(CPP_PROJ) $(SOURCE)
!ELSEIF "$(CFG)" == "ApacheCore - Win32 Debug"
DEP_CPP_MOD_C=\
- ".\alloc.h"\
- ".\buff.h"\
- ".\conf.h"\
- ".\http_conf_globals.h"\
- ".\http_config.h"\
- ".\http_core.h"\
- ".\http_log.h"\
- ".\http_main.h"\
- ".\http_protocol.h"\
- ".\http_request.h"\
- ".\httpd.h"\
- ".\nt\readdir.h"\
+ ".\core\alloc.h"\
+ ".\core\buff.h"\
+ ".\core\conf.h"\
+ ".\core\http_conf_globals.h"\
+ ".\core\http_config.h"\
+ ".\core\http_core.h"\
+ ".\core\http_log.h"\
+ ".\core\http_main.h"\
+ ".\core\http_protocol.h"\
+ ".\core\http_request.h"\
+ ".\core\httpd.h"\
+ ".\core\util_script.h"\
+ ".\os\win32\readdir.h"\
".\regex\regex.h"\
- ".\util_script.h"\
+ {$(INCLUDE)}"sys\stat.h"\
+ {$(INCLUDE)}"sys\types.h"\
+
+NODEP_CPP_MOD_C=\
+ ".\core\sfio.h"\
"$(INTDIR)\mod_cgi.obj" "$(INTDIR)\mod_cgi.sbr" : $(SOURCE)
$(DEP_CPP_MOD_C)\
"$(INTDIR)"
+ $(CPP) $(CPP_PROJ) $(SOURCE)
!ENDIF
-SOURCE=.\mod_dir.c
+SOURCE=.\modules\standard\mod_dir.c
!IF "$(CFG)" == "ApacheCore - Win32 Release"
DEP_CPP_MOD_D=\
- ".\alloc.h"\
- ".\buff.h"\
- ".\conf.h"\
- ".\http_config.h"\
- ".\http_core.h"\
- ".\http_log.h"\
- ".\http_main.h"\
- ".\http_protocol.h"\
- ".\http_request.h"\
- ".\httpd.h"\
- ".\nt\readdir.h"\
+ ".\core\alloc.h"\
+ ".\core\buff.h"\
+ ".\core\conf.h"\
+ ".\core\http_config.h"\
+ ".\core\http_core.h"\
+ ".\core\http_log.h"\
+ ".\core\http_main.h"\
+ ".\core\http_protocol.h"\
+ ".\core\http_request.h"\
+ ".\core\httpd.h"\
+ ".\core\util_script.h"\
+ ".\os\win32\readdir.h"\
".\regex\regex.h"\
- ".\util_script.h"\
- {$(INCLUDE)}"sys\stat.h"\
- {$(INCLUDE)}"sys\types.h"\
-
-NODEP_CPP_MOD_D=\
- ".\sfio.h"\
"$(INTDIR)\mod_dir.obj" : $(SOURCE) $(DEP_CPP_MOD_D) "$(INTDIR)"
+ $(CPP) $(CPP_PROJ) $(SOURCE)
!ELSEIF "$(CFG)" == "ApacheCore - Win32 Debug"
DEP_CPP_MOD_D=\
- ".\alloc.h"\
- ".\buff.h"\
- ".\conf.h"\
- ".\http_config.h"\
- ".\http_core.h"\
- ".\http_log.h"\
- ".\http_main.h"\
- ".\http_protocol.h"\
- ".\http_request.h"\
- ".\httpd.h"\
- ".\nt\readdir.h"\
+ ".\core\alloc.h"\
+ ".\core\buff.h"\
+ ".\core\conf.h"\
+ ".\core\http_config.h"\
+ ".\core\http_core.h"\
+ ".\core\http_log.h"\
+ ".\core\http_main.h"\
+ ".\core\http_protocol.h"\
+ ".\core\http_request.h"\
+ ".\core\httpd.h"\
+ ".\core\util_script.h"\
+ ".\os\win32\readdir.h"\
".\regex\regex.h"\
- ".\util_script.h"\
+ {$(INCLUDE)}"sys\stat.h"\
+ {$(INCLUDE)}"sys\types.h"\
+
+NODEP_CPP_MOD_D=\
+ ".\core\sfio.h"\
"$(INTDIR)\mod_dir.obj" "$(INTDIR)\mod_dir.sbr" : $(SOURCE)
$(DEP_CPP_MOD_D)\
"$(INTDIR)"
+ $(CPP) $(CPP_PROJ) $(SOURCE)
!ENDIF
-SOURCE=.\nt\mod_dll.c
+SOURCE=.\os\win32\mod_dll.c
!IF "$(CFG)" == "ApacheCore - Win32 Release"
DEP_CPP_MOD_DL=\
- ".\alloc.h"\
- ".\buff.h"\
- ".\conf.h"\
- ".\http_config.h"\
- ".\httpd.h"\
- ".\nt\readdir.h"\
+ ".\core\alloc.h"\
+ ".\core\buff.h"\
+ ".\core\conf.h"\
+ ".\core\http_config.h"\
+ ".\core\httpd.h"\
+ ".\os\win32\readdir.h"\
".\regex\regex.h"\
- {$(INCLUDE)}"sys\stat.h"\
- {$(INCLUDE)}"sys\types.h"\
-
-NODEP_CPP_MOD_DL=\
- ".\sfio.h"\
"$(INTDIR)\mod_dll.obj" : $(SOURCE) $(DEP_CPP_MOD_DL) "$(INTDIR)"
@@ -1407,13 +1356,18 @@
!ELSEIF "$(CFG)" == "ApacheCore - Win32 Debug"
DEP_CPP_MOD_DL=\
- ".\alloc.h"\
- ".\buff.h"\
- ".\conf.h"\
- ".\http_config.h"\
- ".\httpd.h"\
- ".\nt\readdir.h"\
+ ".\core\alloc.h"\
+ ".\core\buff.h"\
+ ".\core\conf.h"\
+ ".\core\http_config.h"\
+ ".\core\httpd.h"\
+ ".\os\win32\readdir.h"\
".\regex\regex.h"\
+ {$(INCLUDE)}"sys\stat.h"\
+ {$(INCLUDE)}"sys\types.h"\
+
+NODEP_CPP_MOD_DL=\
+ ".\core\sfio.h"\
"$(INTDIR)\mod_dll.obj" "$(INTDIR)\mod_dll.sbr" : $(SOURCE)
$(DEP_CPP_MOD_DL)\
@@ -1423,174 +1377,175 @@
!ENDIF
-SOURCE=.\mod_env.c
+SOURCE=.\modules\standard\mod_env.c
!IF "$(CFG)" == "ApacheCore - Win32 Release"
DEP_CPP_MOD_E=\
- ".\alloc.h"\
- ".\buff.h"\
- ".\conf.h"\
- ".\http_config.h"\
- ".\httpd.h"\
- ".\nt\readdir.h"\
+ ".\core\alloc.h"\
+ ".\core\buff.h"\
+ ".\core\conf.h"\
+ ".\core\http_config.h"\
+ ".\core\httpd.h"\
+ ".\os\win32\readdir.h"\
".\regex\regex.h"\
- {$(INCLUDE)}"sys\stat.h"\
- {$(INCLUDE)}"sys\types.h"\
-
-NODEP_CPP_MOD_E=\
- ".\sfio.h"\
"$(INTDIR)\mod_env.obj" : $(SOURCE) $(DEP_CPP_MOD_E) "$(INTDIR)"
+ $(CPP) $(CPP_PROJ) $(SOURCE)
!ELSEIF "$(CFG)" == "ApacheCore - Win32 Debug"
DEP_CPP_MOD_E=\
- ".\alloc.h"\
- ".\buff.h"\
- ".\conf.h"\
- ".\http_config.h"\
- ".\httpd.h"\
- ".\nt\readdir.h"\
+ ".\core\alloc.h"\
+ ".\core\buff.h"\
+ ".\core\conf.h"\
+ ".\core\http_config.h"\
+ ".\core\httpd.h"\
+ ".\os\win32\readdir.h"\
".\regex\regex.h"\
+ {$(INCLUDE)}"sys\stat.h"\
+ {$(INCLUDE)}"sys\types.h"\
+
+NODEP_CPP_MOD_E=\
+ ".\core\sfio.h"\
"$(INTDIR)\mod_env.obj" "$(INTDIR)\mod_env.sbr" : $(SOURCE)
$(DEP_CPP_MOD_E)\
"$(INTDIR)"
+ $(CPP) $(CPP_PROJ) $(SOURCE)
!ENDIF
-SOURCE=.\mod_imap.c
+SOURCE=.\modules\standard\mod_imap.c
!IF "$(CFG)" == "ApacheCore - Win32 Release"
DEP_CPP_MOD_I=\
- ".\alloc.h"\
- ".\buff.h"\
- ".\conf.h"\
- ".\http_config.h"\
- ".\http_core.h"\
- ".\http_log.h"\
- ".\http_main.h"\
- ".\http_protocol.h"\
- ".\http_request.h"\
- ".\httpd.h"\
- ".\nt\readdir.h"\
+ ".\core\alloc.h"\
+ ".\core\buff.h"\
+ ".\core\conf.h"\
+ ".\core\http_config.h"\
+ ".\core\http_core.h"\
+ ".\core\http_log.h"\
+ ".\core\http_main.h"\
+ ".\core\http_protocol.h"\
+ ".\core\http_request.h"\
+ ".\core\httpd.h"\
+ ".\core\util_script.h"\
+ ".\os\win32\readdir.h"\
".\regex\regex.h"\
- ".\util_script.h"\
- {$(INCLUDE)}"sys\stat.h"\
- {$(INCLUDE)}"sys\types.h"\
-
-NODEP_CPP_MOD_I=\
- ".\sfio.h"\
"$(INTDIR)\mod_imap.obj" : $(SOURCE) $(DEP_CPP_MOD_I) "$(INTDIR)"
+ $(CPP) $(CPP_PROJ) $(SOURCE)
!ELSEIF "$(CFG)" == "ApacheCore - Win32 Debug"
DEP_CPP_MOD_I=\
- ".\alloc.h"\
- ".\buff.h"\
- ".\conf.h"\
- ".\http_config.h"\
- ".\http_core.h"\
- ".\http_log.h"\
- ".\http_main.h"\
- ".\http_protocol.h"\
- ".\http_request.h"\
- ".\httpd.h"\
- ".\nt\readdir.h"\
+ ".\core\alloc.h"\
+ ".\core\buff.h"\
+ ".\core\conf.h"\
+ ".\core\http_config.h"\
+ ".\core\http_core.h"\
+ ".\core\http_log.h"\
+ ".\core\http_main.h"\
+ ".\core\http_protocol.h"\
+ ".\core\http_request.h"\
+ ".\core\httpd.h"\
+ ".\core\util_script.h"\
+ ".\os\win32\readdir.h"\
".\regex\regex.h"\
- ".\util_script.h"\
+ {$(INCLUDE)}"sys\stat.h"\
+ {$(INCLUDE)}"sys\types.h"\
+
+NODEP_CPP_MOD_I=\
+ ".\core\sfio.h"\
"$(INTDIR)\mod_imap.obj" "$(INTDIR)\mod_imap.sbr" : $(SOURCE)
$(DEP_CPP_MOD_I)\
"$(INTDIR)"
+ $(CPP) $(CPP_PROJ) $(SOURCE)
!ENDIF
-SOURCE=.\mod_include.c
+SOURCE=.\modules\standard\mod_include.c
!IF "$(CFG)" == "ApacheCore - Win32 Release"
DEP_CPP_MOD_IN=\
- ".\alloc.h"\
- ".\buff.h"\
- ".\conf.h"\
- ".\http_config.h"\
- ".\http_core.h"\
- ".\http_log.h"\
- ".\http_main.h"\
- ".\http_protocol.h"\
- ".\http_request.h"\
- ".\httpd.h"\
- ".\nt\readdir.h"\
+ ".\core\alloc.h"\
+ ".\core\buff.h"\
+ ".\core\conf.h"\
+ ".\core\http_config.h"\
+ ".\core\http_core.h"\
+ ".\core\http_log.h"\
+ ".\core\http_main.h"\
+ ".\core\http_protocol.h"\
+ ".\core\http_request.h"\
+ ".\core\httpd.h"\
+ ".\core\util_script.h"\
+ ".\os\win32\readdir.h"\
".\regex\regex.h"\
- ".\util_script.h"\
- {$(INCLUDE)}"sys\stat.h"\
- {$(INCLUDE)}"sys\types.h"\
-
-NODEP_CPP_MOD_IN=\
- ".\config.h"\
- ".\modules\perl\mod_perl.h"\
- ".\sfio.h"\
"$(INTDIR)\mod_include.obj" : $(SOURCE) $(DEP_CPP_MOD_IN) "$(INTDIR)"
+ $(CPP) $(CPP_PROJ) $(SOURCE)
!ELSEIF "$(CFG)" == "ApacheCore - Win32 Debug"
DEP_CPP_MOD_IN=\
- ".\alloc.h"\
- ".\buff.h"\
- ".\conf.h"\
- ".\http_config.h"\
- ".\http_core.h"\
- ".\http_log.h"\
- ".\http_main.h"\
- ".\http_protocol.h"\
- ".\http_request.h"\
- ".\httpd.h"\
- ".\nt\readdir.h"\
+ ".\core\alloc.h"\
+ ".\core\buff.h"\
+ ".\core\conf.h"\
+ ".\core\http_config.h"\
+ ".\core\http_core.h"\
+ ".\core\http_log.h"\
+ ".\core\http_main.h"\
+ ".\core\http_protocol.h"\
+ ".\core\http_request.h"\
+ ".\core\httpd.h"\
+ ".\core\util_script.h"\
+ ".\os\win32\readdir.h"\
".\regex\regex.h"\
- ".\util_script.h"\
+ {$(INCLUDE)}"sys\stat.h"\
+ {$(INCLUDE)}"sys\types.h"\
+
+NODEP_CPP_MOD_IN=\
+ ".\core\sfio.h"\
+ ".\modules\standard\config.h"\
+ ".\modules\standard\modules\perl\mod_perl.h"\
"$(INTDIR)\mod_include.obj" "$(INTDIR)\mod_include.sbr" : $(SOURCE)\
$(DEP_CPP_MOD_IN) "$(INTDIR)"
+ $(CPP) $(CPP_PROJ) $(SOURCE)
!ENDIF
-SOURCE=.\nt\mod_isapi.c
+SOURCE=.\os\win32\mod_isapi.c
!IF "$(CFG)" == "ApacheCore - Win32 Release"
DEP_CPP_MOD_IS=\
- ".\alloc.h"\
- ".\buff.h"\
- ".\conf.h"\
- ".\http_config.h"\
- ".\http_core.h"\
- ".\http_log.h"\
- ".\http_protocol.h"\
- ".\http_request.h"\
- ".\httpd.h"\
- ".\nt\readdir.h"\
+ ".\core\alloc.h"\
+ ".\core\buff.h"\
+ ".\core\conf.h"\
+ ".\core\http_config.h"\
+ ".\core\http_core.h"\
+ ".\core\http_log.h"\
+ ".\core\http_protocol.h"\
+ ".\core\http_request.h"\
+ ".\core\httpd.h"\
+ ".\core\util_script.h"\
+ ".\os\win32\readdir.h"\
".\regex\regex.h"\
- ".\util_script.h"\
- {$(INCLUDE)}"sys\stat.h"\
- {$(INCLUDE)}"sys\types.h"\
-
-NODEP_CPP_MOD_IS=\
- ".\sfio.h"\
"$(INTDIR)\mod_isapi.obj" : $(SOURCE) $(DEP_CPP_MOD_IS) "$(INTDIR)"
@@ -1600,18 +1555,23 @@
!ELSEIF "$(CFG)" == "ApacheCore - Win32 Debug"
DEP_CPP_MOD_IS=\
- ".\alloc.h"\
- ".\buff.h"\
- ".\conf.h"\
- ".\http_config.h"\
- ".\http_core.h"\
- ".\http_log.h"\
- ".\http_protocol.h"\
- ".\http_request.h"\
- ".\httpd.h"\
- ".\nt\readdir.h"\
+ ".\core\alloc.h"\
+ ".\core\buff.h"\
+ ".\core\conf.h"\
+ ".\core\http_config.h"\
+ ".\core\http_core.h"\
+ ".\core\http_log.h"\
+ ".\core\http_protocol.h"\
+ ".\core\http_request.h"\
+ ".\core\httpd.h"\
+ ".\core\util_script.h"\
+ ".\os\win32\readdir.h"\
".\regex\regex.h"\
- ".\util_script.h"\
+ {$(INCLUDE)}"sys\stat.h"\
+ {$(INCLUDE)}"sys\types.h"\
+
+NODEP_CPP_MOD_IS=\
+ ".\core\sfio.h"\
"$(INTDIR)\mod_isapi.obj" "$(INTDIR)\mod_isapi.sbr" : $(SOURCE)\
@@ -1621,239 +1581,244 @@
!ENDIF
-SOURCE=.\mod_log_config.c
+SOURCE=.\modules\standard\mod_log_config.c
!IF "$(CFG)" == "ApacheCore - Win32 Release"
DEP_CPP_MOD_L=\
- ".\alloc.h"\
- ".\buff.h"\
- ".\conf.h"\
- ".\http_config.h"\
- ".\http_core.h"\
- ".\httpd.h"\
- ".\nt\readdir.h"\
+ ".\core\alloc.h"\
+ ".\core\buff.h"\
+ ".\core\conf.h"\
+ ".\core\http_config.h"\
+ ".\core\http_core.h"\
+ ".\core\httpd.h"\
+ ".\os\win32\readdir.h"\
".\regex\regex.h"\
- {$(INCLUDE)}"sys\stat.h"\
- {$(INCLUDE)}"sys\types.h"\
-
-NODEP_CPP_MOD_L=\
- ".\sfio.h"\
"$(INTDIR)\mod_log_config.obj" : $(SOURCE) $(DEP_CPP_MOD_L) "$(INTDIR)"
+ $(CPP) $(CPP_PROJ) $(SOURCE)
!ELSEIF "$(CFG)" == "ApacheCore - Win32 Debug"
DEP_CPP_MOD_L=\
- ".\alloc.h"\
- ".\buff.h"\
- ".\conf.h"\
- ".\http_config.h"\
- ".\http_core.h"\
- ".\httpd.h"\
- ".\nt\readdir.h"\
+ ".\core\alloc.h"\
+ ".\core\buff.h"\
+ ".\core\conf.h"\
+ ".\core\http_config.h"\
+ ".\core\http_core.h"\
+ ".\core\httpd.h"\
+ ".\os\win32\readdir.h"\
".\regex\regex.h"\
+ {$(INCLUDE)}"sys\stat.h"\
+ {$(INCLUDE)}"sys\types.h"\
+
+NODEP_CPP_MOD_L=\
+ ".\core\sfio.h"\
"$(INTDIR)\mod_log_config.obj" "$(INTDIR)\mod_log_config.sbr" :
$(SOURCE)\
$(DEP_CPP_MOD_L) "$(INTDIR)"
+ $(CPP) $(CPP_PROJ) $(SOURCE)
!ENDIF
-SOURCE=.\mod_mime.c
+SOURCE=.\modules\standard\mod_mime.c
!IF "$(CFG)" == "ApacheCore - Win32 Release"
DEP_CPP_MOD_M=\
- ".\alloc.h"\
- ".\buff.h"\
- ".\conf.h"\
- ".\http_config.h"\
- ".\httpd.h"\
- ".\mod_mime.h"\
- ".\nt\readdir.h"\
+ ".\core\alloc.h"\
+ ".\core\buff.h"\
+ ".\core\conf.h"\
+ ".\core\http_config.h"\
+ ".\core\httpd.h"\
+ ".\modules\standard\mod_mime.h"\
+ ".\os\win32\readdir.h"\
".\regex\regex.h"\
- {$(INCLUDE)}"sys\stat.h"\
- {$(INCLUDE)}"sys\types.h"\
-
-NODEP_CPP_MOD_M=\
- ".\sfio.h"\
"$(INTDIR)\mod_mime.obj" : $(SOURCE) $(DEP_CPP_MOD_M) "$(INTDIR)"
+ $(CPP) $(CPP_PROJ) $(SOURCE)
!ELSEIF "$(CFG)" == "ApacheCore - Win32 Debug"
DEP_CPP_MOD_M=\
- ".\alloc.h"\
- ".\buff.h"\
- ".\conf.h"\
- ".\http_config.h"\
- ".\httpd.h"\
- ".\mod_mime.h"\
- ".\nt\readdir.h"\
+ ".\core\alloc.h"\
+ ".\core\buff.h"\
+ ".\core\conf.h"\
+ ".\core\http_config.h"\
+ ".\core\httpd.h"\
+ ".\modules\standard\mod_mime.h"\
+ ".\os\win32\readdir.h"\
".\regex\regex.h"\
+ {$(INCLUDE)}"sys\stat.h"\
+ {$(INCLUDE)}"sys\types.h"\
+
+NODEP_CPP_MOD_M=\
+ ".\core\sfio.h"\
"$(INTDIR)\mod_mime.obj" "$(INTDIR)\mod_mime.sbr" : $(SOURCE)
$(DEP_CPP_MOD_M)\
"$(INTDIR)"
+ $(CPP) $(CPP_PROJ) $(SOURCE)
!ENDIF
-SOURCE=.\mod_negotiation.c
+SOURCE=.\modules\standard\mod_negotiation.c
!IF "$(CFG)" == "ApacheCore - Win32 Release"
DEP_CPP_MOD_N=\
- ".\alloc.h"\
- ".\buff.h"\
- ".\conf.h"\
- ".\http_config.h"\
- ".\http_core.h"\
- ".\http_log.h"\
- ".\http_request.h"\
- ".\httpd.h"\
- ".\nt\readdir.h"\
+ ".\core\alloc.h"\
+ ".\core\buff.h"\
+ ".\core\conf.h"\
+ ".\core\http_config.h"\
+ ".\core\http_core.h"\
+ ".\core\http_log.h"\
+ ".\core\http_request.h"\
+ ".\core\httpd.h"\
+ ".\core\util_script.h"\
+ ".\os\win32\readdir.h"\
".\regex\regex.h"\
- ".\util_script.h"\
- {$(INCLUDE)}"sys\stat.h"\
- {$(INCLUDE)}"sys\types.h"\
-
-NODEP_CPP_MOD_N=\
- ".\sfio.h"\
"$(INTDIR)\mod_negotiation.obj" : $(SOURCE) $(DEP_CPP_MOD_N) "$(INTDIR)"
+ $(CPP) $(CPP_PROJ) $(SOURCE)
!ELSEIF "$(CFG)" == "ApacheCore - Win32 Debug"
DEP_CPP_MOD_N=\
- ".\alloc.h"\
- ".\buff.h"\
- ".\conf.h"\
- ".\http_config.h"\
- ".\http_core.h"\
- ".\http_log.h"\
- ".\http_request.h"\
- ".\httpd.h"\
- ".\nt\readdir.h"\
+ ".\core\alloc.h"\
+ ".\core\buff.h"\
+ ".\core\conf.h"\
+ ".\core\http_config.h"\
+ ".\core\http_core.h"\
+ ".\core\http_log.h"\
+ ".\core\http_request.h"\
+ ".\core\httpd.h"\
+ ".\core\util_script.h"\
+ ".\os\win32\readdir.h"\
".\regex\regex.h"\
- ".\util_script.h"\
+ {$(INCLUDE)}"sys\stat.h"\
+ {$(INCLUDE)}"sys\types.h"\
+
+NODEP_CPP_MOD_N=\
+ ".\core\sfio.h"\
"$(INTDIR)\mod_negotiation.obj" "$(INTDIR)\mod_negotiation.sbr" :
$(SOURCE)\
$(DEP_CPP_MOD_N) "$(INTDIR)"
+ $(CPP) $(CPP_PROJ) $(SOURCE)
!ENDIF
-SOURCE=.\mod_setenvif.c
+SOURCE=.\modules\standard\mod_setenvif.c
!IF "$(CFG)" == "ApacheCore - Win32 Release"
DEP_CPP_MOD_S=\
- ".\alloc.h"\
- ".\buff.h"\
- ".\conf.h"\
- ".\http_config.h"\
- ".\http_core.h"\
- ".\http_log.h"\
- ".\httpd.h"\
- ".\nt\readdir.h"\
+ ".\core\alloc.h"\
+ ".\core\buff.h"\
+ ".\core\conf.h"\
+ ".\core\http_config.h"\
+ ".\core\http_core.h"\
+ ".\core\http_log.h"\
+ ".\core\httpd.h"\
+ ".\os\win32\readdir.h"\
".\regex\regex.h"\
- {$(INCLUDE)}"sys\stat.h"\
- {$(INCLUDE)}"sys\types.h"\
-
-NODEP_CPP_MOD_S=\
- ".\sfio.h"\
"$(INTDIR)\mod_setenvif.obj" : $(SOURCE) $(DEP_CPP_MOD_S) "$(INTDIR)"
+ $(CPP) $(CPP_PROJ) $(SOURCE)
!ELSEIF "$(CFG)" == "ApacheCore - Win32 Debug"
DEP_CPP_MOD_S=\
- ".\alloc.h"\
- ".\buff.h"\
- ".\conf.h"\
- ".\http_config.h"\
- ".\http_core.h"\
- ".\http_log.h"\
- ".\httpd.h"\
- ".\nt\readdir.h"\
+ ".\core\alloc.h"\
+ ".\core\buff.h"\
+ ".\core\conf.h"\
+ ".\core\http_config.h"\
+ ".\core\http_core.h"\
+ ".\core\http_log.h"\
+ ".\core\httpd.h"\
+ ".\os\win32\readdir.h"\
".\regex\regex.h"\
+ {$(INCLUDE)}"sys\stat.h"\
+ {$(INCLUDE)}"sys\types.h"\
+
+NODEP_CPP_MOD_S=\
+ ".\core\sfio.h"\
"$(INTDIR)\mod_setenvif.obj" "$(INTDIR)\mod_setenvif.sbr" : $(SOURCE)\
$(DEP_CPP_MOD_S) "$(INTDIR)"
+ $(CPP) $(CPP_PROJ) $(SOURCE)
!ENDIF
-SOURCE=.\mod_userdir.c
+SOURCE=.\modules\standard\mod_userdir.c
!IF "$(CFG)" == "ApacheCore - Win32 Release"
DEP_CPP_MOD_U=\
- ".\alloc.h"\
- ".\buff.h"\
- ".\conf.h"\
- ".\http_config.h"\
- ".\httpd.h"\
- ".\nt\readdir.h"\
+ ".\core\alloc.h"\
+ ".\core\buff.h"\
+ ".\core\conf.h"\
+ ".\core\http_config.h"\
+ ".\core\httpd.h"\
+ ".\os\win32\readdir.h"\
".\regex\regex.h"\
- {$(INCLUDE)}"sys\stat.h"\
- {$(INCLUDE)}"sys\types.h"\
-
-NODEP_CPP_MOD_U=\
- ".\sfio.h"\
"$(INTDIR)\mod_userdir.obj" : $(SOURCE) $(DEP_CPP_MOD_U) "$(INTDIR)"
+ $(CPP) $(CPP_PROJ) $(SOURCE)
!ELSEIF "$(CFG)" == "ApacheCore - Win32 Debug"
DEP_CPP_MOD_U=\
- ".\alloc.h"\
- ".\buff.h"\
- ".\conf.h"\
- ".\http_config.h"\
- ".\httpd.h"\
- ".\nt\readdir.h"\
+ ".\core\alloc.h"\
+ ".\core\buff.h"\
+ ".\core\conf.h"\
+ ".\core\http_config.h"\
+ ".\core\httpd.h"\
+ ".\os\win32\readdir.h"\
".\regex\regex.h"\
+ {$(INCLUDE)}"sys\stat.h"\
+ {$(INCLUDE)}"sys\types.h"\
+
+NODEP_CPP_MOD_U=\
+ ".\core\sfio.h"\
"$(INTDIR)\mod_userdir.obj" "$(INTDIR)\mod_userdir.sbr" : $(SOURCE)\
$(DEP_CPP_MOD_U) "$(INTDIR)"
+ $(CPP) $(CPP_PROJ) $(SOURCE)
!ENDIF
-SOURCE=.\nt\modules.c
+SOURCE=.\os\win32\modules.c
!IF "$(CFG)" == "ApacheCore - Win32 Release"
DEP_CPP_MODUL=\
- ".\alloc.h"\
- ".\buff.h"\
- ".\conf.h"\
- ".\http_config.h"\
- ".\httpd.h"\
- ".\nt\readdir.h"\
+ ".\core\alloc.h"\
+ ".\core\buff.h"\
+ ".\core\conf.h"\
+ ".\core\http_config.h"\
+ ".\core\httpd.h"\
+ ".\os\win32\readdir.h"\
".\regex\regex.h"\
- {$(INCLUDE)}"sys\stat.h"\
- {$(INCLUDE)}"sys\types.h"\
-
-NODEP_CPP_MODUL=\
- ".\sfio.h"\
"$(INTDIR)\modules.obj" : $(SOURCE) $(DEP_CPP_MODUL) "$(INTDIR)"
@@ -1863,13 +1828,18 @@
!ELSEIF "$(CFG)" == "ApacheCore - Win32 Debug"
DEP_CPP_MODUL=\
- ".\alloc.h"\
- ".\buff.h"\
- ".\conf.h"\
- ".\http_config.h"\
- ".\httpd.h"\
- ".\nt\readdir.h"\
+ ".\core\alloc.h"\
+ ".\core\buff.h"\
+ ".\core\conf.h"\
+ ".\core\http_config.h"\
+ ".\core\httpd.h"\
+ ".\os\win32\readdir.h"\
".\regex\regex.h"\
+ {$(INCLUDE)}"sys\stat.h"\
+ {$(INCLUDE)}"sys\types.h"\
+
+NODEP_CPP_MODUL=\
+ ".\core\sfio.h"\
"$(INTDIR)\modules.obj" "$(INTDIR)\modules.sbr" : $(SOURCE)
$(DEP_CPP_MODUL)\
@@ -1879,16 +1849,14 @@
!ENDIF
-SOURCE=.\nt\multithread.c
+SOURCE=.\os\win32\multithread.c
!IF "$(CFG)" == "ApacheCore - Win32 Release"
DEP_CPP_MULTI=\
- ".\conf.h"\
- ".\multithread.h"\
+ ".\core\conf.h"\
+ ".\core\multithread.h"\
".\regex\regex.h"\
- {$(INCLUDE)}"sys\stat.h"\
- {$(INCLUDE)}"sys\types.h"\
"$(INTDIR)\multithread.obj" : $(SOURCE) $(DEP_CPP_MULTI) "$(INTDIR)"
@@ -1898,9 +1866,11 @@
!ELSEIF "$(CFG)" == "ApacheCore - Win32 Debug"
DEP_CPP_MULTI=\
- ".\conf.h"\
- ".\multithread.h"\
+ ".\core\conf.h"\
+ ".\core\multithread.h"\
".\regex\regex.h"\
+ {$(INCLUDE)}"sys\stat.h"\
+ {$(INCLUDE)}"sys\types.h"\
"$(INTDIR)\multithread.obj" "$(INTDIR)\multithread.sbr" : $(SOURCE)\
@@ -1910,13 +1880,12 @@
!ENDIF
-SOURCE=.\nt\readdir.c
+SOURCE=.\os\win32\readdir.c
!IF "$(CFG)" == "ApacheCore - Win32 Release"
DEP_CPP_READD=\
- ".\nt\readdir.h"\
- {$(INCLUDE)}"sys\types.h"\
+ ".\os\win32\readdir.h"\
"$(INTDIR)\readdir.obj" : $(SOURCE) $(DEP_CPP_READD) "$(INTDIR)"
@@ -1926,7 +1895,8 @@
!ELSEIF "$(CFG)" == "ApacheCore - Win32 Debug"
DEP_CPP_READD=\
- ".\nt\readdir.h"\
+ ".\os\win32\readdir.h"\
+ {$(INCLUDE)}"sys\types.h"\
"$(INTDIR)\readdir.obj" "$(INTDIR)\readdir.sbr" : $(SOURCE)
$(DEP_CPP_READD)\
@@ -1936,61 +1906,61 @@
!ENDIF
-SOURCE=.\rfc1413.c
+SOURCE=.\core\rfc1413.c
!IF "$(CFG)" == "ApacheCore - Win32 Release"
DEP_CPP_RFC14=\
- ".\alloc.h"\
- ".\buff.h"\
- ".\conf.h"\
- ".\http_log.h"\
- ".\http_main.h"\
- ".\httpd.h"\
- ".\nt\readdir.h"\
+ ".\core\alloc.h"\
+ ".\core\buff.h"\
+ ".\core\conf.h"\
+ ".\core\http_log.h"\
+ ".\core\http_main.h"\
+ ".\core\httpd.h"\
+ ".\core\rfc1413.h"\
+ ".\os\win32\readdir.h"\
".\regex\regex.h"\
- ".\rfc1413.h"\
- {$(INCLUDE)}"sys\stat.h"\
- {$(INCLUDE)}"sys\types.h"\
-
-NODEP_CPP_RFC14=\
- ".\sfio.h"\
"$(INTDIR)\rfc1413.obj" : $(SOURCE) $(DEP_CPP_RFC14) "$(INTDIR)"
+ $(CPP) $(CPP_PROJ) $(SOURCE)
!ELSEIF "$(CFG)" == "ApacheCore - Win32 Debug"
DEP_CPP_RFC14=\
- ".\alloc.h"\
- ".\buff.h"\
- ".\conf.h"\
- ".\http_log.h"\
- ".\http_main.h"\
- ".\httpd.h"\
- ".\nt\readdir.h"\
+ ".\core\alloc.h"\
+ ".\core\buff.h"\
+ ".\core\conf.h"\
+ ".\core\http_log.h"\
+ ".\core\http_main.h"\
+ ".\core\httpd.h"\
+ ".\core\rfc1413.h"\
+ ".\os\win32\readdir.h"\
".\regex\regex.h"\
- ".\rfc1413.h"\
+ {$(INCLUDE)}"sys\stat.h"\
+ {$(INCLUDE)}"sys\types.h"\
+
+NODEP_CPP_RFC14=\
+ ".\core\sfio.h"\
"$(INTDIR)\rfc1413.obj" "$(INTDIR)\rfc1413.sbr" : $(SOURCE)
$(DEP_CPP_RFC14)\
"$(INTDIR)"
+ $(CPP) $(CPP_PROJ) $(SOURCE)
!ENDIF
-SOURCE=.\nt\service.c
+SOURCE=.\os\win32\service.c
!IF "$(CFG)" == "ApacheCore - Win32 Release"
DEP_CPP_SERVI=\
- ".\conf.h"\
- ".\multithread.h"\
- ".\nt\service.h"\
+ ".\core\conf.h"\
+ ".\core\multithread.h"\
+ ".\os\win32\service.h"\
".\regex\regex.h"\
- {$(INCLUDE)}"sys\stat.h"\
- {$(INCLUDE)}"sys\types.h"\
"$(INTDIR)\service.obj" : $(SOURCE) $(DEP_CPP_SERVI) "$(INTDIR)"
@@ -2000,10 +1970,12 @@
!ELSEIF "$(CFG)" == "ApacheCore - Win32 Debug"
DEP_CPP_SERVI=\
- ".\conf.h"\
- ".\multithread.h"\
- ".\nt\service.h"\
+ ".\core\conf.h"\
+ ".\core\multithread.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)\
@@ -2013,194 +1985,204 @@
!ENDIF
-SOURCE=.\util.c
+SOURCE=.\core\util.c
!IF "$(CFG)" == "ApacheCore - Win32 Release"
DEP_CPP_UTIL_=\
- ".\alloc.h"\
- ".\buff.h"\
- ".\conf.h"\
- ".\http_conf_globals.h"\
- ".\httpd.h"\
- ".\nt\readdir.h"\
+ ".\core\alloc.h"\
+ ".\core\buff.h"\
+ ".\core\conf.h"\
+ ".\core\http_conf_globals.h"\
+ ".\core\httpd.h"\
+ ".\os\win32\readdir.h"\
".\regex\regex.h"\
- {$(INCLUDE)}"sys\stat.h"\
- {$(INCLUDE)}"sys\types.h"\
-
-NODEP_CPP_UTIL_=\
- ".\sfio.h"\
"$(INTDIR)\util.obj" : $(SOURCE) $(DEP_CPP_UTIL_) "$(INTDIR)"
+ $(CPP) $(CPP_PROJ) $(SOURCE)
!ELSEIF "$(CFG)" == "ApacheCore - Win32 Debug"
DEP_CPP_UTIL_=\
- ".\alloc.h"\
- ".\buff.h"\
- ".\conf.h"\
- ".\http_conf_globals.h"\
- ".\httpd.h"\
- ".\nt\readdir.h"\
+ ".\core\alloc.h"\
+ ".\core\buff.h"\
+ ".\core\conf.h"\
+ ".\core\http_conf_globals.h"\
+ ".\core\httpd.h"\
+ ".\os\win32\readdir.h"\
".\regex\regex.h"\
+ {$(INCLUDE)}"sys\stat.h"\
+ {$(INCLUDE)}"sys\types.h"\
+
+NODEP_CPP_UTIL_=\
+ ".\core\sfio.h"\
"$(INTDIR)\util.obj" "$(INTDIR)\util.sbr" : $(SOURCE) $(DEP_CPP_UTIL_)\
"$(INTDIR)"
+ $(CPP) $(CPP_PROJ) $(SOURCE)
!ENDIF
-SOURCE=.\util_date.c
+SOURCE=.\core\util_date.c
!IF "$(CFG)" == "ApacheCore - Win32 Release"
DEP_CPP_UTIL_D=\
- ".\conf.h"\
+ ".\core\conf.h"\
+ ".\core\util_date.h"\
".\regex\regex.h"\
- ".\util_date.h"\
- {$(INCLUDE)}"sys\stat.h"\
- {$(INCLUDE)}"sys\types.h"\
"$(INTDIR)\util_date.obj" : $(SOURCE) $(DEP_CPP_UTIL_D) "$(INTDIR)"
+ $(CPP) $(CPP_PROJ) $(SOURCE)
!ELSEIF "$(CFG)" == "ApacheCore - Win32 Debug"
DEP_CPP_UTIL_D=\
- ".\conf.h"\
+ ".\core\conf.h"\
+ ".\core\util_date.h"\
".\regex\regex.h"\
- ".\util_date.h"\
+ {$(INCLUDE)}"sys\stat.h"\
+ {$(INCLUDE)}"sys\types.h"\
"$(INTDIR)\util_date.obj" "$(INTDIR)\util_date.sbr" : $(SOURCE)\
$(DEP_CPP_UTIL_D) "$(INTDIR)"
+ $(CPP) $(CPP_PROJ) $(SOURCE)
!ENDIF
-SOURCE=.\util_md5.c
+SOURCE=.\core\util_md5.c
!IF "$(CFG)" == "ApacheCore - Win32 Release"
DEP_CPP_UTIL_M=\
- ".\alloc.h"\
- ".\buff.h"\
- ".\conf.h"\
- ".\httpd.h"\
- ".\md5.h"\
- ".\nt\readdir.h"\
+ ".\core\alloc.h"\
+ ".\core\buff.h"\
+ ".\core\conf.h"\
+ ".\core\httpd.h"\
+ ".\core\md5.h"\
+ ".\core\util_md5.h"\
+ ".\os\win32\readdir.h"\
".\regex\regex.h"\
- ".\util_md5.h"\
- {$(INCLUDE)}"sys\stat.h"\
- {$(INCLUDE)}"sys\types.h"\
-
-NODEP_CPP_UTIL_M=\
- ".\sfio.h"\
"$(INTDIR)\util_md5.obj" : $(SOURCE) $(DEP_CPP_UTIL_M) "$(INTDIR)"
+ $(CPP) $(CPP_PROJ) $(SOURCE)
!ELSEIF "$(CFG)" == "ApacheCore - Win32 Debug"
DEP_CPP_UTIL_M=\
- ".\alloc.h"\
- ".\buff.h"\
- ".\conf.h"\
- ".\httpd.h"\
- ".\md5.h"\
- ".\nt\readdir.h"\
+ ".\core\alloc.h"\
+ ".\core\buff.h"\
+ ".\core\conf.h"\
+ ".\core\httpd.h"\
+ ".\core\md5.h"\
+ ".\core\util_md5.h"\
+ ".\os\win32\readdir.h"\
".\regex\regex.h"\
- ".\util_md5.h"\
+ {$(INCLUDE)}"sys\stat.h"\
+ {$(INCLUDE)}"sys\types.h"\
+
+NODEP_CPP_UTIL_M=\
+ ".\core\sfio.h"\
"$(INTDIR)\util_md5.obj" "$(INTDIR)\util_md5.sbr" : $(SOURCE)
$(DEP_CPP_UTIL_M)\
"$(INTDIR)"
+ $(CPP) $(CPP_PROJ) $(SOURCE)
!ENDIF
-SOURCE=.\util_script.c
+SOURCE=.\core\util_script.c
!IF "$(CFG)" == "ApacheCore - Win32 Release"
DEP_CPP_UTIL_S=\
- ".\alloc.h"\
- ".\buff.h"\
- ".\conf.h"\
- ".\http_conf_globals.h"\
- ".\http_config.h"\
- ".\http_core.h"\
- ".\http_log.h"\
- ".\http_main.h"\
- ".\http_protocol.h"\
- ".\http_request.h"\
- ".\httpd.h"\
- ".\nt\readdir.h"\
+ ".\core\alloc.h"\
+ ".\core\buff.h"\
+ ".\core\conf.h"\
+ ".\core\http_conf_globals.h"\
+ ".\core\http_config.h"\
+ ".\core\http_core.h"\
+ ".\core\http_log.h"\
+ ".\core\http_main.h"\
+ ".\core\http_protocol.h"\
+ ".\core\http_request.h"\
+ ".\core\httpd.h"\
+ ".\core\util_script.h"\
+ ".\os\win32\readdir.h"\
".\regex\regex.h"\
- ".\util_script.h"\
- {$(INCLUDE)}"sys\stat.h"\
- {$(INCLUDE)}"sys\types.h"\
-
-NODEP_CPP_UTIL_S=\
- ".\sfio.h"\
"$(INTDIR)\util_script.obj" : $(SOURCE) $(DEP_CPP_UTIL_S) "$(INTDIR)"
+ $(CPP) $(CPP_PROJ) $(SOURCE)
!ELSEIF "$(CFG)" == "ApacheCore - Win32 Debug"
DEP_CPP_UTIL_S=\
- ".\alloc.h"\
- ".\buff.h"\
- ".\conf.h"\
- ".\http_conf_globals.h"\
- ".\http_config.h"\
- ".\http_core.h"\
- ".\http_log.h"\
- ".\http_main.h"\
- ".\http_protocol.h"\
- ".\http_request.h"\
- ".\httpd.h"\
- ".\nt\readdir.h"\
+ ".\core\alloc.h"\
+ ".\core\buff.h"\
+ ".\core\conf.h"\
+ ".\core\http_conf_globals.h"\
+ ".\core\http_config.h"\
+ ".\core\http_core.h"\
+ ".\core\http_log.h"\
+ ".\core\http_main.h"\
+ ".\core\http_protocol.h"\
+ ".\core\http_request.h"\
+ ".\core\httpd.h"\
+ ".\core\util_script.h"\
+ ".\os\win32\readdir.h"\
".\regex\regex.h"\
- ".\util_script.h"\
+ {$(INCLUDE)}"sys\stat.h"\
+ {$(INCLUDE)}"sys\types.h"\
+
+NODEP_CPP_UTIL_S=\
+ ".\core\sfio.h"\
"$(INTDIR)\util_script.obj" "$(INTDIR)\util_script.sbr" : $(SOURCE)\
$(DEP_CPP_UTIL_S) "$(INTDIR)"
+ $(CPP) $(CPP_PROJ) $(SOURCE)
!ENDIF
-SOURCE=.\util_snprintf.c
+SOURCE=.\core\util_snprintf.c
!IF "$(CFG)" == "ApacheCore - Win32 Release"
DEP_CPP_UTIL_SN=\
- ".\conf.h"\
+ ".\core\conf.h"\
".\regex\regex.h"\
- {$(INCLUDE)}"sys\stat.h"\
- {$(INCLUDE)}"sys\types.h"\
"$(INTDIR)\util_snprintf.obj" : $(SOURCE) $(DEP_CPP_UTIL_SN) "$(INTDIR)"
+ $(CPP) $(CPP_PROJ) $(SOURCE)
!ELSEIF "$(CFG)" == "ApacheCore - Win32 Debug"
DEP_CPP_UTIL_SN=\
- ".\conf.h"\
+ ".\core\conf.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)"
+ $(CPP) $(CPP_PROJ) $(SOURCE)
!ENDIF
1.11 +99 -99 apachen/src/Makefile.nt
Index: Makefile.nt
===================================================================
RCS file: /export/home/cvs/apachen/src/Makefile.nt,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- Makefile.nt 1997/07/27 18:44:04 1.10
+++ Makefile.nt 1997/08/13 08:37:14 1.11
@@ -1,99 +1,99 @@
-# Makefile for NT
-# Note that this doesn't quite work... apache.exe doesn't depend on proxy.lib
-# or regex.lib. Nor can it, without some messing about - the debug and
release
-# versions need different dependencies, and that isn't an option.
-# One way that occurs to me to solve the problem is to have the proxy and
-# regex makes delete the appropriate apache.exe. Tacky, but it'll work!
-# Ben, 5 July 97
-
-_apacher:
- cd regex & set CFG=regex - Win32 Release& nmake /nologo -f regex.mak
- cd . & set CFG=ApacheCore - Win32 Release& nmake /nologo -f
ApacheCore.mak
- cd . & set CFG=Apache - Win32 Release& nmake /nologo -f Apache.mak
- cd nt & set CFG=ApacheModuleStatus - Win32 Release& nmake /nologo -f
ApacheModuleStatus.mak
-# cd nt & set CFG=ApacheModuleInfo - Win32 Release& nmake /nologo -f
ApacheModuleInfo.mak
- cd nt & set CFG=ApacheModuleAuthAnon - Win32 Release& nmake /nologo -f
ApacheModuleAuthAnon.mak
- cd nt & set CFG=ApacheModuleDigest - Win32 Release& nmake /nologo -f
ApacheModuleDigest.mak
- cd nt & set CFG=ApacheModuleCERNMeta - Win32 Release& nmake /nologo -f
ApacheModuleCERNMeta.mak
- cd nt & set CFG=ApacheModuleExpires - Win32 Release& nmake /nologo -f
ApacheModuleExpires.mak
- cd nt & set CFG=ApacheModuleHeaders - Win32 Release& nmake /nologo -f
ApacheModuleHeaders.mak
- cd nt & set CFG=ApacheModuleUserTrack - Win32 Release& nmake /nologo -f
ApacheModuleUserTrack.mak
- cd modules\proxy & set CFG=ApacheModuleProxy - Win32 Release& nmake
/nologo -f ApacheModuleProxy.mak
-
-_apached:
- cd regex & set CFG=regex - Win32 Debug& nmake /nologo -f regex.mak
- cd . & set CFG=ApacheCore - Win32 Debug& nmake /nologo -f ApacheCore.mak
- cd . & set CFG=Apache - Win32 Debug& nmake /nologo -f Apache.mak
- cd nt & set CFG=ApacheModuleStatus - Win32 Debug& nmake /nologo -f
ApacheModuleStatus.mak
-# cd nt & set CFG=ApacheModuleInfo - Win32 Debug& nmake /nologo -f
ApacheModuleInfo.mak
- cd nt & set CFG=ApacheModuleAuthAnon - Win32 Debug& nmake /nologo -f
ApacheModuleAuthAnon.mak
- cd nt & set CFG=ApacheModuleDigest - Win32 Debug& nmake /nologo -f
ApacheModuleDigest.mak
- cd nt & set CFG=ApacheModuleCERNMeta - Win32 Debug& nmake /nologo -f
ApacheModuleCERNMeta.mak
- cd nt & set CFG=ApacheModuleExpires - Win32 Debug& nmake /nologo -f
ApacheModuleExpires.mak
- cd nt & set CFG=ApacheModuleHeaders - Win32 Debug& nmake /nologo -f
ApacheModuleHeaders.mak
- cd nt & set CFG=ApacheModuleUserTrack - Win32 Debug& nmake /nologo -f
ApacheModuleUserTrack.mak
- cd modules\proxy & set CFG=ApacheModuleProxy - Win32 Debug& nmake
/nologo -f ApacheModuleProxy.mak
-
-installr: apacher
- -mkdir \Apache
- -mkdir \Apache\modules
- -mkdir \Apache\logs
- -mkdir \Apache\conf
- copy ApacheR\Apache.exe \Apache
- copy CoreR\ApacheCore.dll \Apache
- copy nt\ApacheModuleStatusR\ApacheModuleStatus.dll \Apache\modules
-# copy nt\ApacheModuleInfoR\ApacheModuleInfo.dll \Apache\modules
- copy nt\ApacheModuleAuthAnonR\ApacheModuleAuthAnon.dll \Apache\modules
- copy nt\ApacheModuleDigestR\ApacheModuleDigest.dll \Apache\modules
- copy nt\ApacheModuleCERNMetaR\ApacheModuleCERNMeta.dll \Apache\modules
- copy nt\ApacheModuleExpiresR\ApacheModuleExpires.dll \Apache\modules
- copy nt\ApacheModuleHeadersR\ApacheModuleHeaders.dll \Apache\modules
- copy nt\ApacheModuleUserTrackR\ApacheModuleUserTrack.dll \Apache\modules
- copy modules\proxy\Release\ApacheModuleProxy.dll \Apache\modules
-
-installd: apached
- -mkdir \Apache
- -mkdir \Apache\modules
- -mkdir \Apache\logs
- -mkdir \Apache\conf
- copy ApacheD\Apache.exe \Apache
- copy CoreD\ApacheCore.dll \Apache
- copy nt\ApacheModuleStatusD\ApacheModuleStatus.dll \Apache\modules
-# copy nt\ApacheModuleInfoD\ApacheModuleInfo.dll \Apache\modules
- copy nt\ApacheModuleAuthAnonD\ApacheModuleAuthAnon.dll \Apache\modules
- copy nt\ApacheModuleDigestD\ApacheModuleDigest.dll \Apache\modules
- copy nt\ApacheModuleCERNMetaD\ApacheModuleCERNMeta.dll \Apache\modules
- copy nt\ApacheModuleExpiresD\ApacheModuleExpires.dll \Apache\modules
- copy nt\ApacheModuleHeadersD\ApacheModuleHeaders.dll \Apache\modules
- copy nt\ApacheModuleUserTrackD\ApacheModuleUserTrack.dll \Apache\modules
- copy modules\proxy\Debug\ApacheModuleProxy.dll \Apache\modules
-
-cleanr:
- cd regex & set CFG=regex - Win32 Release& nmake /nologo -f regex.mak
clean
- cd . & set CFG=ApacheCore - Win32 Release& nmake /nologo -f
ApacheCore.mak clean
- cd . & set CFG=Apache - Win32 Release& nmake /nologo -f Apache.mak clean
- cd nt & set CFG=ApacheModuleStatus - Win32 Release& nmake /nologo -f
ApacheModuleStatus.mak clean
-# cd nt & set CFG=ApacheModuleInfo - Win32 Release& nmake /nologo -f
ApacheModuleInfo.mak clean
- cd nt & set CFG=ApacheModuleAuthAnon - Win32 Release& nmake /nologo -f
ApacheModuleAuthAnon.mak clean
- cd nt & set CFG=ApacheModuleDigest - Win32 Release& nmake /nologo -f
ApacheModuleDigest.mak clean
- cd nt & set CFG=ApacheModuleCERNMeta - Win32 Release& nmake /nologo -f
ApacheModuleCERNMeta.mak clean
- cd nt & set CFG=ApacheModuleExpires - Win32 Release& nmake /nologo -f
ApacheModuleExpires.mak clean
- cd nt & set CFG=ApacheModuleHeaders - Win32 Release& nmake /nologo -f
ApacheModuleHeaders.mak clean
- cd nt & set CFG=ApacheModuleUserTrack - Win32 Release& nmake /nologo -f
ApacheModuleUserTrack.mak clean
- cd modules\proxy & set CFG=ApacheModuleProxy - Win32 Release& nmake
/nologo -f ApacheModuleProxy.mak clean
-
-cleand:
- cd regex & set CFG=regex - Win32 Debug& nmake /nologo -f regex.mak clean
- cd . & set CFG=ApacheCore - Win32 Debug& nmake /nologo -f
ApacheCore.mak clean
- cd . & set CFG=Apache - Win32 Debug& nmake /nologo -f Apache.mak clean
- cd nt & set CFG=ApacheModuleStatus - Win32 Debug& nmake /nologo -f
ApacheModuleStatus.mak clean
-# cd nt & set CFG=ApacheModuleInfo - Win32 Debug& nmake /nologo -f
ApacheModuleInfo.mak clean
- cd nt & set CFG=ApacheModuleAuthAnon - Win32 Debug& nmake /nologo -f
ApacheModuleAuthAnon.mak clean
- cd nt & set CFG=ApacheModuleDigest - Win32 Debug& nmake /nologo -f
ApacheModuleDigest.mak clean
- cd nt & set CFG=ApacheModuleCERNMeta - Win32 Debug& nmake /nologo -f
ApacheModuleCERNMeta.mak clean
- cd nt & set CFG=ApacheModuleExpires - Win32 Debug& nmake /nologo -f
ApacheModuleExpires.mak clean
- cd nt & set CFG=ApacheModuleHeaders - Win32 Debug& nmake /nologo -f
ApacheModuleHeaders.mak clean
- cd nt & set CFG=ApacheModuleUserTrack - Win32 Debug& nmake /nologo -f
ApacheModuleUserTrack.mak clean
- cd modules\proxy & set CFG=ApacheModuleProxy - Win32 Debug& nmake
/nologo -f ApacheModuleProxy.mak clean
-
-clean: cleand cleanr
+# Makefile for NT
+# Note that this doesn't quite work... apache.exe doesn't depend on proxy.lib
+# or regex.lib. Nor can it, without some messing about - the debug and
release
+# versions need different dependencies, and that isn't an option.
+# One way that occurs to me to solve the problem is to have the proxy and
+# regex makes delete the appropriate apache.exe. Tacky, but it'll work!
+# Ben, 5 July 97
+
+_apacher:
+ cd regex & set CFG=regex - Win32 Release& nmake /nologo -f regex.mak
+ cd . & set CFG=ApacheCore - Win32 Release& nmake /nologo -f
ApacheCore.mak
+ cd . & set CFG=Apache - Win32 Release& nmake /nologo -f Apache.mak
+ cd os\win32 & set CFG=ApacheModuleStatus - Win32 Release& nmake /nologo
-f ApacheModuleStatus.mak
+# cd os\win32 & set CFG=ApacheModuleInfo - Win32 Release& nmake
/nologo -f ApacheModuleInfo.mak
+ cd os\win32 & set CFG=ApacheModuleAuthAnon - Win32 Release& nmake
/nologo -f ApacheModuleAuthAnon.mak
+ cd os\win32 & set CFG=ApacheModuleDigest - Win32 Release& nmake /nologo
-f ApacheModuleDigest.mak
+ cd os\win32 & set CFG=ApacheModuleCERNMeta - Win32 Release& nmake
/nologo -f ApacheModuleCERNMeta.mak
+ cd os\win32 & set CFG=ApacheModuleExpires - Win32 Release& nmake
/nologo -f ApacheModuleExpires.mak
+ cd os\win32 & set CFG=ApacheModuleHeaders - Win32 Release& nmake
/nologo -f ApacheModuleHeaders.mak
+ cd os\win32 & set CFG=ApacheModuleUserTrack - Win32 Release& nmake
/nologo -f ApacheModuleUserTrack.mak
+ cd modules\proxy & set CFG=ApacheModuleProxy - Win32 Release& nmake
/nologo -f ApacheModuleProxy.mak
+
+_apached:
+ cd regex & set CFG=regex - Win32 Debug& nmake /nologo -f regex.mak
+ cd . & set CFG=ApacheCore - Win32 Debug& nmake /nologo -f ApacheCore.mak
+ cd . & set CFG=Apache - Win32 Debug& nmake /nologo -f Apache.mak
+ cd os\win32 & set CFG=ApacheModuleStatus - Win32 Debug& nmake /nologo
-f ApacheModuleStatus.mak
+# cd os\win32 & set CFG=ApacheModuleInfo - Win32 Debug& nmake /nologo
-f ApacheModuleInfo.mak
+ cd os\win32 & set CFG=ApacheModuleAuthAnon - Win32 Debug& nmake /nologo
-f ApacheModuleAuthAnon.mak
+ cd os\win32 & set CFG=ApacheModuleDigest - Win32 Debug& nmake /nologo
-f ApacheModuleDigest.mak
+ cd os\win32 & set CFG=ApacheModuleCERNMeta - Win32 Debug& nmake /nologo
-f ApacheModuleCERNMeta.mak
+ cd os\win32 & set CFG=ApacheModuleExpires - Win32 Debug& nmake /nologo
-f ApacheModuleExpires.mak
+ cd os\win32 & set CFG=ApacheModuleHeaders - Win32 Debug& nmake /nologo
-f ApacheModuleHeaders.mak
+ cd os\win32 & set CFG=ApacheModuleUserTrack - Win32 Debug& nmake
/nologo -f ApacheModuleUserTrack.mak
+ cd modules\proxy & set CFG=ApacheModuleProxy - Win32 Debug& nmake
/nologo -f ApacheModuleProxy.mak
+
+installr: apacher
+ -mkdir \Apache
+ -mkdir \Apache\modules
+ -mkdir \Apache\logs
+ -mkdir \Apache\conf
+ copy ApacheR\Apache.exe \Apache
+ copy CoreR\ApacheCore.dll \Apache
+ copy nt\ApacheModuleStatusR\ApacheModuleStatus.dll \Apache\modules
+# copy nt\ApacheModuleInfoR\ApacheModuleInfo.dll \Apache\modules
+ copy nt\ApacheModuleAuthAnonR\ApacheModuleAuthAnon.dll \Apache\modules
+ copy nt\ApacheModuleDigestR\ApacheModuleDigest.dll \Apache\modules
+ copy nt\ApacheModuleCERNMetaR\ApacheModuleCERNMeta.dll \Apache\modules
+ copy nt\ApacheModuleExpiresR\ApacheModuleExpires.dll \Apache\modules
+ copy nt\ApacheModuleHeadersR\ApacheModuleHeaders.dll \Apache\modules
+ copy nt\ApacheModuleUserTrackR\ApacheModuleUserTrack.dll \Apache\modules
+ copy modules\proxy\Release\ApacheModuleProxy.dll \Apache\modules
+
+installd: apached
+ -mkdir \Apache
+ -mkdir \Apache\modules
+ -mkdir \Apache\logs
+ -mkdir \Apache\conf
+ copy ApacheD\Apache.exe \Apache
+ copy CoreD\ApacheCore.dll \Apache
+ copy nt\ApacheModuleStatusD\ApacheModuleStatus.dll \Apache\modules
+# copy nt\ApacheModuleInfoD\ApacheModuleInfo.dll \Apache\modules
+ copy nt\ApacheModuleAuthAnonD\ApacheModuleAuthAnon.dll \Apache\modules
+ copy nt\ApacheModuleDigestD\ApacheModuleDigest.dll \Apache\modules
+ copy nt\ApacheModuleCERNMetaD\ApacheModuleCERNMeta.dll \Apache\modules
+ copy nt\ApacheModuleExpiresD\ApacheModuleExpires.dll \Apache\modules
+ copy nt\ApacheModuleHeadersD\ApacheModuleHeaders.dll \Apache\modules
+ copy nt\ApacheModuleUserTrackD\ApacheModuleUserTrack.dll \Apache\modules
+ copy modules\proxy\Debug\ApacheModuleProxy.dll \Apache\modules
+
+cleanr:
+ cd regex & set CFG=regex - Win32 Release& nmake /nologo -f regex.mak
clean
+ cd . & set CFG=ApacheCore - Win32 Release& nmake /nologo -f
ApacheCore.mak clean
+ cd . & set CFG=Apache - Win32 Release& nmake /nologo -f Apache.mak clean
+ cd os\win32 & set CFG=ApacheModuleStatus - Win32 Release& nmake /nologo
-f ApacheModuleStatus.mak clean
+# cd os\win32 & set CFG=ApacheModuleInfo - Win32 Release& nmake
/nologo -f ApacheModuleInfo.mak clean
+ cd os\win32 & set CFG=ApacheModuleAuthAnon - Win32 Release& nmake
/nologo -f ApacheModuleAuthAnon.mak clean
+ cd os\win32 & set CFG=ApacheModuleDigest - Win32 Release& nmake /nologo
-f ApacheModuleDigest.mak clean
+ cd os\win32 & set CFG=ApacheModuleCERNMeta - Win32 Release& nmake
/nologo -f ApacheModuleCERNMeta.mak clean
+ cd os\win32 & set CFG=ApacheModuleExpires - Win32 Release& nmake
/nologo -f ApacheModuleExpires.mak clean
+ cd os\win32 & set CFG=ApacheModuleHeaders - Win32 Release& nmake
/nologo -f ApacheModuleHeaders.mak clean
+ cd os\win32 & set CFG=ApacheModuleUserTrack - Win32 Release& nmake
/nologo -f ApacheModuleUserTrack.mak clean
+ cd modules\proxy & set CFG=ApacheModuleProxy - Win32 Release& nmake
/nologo -f ApacheModuleProxy.mak clean
+
+cleand:
+ cd regex & set CFG=regex - Win32 Debug& nmake /nologo -f regex.mak clean
+ cd . & set CFG=ApacheCore - Win32 Debug& nmake /nologo -f
ApacheCore.mak clean
+ cd . & set CFG=Apache - Win32 Debug& nmake /nologo -f Apache.mak clean
+ cd os\win32 & set CFG=ApacheModuleStatus - Win32 Debug& nmake /nologo
-f ApacheModuleStatus.mak clean
+# cd os\win32 & set CFG=ApacheModuleInfo - Win32 Debug& nmake /nologo
-f ApacheModuleInfo.mak clean
+ cd os\win32 & set CFG=ApacheModuleAuthAnon - Win32 Debug& nmake /nologo
-f ApacheModuleAuthAnon.mak clean
+ cd os\win32 & set CFG=ApacheModuleDigest - Win32 Debug& nmake /nologo
-f ApacheModuleDigest.mak clean
+ cd os\win32 & set CFG=ApacheModuleCERNMeta - Win32 Debug& nmake /nologo
-f ApacheModuleCERNMeta.mak clean
+ cd os\win32 & set CFG=ApacheModuleExpires - Win32 Debug& nmake /nologo
-f ApacheModuleExpires.mak clean
+ cd os\win32 & set CFG=ApacheModuleHeaders - Win32 Debug& nmake /nologo
-f ApacheModuleHeaders.mak clean
+ cd os\win32 & set CFG=ApacheModuleUserTrack - Win32 Debug& nmake
/nologo -f ApacheModuleUserTrack.mak clean
+ cd modules\proxy & set CFG=ApacheModuleProxy - Win32 Debug& nmake
/nologo -f ApacheModuleProxy.mak clean
+
+clean: cleand cleanr
1.33 +1 -1 apachen/src/core/alloc.h
Index: alloc.h
===================================================================
RCS file: /export/home/cvs/apachen/src/core/alloc.h,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -r1.32 -r1.33
--- alloc.h 1997/08/02 00:58:26 1.32
+++ alloc.h 1997/08/13 08:37:17 1.33
@@ -74,7 +74,7 @@
/* Need declaration of DIR on Win32 */
#ifdef WIN32
-#include "nt/readdir.h"
+#include "../os/win32/readdir.h"
#endif
typedef struct pool pool;
1.199 +2 -2 apachen/src/core/http_main.c
Index: http_main.c
===================================================================
RCS file: /export/home/cvs/apachen/src/core/http_main.c,v
retrieving revision 1.198
retrieving revision 1.199
diff -u -r1.198 -r1.199
--- http_main.c 1997/08/08 08:00:19 1.198
+++ http_main.c 1997/08/13 08:37:18 1.199
@@ -97,7 +97,7 @@
#include <prot.h>
#endif
#ifdef WIN32
-#include "nt/getopt.h"
+#include "../os/win32/getopt.h"
#else
#include <netinet/tcp.h>
#endif
@@ -113,7 +113,7 @@
#endif
#ifdef WIN32
-#include "nt/service.h"
+#include "../os/win32/service.h"
#endif
1.2 +4 -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.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ApacheModuleProxy.dsp 1997/07/20 14:59:58 1.1
+++ ApacheModuleProxy.dsp 1997/08/13 08:37:20 1.2
@@ -42,9 +42,10 @@
# PROP Use_Debug_Libraries 0
# PROP Output_Dir ".\Release"
# PROP Intermediate_Dir ".\Release"
+# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS"
/YX /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\.." /I "..\..\regex" /D "WIN32" /D
"NDEBUG" /D "_WINDOWS" /YX /FD /c
+# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\core" /I "..\..\regex" /D
"WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c
# ADD BASE MTL /nologo /D "NDEBUG" /win32
# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
# ADD BASE RSC /l 0x809 /d "NDEBUG"
@@ -67,9 +68,10 @@
# PROP Use_Debug_Libraries 1
# PROP Output_Dir ".\Debug"
# PROP Intermediate_Dir ".\Debug"
+# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D
"_WINDOWS" /YX /c
-# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\.." /I "..\..\regex" /D
"WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c
+# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\core" /I "..\..\regex"
/D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c
# ADD BASE MTL /nologo /D "_DEBUG" /win32
# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
# ADD BASE RSC /l 0x809 /d "_DEBUG"
1.2 +185 -274 apachen/src/modules/proxy/ApacheModuleProxy.mak
Index: ApacheModuleProxy.mak
===================================================================
RCS file: /export/home/cvs/apachen/src/modules/proxy/ApacheModuleProxy.mak,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ApacheModuleProxy.mak 1997/07/19 20:16:20 1.1
+++ ApacheModuleProxy.mak 1997/08/13 08:37:21 1.2
@@ -1,21 +1,18 @@
-# Microsoft Developer Studio Generated NMAKE File, Format Version 4.20
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102
-
+# Microsoft Developer Studio Generated NMAKE File, Based on
ApacheModuleProxy.dsp
!IF "$(CFG)" == ""
-CFG=ApacheModuleProxy - Win32 Debug
-!MESSAGE No configuration specified. Defaulting to ApacheModuleProxy -
Win32\
- Debug.
+CFG=ApacheModuleProxy - Win32 Release
+!MESSAGE No configuration specified. Defaulting to ApacheModuleProxy - Win32\
+ Release.
!ENDIF
!IF "$(CFG)" != "ApacheModuleProxy - Win32 Release" && "$(CFG)" !=\
"ApacheModuleProxy - Win32 Debug"
!MESSAGE Invalid configuration "$(CFG)" specified.
-!MESSAGE You can specify a configuration when running NMAKE on this makefile
-!MESSAGE by defining the macro CFG on the command line. For example:
+!MESSAGE You can specify a configuration when running NMAKE
+!MESSAGE by defining the macro CFG on the command line. For example:
!MESSAGE
-!MESSAGE NMAKE /f "ApacheModuleProxy.mak" CFG="ApacheModuleProxy - Win32
Debug"
+!MESSAGE NMAKE /f "ApacheModuleProxy.mak"\
+ CFG="ApacheModuleProxy - Win32 Release"
!MESSAGE
!MESSAGE Possible choices for configuration are:
!MESSAGE
@@ -32,37 +29,37 @@
!ELSE
NULL=nul
!ENDIF
-################################################################################
-# Begin Project
-# PROP Target_Last_Scanned "ApacheModuleProxy - Win32 Debug"
-MTL=mktyplib.exe
-RSC=rc.exe
+
CPP=cl.exe
+MTL=midl.exe
+RSC=rc.exe
!IF "$(CFG)" == "ApacheModuleProxy - Win32 Release"
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "ApacheMo"
-# PROP BASE Intermediate_Dir "ApacheMo"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "Release"
-# PROP Intermediate_Dir "Release"
-# PROP Target_Dir ""
OUTDIR=.\Release
INTDIR=.\Release
+# Begin Custom Macros
+OutDir=.\.\Release
+# End Custom Macros
+
+!IF "$(RECURSE)" == "0"
ALL : "$(OUTDIR)\ApacheModuleProxy.dll"
-CLEAN :
+!ELSE
+
+ALL : "$(OUTDIR)\ApacheModuleProxy.dll"
+
+!ENDIF
+
+CLEAN :
[EMAIL PROTECTED] "$(INTDIR)\mod_proxy.obj"
[EMAIL PROTECTED] "$(INTDIR)\proxy_cache.obj"
[EMAIL PROTECTED] "$(INTDIR)\proxy_connect.obj"
[EMAIL PROTECTED] "$(INTDIR)\proxy_ftp.obj"
[EMAIL PROTECTED] "$(INTDIR)\proxy_http.obj"
[EMAIL PROTECTED] "$(INTDIR)\proxy_util.obj"
+ [EMAIL PROTECTED] "$(INTDIR)\vc50.idb"
[EMAIL PROTECTED] "$(OUTDIR)\ApacheModuleProxy.dll"
[EMAIL PROTECTED] "$(OUTDIR)\ApacheModuleProxy.exp"
[EMAIL PROTECTED] "$(OUTDIR)\ApacheModuleProxy.lib"
@@ -70,33 +67,23 @@
"$(OUTDIR)" :
if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
-# ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS"
/YX /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\.." /I "..\..\regex" /D "WIN32" /D
"NDEBUG" /D "_WINDOWS" /YX /c
-CPP_PROJ=/nologo /MD /W3 /GX /O2 /I "..\.." /I "..\..\regex" /D "WIN32" /D\
- "NDEBUG" /D "_WINDOWS" /Fp"$(INTDIR)/ApacheModuleProxy.pch" /YX
/Fo"$(INTDIR)/"\
- /c
+CPP_PROJ=/nologo /MD /W3 /GX /O2 /I "..\..\core" /I "..\..\regex" /D "WIN32"
/D\
+ "NDEBUG" /D "_WINDOWS" /Fp"$(INTDIR)\ApacheModuleProxy.pch" /YX\
+ /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c
CPP_OBJS=.\Release/
-CPP_SBRS=.\.
-# ADD BASE MTL /nologo /D "NDEBUG" /win32
-# ADD MTL /nologo /D "NDEBUG" /win32
-MTL_PROJ=/nologo /D "NDEBUG" /win32
-# ADD BASE RSC /l 0x809 /d "NDEBUG"
-# ADD RSC /l 0x809 /d "NDEBUG"
+CPP_SBRS=.
+MTL_PROJ=/nologo /D "NDEBUG" /mktyplib203 /win32
BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-BSC32_FLAGS=/nologo /o"$(OUTDIR)/ApacheModuleProxy.bsc"
+BSC32_FLAGS=/nologo /o"$(OUTDIR)\ApacheModuleProxy.bsc"
BSC32_SBRS= \
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
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"\
- /implib:"$(OUTDIR)/ApacheModuleProxy.lib"
+ /incremental:no /pdb:"$(OUTDIR)\ApacheModuleProxy.pdb" /machine:I386\
+ /out:"$(OUTDIR)\ApacheModuleProxy.dll"\
+ /implib:"$(OUTDIR)\ApacheModuleProxy.lib"
LINK32_OBJS= \
"$(INTDIR)\mod_proxy.obj" \
"$(INTDIR)\proxy_cache.obj" \
@@ -112,30 +99,31 @@
!ELSEIF "$(CFG)" == "ApacheModuleProxy - Win32 Debug"
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "ApacheM0"
-# PROP BASE Intermediate_Dir "ApacheM0"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "Debug"
-# PROP Intermediate_Dir "Debug"
-# PROP Target_Dir ""
OUTDIR=.\Debug
INTDIR=.\Debug
+# Begin Custom Macros
+OutDir=.\.\Debug
+# End Custom Macros
+
+!IF "$(RECURSE)" == "0"
+
+ALL : "$(OUTDIR)\ApacheModuleProxy.dll"
+
+!ELSE
ALL : "$(OUTDIR)\ApacheModuleProxy.dll"
-CLEAN :
+!ENDIF
+
+CLEAN :
[EMAIL PROTECTED] "$(INTDIR)\mod_proxy.obj"
[EMAIL PROTECTED] "$(INTDIR)\proxy_cache.obj"
[EMAIL PROTECTED] "$(INTDIR)\proxy_connect.obj"
[EMAIL PROTECTED] "$(INTDIR)\proxy_ftp.obj"
[EMAIL PROTECTED] "$(INTDIR)\proxy_http.obj"
[EMAIL PROTECTED] "$(INTDIR)\proxy_util.obj"
- [EMAIL PROTECTED] "$(INTDIR)\vc40.idb"
- [EMAIL PROTECTED] "$(INTDIR)\vc40.pdb"
+ [EMAIL PROTECTED] "$(INTDIR)\vc50.idb"
+ [EMAIL PROTECTED] "$(INTDIR)\vc50.pdb"
[EMAIL PROTECTED] "$(OUTDIR)\ApacheModuleProxy.dll"
[EMAIL PROTECTED] "$(OUTDIR)\ApacheModuleProxy.exp"
[EMAIL PROTECTED] "$(OUTDIR)\ApacheModuleProxy.ilk"
@@ -145,33 +133,23 @@
"$(OUTDIR)" :
if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
-# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D
"_WINDOWS" /YX /c
-# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\.." /I "..\..\regex" /D
"WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /c
-CPP_PROJ=/nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\.." /I "..\..\regex" /D\
- "WIN32" /D "_DEBUG" /D "_WINDOWS" /Fp"$(INTDIR)/ApacheModuleProxy.pch" /YX\
- /Fo"$(INTDIR)/" /Fd"$(INTDIR)/" /c
+CPP_PROJ=/nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\core" /I "..\..\regex"
/D\
+ "WIN32" /D "_DEBUG" /D "_WINDOWS" /Fp"$(INTDIR)\ApacheModuleProxy.pch" /YX\
+ /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c
CPP_OBJS=.\Debug/
-CPP_SBRS=.\.
-# ADD BASE MTL /nologo /D "_DEBUG" /win32
-# ADD MTL /nologo /D "_DEBUG" /win32
-MTL_PROJ=/nologo /D "_DEBUG" /win32
-# ADD BASE RSC /l 0x809 /d "_DEBUG"
-# ADD RSC /l 0x809 /d "_DEBUG"
+CPP_SBRS=.
+MTL_PROJ=/nologo /D "_DEBUG" /mktyplib203 /win32
BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-BSC32_FLAGS=/nologo /o"$(OUTDIR)/ApacheModuleProxy.bsc"
+BSC32_FLAGS=/nologo /o"$(OUTDIR)\ApacheModuleProxy.bsc"
BSC32_SBRS= \
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
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"\
- /implib:"$(OUTDIR)/ApacheModuleProxy.lib"
+ /incremental:yes /pdb:"$(OUTDIR)\ApacheModuleProxy.pdb" /debug
/machine:I386\
+ /out:"$(OUTDIR)\ApacheModuleProxy.dll"\
+ /implib:"$(OUTDIR)\ApacheModuleProxy.lib"
LINK32_OBJS= \
"$(INTDIR)\mod_proxy.obj" \
"$(INTDIR)\proxy_cache.obj" \
@@ -187,161 +165,147 @@
!ENDIF
-.c{$(CPP_OBJS)}.obj:
- $(CPP) $(CPP_PROJ) $<
+.c{$(CPP_OBJS)}.obj::
+ $(CPP) @<<
+ $(CPP_PROJ) $<
+<<
-.cpp{$(CPP_OBJS)}.obj:
- $(CPP) $(CPP_PROJ) $<
+.cpp{$(CPP_OBJS)}.obj::
+ $(CPP) @<<
+ $(CPP_PROJ) $<
+<<
-.cxx{$(CPP_OBJS)}.obj:
- $(CPP) $(CPP_PROJ) $<
+.cxx{$(CPP_OBJS)}.obj::
+ $(CPP) @<<
+ $(CPP_PROJ) $<
+<<
-.c{$(CPP_SBRS)}.sbr:
- $(CPP) $(CPP_PROJ) $<
+.c{$(CPP_SBRS)}.sbr::
+ $(CPP) @<<
+ $(CPP_PROJ) $<
+<<
-.cpp{$(CPP_SBRS)}.sbr:
- $(CPP) $(CPP_PROJ) $<
+.cpp{$(CPP_SBRS)}.sbr::
+ $(CPP) @<<
+ $(CPP_PROJ) $<
+<<
-.cxx{$(CPP_SBRS)}.sbr:
- $(CPP) $(CPP_PROJ) $<
+.cxx{$(CPP_SBRS)}.sbr::
+ $(CPP) @<<
+ $(CPP_PROJ) $<
+<<
-################################################################################
-# Begin Target
-# Name "ApacheModuleProxy - Win32 Release"
-# Name "ApacheModuleProxy - Win32 Debug"
+!IF "$(CFG)" == "ApacheModuleProxy - Win32 Release" || "$(CFG)" ==\
+ "ApacheModuleProxy - Win32 Debug"
+SOURCE=.\mod_proxy.c
!IF "$(CFG)" == "ApacheModuleProxy - Win32 Release"
-!ELSEIF "$(CFG)" == "ApacheModuleProxy - Win32 Debug"
-
-!ENDIF
-
-################################################################################
-# Begin Source File
-
-SOURCE=.\proxy_util.c
-DEP_CPP_PROXY=\
- "..\..\alloc.h"\
- "..\..\buff.h"\
- "..\..\conf.h"\
- "..\..\explain.h"\
- "..\..\http_config.h"\
- "..\..\http_log.h"\
- "..\..\http_main.h"\
- "..\..\http_protocol.h"\
- "..\..\httpd.h"\
- "..\..\md5.h"\
- "..\..\multithread.h"\
- "..\..\nt\readdir.h"\
+DEP_CPP_MOD_P=\
+ "..\..\core\alloc.h"\
+ "..\..\core\buff.h"\
+ "..\..\core\conf.h"\
+ "..\..\core\explain.h"\
+ "..\..\core\http_config.h"\
+ "..\..\core\http_log.h"\
+ "..\..\core\http_protocol.h"\
+ "..\..\core\httpd.h"\
+ "..\..\os\win32\readdir.h"\
"..\..\regex\regex.h"\
".\mod_proxy.h"\
- {$(INCLUDE)}"\sys\stat.h"\
- {$(INCLUDE)}"\sys\types.h"\
-
-NODEP_CPP_PROXY=\
- "..\..\sfio.h"\
-"$(INTDIR)\proxy_util.obj" : $(SOURCE) $(DEP_CPP_PROXY) "$(INTDIR)"
+"$(INTDIR)\mod_proxy.obj" : $(SOURCE) $(DEP_CPP_MOD_P) "$(INTDIR)"
+
+
+!ELSEIF "$(CFG)" == "ApacheModuleProxy - Win32 Debug"
+
+"$(INTDIR)\mod_proxy.obj" : $(SOURCE) "$(INTDIR)"
-# End Source File
-################################################################################
-# Begin Source File
+
+!ENDIF
SOURCE=.\proxy_cache.c
!IF "$(CFG)" == "ApacheModuleProxy - Win32 Release"
-DEP_CPP_PROXY_=\
- "..\..\conf.h"\
- "..\..\http_log.h"\
- "..\..\http_main.h"\
- "..\..\httpd.h"\
- "..\..\md5.h"\
- "..\..\multithread.h"\
- "..\..\util_date.h"\
+DEP_CPP_PROXY=\
+ "..\..\core\alloc.h"\
+ "..\..\core\buff.h"\
+ "..\..\core\conf.h"\
+ "..\..\core\explain.h"\
+ "..\..\core\http_config.h"\
+ "..\..\core\http_log.h"\
+ "..\..\core\http_main.h"\
+ "..\..\core\http_protocol.h"\
+ "..\..\core\httpd.h"\
+ "..\..\core\md5.h"\
+ "..\..\core\multithread.h"\
+ "..\..\core\util_date.h"\
+ "..\..\os\win32\readdir.h"\
+ "..\..\regex\regex.h"\
".\mod_proxy.h"\
- {$(INCLUDE)}"\sys\types.h"\
- {$(INCLUDE)}"\sys\utime.h"\
-"$(INTDIR)\proxy_cache.obj" : $(SOURCE) $(DEP_CPP_PROXY_) "$(INTDIR)"
+"$(INTDIR)\proxy_cache.obj" : $(SOURCE) $(DEP_CPP_PROXY) "$(INTDIR)"
!ELSEIF "$(CFG)" == "ApacheModuleProxy - Win32 Debug"
-DEP_CPP_PROXY_=\
- "..\..\alloc.h"\
- "..\..\buff.h"\
- "..\..\conf.h"\
- "..\..\explain.h"\
- "..\..\http_config.h"\
- "..\..\http_log.h"\
- "..\..\http_main.h"\
- "..\..\http_protocol.h"\
- "..\..\httpd.h"\
- "..\..\md5.h"\
- "..\..\multithread.h"\
- "..\..\nt\readdir.h"\
- "..\..\regex\regex.h"\
- "..\..\util_date.h"\
- ".\mod_proxy.h"\
- {$(INCLUDE)}"\sys\stat.h"\
- {$(INCLUDE)}"\sys\types.h"\
- {$(INCLUDE)}"\sys\utime.h"\
-
-NODEP_CPP_PROXY_=\
- "..\..\sfio.h"\
-
-"$(INTDIR)\proxy_cache.obj" : $(SOURCE) $(DEP_CPP_PROXY_) "$(INTDIR)"
+"$(INTDIR)\proxy_cache.obj" : $(SOURCE) "$(INTDIR)"
!ENDIF
-# End Source File
-################################################################################
-# Begin Source File
-
SOURCE=.\proxy_connect.c
-DEP_CPP_PROXY_C=\
- "..\..\alloc.h"\
- "..\..\buff.h"\
- "..\..\conf.h"\
- "..\..\explain.h"\
- "..\..\http_config.h"\
- "..\..\http_log.h"\
- "..\..\http_main.h"\
- "..\..\http_protocol.h"\
- "..\..\httpd.h"\
- "..\..\nt\readdir.h"\
+
+!IF "$(CFG)" == "ApacheModuleProxy - Win32 Release"
+
+DEP_CPP_PROXY_=\
+ "..\..\core\alloc.h"\
+ "..\..\core\buff.h"\
+ "..\..\core\conf.h"\
+ "..\..\core\explain.h"\
+ "..\..\core\http_config.h"\
+ "..\..\core\http_log.h"\
+ "..\..\core\http_main.h"\
+ "..\..\core\http_protocol.h"\
+ "..\..\core\httpd.h"\
+ "..\..\os\win32\readdir.h"\
"..\..\regex\regex.h"\
".\mod_proxy.h"\
- {$(INCLUDE)}"\sys\stat.h"\
- {$(INCLUDE)}"\sys\types.h"\
-
-NODEP_CPP_PROXY_C=\
- "..\..\sfio.h"\
-"$(INTDIR)\proxy_connect.obj" : $(SOURCE) $(DEP_CPP_PROXY_C) "$(INTDIR)"
+"$(INTDIR)\proxy_connect.obj" : $(SOURCE) $(DEP_CPP_PROXY_) "$(INTDIR)"
+
+!ELSEIF "$(CFG)" == "ApacheModuleProxy - Win32 Debug"
-# End Source File
-################################################################################
-# Begin Source File
+
+"$(INTDIR)\proxy_connect.obj" : $(SOURCE) "$(INTDIR)"
+
+
+!ENDIF
SOURCE=.\proxy_ftp.c
!IF "$(CFG)" == "ApacheModuleProxy - Win32 Release"
DEP_CPP_PROXY_F=\
- "..\..\conf.h"\
- "..\..\http_main.h"\
- "..\..\httpd.h"\
- "..\..\mod_mime.h"\
+ "..\..\core\alloc.h"\
+ "..\..\core\buff.h"\
+ "..\..\core\conf.h"\
+ "..\..\core\explain.h"\
+ "..\..\core\http_config.h"\
+ "..\..\core\http_main.h"\
+ "..\..\core\http_protocol.h"\
+ "..\..\core\httpd.h"\
+ "..\..\os\win32\readdir.h"\
+ "..\..\regex\regex.h"\
+ "..\standard\mod_mime.h"\
".\mod_proxy.h"\
@@ -350,47 +314,30 @@
!ELSEIF "$(CFG)" == "ApacheModuleProxy - Win32 Debug"
-DEP_CPP_PROXY_F=\
- "..\..\alloc.h"\
- "..\..\buff.h"\
- "..\..\conf.h"\
- "..\..\explain.h"\
- "..\..\http_config.h"\
- "..\..\http_main.h"\
- "..\..\http_protocol.h"\
- "..\..\httpd.h"\
- "..\..\mod_mime.h"\
- "..\..\nt\readdir.h"\
- "..\..\regex\regex.h"\
- ".\mod_proxy.h"\
- {$(INCLUDE)}"\sys\stat.h"\
- {$(INCLUDE)}"\sys\types.h"\
-
-NODEP_CPP_PROXY_F=\
- "..\..\sfio.h"\
-
-"$(INTDIR)\proxy_ftp.obj" : $(SOURCE) $(DEP_CPP_PROXY_F) "$(INTDIR)"
+"$(INTDIR)\proxy_ftp.obj" : $(SOURCE) "$(INTDIR)"
!ENDIF
-# End Source File
-################################################################################
-# Begin Source File
-
SOURCE=.\proxy_http.c
!IF "$(CFG)" == "ApacheModuleProxy - Win32 Release"
DEP_CPP_PROXY_H=\
- "..\..\conf.h"\
- "..\..\http_log.h"\
- "..\..\http_main.h"\
- "..\..\httpd.h"\
- "..\..\util_date.h"\
+ "..\..\core\alloc.h"\
+ "..\..\core\buff.h"\
+ "..\..\core\conf.h"\
+ "..\..\core\explain.h"\
+ "..\..\core\http_config.h"\
+ "..\..\core\http_log.h"\
+ "..\..\core\http_main.h"\
+ "..\..\core\http_protocol.h"\
+ "..\..\core\httpd.h"\
+ "..\..\core\util_date.h"\
+ "..\..\os\win32\readdir.h"\
+ "..\..\regex\regex.h"\
".\mod_proxy.h"\
- {$(INCLUDE)}"\sys\types.h"\
"$(INTDIR)\proxy_http.obj" : $(SOURCE) $(DEP_CPP_PROXY_H) "$(INTDIR)"
@@ -398,80 +345,44 @@
!ELSEIF "$(CFG)" == "ApacheModuleProxy - Win32 Debug"
-DEP_CPP_PROXY_H=\
- "..\..\alloc.h"\
- "..\..\buff.h"\
- "..\..\conf.h"\
- "..\..\explain.h"\
- "..\..\http_config.h"\
- "..\..\http_log.h"\
- "..\..\http_main.h"\
- "..\..\http_protocol.h"\
- "..\..\httpd.h"\
- "..\..\nt\readdir.h"\
- "..\..\regex\regex.h"\
- "..\..\util_date.h"\
- ".\mod_proxy.h"\
- {$(INCLUDE)}"\sys\stat.h"\
- {$(INCLUDE)}"\sys\types.h"\
-
-NODEP_CPP_PROXY_H=\
- "..\..\sfio.h"\
-
-"$(INTDIR)\proxy_http.obj" : $(SOURCE) $(DEP_CPP_PROXY_H) "$(INTDIR)"
+"$(INTDIR)\proxy_http.obj" : $(SOURCE) "$(INTDIR)"
!ENDIF
-# End Source File
-################################################################################
-# Begin Source File
-
-SOURCE=.\mod_proxy.c
+SOURCE=.\proxy_util.c
!IF "$(CFG)" == "ApacheModuleProxy - Win32 Release"
-DEP_CPP_MOD_P=\
- "..\..\conf.h"\
- "..\..\explain.h"\
- "..\..\http_config.h"\
- "..\..\http_log.h"\
- "..\..\http_protocol.h"\
- "..\..\httpd.h"\
+DEP_CPP_PROXY_U=\
+ "..\..\core\alloc.h"\
+ "..\..\core\buff.h"\
+ "..\..\core\conf.h"\
+ "..\..\core\explain.h"\
+ "..\..\core\http_config.h"\
+ "..\..\core\http_log.h"\
+ "..\..\core\http_main.h"\
+ "..\..\core\http_protocol.h"\
+ "..\..\core\httpd.h"\
+ "..\..\core\md5.h"\
+ "..\..\core\multithread.h"\
+ "..\..\os\win32\readdir.h"\
+ "..\..\regex\regex.h"\
".\mod_proxy.h"\
-"$(INTDIR)\mod_proxy.obj" : $(SOURCE) $(DEP_CPP_MOD_P) "$(INTDIR)"
+"$(INTDIR)\proxy_util.obj" : $(SOURCE) $(DEP_CPP_PROXY_U) "$(INTDIR)"
!ELSEIF "$(CFG)" == "ApacheModuleProxy - Win32 Debug"
-DEP_CPP_MOD_P=\
- "..\..\alloc.h"\
- "..\..\buff.h"\
- "..\..\conf.h"\
- "..\..\explain.h"\
- "..\..\http_config.h"\
- "..\..\http_log.h"\
- "..\..\http_protocol.h"\
- "..\..\httpd.h"\
- "..\..\nt\readdir.h"\
- "..\..\regex\regex.h"\
- ".\mod_proxy.h"\
- {$(INCLUDE)}"\sys\stat.h"\
- {$(INCLUDE)}"\sys\types.h"\
-
-NODEP_CPP_MOD_P=\
- "..\..\sfio.h"\
-
-"$(INTDIR)\mod_proxy.obj" : $(SOURCE) $(DEP_CPP_MOD_P) "$(INTDIR)"
+"$(INTDIR)\proxy_util.obj" : $(SOURCE) "$(INTDIR)"
+
+
+!ENDIF
!ENDIF
-# End Source File
-# End Target
-# End Project
-################################################################################
1.31 +1 -1 apachen/src/modules/proxy/proxy_ftp.c
Index: proxy_ftp.c
===================================================================
RCS file: /export/home/cvs/apachen/src/modules/proxy/proxy_ftp.c,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -r1.30 -r1.31
--- proxy_ftp.c 1997/08/02 00:58:34 1.30
+++ proxy_ftp.c 1997/08/13 08:37:21 1.31
@@ -54,7 +54,7 @@
#include "mod_proxy.h"
#include "http_main.h"
-#include "mod_mime.h"
+#include "..\..\modules\standard\mod_mime.h"
/*
* Decodes a '%' escaped string, and returns the number of characters
1.2 +7 -5 apachen/src/os/win32/ApacheModuleAuthAnon.dsp
Index: ApacheModuleAuthAnon.dsp
===================================================================
RCS file: /export/home/cvs/apachen/src/os/win32/ApacheModuleAuthAnon.dsp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ApacheModuleAuthAnon.dsp 1997/07/20 12:31:12 1.1
+++ ApacheModuleAuthAnon.dsp 1997/08/13 08:37:25 1.2
@@ -42,9 +42,10 @@
# PROP Use_Debug_Libraries 0
# PROP Output_Dir ".\ApacheModuleAuthAnonR"
# PROP Intermediate_Dir ".\ApacheModuleAuthAnonR"
+# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS"
/YX /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\regex" /D "WIN32" /D "NDEBUG" /D
"_WINDOWS" /YX /FD /c
+# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\regex" /I "..\..\core" /D
"WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c
# ADD BASE MTL /nologo /D "NDEBUG" /win32
# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
# ADD BASE RSC /l 0x809 /d "NDEBUG"
@@ -54,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 ole32.lib oleaut32.lib
uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /dll /machine:I386
!ELSEIF "$(CFG)" == "ApacheModuleAuthAnon - Win32 Debug"
@@ -67,9 +68,10 @@
# PROP Use_Debug_Libraries 1
# PROP Output_Dir ".\ApacheModuleAuthAnonD"
# PROP Intermediate_Dir ".\ApacheModuleAuthAnonD"
+# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D
"_WINDOWS" /YX /c
-# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\regex" /D "WIN32" /D
"_DEBUG" /D "_WINDOWS" /YX /FD /c
+# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\regex" /I "..\..\core"
/D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c
# ADD BASE MTL /nologo /D "_DEBUG" /win32
# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
# ADD BASE RSC /l 0x809 /d "_DEBUG"
@@ -79,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 ole32.lib oleaut32.lib
uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /dll /debug
/machine:I386
!ENDIF
@@ -92,7 +94,7 @@
# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;hpj;bat;for;f90"
# Begin Source File
-SOURCE=..\mod_auth_anon.c
+SOURCE=..\..\modules\standard\mod_auth_anon.c
# End Source File
# End Group
# Begin Group "Header Files"
1.4 +48 -22 apachen/src/os/win32/ApacheModuleAuthAnon.mak
Index: ApacheModuleAuthAnon.mak
===================================================================
RCS file: /export/home/cvs/apachen/src/os/win32/ApacheModuleAuthAnon.mak,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- ApacheModuleAuthAnon.mak 1997/07/20 12:31:12 1.3
+++ ApacheModuleAuthAnon.mak 1997/08/13 08:37:25 1.4
@@ -54,6 +54,7 @@
CLEAN :
[EMAIL PROTECTED] "$(INTDIR)\mod_auth_anon.obj"
+ [EMAIL PROTECTED] "$(INTDIR)\vc50.idb"
[EMAIL PROTECTED] "$(OUTDIR)\ApacheModuleAuthAnon.dll"
[EMAIL PROTECTED] "$(OUTDIR)\ApacheModuleAuthAnon.exp"
[EMAIL PROTECTED] "$(OUTDIR)\ApacheModuleAuthAnon.lib"
@@ -61,9 +62,9 @@
"$(OUTDIR)" :
if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
-CPP_PROJ=/nologo /MD /W3 /GX /O2 /I "..\regex" /D "WIN32" /D "NDEBUG" /D\
- "_WINDOWS" /Fp"$(INTDIR)\ApacheModuleAuthAnon.pch" /YX /Fo"$(INTDIR)\\"\
- /Fd"$(INTDIR)\\" /FD /c
+CPP_PROJ=/nologo /MD /W3 /GX /O2 /I "..\..\regex" /I "..\..\core" /D "WIN32"
/D\
+ "NDEBUG" /D "_WINDOWS" /Fp"$(INTDIR)\ApacheModuleAuthAnon.pch" /YX\
+ /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c
CPP_OBJS=.\ApacheModuleAuthAnonR/
CPP_SBRS=.
MTL_PROJ=/nologo /D "NDEBUG" /mktyplib203 /win32
@@ -72,7 +73,7 @@
BSC32_SBRS= \
LINK32=link.exe
-LINK32_FLAGS=..\CoreR\ApacheCore.lib kernel32.lib user32.lib gdi32.lib\
+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\
@@ -117,9 +118,9 @@
"$(OUTDIR)" :
if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
-CPP_PROJ=/nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\regex" /D "WIN32" /D
"_DEBUG"\
- /D "_WINDOWS" /Fp"$(INTDIR)\ApacheModuleAuthAnon.pch" /YX /Fo"$(INTDIR)\\"\
- /Fd"$(INTDIR)\\" /FD /c
+CPP_PROJ=/nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\regex" /I "..\..\core"
/D\
+ "WIN32" /D "_DEBUG" /D "_WINDOWS" /Fp"$(INTDIR)\ApacheModuleAuthAnon.pch"
/YX\
+ /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c
CPP_OBJS=.\ApacheModuleAuthAnonD/
CPP_SBRS=.
MTL_PROJ=/nologo /D "_DEBUG" /mktyplib203 /win32
@@ -128,7 +129,7 @@
BSC32_SBRS= \
LINK32=link.exe
-LINK32_FLAGS=..\CoreD\ApacheCore.lib kernel32.lib user32.lib gdi32.lib\
+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\
@@ -177,29 +178,54 @@
!IF "$(CFG)" == "ApacheModuleAuthAnon - Win32 Release" || "$(CFG)" ==\
"ApacheModuleAuthAnon - Win32 Debug"
-SOURCE=..\mod_auth_anon.c
+SOURCE=..\..\modules\standard\mod_auth_anon.c
+
+!IF "$(CFG)" == "ApacheModuleAuthAnon - Win32 Release"
+
DEP_CPP_MOD_A=\
- "..\alloc.h"\
- "..\buff.h"\
- "..\conf.h"\
- "..\http_config.h"\
- "..\http_core.h"\
- "..\http_log.h"\
- "..\http_protocol.h"\
- "..\http_request.h"\
- "..\httpd.h"\
- "..\regex\regex.h"\
+ "..\..\core\alloc.h"\
+ "..\..\core\buff.h"\
+ "..\..\core\conf.h"\
+ "..\..\core\http_config.h"\
+ "..\..\core\http_core.h"\
+ "..\..\core\http_log.h"\
+ "..\..\core\http_protocol.h"\
+ "..\..\core\http_request.h"\
+ "..\..\core\httpd.h"\
+ "..\..\regex\regex.h"\
".\readdir.h"\
- {$(INCLUDE)}"sys\STAT.H"\
- {$(INCLUDE)}"sys\TYPES.H"\
+
+
+"$(INTDIR)\mod_auth_anon.obj" : $(SOURCE) $(DEP_CPP_MOD_A) "$(INTDIR)"
+ $(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+!ELSEIF "$(CFG)" == "ApacheModuleAuthAnon - Win32 Debug"
+
+DEP_CPP_MOD_A=\
+ "..\..\core\alloc.h"\
+ "..\..\core\buff.h"\
+ "..\..\core\conf.h"\
+ "..\..\core\http_config.h"\
+ "..\..\core\http_core.h"\
+ "..\..\core\http_log.h"\
+ "..\..\core\http_protocol.h"\
+ "..\..\core\http_request.h"\
+ "..\..\core\httpd.h"\
+ "..\..\regex\regex.h"\
+ ".\readdir.h"\
+ {$(INCLUDE)}"sys\stat.h"\
+ {$(INCLUDE)}"sys\types.h"\
NODEP_CPP_MOD_A=\
- "..\sfio.h"\
+ "..\..\core\sfio.h"\
"$(INTDIR)\mod_auth_anon.obj" : $(SOURCE) $(DEP_CPP_MOD_A) "$(INTDIR)"
$(CPP) $(CPP_PROJ) $(SOURCE)
+
+!ENDIF
!ENDIF
1.2 +7 -5 apachen/src/os/win32/ApacheModuleCERNMeta.dsp
Index: ApacheModuleCERNMeta.dsp
===================================================================
RCS file: /export/home/cvs/apachen/src/os/win32/ApacheModuleCERNMeta.dsp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ApacheModuleCERNMeta.dsp 1997/07/20 12:31:12 1.1
+++ ApacheModuleCERNMeta.dsp 1997/08/13 08:37:25 1.2
@@ -42,9 +42,10 @@
# PROP Use_Debug_Libraries 0
# PROP Output_Dir ".\ApacheModuleCERNMetaR"
# PROP Intermediate_Dir ".\ApacheModuleCERNMetaR"
+# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS"
/YX /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\regex" /D "WIN32" /D "NDEBUG" /D
"_WINDOWS" /YX /FD /c
+# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\regex" /I "..\..\core" /D
"WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c
# ADD BASE MTL /nologo /D "NDEBUG" /win32
# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
# ADD BASE RSC /l 0x809 /d "NDEBUG"
@@ -54,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 ole32.lib oleaut32.lib
uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /dll /machine:I386
!ELSEIF "$(CFG)" == "ApacheModuleCERNMeta - Win32 Debug"
@@ -67,9 +68,10 @@
# PROP Use_Debug_Libraries 1
# PROP Output_Dir ".\ApacheModuleCERNMetaD"
# PROP Intermediate_Dir ".\ApacheModuleCERNMetaD"
+# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D
"_WINDOWS" /YX /c
-# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\regex" /D "WIN32" /D
"_DEBUG" /D "_WINDOWS" /YX /FD /c
+# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\regex" /I "..\..\core"
/D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c
# ADD BASE MTL /nologo /D "_DEBUG" /win32
# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
# ADD BASE RSC /l 0x809 /d "_DEBUG"
@@ -79,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 ole32.lib oleaut32.lib
uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /dll /debug
/machine:I386
!ENDIF
@@ -92,7 +94,7 @@
# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;hpj;bat;for;f90"
# Begin Source File
-SOURCE=..\mod_cern_meta.c
+SOURCE=..\..\modules\standard\mod_cern_meta.c
# End Source File
# End Group
# Begin Group "Header Files"
1.4 +43 -19 apachen/src/os/win32/ApacheModuleCERNMeta.mak
Index: ApacheModuleCERNMeta.mak
===================================================================
RCS file: /export/home/cvs/apachen/src/os/win32/ApacheModuleCERNMeta.mak,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- ApacheModuleCERNMeta.mak 1997/07/20 15:30:04 1.3
+++ ApacheModuleCERNMeta.mak 1997/08/13 08:37:26 1.4
@@ -62,9 +62,9 @@
"$(OUTDIR)" :
if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
-CPP_PROJ=/nologo /MD /W3 /GX /O2 /I "..\regex" /D "WIN32" /D "NDEBUG" /D\
- "_WINDOWS" /Fp"$(INTDIR)\ApacheModuleCERNMeta.pch" /YX /Fo"$(INTDIR)\\"\
- /Fd"$(INTDIR)\\" /FD /c
+CPP_PROJ=/nologo /MD /W3 /GX /O2 /I "..\..\regex" /I "..\..\core" /D "WIN32"
/D\
+ "NDEBUG" /D "_WINDOWS" /Fp"$(INTDIR)\ApacheModuleCERNMeta.pch" /YX\
+ /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c
CPP_OBJS=.\ApacheModuleCERNMetaR/
CPP_SBRS=.
MTL_PROJ=/nologo /D "NDEBUG" /mktyplib203 /win32
@@ -73,7 +73,7 @@
BSC32_SBRS= \
LINK32=link.exe
-LINK32_FLAGS=..\CoreR\ApacheCore.lib kernel32.lib user32.lib gdi32.lib\
+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\
@@ -118,9 +118,9 @@
"$(OUTDIR)" :
if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
-CPP_PROJ=/nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\regex" /D "WIN32" /D
"_DEBUG"\
- /D "_WINDOWS" /Fp"$(INTDIR)\ApacheModuleCERNMeta.pch" /YX /Fo"$(INTDIR)\\"\
- /Fd"$(INTDIR)\\" /FD /c
+CPP_PROJ=/nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\regex" /I "..\..\core"
/D\
+ "WIN32" /D "_DEBUG" /D "_WINDOWS" /Fp"$(INTDIR)\ApacheModuleCERNMeta.pch"
/YX\
+ /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c
CPP_OBJS=.\ApacheModuleCERNMetaD/
CPP_SBRS=.
MTL_PROJ=/nologo /D "_DEBUG" /mktyplib203 /win32
@@ -129,7 +129,7 @@
BSC32_SBRS= \
LINK32=link.exe
-LINK32_FLAGS=..\CoreD\ApacheCore.lib kernel32.lib user32.lib gdi32.lib\
+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\
@@ -178,28 +178,52 @@
!IF "$(CFG)" == "ApacheModuleCERNMeta - Win32 Release" || "$(CFG)" ==\
"ApacheModuleCERNMeta - Win32 Debug"
-SOURCE=..\mod_cern_meta.c
+SOURCE=..\..\modules\standard\mod_cern_meta.c
+
+!IF "$(CFG)" == "ApacheModuleCERNMeta - Win32 Release"
+
+DEP_CPP_MOD_C=\
+ "..\..\core\alloc.h"\
+ "..\..\core\buff.h"\
+ "..\..\core\conf.h"\
+ "..\..\core\http_config.h"\
+ "..\..\core\http_log.h"\
+ "..\..\core\http_request.h"\
+ "..\..\core\httpd.h"\
+ "..\..\core\util_script.h"\
+ "..\..\regex\regex.h"\
+ ".\readdir.h"\
+
+
+"$(INTDIR)\mod_cern_meta.obj" : $(SOURCE) $(DEP_CPP_MOD_C) "$(INTDIR)"
+ $(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+!ELSEIF "$(CFG)" == "ApacheModuleCERNMeta - Win32 Debug"
+
DEP_CPP_MOD_C=\
- "..\alloc.h"\
- "..\buff.h"\
- "..\conf.h"\
- "..\http_config.h"\
- "..\http_log.h"\
- "..\http_request.h"\
- "..\httpd.h"\
- "..\regex\regex.h"\
- "..\util_script.h"\
+ "..\..\core\alloc.h"\
+ "..\..\core\buff.h"\
+ "..\..\core\conf.h"\
+ "..\..\core\http_config.h"\
+ "..\..\core\http_log.h"\
+ "..\..\core\http_request.h"\
+ "..\..\core\httpd.h"\
+ "..\..\core\util_script.h"\
+ "..\..\regex\regex.h"\
".\readdir.h"\
{$(INCLUDE)}"sys\stat.h"\
{$(INCLUDE)}"sys\types.h"\
NODEP_CPP_MOD_C=\
- "..\sfio.h"\
+ "..\..\core\sfio.h"\
"$(INTDIR)\mod_cern_meta.obj" : $(SOURCE) $(DEP_CPP_MOD_C) "$(INTDIR)"
$(CPP) $(CPP_PROJ) $(SOURCE)
+
+!ENDIF
!ENDIF
1.2 +7 -5 apachen/src/os/win32/ApacheModuleDigest.dsp
Index: ApacheModuleDigest.dsp
===================================================================
RCS file: /export/home/cvs/apachen/src/os/win32/ApacheModuleDigest.dsp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ApacheModuleDigest.dsp 1997/07/20 12:31:12 1.1
+++ ApacheModuleDigest.dsp 1997/08/13 08:37:26 1.2
@@ -42,9 +42,10 @@
# PROP Use_Debug_Libraries 0
# PROP Output_Dir ".\ApacheModuleDigestR"
# PROP Intermediate_Dir ".\ApacheModuleDigestR"
+# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS"
/YX /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\regex" /D "WIN32" /D "NDEBUG" /D
"_WINDOWS" /YX /FD /c
+# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\regex" /I "..\..\core" /D
"WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c
# ADD BASE MTL /nologo /D "NDEBUG" /win32
# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
# ADD BASE RSC /l 0x809 /d "NDEBUG"
@@ -54,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 ole32.lib oleaut32.lib
uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /dll /machine:I386
!ELSEIF "$(CFG)" == "ApacheModuleDigest - Win32 Debug"
@@ -67,9 +68,10 @@
# PROP Use_Debug_Libraries 1
# PROP Output_Dir ".\ApacheModuleDigestD"
# PROP Intermediate_Dir ".\ApacheModuleDigestD"
+# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D
"_WINDOWS" /YX /c
-# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\regex" /D "WIN32" /D
"_DEBUG" /D "_WINDOWS" /YX /FD /c
+# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\regex" /I "..\..\core"
/D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c
# ADD BASE MTL /nologo /D "_DEBUG" /win32
# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
# ADD BASE RSC /l 0x809 /d "_DEBUG"
@@ -79,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 ole32.lib oleaut32.lib
uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /dll /debug
/machine:I386
!ENDIF
@@ -92,7 +94,7 @@
# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;hpj;bat;for;f90"
# Begin Source File
-SOURCE=..\mod_digest.c
+SOURCE=..\..\modules\standard\mod_digest.c
# End Source File
# End Group
# Begin Group "Header Files"
1.4 +48 -21 apachen/src/os/win32/ApacheModuleDigest.mak
Index: ApacheModuleDigest.mak
===================================================================
RCS file: /export/home/cvs/apachen/src/os/win32/ApacheModuleDigest.mak,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- ApacheModuleDigest.mak 1997/07/20 12:31:13 1.3
+++ ApacheModuleDigest.mak 1997/08/13 08:37:27 1.4
@@ -54,6 +54,7 @@
CLEAN :
[EMAIL PROTECTED] "$(INTDIR)\mod_digest.obj"
+ [EMAIL PROTECTED] "$(INTDIR)\vc50.idb"
[EMAIL PROTECTED] "$(OUTDIR)\ApacheModuleDigest.dll"
[EMAIL PROTECTED] "$(OUTDIR)\ApacheModuleDigest.exp"
[EMAIL PROTECTED] "$(OUTDIR)\ApacheModuleDigest.lib"
@@ -61,9 +62,9 @@
"$(OUTDIR)" :
if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
-CPP_PROJ=/nologo /MD /W3 /GX /O2 /I "..\regex" /D "WIN32" /D "NDEBUG" /D\
- "_WINDOWS" /Fp"$(INTDIR)\ApacheModuleDigest.pch" /YX /Fo"$(INTDIR)\\"\
- /Fd"$(INTDIR)\\" /FD /c
+CPP_PROJ=/nologo /MD /W3 /GX /O2 /I "..\..\regex" /I "..\..\core" /D "WIN32"
/D\
+ "NDEBUG" /D "_WINDOWS" /Fp"$(INTDIR)\ApacheModuleDigest.pch" /YX\
+ /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c
CPP_OBJS=.\ApacheModuleDigestR/
CPP_SBRS=.
MTL_PROJ=/nologo /D "NDEBUG" /mktyplib203 /win32
@@ -72,7 +73,7 @@
BSC32_SBRS= \
LINK32=link.exe
-LINK32_FLAGS=..\CoreR\ApacheCore.lib kernel32.lib user32.lib gdi32.lib\
+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\
@@ -117,9 +118,9 @@
"$(OUTDIR)" :
if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
-CPP_PROJ=/nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\regex" /D "WIN32" /D
"_DEBUG"\
- /D "_WINDOWS" /Fp"$(INTDIR)\ApacheModuleDigest.pch" /YX /Fo"$(INTDIR)\\"\
- /Fd"$(INTDIR)\\" /FD /c
+CPP_PROJ=/nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\regex" /I "..\..\core"
/D\
+ "WIN32" /D "_DEBUG" /D "_WINDOWS" /Fp"$(INTDIR)\ApacheModuleDigest.pch" /YX\
+ /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c
CPP_OBJS=.\ApacheModuleDigestD/
CPP_SBRS=.
MTL_PROJ=/nologo /D "_DEBUG" /mktyplib203 /win32
@@ -128,7 +129,7 @@
BSC32_SBRS= \
LINK32=link.exe
-LINK32_FLAGS=..\CoreD\ApacheCore.lib kernel32.lib user32.lib gdi32.lib\
+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\
@@ -177,30 +178,56 @@
!IF "$(CFG)" == "ApacheModuleDigest - Win32 Release" || "$(CFG)" ==\
"ApacheModuleDigest - Win32 Debug"
-SOURCE=..\mod_digest.c
+SOURCE=..\..\modules\standard\mod_digest.c
+
+!IF "$(CFG)" == "ApacheModuleDigest - Win32 Release"
+
DEP_CPP_MOD_D=\
- "..\alloc.h"\
- "..\buff.h"\
- "..\conf.h"\
- "..\http_config.h"\
- "..\http_core.h"\
- "..\http_log.h"\
- "..\http_protocol.h"\
- "..\httpd.h"\
- "..\md5.h"\
- "..\regex\regex.h"\
- "..\util_md5.h"\
+ "..\..\core\alloc.h"\
+ "..\..\core\buff.h"\
+ "..\..\core\conf.h"\
+ "..\..\core\http_config.h"\
+ "..\..\core\http_core.h"\
+ "..\..\core\http_log.h"\
+ "..\..\core\http_protocol.h"\
+ "..\..\core\httpd.h"\
+ "..\..\core\md5.h"\
+ "..\..\core\util_md5.h"\
+ "..\..\regex\regex.h"\
+ ".\readdir.h"\
+
+
+"$(INTDIR)\mod_digest.obj" : $(SOURCE) $(DEP_CPP_MOD_D) "$(INTDIR)"
+ $(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+!ELSEIF "$(CFG)" == "ApacheModuleDigest - Win32 Debug"
+
+DEP_CPP_MOD_D=\
+ "..\..\core\alloc.h"\
+ "..\..\core\buff.h"\
+ "..\..\core\conf.h"\
+ "..\..\core\http_config.h"\
+ "..\..\core\http_core.h"\
+ "..\..\core\http_log.h"\
+ "..\..\core\http_protocol.h"\
+ "..\..\core\httpd.h"\
+ "..\..\core\md5.h"\
+ "..\..\core\util_md5.h"\
+ "..\..\regex\regex.h"\
".\readdir.h"\
{$(INCLUDE)}"sys\stat.h"\
{$(INCLUDE)}"sys\types.h"\
NODEP_CPP_MOD_D=\
- "..\sfio.h"\
+ "..\..\core\sfio.h"\
"$(INTDIR)\mod_digest.obj" : $(SOURCE) $(DEP_CPP_MOD_D) "$(INTDIR)"
$(CPP) $(CPP_PROJ) $(SOURCE)
+
+!ENDIF
!ENDIF
1.2 +7 -5 apachen/src/os/win32/ApacheModuleExpires.dsp
Index: ApacheModuleExpires.dsp
===================================================================
RCS file: /export/home/cvs/apachen/src/os/win32/ApacheModuleExpires.dsp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ApacheModuleExpires.dsp 1997/07/20 12:31:13 1.1
+++ ApacheModuleExpires.dsp 1997/08/13 08:37:27 1.2
@@ -42,9 +42,10 @@
# PROP Use_Debug_Libraries 0
# PROP Output_Dir ".\ApacheModuleExpiresR"
# PROP Intermediate_Dir ".\ApacheModuleExpiresR"
+# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS"
/YX /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\regex" /D "WIN32" /D "NDEBUG" /D
"_WINDOWS" /YX /FD /c
+# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\regex" /I "..\..\core" /D
"WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c
# ADD BASE MTL /nologo /D "NDEBUG" /win32
# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
# ADD BASE RSC /l 0x809 /d "NDEBUG"
@@ -54,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 ole32.lib oleaut32.lib
uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /dll /machine:I386
!ELSEIF "$(CFG)" == "ApacheModuleExpires - Win32 Debug"
@@ -67,9 +68,10 @@
# PROP Use_Debug_Libraries 1
# PROP Output_Dir ".\ApacheModuleExpiresD"
# PROP Intermediate_Dir ".\ApacheModuleExpiresD"
+# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D
"_WINDOWS" /YX /c
-# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\regex" /D "WIN32" /D
"_DEBUG" /D "_WINDOWS" /YX /FD /c
+# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\regex" /I "..\..\core"
/D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c
# ADD BASE MTL /nologo /D "_DEBUG" /win32
# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
# ADD BASE RSC /l 0x809 /d "_DEBUG"
@@ -79,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 ole32.lib oleaut32.lib
uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /dll /debug
/machine:I386
!ENDIF
@@ -92,7 +94,7 @@
# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;hpj;bat;for;f90"
# Begin Source File
-SOURCE=..\mod_expires.c
+SOURCE=..\..\modules\standard\mod_expires.c
# End Source File
# End Group
# Begin Group "Header Files"
1.4 +29 -28 apachen/src/os/win32/ApacheModuleExpires.mak
Index: ApacheModuleExpires.mak
===================================================================
RCS file: /export/home/cvs/apachen/src/os/win32/ApacheModuleExpires.mak,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- ApacheModuleExpires.mak 1997/07/20 12:31:13 1.3
+++ ApacheModuleExpires.mak 1997/08/13 08:37:28 1.4
@@ -54,6 +54,7 @@
CLEAN :
[EMAIL PROTECTED] "$(INTDIR)\mod_expires.obj"
+ [EMAIL PROTECTED] "$(INTDIR)\vc50.idb"
[EMAIL PROTECTED] "$(OUTDIR)\ApacheModuleExpires.dll"
[EMAIL PROTECTED] "$(OUTDIR)\ApacheModuleExpires.exp"
[EMAIL PROTECTED] "$(OUTDIR)\ApacheModuleExpires.lib"
@@ -61,9 +62,9 @@
"$(OUTDIR)" :
if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
-CPP_PROJ=/nologo /MD /W3 /GX /O2 /I "..\regex" /D "WIN32" /D "NDEBUG" /D\
- "_WINDOWS" /Fp"$(INTDIR)\ApacheModuleExpires.pch" /YX /Fo"$(INTDIR)\\"\
- /Fd"$(INTDIR)\\" /FD /c
+CPP_PROJ=/nologo /MD /W3 /GX /O2 /I "..\..\regex" /I "..\..\core" /D "WIN32"
/D\
+ "NDEBUG" /D "_WINDOWS" /Fp"$(INTDIR)\ApacheModuleExpires.pch" /YX\
+ /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c
CPP_OBJS=.\ApacheModuleExpiresR/
CPP_SBRS=.
MTL_PROJ=/nologo /D "NDEBUG" /mktyplib203 /win32
@@ -72,7 +73,7 @@
BSC32_SBRS= \
LINK32=link.exe
-LINK32_FLAGS=..\CoreR\ApacheCore.lib kernel32.lib user32.lib gdi32.lib\
+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\
@@ -117,9 +118,9 @@
"$(OUTDIR)" :
if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
-CPP_PROJ=/nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\regex" /D "WIN32" /D
"_DEBUG"\
- /D "_WINDOWS" /Fp"$(INTDIR)\ApacheModuleExpires.pch" /YX /Fo"$(INTDIR)\\"\
- /Fd"$(INTDIR)\\" /FD /c
+CPP_PROJ=/nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\regex" /I "..\..\core"
/D\
+ "WIN32" /D "_DEBUG" /D "_WINDOWS" /Fp"$(INTDIR)\ApacheModuleExpires.pch"
/YX\
+ /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c
CPP_OBJS=.\ApacheModuleExpiresD/
CPP_SBRS=.
MTL_PROJ=/nologo /D "_DEBUG" /mktyplib203 /win32
@@ -128,7 +129,7 @@
BSC32_SBRS= \
LINK32=link.exe
-LINK32_FLAGS=..\CoreD\ApacheCore.lib kernel32.lib user32.lib gdi32.lib\
+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\
@@ -177,24 +178,19 @@
!IF "$(CFG)" == "ApacheModuleExpires - Win32 Release" || "$(CFG)" ==\
"ApacheModuleExpires - Win32 Debug"
-SOURCE=..\mod_expires.c
+SOURCE=..\..\modules\standard\mod_expires.c
!IF "$(CFG)" == "ApacheModuleExpires - Win32 Release"
DEP_CPP_MOD_E=\
- "..\alloc.h"\
- "..\buff.h"\
- "..\conf.h"\
- "..\http_config.h"\
- "..\http_log.h"\
- "..\httpd.h"\
- "..\regex\regex.h"\
+ "..\..\core\alloc.h"\
+ "..\..\core\buff.h"\
+ "..\..\core\conf.h"\
+ "..\..\core\http_config.h"\
+ "..\..\core\http_log.h"\
+ "..\..\core\httpd.h"\
+ "..\..\regex\regex.h"\
".\readdir.h"\
- {$(INCLUDE)}"sys\STAT.H"\
- {$(INCLUDE)}"sys\TYPES.H"\
-
-NODEP_CPP_MOD_E=\
- "..\sfio.h"\
"$(INTDIR)\mod_expires.obj" : $(SOURCE) $(DEP_CPP_MOD_E) "$(INTDIR)"
@@ -204,14 +200,19 @@
!ELSEIF "$(CFG)" == "ApacheModuleExpires - Win32 Debug"
DEP_CPP_MOD_E=\
- "..\alloc.h"\
- "..\buff.h"\
- "..\conf.h"\
- "..\http_config.h"\
- "..\http_log.h"\
- "..\httpd.h"\
- "..\regex\regex.h"\
+ "..\..\core\alloc.h"\
+ "..\..\core\buff.h"\
+ "..\..\core\conf.h"\
+ "..\..\core\http_config.h"\
+ "..\..\core\http_log.h"\
+ "..\..\core\httpd.h"\
+ "..\..\regex\regex.h"\
".\readdir.h"\
+ {$(INCLUDE)}"sys\stat.h"\
+ {$(INCLUDE)}"sys\types.h"\
+
+NODEP_CPP_MOD_E=\
+ "..\..\core\sfio.h"\
"$(INTDIR)\mod_expires.obj" : $(SOURCE) $(DEP_CPP_MOD_E) "$(INTDIR)"
1.2 +7 -5 apachen/src/os/win32/ApacheModuleHeaders.dsp
Index: ApacheModuleHeaders.dsp
===================================================================
RCS file: /export/home/cvs/apachen/src/os/win32/ApacheModuleHeaders.dsp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ApacheModuleHeaders.dsp 1997/07/20 12:31:14 1.1
+++ ApacheModuleHeaders.dsp 1997/08/13 08:37:28 1.2
@@ -42,9 +42,10 @@
# PROP Use_Debug_Libraries 0
# PROP Output_Dir ".\ApacheModuleHeadersR"
# PROP Intermediate_Dir ".\ApacheModuleHeadersR"
+# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS"
/YX /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\regex" /D "WIN32" /D "NDEBUG" /D
"_WINDOWS" /YX /FD /c
+# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\regex" /I "..\..\core" /D
"WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c
# ADD BASE MTL /nologo /D "NDEBUG" /win32
# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
# ADD BASE RSC /l 0x809 /d "NDEBUG"
@@ -54,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 ole32.lib oleaut32.lib
uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /dll /machine:I386
!ELSEIF "$(CFG)" == "ApacheModuleHeaders - Win32 Debug"
@@ -67,9 +68,10 @@
# PROP Use_Debug_Libraries 1
# PROP Output_Dir ".\ApacheModuleHeadersD"
# PROP Intermediate_Dir ".\ApacheModuleHeadersD"
+# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D
"_WINDOWS" /YX /c
-# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\regex" /D "WIN32" /D
"_DEBUG" /D "_WINDOWS" /YX /FD /c
+# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\regex" /I "..\..\core"
/D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c
# ADD BASE MTL /nologo /D "_DEBUG" /win32
# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
# ADD BASE RSC /l 0x809 /d "_DEBUG"
@@ -79,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 ole32.lib oleaut32.lib
uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /dll /debug
/machine:I386
!ENDIF
@@ -92,7 +94,7 @@
# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;hpj;bat;for;f90"
# Begin Source File
-SOURCE=..\mod_headers.c
+SOURCE=..\..\modules\standard\mod_headers.c
# End Source File
# End Group
# Begin Group "Header Files"
1.4 +40 -18 apachen/src/os/win32/ApacheModuleHeaders.mak
Index: ApacheModuleHeaders.mak
===================================================================
RCS file: /export/home/cvs/apachen/src/os/win32/ApacheModuleHeaders.mak,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- ApacheModuleHeaders.mak 1997/07/20 12:31:14 1.3
+++ ApacheModuleHeaders.mak 1997/08/13 08:37:29 1.4
@@ -54,6 +54,7 @@
CLEAN :
[EMAIL PROTECTED] "$(INTDIR)\mod_headers.obj"
+ [EMAIL PROTECTED] "$(INTDIR)\vc50.idb"
[EMAIL PROTECTED] "$(OUTDIR)\ApacheModuleHeaders.dll"
[EMAIL PROTECTED] "$(OUTDIR)\ApacheModuleHeaders.exp"
[EMAIL PROTECTED] "$(OUTDIR)\ApacheModuleHeaders.lib"
@@ -61,9 +62,9 @@
"$(OUTDIR)" :
if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
-CPP_PROJ=/nologo /MD /W3 /GX /O2 /I "..\regex" /D "WIN32" /D "NDEBUG" /D\
- "_WINDOWS" /Fp"$(INTDIR)\ApacheModuleHeaders.pch" /YX /Fo"$(INTDIR)\\"\
- /Fd"$(INTDIR)\\" /FD /c
+CPP_PROJ=/nologo /MD /W3 /GX /O2 /I "..\..\regex" /I "..\..\core" /D "WIN32"
/D\
+ "NDEBUG" /D "_WINDOWS" /Fp"$(INTDIR)\ApacheModuleHeaders.pch" /YX\
+ /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c
CPP_OBJS=.\ApacheModuleHeadersR/
CPP_SBRS=.
MTL_PROJ=/nologo /D "NDEBUG" /mktyplib203 /win32
@@ -72,7 +73,7 @@
BSC32_SBRS= \
LINK32=link.exe
-LINK32_FLAGS=..\CoreR\ApacheCore.lib kernel32.lib user32.lib gdi32.lib\
+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\
@@ -117,9 +118,9 @@
"$(OUTDIR)" :
if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
-CPP_PROJ=/nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\regex" /D "WIN32" /D
"_DEBUG"\
- /D "_WINDOWS" /Fp"$(INTDIR)\ApacheModuleHeaders.pch" /YX /Fo"$(INTDIR)\\"\
- /Fd"$(INTDIR)\\" /FD /c
+CPP_PROJ=/nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\regex" /I "..\..\core"
/D\
+ "WIN32" /D "_DEBUG" /D "_WINDOWS" /Fp"$(INTDIR)\ApacheModuleHeaders.pch"
/YX\
+ /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c
CPP_OBJS=.\ApacheModuleHeadersD/
CPP_SBRS=.
MTL_PROJ=/nologo /D "_DEBUG" /mktyplib203 /win32
@@ -128,7 +129,7 @@
BSC32_SBRS= \
LINK32=link.exe
-LINK32_FLAGS=..\CoreD\ApacheCore.lib kernel32.lib user32.lib gdi32.lib\
+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\
@@ -177,25 +178,46 @@
!IF "$(CFG)" == "ApacheModuleHeaders - Win32 Release" || "$(CFG)" ==\
"ApacheModuleHeaders - Win32 Debug"
-SOURCE=..\mod_headers.c
+SOURCE=..\..\modules\standard\mod_headers.c
+
+!IF "$(CFG)" == "ApacheModuleHeaders - Win32 Release"
+
DEP_CPP_MOD_H=\
- "..\alloc.h"\
- "..\buff.h"\
- "..\conf.h"\
- "..\http_config.h"\
- "..\httpd.h"\
- "..\regex\regex.h"\
+ "..\..\core\alloc.h"\
+ "..\..\core\buff.h"\
+ "..\..\core\conf.h"\
+ "..\..\core\http_config.h"\
+ "..\..\core\httpd.h"\
+ "..\..\regex\regex.h"\
".\readdir.h"\
- {$(INCLUDE)}"sys\STAT.H"\
- {$(INCLUDE)}"sys\TYPES.H"\
+
+
+"$(INTDIR)\mod_headers.obj" : $(SOURCE) $(DEP_CPP_MOD_H) "$(INTDIR)"
+ $(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+!ELSEIF "$(CFG)" == "ApacheModuleHeaders - Win32 Debug"
+
+DEP_CPP_MOD_H=\
+ "..\..\core\alloc.h"\
+ "..\..\core\buff.h"\
+ "..\..\core\conf.h"\
+ "..\..\core\http_config.h"\
+ "..\..\core\httpd.h"\
+ "..\..\regex\regex.h"\
+ ".\readdir.h"\
+ {$(INCLUDE)}"sys\stat.h"\
+ {$(INCLUDE)}"sys\types.h"\
NODEP_CPP_MOD_H=\
- "..\sfio.h"\
+ "..\..\core\sfio.h"\
"$(INTDIR)\mod_headers.obj" : $(SOURCE) $(DEP_CPP_MOD_H) "$(INTDIR)"
$(CPP) $(CPP_PROJ) $(SOURCE)
+
+!ENDIF
!ENDIF
1.2 +7 -5 apachen/src/os/win32/ApacheModuleInfo.dsp
Index: ApacheModuleInfo.dsp
===================================================================
RCS file: /export/home/cvs/apachen/src/os/win32/ApacheModuleInfo.dsp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ApacheModuleInfo.dsp 1997/07/20 12:31:14 1.1
+++ ApacheModuleInfo.dsp 1997/08/13 08:37:29 1.2
@@ -41,9 +41,10 @@
# PROP Use_Debug_Libraries 0
# PROP Output_Dir ".\ApacheModuleInfoR"
# PROP Intermediate_Dir ".\ApacheModuleInfoR"
+# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS"
/YX /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\regex" /D "WIN32" /D "NDEBUG" /D
"_WINDOWS" /YX /FD /c
+# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\regex" /I "..\..\core" /D
"WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c
# ADD BASE MTL /nologo /D "NDEBUG" /win32
# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
# ADD BASE RSC /l 0x809 /d "NDEBUG"
@@ -53,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 ole32.lib oleaut32.lib
uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /dll /machine:I386
!ELSEIF "$(CFG)" == "ApacheModuleInfo - Win32 Debug"
@@ -66,9 +67,10 @@
# PROP Use_Debug_Libraries 1
# PROP Output_Dir ".\ApacheModuleInfoD"
# PROP Intermediate_Dir ".\ApacheModuleInfoD"
+# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D
"_WINDOWS" /YX /c
-# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\regex" /D "WIN32" /D
"_DEBUG" /D "_WINDOWS" /YX /FD /c
+# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\regex" /I "..\..\core"
/D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c
# ADD BASE MTL /nologo /D "_DEBUG" /win32
# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
# ADD BASE RSC /l 0x809 /d "_DEBUG"
@@ -78,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 ole32.lib oleaut32.lib
uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /dll /debug
/machine:I386
!ENDIF
@@ -91,7 +93,7 @@
# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;hpj;bat;for;f90"
# Begin Source File
-SOURCE=..\mod_info.c
+SOURCE=..\..\modules\standard\mod_info.c
# End Source File
# End Group
# Begin Group "Header Files"
1.2 +114 -140 apachen/src/os/win32/ApacheModuleInfo.mak
Index: ApacheModuleInfo.mak
===================================================================
RCS file: /export/home/cvs/apachen/src/os/win32/ApacheModuleInfo.mak,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ApacheModuleInfo.mak 1997/07/17 20:01:36 1.1
+++ ApacheModuleInfo.mak 1997/08/13 08:37:30 1.2
@@ -1,21 +1,17 @@
-# Microsoft Developer Studio Generated NMAKE File, Format Version 4.20
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102
-
+# Microsoft Developer Studio Generated NMAKE File, Based on
ApacheModuleInfo.dsp
!IF "$(CFG)" == ""
-CFG=ApacheModuleInfo - Win32 Debug
-!MESSAGE No configuration specified. Defaulting to ApacheModuleInfo - Win32\
- Debug.
+CFG=ApacheModuleInfo - Win32 Release
+!MESSAGE No configuration specified. Defaulting to ApacheModuleInfo - Win32\
+ Release.
!ENDIF
!IF "$(CFG)" != "ApacheModuleInfo - Win32 Release" && "$(CFG)" !=\
"ApacheModuleInfo - Win32 Debug"
!MESSAGE Invalid configuration "$(CFG)" specified.
-!MESSAGE You can specify a configuration when running NMAKE on this makefile
-!MESSAGE by defining the macro CFG on the command line. For example:
+!MESSAGE You can specify a configuration when running NMAKE
+!MESSAGE by defining the macro CFG on the command line. For example:
!MESSAGE
-!MESSAGE NMAKE /f "ApacheModuleInfo.mak" CFG="ApacheModuleInfo - Win32 Debug"
+!MESSAGE NMAKE /f "ApacheModuleInfo.mak" CFG="ApacheModuleInfo - Win32
Release"
!MESSAGE
!MESSAGE Possible choices for configuration are:
!MESSAGE
@@ -32,32 +28,32 @@
!ELSE
NULL=nul
!ENDIF
-################################################################################
-# Begin Project
-# PROP Target_Last_Scanned "ApacheModuleInfo - Win32 Debug"
-MTL=mktyplib.exe
-RSC=rc.exe
+
CPP=cl.exe
+MTL=midl.exe
+RSC=rc.exe
!IF "$(CFG)" == "ApacheModuleInfo - Win32 Release"
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "ApacheModuleInfoR"
-# PROP Intermediate_Dir "ApacheModuleInfoR"
-# PROP Target_Dir ""
OUTDIR=.\ApacheModuleInfoR
INTDIR=.\ApacheModuleInfoR
+# Begin Custom Macros
+OutDir=.\.\ApacheModuleInfoR
+# End Custom Macros
+
+!IF "$(RECURSE)" == "0"
+
+ALL : "$(OUTDIR)\ApacheModuleInfo.dll"
+
+!ELSE
ALL : "$(OUTDIR)\ApacheModuleInfo.dll"
-CLEAN :
+!ENDIF
+
+CLEAN :
[EMAIL PROTECTED] "$(INTDIR)\mod_info.obj"
+ [EMAIL PROTECTED] "$(INTDIR)\vc50.idb"
[EMAIL PROTECTED] "$(OUTDIR)\ApacheModuleInfo.dll"
[EMAIL PROTECTED] "$(OUTDIR)\ApacheModuleInfo.exp"
[EMAIL PROTECTED] "$(OUTDIR)\ApacheModuleInfo.lib"
@@ -65,31 +61,22 @@
"$(OUTDIR)" :
if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
-# ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS"
/YX /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\regex" /D "WIN32" /D "NDEBUG" /D
"_WINDOWS" /YX /c
-CPP_PROJ=/nologo /MD /W3 /GX /O2 /I "..\regex" /D "WIN32" /D "NDEBUG" /D\
- "_WINDOWS" /Fp"$(INTDIR)/ApacheModuleInfo.pch" /YX /Fo"$(INTDIR)/" /c
+CPP_PROJ=/nologo /MD /W3 /GX /O2 /I "..\..\regex" /I "..\..\core" /D "WIN32"
/D\
+ "NDEBUG" /D "_WINDOWS" /Fp"$(INTDIR)\ApacheModuleInfo.pch" /YX
/Fo"$(INTDIR)\\"\
+ /Fd"$(INTDIR)\\" /FD /c
CPP_OBJS=.\ApacheModuleInfoR/
-CPP_SBRS=.\.
-# ADD BASE MTL /nologo /D "NDEBUG" /win32
-# ADD MTL /nologo /D "NDEBUG" /win32
-MTL_PROJ=/nologo /D "NDEBUG" /win32
-# ADD BASE RSC /l 0x809 /d "NDEBUG"
-# ADD RSC /l 0x809 /d "NDEBUG"
+CPP_SBRS=.
+MTL_PROJ=/nologo /D "NDEBUG" /mktyplib203 /win32
BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-BSC32_FLAGS=/nologo /o"$(OUTDIR)/ApacheModuleInfo.bsc"
+BSC32_FLAGS=/nologo /o"$(OUTDIR)\ApacheModuleInfo.bsc"
BSC32_SBRS= \
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
-LINK32_FLAGS=..\CoreR\ApacheCore.lib kernel32.lib user32.lib gdi32.lib\
+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\
- /out:"$(OUTDIR)/ApacheModuleInfo.dll"
/implib:"$(OUTDIR)/ApacheModuleInfo.lib"
+ /incremental:no /pdb:"$(OUTDIR)\ApacheModuleInfo.pdb" /machine:I386\
+ /out:"$(OUTDIR)\ApacheModuleInfo.dll"
/implib:"$(OUTDIR)\ApacheModuleInfo.lib"
LINK32_OBJS= \
"$(INTDIR)\mod_info.obj"
@@ -100,25 +87,26 @@
!ELSEIF "$(CFG)" == "ApacheModuleInfo - Win32 Debug"
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Debug"
-# PROP BASE Intermediate_Dir "Debug"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "ApacheModuleInfoD"
-# PROP Intermediate_Dir "ApacheModuleInfoD"
-# PROP Target_Dir ""
OUTDIR=.\ApacheModuleInfoD
INTDIR=.\ApacheModuleInfoD
+# Begin Custom Macros
+OutDir=.\.\ApacheModuleInfoD
+# End Custom Macros
+
+!IF "$(RECURSE)" == "0"
+
+ALL : "$(OUTDIR)\ApacheModuleInfo.dll"
+
+!ELSE
ALL : "$(OUTDIR)\ApacheModuleInfo.dll"
-CLEAN :
+!ENDIF
+
+CLEAN :
[EMAIL PROTECTED] "$(INTDIR)\mod_info.obj"
- [EMAIL PROTECTED] "$(INTDIR)\vc40.idb"
- [EMAIL PROTECTED] "$(INTDIR)\vc40.pdb"
+ [EMAIL PROTECTED] "$(INTDIR)\vc50.idb"
+ [EMAIL PROTECTED] "$(INTDIR)\vc50.pdb"
[EMAIL PROTECTED] "$(OUTDIR)\ApacheModuleInfo.dll"
[EMAIL PROTECTED] "$(OUTDIR)\ApacheModuleInfo.exp"
[EMAIL PROTECTED] "$(OUTDIR)\ApacheModuleInfo.ilk"
@@ -128,32 +116,22 @@
"$(OUTDIR)" :
if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
-# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D
"_WINDOWS" /YX /c
-# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\regex" /D "WIN32" /D
"_DEBUG" /D "_WINDOWS" /YX /c
-CPP_PROJ=/nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\regex" /D "WIN32" /D
"_DEBUG"\
- /D "_WINDOWS" /Fp"$(INTDIR)/ApacheModuleInfo.pch" /YX /Fo"$(INTDIR)/"\
- /Fd"$(INTDIR)/" /c
+CPP_PROJ=/nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\regex" /I "..\..\core"
/D\
+ "WIN32" /D "_DEBUG" /D "_WINDOWS" /Fp"$(INTDIR)\ApacheModuleInfo.pch" /YX\
+ /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c
CPP_OBJS=.\ApacheModuleInfoD/
-CPP_SBRS=.\.
-# ADD BASE MTL /nologo /D "_DEBUG" /win32
-# ADD MTL /nologo /D "_DEBUG" /win32
-MTL_PROJ=/nologo /D "_DEBUG" /win32
-# ADD BASE RSC /l 0x809 /d "_DEBUG"
-# ADD RSC /l 0x809 /d "_DEBUG"
+CPP_SBRS=.
+MTL_PROJ=/nologo /D "_DEBUG" /mktyplib203 /win32
BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-BSC32_FLAGS=/nologo /o"$(OUTDIR)/ApacheModuleInfo.bsc"
+BSC32_FLAGS=/nologo /o"$(OUTDIR)\ApacheModuleInfo.bsc"
BSC32_SBRS= \
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
-LINK32_FLAGS=..\CoreD\ApacheCore.lib kernel32.lib user32.lib gdi32.lib\
+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"
+ /incremental:yes /pdb:"$(OUTDIR)\ApacheModuleInfo.pdb" /debug /machine:I386\
+ /out:"$(OUTDIR)\ApacheModuleInfo.dll"
/implib:"$(OUTDIR)\ApacheModuleInfo.lib"
LINK32_OBJS= \
"$(INTDIR)\mod_info.obj"
@@ -164,96 +142,92 @@
!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) $<
+.c{$(CPP_OBJS)}.obj::
+ $(CPP) @<<
+ $(CPP_PROJ) $<
+<<
-################################################################################
-# Begin Target
+.cpp{$(CPP_OBJS)}.obj::
+ $(CPP) @<<
+ $(CPP_PROJ) $<
+<<
-# Name "ApacheModuleInfo - Win32 Release"
-# Name "ApacheModuleInfo - Win32 Debug"
+.cxx{$(CPP_OBJS)}.obj::
+ $(CPP) @<<
+ $(CPP_PROJ) $<
+<<
-!IF "$(CFG)" == "ApacheModuleInfo - Win32 Release"
+.c{$(CPP_SBRS)}.sbr::
+ $(CPP) @<<
+ $(CPP_PROJ) $<
+<<
-!ELSEIF "$(CFG)" == "ApacheModuleInfo - Win32 Debug"
+.cpp{$(CPP_SBRS)}.sbr::
+ $(CPP) @<<
+ $(CPP_PROJ) $<
+<<
-!ENDIF
+.cxx{$(CPP_SBRS)}.sbr::
+ $(CPP) @<<
+ $(CPP_PROJ) $<
+<<
-################################################################################
-# Begin Source File
-SOURCE=\work\apache\src\mod_info.c
+!IF "$(CFG)" == "ApacheModuleInfo - Win32 Release" || "$(CFG)" ==\
+ "ApacheModuleInfo - Win32 Debug"
+SOURCE=..\..\modules\standard\mod_info.c
!IF "$(CFG)" == "ApacheModuleInfo - Win32 Release"
DEP_CPP_MOD_I=\
- "..\alloc.h"\
- "..\buff.h"\
- "..\conf.h"\
- "..\http_conf_globals.h"\
- "..\http_config.h"\
- "..\http_core.h"\
- "..\http_log.h"\
- "..\http_main.h"\
- "..\http_protocol.h"\
- "..\httpd.h"\
- "..\util_script.h"\
+ "..\..\core\alloc.h"\
+ "..\..\core\buff.h"\
+ "..\..\core\conf.h"\
+ "..\..\core\http_conf_globals.h"\
+ "..\..\core\http_config.h"\
+ "..\..\core\http_core.h"\
+ "..\..\core\http_log.h"\
+ "..\..\core\http_main.h"\
+ "..\..\core\http_protocol.h"\
+ "..\..\core\httpd.h"\
+ "..\..\core\util_script.h"\
+ "..\..\regex\regex.h"\
".\readdir.h"\
- {$(INCLUDE)}"\sys\types.h"\
-
-NODEP_CPP_MOD_I=\
- "..\sfio.h"\
"$(INTDIR)\mod_info.obj" : $(SOURCE) $(DEP_CPP_MOD_I) "$(INTDIR)"
- $(CPP) $(CPP_PROJ) $(SOURCE)
+ $(CPP) $(CPP_PROJ) $(SOURCE)
!ELSEIF "$(CFG)" == "ApacheModuleInfo - Win32 Debug"
DEP_CPP_MOD_I=\
- "..\alloc.h"\
- "..\buff.h"\
- "..\conf.h"\
- "..\http_conf_globals.h"\
- "..\http_config.h"\
- "..\http_core.h"\
- "..\http_log.h"\
- "..\http_main.h"\
- "..\http_protocol.h"\
- "..\httpd.h"\
- "..\regex\regex.h"\
- "..\util_script.h"\
+ "..\..\core\alloc.h"\
+ "..\..\core\buff.h"\
+ "..\..\core\conf.h"\
+ "..\..\core\http_conf_globals.h"\
+ "..\..\core\http_config.h"\
+ "..\..\core\http_core.h"\
+ "..\..\core\http_log.h"\
+ "..\..\core\http_main.h"\
+ "..\..\core\http_protocol.h"\
+ "..\..\core\httpd.h"\
+ "..\..\core\util_script.h"\
+ "..\..\regex\regex.h"\
".\readdir.h"\
- {$(INCLUDE)}"\sys\stat.h"\
- {$(INCLUDE)}"\sys\types.h"\
+ {$(INCLUDE)}"sys\stat.h"\
+ {$(INCLUDE)}"sys\types.h"\
NODEP_CPP_MOD_I=\
- "..\sfio.h"\
+ "..\..\core\sfio.h"\
"$(INTDIR)\mod_info.obj" : $(SOURCE) $(DEP_CPP_MOD_I) "$(INTDIR)"
- $(CPP) $(CPP_PROJ) $(SOURCE)
+ $(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+!ENDIF
!ENDIF
-# End Source File
-# End Target
-# End Project
-################################################################################
1.2 +7 -5 apachen/src/os/win32/ApacheModuleRewrite.dsp
Index: ApacheModuleRewrite.dsp
===================================================================
RCS file: /export/home/cvs/apachen/src/os/win32/ApacheModuleRewrite.dsp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ApacheModuleRewrite.dsp 1997/07/20 12:31:14 1.1
+++ ApacheModuleRewrite.dsp 1997/08/13 08:37:30 1.2
@@ -42,9 +42,10 @@
# PROP Use_Debug_Libraries 0
# PROP Output_Dir ".\ApacheModuleRewriteR"
# PROP Intermediate_Dir ".\ApacheModuleRewriteR"
+# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS"
/YX /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\regex" /D "WIN32" /D "NDEBUG" /D
"_WINDOWS" /YX /FD /c
+# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\regex" /I "..\..\core" /D
"WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c
# ADD BASE MTL /nologo /D "NDEBUG" /win32
# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
# ADD BASE RSC /l 0x809 /d "NDEBUG"
@@ -54,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 ole32.lib oleaut32.lib
uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /dll /machine:I386
!ELSEIF "$(CFG)" == "ApacheModuleRewrite - Win32 Debug"
@@ -67,9 +68,10 @@
# PROP Use_Debug_Libraries 1
# PROP Output_Dir ".\ApacheModuleRewriteD"
# PROP Intermediate_Dir ".\ApacheModuleRewriteD"
+# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D
"_WINDOWS" /YX /c
-# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\regex" /D "WIN32" /D
"_DEBUG" /D "_WINDOWS" /YX /FD /c
+# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\regex" /I "..\..\core"
/D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c
# ADD BASE MTL /nologo /D "_DEBUG" /win32
# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
# ADD BASE RSC /l 0x809 /d "_DEBUG"
@@ -79,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 ole32.lib oleaut32.lib
uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /dll /debug
/machine:I386
!ENDIF
@@ -92,7 +94,7 @@
# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;hpj;bat;for;f90"
# Begin Source File
-SOURCE=..\mod_rewrite.c
+SOURCE=..\..\modules\standard\mod_rewrite.c
# End Source File
# End Group
# Begin Group "Header Files"
1.2 +98 -150 apachen/src/os/win32/ApacheModuleRewrite.mak
Index: ApacheModuleRewrite.mak
===================================================================
RCS file: /export/home/cvs/apachen/src/os/win32/ApacheModuleRewrite.mak,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ApacheModuleRewrite.mak 1997/07/17 20:01:38 1.1
+++ ApacheModuleRewrite.mak 1997/08/13 08:37:31 1.2
@@ -1,22 +1,18 @@
-# Microsoft Developer Studio Generated NMAKE File, Format Version 4.20
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102
-
+# Microsoft Developer Studio Generated NMAKE File, Based on
ApacheModuleRewrite.dsp
!IF "$(CFG)" == ""
-CFG=ApacheModuleRewrite - Win32 Debug
-!MESSAGE No configuration specified. Defaulting to ApacheModuleRewrite -
Win32\
- Debug.
+CFG=ApacheModuleRewrite - Win32 Release
+!MESSAGE No configuration specified. Defaulting to ApacheModuleRewrite -
Win32\
+ Release.
!ENDIF
!IF "$(CFG)" != "ApacheModuleRewrite - Win32 Release" && "$(CFG)" !=\
"ApacheModuleRewrite - Win32 Debug"
!MESSAGE Invalid configuration "$(CFG)" specified.
-!MESSAGE You can specify a configuration when running NMAKE on this makefile
-!MESSAGE by defining the macro CFG on the command line. For example:
+!MESSAGE You can specify a configuration when running NMAKE
+!MESSAGE by defining the macro CFG on the command line. For example:
!MESSAGE
!MESSAGE NMAKE /f "ApacheModuleRewrite.mak"\
- CFG="ApacheModuleRewrite - Win32 Debug"
+ CFG="ApacheModuleRewrite - Win32 Release"
!MESSAGE
!MESSAGE Possible choices for configuration are:
!MESSAGE
@@ -33,32 +29,32 @@
!ELSE
NULL=nul
!ENDIF
-################################################################################
-# Begin Project
-# PROP Target_Last_Scanned "ApacheModuleRewrite - Win32 Debug"
-MTL=mktyplib.exe
-RSC=rc.exe
+
CPP=cl.exe
+MTL=midl.exe
+RSC=rc.exe
!IF "$(CFG)" == "ApacheModuleRewrite - Win32 Release"
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "ApacheModuleRewriteR"
-# PROP Intermediate_Dir "ApacheModuleRewriteR"
-# PROP Target_Dir ""
OUTDIR=.\ApacheModuleRewriteR
INTDIR=.\ApacheModuleRewriteR
+# Begin Custom Macros
+OutDir=.\.\ApacheModuleRewriteR
+# End Custom Macros
+
+!IF "$(RECURSE)" == "0"
ALL : "$(OUTDIR)\ApacheModuleRewrite.dll"
-CLEAN :
+!ELSE
+
+ALL : "$(OUTDIR)\ApacheModuleRewrite.dll"
+
+!ENDIF
+
+CLEAN :
[EMAIL PROTECTED] "$(INTDIR)\mod_rewrite.obj"
+ [EMAIL PROTECTED] "$(INTDIR)\vc50.idb"
[EMAIL PROTECTED] "$(OUTDIR)\ApacheModuleRewrite.dll"
[EMAIL PROTECTED] "$(OUTDIR)\ApacheModuleRewrite.exp"
[EMAIL PROTECTED] "$(OUTDIR)\ApacheModuleRewrite.lib"
@@ -66,32 +62,23 @@
"$(OUTDIR)" :
if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
-# ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS"
/YX /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\regex" /D "WIN32" /D "NDEBUG" /D
"_WINDOWS" /YX /c
-CPP_PROJ=/nologo /MD /W3 /GX /O2 /I "..\regex" /D "WIN32" /D "NDEBUG" /D\
- "_WINDOWS" /Fp"$(INTDIR)/ApacheModuleRewrite.pch" /YX /Fo"$(INTDIR)/" /c
+CPP_PROJ=/nologo /MD /W3 /GX /O2 /I "..\..\regex" /I "..\..\core" /D "WIN32"
/D\
+ "NDEBUG" /D "_WINDOWS" /Fp"$(INTDIR)\ApacheModuleRewrite.pch" /YX\
+ /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c
CPP_OBJS=.\ApacheModuleRewriteR/
-CPP_SBRS=.\.
-# ADD BASE MTL /nologo /D "NDEBUG" /win32
-# ADD MTL /nologo /D "NDEBUG" /win32
-MTL_PROJ=/nologo /D "NDEBUG" /win32
-# ADD BASE RSC /l 0x809 /d "NDEBUG"
-# ADD RSC /l 0x809 /d "NDEBUG"
+CPP_SBRS=.
+MTL_PROJ=/nologo /D "NDEBUG" /mktyplib203 /win32
BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-BSC32_FLAGS=/nologo /o"$(OUTDIR)/ApacheModuleRewrite.bsc"
+BSC32_FLAGS=/nologo /o"$(OUTDIR)\ApacheModuleRewrite.bsc"
BSC32_SBRS= \
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
-LINK32_FLAGS=..\CoreR\ApacheCore.lib kernel32.lib user32.lib gdi32.lib\
+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)/ApacheModuleRewrite.pdb" /machine:I386\
- /out:"$(OUTDIR)/ApacheModuleRewrite.dll"\
- /implib:"$(OUTDIR)/ApacheModuleRewrite.lib"
+ /incremental:no /pdb:"$(OUTDIR)\ApacheModuleRewrite.pdb" /machine:I386\
+ /out:"$(OUTDIR)\ApacheModuleRewrite.dll"\
+ /implib:"$(OUTDIR)\ApacheModuleRewrite.lib"
LINK32_OBJS= \
"$(INTDIR)\mod_rewrite.obj"
@@ -102,25 +89,26 @@
!ELSEIF "$(CFG)" == "ApacheModuleRewrite - Win32 Debug"
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Debug"
-# PROP BASE Intermediate_Dir "Debug"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "ApacheModuleRewriteD"
-# PROP Intermediate_Dir "ApacheModuleRewriteD"
-# PROP Target_Dir ""
OUTDIR=.\ApacheModuleRewriteD
INTDIR=.\ApacheModuleRewriteD
+# Begin Custom Macros
+OutDir=.\.\ApacheModuleRewriteD
+# End Custom Macros
+
+!IF "$(RECURSE)" == "0"
+
+ALL : "$(OUTDIR)\ApacheModuleRewrite.dll"
+
+!ELSE
ALL : "$(OUTDIR)\ApacheModuleRewrite.dll"
-CLEAN :
+!ENDIF
+
+CLEAN :
[EMAIL PROTECTED] "$(INTDIR)\mod_rewrite.obj"
- [EMAIL PROTECTED] "$(INTDIR)\vc40.idb"
- [EMAIL PROTECTED] "$(INTDIR)\vc40.pdb"
+ [EMAIL PROTECTED] "$(INTDIR)\vc50.idb"
+ [EMAIL PROTECTED] "$(INTDIR)\vc50.pdb"
[EMAIL PROTECTED] "$(OUTDIR)\ApacheModuleRewrite.dll"
[EMAIL PROTECTED] "$(OUTDIR)\ApacheModuleRewrite.exp"
[EMAIL PROTECTED] "$(OUTDIR)\ApacheModuleRewrite.ilk"
@@ -130,33 +118,23 @@
"$(OUTDIR)" :
if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
-# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D
"_WINDOWS" /YX /c
-# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\regex" /D "WIN32" /D
"_DEBUG" /D "_WINDOWS" /YX /c
-CPP_PROJ=/nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\regex" /D "WIN32" /D
"_DEBUG"\
- /D "_WINDOWS" /Fp"$(INTDIR)/ApacheModuleRewrite.pch" /YX /Fo"$(INTDIR)/"\
- /Fd"$(INTDIR)/" /c
+CPP_PROJ=/nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\regex" /I "..\..\core"
/D\
+ "WIN32" /D "_DEBUG" /D "_WINDOWS" /Fp"$(INTDIR)\ApacheModuleRewrite.pch"
/YX\
+ /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c
CPP_OBJS=.\ApacheModuleRewriteD/
-CPP_SBRS=.\.
-# ADD BASE MTL /nologo /D "_DEBUG" /win32
-# ADD MTL /nologo /D "_DEBUG" /win32
-MTL_PROJ=/nologo /D "_DEBUG" /win32
-# ADD BASE RSC /l 0x809 /d "_DEBUG"
-# ADD RSC /l 0x809 /d "_DEBUG"
+CPP_SBRS=.
+MTL_PROJ=/nologo /D "_DEBUG" /mktyplib203 /win32
BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-BSC32_FLAGS=/nologo /o"$(OUTDIR)/ApacheModuleRewrite.bsc"
+BSC32_FLAGS=/nologo /o"$(OUTDIR)\ApacheModuleRewrite.bsc"
BSC32_SBRS= \
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
-LINK32_FLAGS=..\CoreD\ApacheCore.lib kernel32.lib user32.lib gdi32.lib\
+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)/ApacheModuleRewrite.pdb" /debug
/machine:I386\
- /out:"$(OUTDIR)/ApacheModuleRewrite.dll"\
- /implib:"$(OUTDIR)/ApacheModuleRewrite.lib"
+ /incremental:yes /pdb:"$(OUTDIR)\ApacheModuleRewrite.pdb" /debug
/machine:I386\
+ /out:"$(OUTDIR)\ApacheModuleRewrite.dll"\
+ /implib:"$(OUTDIR)\ApacheModuleRewrite.lib"
LINK32_OBJS= \
"$(INTDIR)\mod_rewrite.obj"
@@ -167,93 +145,63 @@
!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) $<
-
-################################################################################
-# Begin Target
-
-# Name "ApacheModuleRewrite - Win32 Release"
-# Name "ApacheModuleRewrite - Win32 Debug"
+.c{$(CPP_OBJS)}.obj::
+ $(CPP) @<<
+ $(CPP_PROJ) $<
+<<
-!IF "$(CFG)" == "ApacheModuleRewrite - Win32 Release"
+.cpp{$(CPP_OBJS)}.obj::
+ $(CPP) @<<
+ $(CPP_PROJ) $<
+<<
-!ELSEIF "$(CFG)" == "ApacheModuleRewrite - Win32 Debug"
+.cxx{$(CPP_OBJS)}.obj::
+ $(CPP) @<<
+ $(CPP_PROJ) $<
+<<
-!ENDIF
+.c{$(CPP_SBRS)}.sbr::
+ $(CPP) @<<
+ $(CPP_PROJ) $<
+<<
-################################################################################
-# Begin Source File
+.cpp{$(CPP_SBRS)}.sbr::
+ $(CPP) @<<
+ $(CPP_PROJ) $<
+<<
-SOURCE=\work\apache\src\mod_rewrite.c
+.cxx{$(CPP_SBRS)}.sbr::
+ $(CPP) @<<
+ $(CPP_PROJ) $<
+<<
-!IF "$(CFG)" == "ApacheModuleRewrite - Win32 Release"
+!IF "$(CFG)" == "ApacheModuleRewrite - Win32 Release" || "$(CFG)" ==\
+ "ApacheModuleRewrite - Win32 Debug"
+SOURCE=..\..\modules\standard\mod_rewrite.c
DEP_CPP_MOD_R=\
- "..\alloc.h"\
- "..\buff.h"\
- "..\conf.h"\
- "..\http_config.h"\
- "..\http_core.h"\
- "..\http_log.h"\
- "..\http_request.h"\
- "..\httpd.h"\
- "..\mod_rewrite.h"\
+ "..\..\core\alloc.h"\
+ "..\..\core\buff.h"\
+ "..\..\core\conf.h"\
+ "..\..\core\http_config.h"\
+ "..\..\core\http_core.h"\
+ "..\..\core\http_log.h"\
+ "..\..\core\http_request.h"\
+ "..\..\core\httpd.h"\
+ "..\..\modules\standard\mod_rewrite.h"\
+ "..\..\regex\regex.h"\
".\readdir.h"\
- {$(INCLUDE)}"\sys\stat.h"\
- {$(INCLUDE)}"\sys\types.h"\
+ {$(INCLUDE)}"sys\stat.h"\
+ {$(INCLUDE)}"sys\types.h"\
NODEP_CPP_MOD_R=\
- "..\sfio.h"\
+ "..\..\core\sfio.h"\
"$(INTDIR)\mod_rewrite.obj" : $(SOURCE) $(DEP_CPP_MOD_R) "$(INTDIR)"
- $(CPP) $(CPP_PROJ) $(SOURCE)
-
-
-!ELSEIF "$(CFG)" == "ApacheModuleRewrite - Win32 Debug"
+ $(CPP) $(CPP_PROJ) $(SOURCE)
-DEP_CPP_MOD_R=\
- "..\alloc.h"\
- "..\buff.h"\
- "..\conf.h"\
- "..\http_config.h"\
- "..\http_core.h"\
- "..\http_log.h"\
- "..\http_request.h"\
- "..\httpd.h"\
- "..\mod_rewrite.h"\
- "..\regex\regex.h"\
- ".\readdir.h"\
- {$(INCLUDE)}"\sys\stat.h"\
- {$(INCLUDE)}"\sys\types.h"\
-
-NODEP_CPP_MOD_R=\
- "..\sfio.h"\
-
-
-"$(INTDIR)\mod_rewrite.obj" : $(SOURCE) $(DEP_CPP_MOD_R) "$(INTDIR)"
- $(CPP) $(CPP_PROJ) $(SOURCE)
!ENDIF
-# End Source File
-# End Target
-# End Project
-################################################################################
1.2 +7 -5 apachen/src/os/win32/ApacheModuleStatus.dsp
Index: ApacheModuleStatus.dsp
===================================================================
RCS file: /export/home/cvs/apachen/src/os/win32/ApacheModuleStatus.dsp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ApacheModuleStatus.dsp 1997/07/20 12:31:14 1.1
+++ ApacheModuleStatus.dsp 1997/08/13 08:37:31 1.2
@@ -42,9 +42,10 @@
# PROP Use_Debug_Libraries 0
# PROP Output_Dir ".\ApacheModuleStatusR"
# PROP Intermediate_Dir ".\ApacheModuleStatusR"
+# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS"
/YX /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\regex" /D "WIN32" /D "NDEBUG" /D
"_WINDOWS" /YX /FD /c
+# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\regex" /I "..\..\core" /D
"WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c
# ADD BASE MTL /nologo /D "NDEBUG" /win32
# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
# ADD BASE RSC /l 0x809 /d "NDEBUG"
@@ -54,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 ole32.lib oleaut32.lib
uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /dll /machine:I386
!ELSEIF "$(CFG)" == "ApacheModuleStatus - Win32 Debug"
@@ -67,9 +68,10 @@
# PROP Use_Debug_Libraries 1
# PROP Output_Dir ".\ApacheModuleStatusD"
# PROP Intermediate_Dir ".\ApacheModuleStatusD"
+# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D
"_WINDOWS" /YX /c
-# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\regex" /D "WIN32" /D
"_DEBUG" /D "_WINDOWS" /YX /FD /c
+# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\regex" /I "..\..\core"
/D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c
# ADD BASE MTL /nologo /D "_DEBUG" /win32
# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
# ADD BASE RSC /l 0x809 /d "_DEBUG"
@@ -79,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 ole32.lib oleaut32.lib
uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /dll /debug
/machine:I386
!ENDIF
@@ -92,7 +94,7 @@
# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;hpj;bat;for;f90"
# Begin Source File
-SOURCE=..\mod_status.c
+SOURCE=..\..\modules\standard\mod_status.c
# End Source File
# End Group
# Begin Group "Header Files"
1.4 +23 -42 apachen/src/os/win32/ApacheModuleStatus.mak
Index: ApacheModuleStatus.mak
===================================================================
RCS file: /export/home/cvs/apachen/src/os/win32/ApacheModuleStatus.mak,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- ApacheModuleStatus.mak 1997/07/20 12:31:14 1.3
+++ ApacheModuleStatus.mak 1997/08/13 08:37:31 1.4
@@ -54,6 +54,7 @@
CLEAN :
[EMAIL PROTECTED] "$(INTDIR)\mod_status.obj"
+ [EMAIL PROTECTED] "$(INTDIR)\vc50.idb"
[EMAIL PROTECTED] "$(OUTDIR)\ApacheModuleStatus.dll"
[EMAIL PROTECTED] "$(OUTDIR)\ApacheModuleStatus.exp"
[EMAIL PROTECTED] "$(OUTDIR)\ApacheModuleStatus.lib"
@@ -61,9 +62,9 @@
"$(OUTDIR)" :
if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
-CPP_PROJ=/nologo /MD /W3 /GX /O2 /I "..\regex" /D "WIN32" /D "NDEBUG" /D\
- "_WINDOWS" /Fp"$(INTDIR)\ApacheModuleStatus.pch" /YX /Fo"$(INTDIR)\\"\
- /Fd"$(INTDIR)\\" /FD /c
+CPP_PROJ=/nologo /MD /W3 /GX /O2 /I "..\..\regex" /I "..\..\core" /D "WIN32"
/D\
+ "NDEBUG" /D "_WINDOWS" /Fp"$(INTDIR)\ApacheModuleStatus.pch" /YX\
+ /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c
CPP_OBJS=.\ApacheModuleStatusR/
CPP_SBRS=.
MTL_PROJ=/nologo /D "NDEBUG" /mktyplib203 /win32
@@ -72,7 +73,7 @@
BSC32_SBRS= \
LINK32=link.exe
-LINK32_FLAGS=..\CoreR\ApacheCore.lib kernel32.lib user32.lib gdi32.lib\
+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\
@@ -117,9 +118,9 @@
"$(OUTDIR)" :
if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
-CPP_PROJ=/nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\regex" /D "WIN32" /D
"_DEBUG"\
- /D "_WINDOWS" /Fp"$(INTDIR)\ApacheModuleStatus.pch" /YX /Fo"$(INTDIR)\\"\
- /Fd"$(INTDIR)\\" /FD /c
+CPP_PROJ=/nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\regex" /I "..\..\core"
/D\
+ "WIN32" /D "_DEBUG" /D "_WINDOWS" /Fp"$(INTDIR)\ApacheModuleStatus.pch" /YX\
+ /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c
CPP_OBJS=.\ApacheModuleStatusD/
CPP_SBRS=.
MTL_PROJ=/nologo /D "_DEBUG" /mktyplib203 /win32
@@ -128,7 +129,7 @@
BSC32_SBRS= \
LINK32=link.exe
-LINK32_FLAGS=..\CoreD\ApacheCore.lib kernel32.lib user32.lib gdi32.lib\
+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\
@@ -177,29 +178,24 @@
!IF "$(CFG)" == "ApacheModuleStatus - Win32 Release" || "$(CFG)" ==\
"ApacheModuleStatus - Win32 Debug"
-SOURCE=..\mod_status.c
+SOURCE=..\..\modules\standard\mod_status.c
!IF "$(CFG)" == "ApacheModuleStatus - Win32 Release"
DEP_CPP_MOD_S=\
- "..\alloc.h"\
- "..\buff.h"\
- "..\conf.h"\
- "..\http_config.h"\
- "..\http_core.h"\
- "..\http_log.h"\
- "..\http_main.h"\
- "..\http_protocol.h"\
- "..\httpd.h"\
- "..\regex\regex.h"\
- "..\scoreboard.h"\
- "..\util_script.h"\
+ "..\..\core\alloc.h"\
+ "..\..\core\buff.h"\
+ "..\..\core\conf.h"\
+ "..\..\core\http_config.h"\
+ "..\..\core\http_core.h"\
+ "..\..\core\http_log.h"\
+ "..\..\core\http_main.h"\
+ "..\..\core\http_protocol.h"\
+ "..\..\core\httpd.h"\
+ "..\..\core\scoreboard.h"\
+ "..\..\core\util_script.h"\
+ "..\..\regex\regex.h"\
".\readdir.h"\
- {$(INCLUDE)}"sys\stat.h"\
- {$(INCLUDE)}"sys\types.h"\
-
-NODEP_CPP_MOD_S=\
- "..\sfio.h"\
"$(INTDIR)\mod_status.obj" : $(SOURCE) $(DEP_CPP_MOD_S) "$(INTDIR)"
@@ -208,23 +204,8 @@
!ELSEIF "$(CFG)" == "ApacheModuleStatus - Win32 Debug"
-DEP_CPP_MOD_S=\
- "..\alloc.h"\
- "..\buff.h"\
- "..\conf.h"\
- "..\http_config.h"\
- "..\http_core.h"\
- "..\http_log.h"\
- "..\http_main.h"\
- "..\http_protocol.h"\
- "..\httpd.h"\
- "..\regex\regex.h"\
- "..\scoreboard.h"\
- "..\util_script.h"\
- ".\readdir.h"\
-
-"$(INTDIR)\mod_status.obj" : $(SOURCE) $(DEP_CPP_MOD_S) "$(INTDIR)"
+"$(INTDIR)\mod_status.obj" : $(SOURCE) "$(INTDIR)"
$(CPP) $(CPP_PROJ) $(SOURCE)
1.2 +7 -5 apachen/src/os/win32/ApacheModuleUserTrack.dsp
Index: ApacheModuleUserTrack.dsp
===================================================================
RCS file: /export/home/cvs/apachen/src/os/win32/ApacheModuleUserTrack.dsp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ApacheModuleUserTrack.dsp 1997/07/20 12:31:15 1.1
+++ ApacheModuleUserTrack.dsp 1997/08/13 08:37:32 1.2
@@ -42,9 +42,10 @@
# PROP Use_Debug_Libraries 0
# PROP Output_Dir ".\ApacheModuleUserTrackR"
# PROP Intermediate_Dir ".\ApacheModuleUserTrackR"
+# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /MT /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS"
/YX /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\regex" /D "WIN32" /D "NDEBUG" /D
"_WINDOWS" /YX /FD /c
+# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\..\regex" /I "..\..\core" /D
"WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c
# ADD BASE MTL /nologo /D "NDEBUG" /win32
# ADD MTL /nologo /D "NDEBUG" /mktyplib203 /win32
# ADD BASE RSC /l 0x809 /d "NDEBUG"
@@ -54,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 ole32.lib oleaut32.lib
uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /dll /machine:I386
!ELSEIF "$(CFG)" == "ApacheModuleUserTrack - Win32 Debug"
@@ -67,9 +68,10 @@
# PROP Use_Debug_Libraries 1
# PROP Output_Dir ".\ApacheModuleUserTrackD"
# PROP Intermediate_Dir ".\ApacheModuleUserTrackD"
+# PROP Ignore_Export_Lib 0
# PROP Target_Dir ""
# ADD BASE CPP /nologo /MTd /W3 /Gm /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D
"_WINDOWS" /YX /c
-# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\regex" /D "WIN32" /D
"_DEBUG" /D "_WINDOWS" /YX /FD /c
+# ADD CPP /nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\regex" /I "..\..\core"
/D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c
# ADD BASE MTL /nologo /D "_DEBUG" /win32
# ADD MTL /nologo /D "_DEBUG" /mktyplib203 /win32
# ADD BASE RSC /l 0x809 /d "_DEBUG"
@@ -79,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 ole32.lib oleaut32.lib
uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:windows /dll /debug
/machine:I386
!ENDIF
@@ -92,7 +94,7 @@
# PROP Default_Filter "cpp;c;cxx;rc;def;r;odl;hpj;bat;for;f90"
# Begin Source File
-SOURCE=..\mod_usertrack.c
+SOURCE=..\..\modules\standard\mod_usertrack.c
# End Source File
# End Group
# Begin Group "Header Files"
1.4 +29 -28 apachen/src/os/win32/ApacheModuleUserTrack.mak
Index: ApacheModuleUserTrack.mak
===================================================================
RCS file: /export/home/cvs/apachen/src/os/win32/ApacheModuleUserTrack.mak,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- ApacheModuleUserTrack.mak 1997/07/20 12:31:15 1.3
+++ ApacheModuleUserTrack.mak 1997/08/13 08:37:32 1.4
@@ -54,6 +54,7 @@
CLEAN :
[EMAIL PROTECTED] "$(INTDIR)\mod_usertrack.obj"
+ [EMAIL PROTECTED] "$(INTDIR)\vc50.idb"
[EMAIL PROTECTED] "$(OUTDIR)\ApacheModuleUserTrack.dll"
[EMAIL PROTECTED] "$(OUTDIR)\ApacheModuleUserTrack.exp"
[EMAIL PROTECTED] "$(OUTDIR)\ApacheModuleUserTrack.lib"
@@ -61,9 +62,9 @@
"$(OUTDIR)" :
if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
-CPP_PROJ=/nologo /MD /W3 /GX /O2 /I "..\regex" /D "WIN32" /D "NDEBUG" /D\
- "_WINDOWS" /Fp"$(INTDIR)\ApacheModuleUserTrack.pch" /YX /Fo"$(INTDIR)\\"\
- /Fd"$(INTDIR)\\" /FD /c
+CPP_PROJ=/nologo /MD /W3 /GX /O2 /I "..\..\regex" /I "..\..\core" /D "WIN32"
/D\
+ "NDEBUG" /D "_WINDOWS" /Fp"$(INTDIR)\ApacheModuleUserTrack.pch" /YX\
+ /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c
CPP_OBJS=.\ApacheModuleUserTrackR/
CPP_SBRS=.
MTL_PROJ=/nologo /D "NDEBUG" /mktyplib203 /win32
@@ -72,7 +73,7 @@
BSC32_SBRS= \
LINK32=link.exe
-LINK32_FLAGS=..\CoreR\ApacheCore.lib kernel32.lib user32.lib gdi32.lib\
+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\
@@ -117,9 +118,9 @@
"$(OUTDIR)" :
if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
-CPP_PROJ=/nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\regex" /D "WIN32" /D
"_DEBUG"\
- /D "_WINDOWS" /Fp"$(INTDIR)\ApacheModuleUserTrack.pch" /YX /Fo"$(INTDIR)\\"\
- /Fd"$(INTDIR)\\" /FD /c
+CPP_PROJ=/nologo /MDd /W3 /Gm /GX /Zi /Od /I "..\..\regex" /I "..\..\core"
/D\
+ "WIN32" /D "_DEBUG" /D "_WINDOWS" /Fp"$(INTDIR)\ApacheModuleUserTrack.pch"
/YX\
+ /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c
CPP_OBJS=.\ApacheModuleUserTrackD/
CPP_SBRS=.
MTL_PROJ=/nologo /D "_DEBUG" /mktyplib203 /win32
@@ -128,7 +129,7 @@
BSC32_SBRS= \
LINK32=link.exe
-LINK32_FLAGS=..\CoreD\ApacheCore.lib kernel32.lib user32.lib gdi32.lib\
+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\
@@ -177,24 +178,19 @@
!IF "$(CFG)" == "ApacheModuleUserTrack - Win32 Release" || "$(CFG)" ==\
"ApacheModuleUserTrack - Win32 Debug"
-SOURCE=..\mod_usertrack.c
+SOURCE=..\..\modules\standard\mod_usertrack.c
!IF "$(CFG)" == "ApacheModuleUserTrack - Win32 Release"
DEP_CPP_MOD_U=\
- "..\alloc.h"\
- "..\buff.h"\
- "..\conf.h"\
- "..\http_config.h"\
- "..\http_core.h"\
- "..\httpd.h"\
- "..\regex\regex.h"\
+ "..\..\core\alloc.h"\
+ "..\..\core\buff.h"\
+ "..\..\core\conf.h"\
+ "..\..\core\http_config.h"\
+ "..\..\core\http_core.h"\
+ "..\..\core\httpd.h"\
+ "..\..\regex\regex.h"\
".\readdir.h"\
- {$(INCLUDE)}"sys\stat.h"\
- {$(INCLUDE)}"sys\types.h"\
-
-NODEP_CPP_MOD_U=\
- "..\sfio.h"\
"$(INTDIR)\mod_usertrack.obj" : $(SOURCE) $(DEP_CPP_MOD_U) "$(INTDIR)"
@@ -204,14 +200,19 @@
!ELSEIF "$(CFG)" == "ApacheModuleUserTrack - Win32 Debug"
DEP_CPP_MOD_U=\
- "..\alloc.h"\
- "..\buff.h"\
- "..\conf.h"\
- "..\http_config.h"\
- "..\http_core.h"\
- "..\httpd.h"\
- "..\regex\regex.h"\
+ "..\..\core\alloc.h"\
+ "..\..\core\buff.h"\
+ "..\..\core\conf.h"\
+ "..\..\core\http_config.h"\
+ "..\..\core\http_core.h"\
+ "..\..\core\httpd.h"\
+ "..\..\regex\regex.h"\
".\readdir.h"\
+ {$(INCLUDE)}"sys\stat.h"\
+ {$(INCLUDE)}"sys\types.h"\
+
+NODEP_CPP_MOD_U=\
+ "..\..\core\sfio.h"\
"$(INTDIR)\mod_usertrack.obj" : $(SOURCE) $(DEP_CPP_MOD_U) "$(INTDIR)"
1.4 +2 -2 apachen/src/os/win32/mod_dll.c
Index: mod_dll.c
===================================================================
RCS file: /export/home/cvs/apachen/src/os/win32/mod_dll.c,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- mod_dll.c 1997/07/21 21:26:59 1.3
+++ mod_dll.c 1997/08/13 08:37:33 1.4
@@ -91,8 +91,8 @@
* DLL, follow the above instructions to load it into Apache.
*/
-#include "../httpd.h"
-#include "../http_config.h"
+#include "httpd.h"
+#include "http_config.h"
/*
* The hard part of implementing LoadModule is deciding what to do about
1.2 +7 -7 apachen/src/os/win32/mod_isapi.c
Index: mod_isapi.c
===================================================================
RCS file: /export/home/cvs/apachen/src/os/win32/mod_isapi.c,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- mod_isapi.c 1997/07/22 19:25:19 1.1
+++ mod_isapi.c 1997/08/13 08:37:33 1.2
@@ -69,13 +69,13 @@
* the ISA is in.
*/
-#include "../httpd.h"
-#include "../http_config.h"
-#include "../http_core.h"
-#include "../http_protocol.h"
-#include "../http_request.h"
-#include "../http_log.h"
-#include "../util_script.h"
+#include "httpd.h"
+#include "http_config.h"
+#include "http_core.h"
+#include "http_protocol.h"
+#include "http_request.h"
+#include "http_log.h"
+#include "util_script.h"
/* We use the exact same header file as the original */
#include <HttpExt.h>
1.6 +2 -2 apachen/src/os/win32/modules.c
Index: modules.c
===================================================================
RCS file: /export/home/cvs/apachen/src/os/win32/modules.c,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- modules.c 1997/08/09 11:52:08 1.5
+++ modules.c 1997/08/13 08:37:34 1.6
@@ -2,8 +2,8 @@
* configuration script. DO NOT HAND EDIT!!!!!
*/
-#include "../httpd.h"
-#include "../http_config.h"
+#include "httpd.h"
+#include "http_config.h"
extern module core_module;
extern module dll_module;
1.3 +2 -2 apachen/src/os/win32/multithread.c
Index: multithread.c
===================================================================
RCS file: /export/home/cvs/apachen/src/os/win32/multithread.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- multithread.c 1997/07/19 20:16:23 1.2
+++ multithread.c 1997/08/13 08:37:34 1.3
@@ -1,6 +1,6 @@
-#include "../conf.h"
-#include "../multithread.h"
+#include "conf.h"
+#include "multithread.h"
#ifdef WIN32
#include <process.h>
1.3 +2 -2 apachen/src/os/win32/service.c
Index: service.c
===================================================================
RCS file: /export/home/cvs/apachen/src/os/win32/service.c,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- service.c 1997/06/29 18:32:00 1.2
+++ service.c 1997/08/13 08:37:35 1.3
@@ -7,8 +7,8 @@
#include <process.h>
#include <direct.h>
-#include "../conf.h"
-#include "../multithread.h"
+#include "conf.h"
+#include "multithread.h"
#include "service.h"
1.3 +116 -121 apachen/src/regex/regex.mak
Index: regex.mak
===================================================================
RCS file: /export/home/cvs/apachen/src/regex/regex.mak,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- regex.mak 1997/07/13 19:01:36 1.2
+++ regex.mak 1997/08/13 08:37:42 1.3
@@ -1,19 +1,15 @@
-# Microsoft Developer Studio Generated NMAKE File, Format Version 4.20
-# ** DO NOT EDIT **
-
-# TARGTYPE "Win32 (x86) Static Library" 0x0104
-
+# Microsoft Developer Studio Generated NMAKE File, Based on regex.dsp
!IF "$(CFG)" == ""
-CFG=regex - Win32 Debug
-!MESSAGE No configuration specified. Defaulting to regex - Win32 Debug.
+CFG=regex - Win32 Release
+!MESSAGE No configuration specified. Defaulting to regex - Win32 Release.
!ENDIF
!IF "$(CFG)" != "regex - Win32 Release" && "$(CFG)" != "regex - Win32 Debug"
!MESSAGE Invalid configuration "$(CFG)" specified.
-!MESSAGE You can specify a configuration when running NMAKE on this makefile
-!MESSAGE by defining the macro CFG on the command line. For example:
+!MESSAGE You can specify a configuration when running NMAKE
+!MESSAGE by defining the macro CFG on the command line. For example:
!MESSAGE
-!MESSAGE NMAKE /f "regex.mak" CFG="regex - Win32 Debug"
+!MESSAGE NMAKE /f "regex.mak" CFG="regex - Win32 Release"
!MESSAGE
!MESSAGE Possible choices for configuration are:
!MESSAGE
@@ -28,54 +24,48 @@
!ELSE
NULL=nul
!ENDIF
-################################################################################
-# Begin Project
-# PROP Target_Last_Scanned "regex - Win32 Debug"
+
CPP=cl.exe
!IF "$(CFG)" == "regex - Win32 Release"
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 0
-# PROP BASE Output_Dir "Release"
-# PROP BASE Intermediate_Dir "Release"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 0
-# PROP Output_Dir "Release"
-# PROP Intermediate_Dir "Release"
-# PROP Target_Dir ""
OUTDIR=.\Release
INTDIR=.\Release
+# Begin Custom Macros
+OutDir=.\.\Release
+# End Custom Macros
+
+!IF "$(RECURSE)" == "0"
ALL : "$(OUTDIR)\regex.lib"
-CLEAN :
+!ELSE
+
+ALL : "$(OUTDIR)\regex.lib"
+
+!ENDIF
+
+CLEAN :
[EMAIL PROTECTED] "$(INTDIR)\regcomp.obj"
[EMAIL PROTECTED] "$(INTDIR)\regerror.obj"
[EMAIL PROTECTED] "$(INTDIR)\regexec.obj"
[EMAIL PROTECTED] "$(INTDIR)\regfree.obj"
+ [EMAIL PROTECTED] "$(INTDIR)\vc50.idb"
[EMAIL PROTECTED] "$(OUTDIR)\regex.lib"
"$(OUTDIR)" :
if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
-# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX
/c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "." /D "WIN32" /D "NDEBUG" /D
"_WINDOWS" /YX /c
CPP_PROJ=/nologo /MD /W3 /GX /O2 /I "." /D "WIN32" /D "NDEBUG" /D "_WINDOWS"\
- /Fp"$(INTDIR)/regex.pch" /YX /Fo"$(INTDIR)/" /c
+ /Fp"$(INTDIR)\regex.pch" /YX /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c
CPP_OBJS=.\Release/
-CPP_SBRS=.\.
+CPP_SBRS=.
BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-BSC32_FLAGS=/nologo /o"$(OUTDIR)/regex.bsc"
+BSC32_FLAGS=/nologo /o"$(OUTDIR)\regex.bsc"
BSC32_SBRS= \
LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo
-# ADD LIB32 /nologo
-LIB32_FLAGS=/nologo /out:"$(OUTDIR)/regex.lib"
+LIB32_FLAGS=/nologo /out:"$(OUTDIR)\regex.lib"
LIB32_OBJS= \
"$(INTDIR)\regcomp.obj" \
"$(INTDIR)\regerror.obj" \
@@ -89,22 +79,23 @@
!ELSEIF "$(CFG)" == "regex - Win32 Debug"
-# PROP BASE Use_MFC 0
-# PROP BASE Use_Debug_Libraries 1
-# PROP BASE Output_Dir "Debug"
-# PROP BASE Intermediate_Dir "Debug"
-# PROP BASE Target_Dir ""
-# PROP Use_MFC 0
-# PROP Use_Debug_Libraries 1
-# PROP Output_Dir "Debug"
-# PROP Intermediate_Dir "Debug"
-# PROP Target_Dir ""
OUTDIR=.\Debug
INTDIR=.\Debug
+# Begin Custom Macros
+OutDir=.\.\Debug
+# End Custom Macros
+
+!IF "$(RECURSE)" == "0"
ALL : "$(OUTDIR)\regex.lib" "$(OUTDIR)\regex.bsc"
-CLEAN :
+!ELSE
+
+ALL : "$(OUTDIR)\regex.lib" "$(OUTDIR)\regex.bsc"
+
+!ENDIF
+
+CLEAN :
[EMAIL PROTECTED] "$(INTDIR)\regcomp.obj"
[EMAIL PROTECTED] "$(INTDIR)\regcomp.sbr"
[EMAIL PROTECTED] "$(INTDIR)\regerror.obj"
@@ -113,22 +104,20 @@
[EMAIL PROTECTED] "$(INTDIR)\regexec.sbr"
[EMAIL PROTECTED] "$(INTDIR)\regfree.obj"
[EMAIL PROTECTED] "$(INTDIR)\regfree.sbr"
+ [EMAIL PROTECTED] "$(INTDIR)\vc50.idb"
[EMAIL PROTECTED] "$(OUTDIR)\regex.bsc"
[EMAIL PROTECTED] "$(OUTDIR)\regex.lib"
"$(OUTDIR)" :
if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
-# ADD BASE CPP /nologo /W3 /GX /Z7 /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS"
/YX /c
-# ADD CPP /nologo /MDd /W3 /GX /Z7 /Od /I "." /D "WIN32" /D "_DEBUG" /D
"_WINDOWS" /FR /YX /c
CPP_PROJ=/nologo /MDd /W3 /GX /Z7 /Od /I "." /D "WIN32" /D "_DEBUG" /D\
- "_WINDOWS" /FR"$(INTDIR)/" /Fp"$(INTDIR)/regex.pch" /YX /Fo"$(INTDIR)/" /c
+ "_WINDOWS" /FR"$(INTDIR)\\" /Fp"$(INTDIR)\regex.pch" /YX /Fo"$(INTDIR)\\"\
+ /Fd"$(INTDIR)\\" /FD /c
CPP_OBJS=.\Debug/
CPP_SBRS=.\Debug/
BSC32=bscmake.exe
-# ADD BASE BSC32 /nologo
-# ADD BSC32 /nologo
-BSC32_FLAGS=/nologo /o"$(OUTDIR)/regex.bsc"
+BSC32_FLAGS=/nologo /o"$(OUTDIR)\regex.bsc"
BSC32_SBRS= \
"$(INTDIR)\regcomp.sbr" \
"$(INTDIR)\regerror.sbr" \
@@ -141,9 +130,7 @@
<<
LIB32=link.exe -lib
-# ADD BASE LIB32 /nologo
-# ADD LIB32 /nologo
-LIB32_FLAGS=/nologo /out:"$(OUTDIR)/regex.lib"
+LIB32_FLAGS=/nologo /out:"$(OUTDIR)\regex.lib"
LIB32_OBJS= \
"$(INTDIR)\regcomp.obj" \
"$(INTDIR)\regerror.obj" \
@@ -157,40 +144,42 @@
!ENDIF
-.c{$(CPP_OBJS)}.obj:
- $(CPP) $(CPP_PROJ) $<
+.c{$(CPP_OBJS)}.obj::
+ $(CPP) @<<
+ $(CPP_PROJ) $<
+<<
-.cpp{$(CPP_OBJS)}.obj:
- $(CPP) $(CPP_PROJ) $<
+.cpp{$(CPP_OBJS)}.obj::
+ $(CPP) @<<
+ $(CPP_PROJ) $<
+<<
-.cxx{$(CPP_OBJS)}.obj:
- $(CPP) $(CPP_PROJ) $<
+.cxx{$(CPP_OBJS)}.obj::
+ $(CPP) @<<
+ $(CPP_PROJ) $<
+<<
-.c{$(CPP_SBRS)}.sbr:
- $(CPP) $(CPP_PROJ) $<
+.c{$(CPP_SBRS)}.sbr::
+ $(CPP) @<<
+ $(CPP_PROJ) $<
+<<
-.cpp{$(CPP_SBRS)}.sbr:
- $(CPP) $(CPP_PROJ) $<
+.cpp{$(CPP_SBRS)}.sbr::
+ $(CPP) @<<
+ $(CPP_PROJ) $<
+<<
-.cxx{$(CPP_SBRS)}.sbr:
- $(CPP) $(CPP_PROJ) $<
+.cxx{$(CPP_SBRS)}.sbr::
+ $(CPP) @<<
+ $(CPP_PROJ) $<
+<<
-################################################################################
-# Begin Target
-# Name "regex - Win32 Release"
-# Name "regex - Win32 Debug"
+!IF "$(CFG)" == "regex - Win32 Release" || "$(CFG)" == "regex - Win32 Debug"
+SOURCE=.\regcomp.c
!IF "$(CFG)" == "regex - Win32 Release"
-!ELSEIF "$(CFG)" == "regex - Win32 Debug"
-
-!ENDIF
-
-################################################################################
-# Begin Source File
-
-SOURCE=.\regcomp.c
DEP_CPP_REGCO=\
".\cclass.h"\
".\cname.h"\
@@ -198,112 +187,118 @@
".\regex.h"\
".\regex2.h"\
".\utils.h"\
- {$(INCLUDE)}"\sys\types.h"\
-!IF "$(CFG)" == "regex - Win32 Release"
-
-
"$(INTDIR)\regcomp.obj" : $(SOURCE) $(DEP_CPP_REGCO) "$(INTDIR)"
!ELSEIF "$(CFG)" == "regex - Win32 Debug"
+DEP_CPP_REGCO=\
+ ".\cclass.h"\
+ ".\cname.h"\
+ ".\regcomp.ih"\
+ ".\regex.h"\
+ ".\regex2.h"\
+ ".\utils.h"\
+ {$(INCLUDE)}"sys\types.h"\
+
-"$(INTDIR)\regcomp.obj" : $(SOURCE) $(DEP_CPP_REGCO) "$(INTDIR)"
-
-"$(INTDIR)\regcomp.sbr" : $(SOURCE) $(DEP_CPP_REGCO) "$(INTDIR)"
+"$(INTDIR)\regcomp.obj" "$(INTDIR)\regcomp.sbr" : $(SOURCE)
$(DEP_CPP_REGCO)\
+ "$(INTDIR)"
!ENDIF
-# End Source File
-################################################################################
-# Begin Source File
-
SOURCE=.\regerror.c
+
+!IF "$(CFG)" == "regex - Win32 Release"
+
DEP_CPP_REGER=\
".\regerror.ih"\
".\regex.h"\
".\utils.h"\
- {$(INCLUDE)}"\sys\types.h"\
-!IF "$(CFG)" == "regex - Win32 Release"
-
-
"$(INTDIR)\regerror.obj" : $(SOURCE) $(DEP_CPP_REGER) "$(INTDIR)"
!ELSEIF "$(CFG)" == "regex - Win32 Debug"
+DEP_CPP_REGER=\
+ ".\regerror.ih"\
+ ".\regex.h"\
+ ".\utils.h"\
+ {$(INCLUDE)}"sys\types.h"\
+
-"$(INTDIR)\regerror.obj" : $(SOURCE) $(DEP_CPP_REGER) "$(INTDIR)"
-
-"$(INTDIR)\regerror.sbr" : $(SOURCE) $(DEP_CPP_REGER) "$(INTDIR)"
+"$(INTDIR)\regerror.obj" "$(INTDIR)\regerror.sbr" : $(SOURCE)
$(DEP_CPP_REGER)\
+ "$(INTDIR)"
!ENDIF
-# End Source File
-################################################################################
-# Begin Source File
-
SOURCE=.\regexec.c
+
+!IF "$(CFG)" == "regex - Win32 Release"
+
DEP_CPP_REGEX=\
".\engine.c"\
".\engine.ih"\
".\regex.h"\
".\regex2.h"\
".\utils.h"\
- {$(INCLUDE)}"\sys\types.h"\
-!IF "$(CFG)" == "regex - Win32 Release"
-
-
"$(INTDIR)\regexec.obj" : $(SOURCE) $(DEP_CPP_REGEX) "$(INTDIR)"
!ELSEIF "$(CFG)" == "regex - Win32 Debug"
+DEP_CPP_REGEX=\
+ ".\engine.c"\
+ ".\engine.ih"\
+ ".\regex.h"\
+ ".\regex2.h"\
+ ".\utils.h"\
+ {$(INCLUDE)}"sys\types.h"\
+
-"$(INTDIR)\regexec.obj" : $(SOURCE) $(DEP_CPP_REGEX) "$(INTDIR)"
-
-"$(INTDIR)\regexec.sbr" : $(SOURCE) $(DEP_CPP_REGEX) "$(INTDIR)"
+"$(INTDIR)\regexec.obj" "$(INTDIR)\regexec.sbr" : $(SOURCE)
$(DEP_CPP_REGEX)\
+ "$(INTDIR)"
!ENDIF
-# End Source File
-################################################################################
-# Begin Source File
-
SOURCE=.\regfree.c
+
+!IF "$(CFG)" == "regex - Win32 Release"
+
DEP_CPP_REGFR=\
".\regex.h"\
".\regex2.h"\
".\utils.h"\
- {$(INCLUDE)}"\sys\types.h"\
-!IF "$(CFG)" == "regex - Win32 Release"
-
-
"$(INTDIR)\regfree.obj" : $(SOURCE) $(DEP_CPP_REGFR) "$(INTDIR)"
!ELSEIF "$(CFG)" == "regex - Win32 Debug"
+DEP_CPP_REGFR=\
+ ".\regex.h"\
+ ".\regex2.h"\
+ ".\utils.h"\
+ {$(INCLUDE)}"sys\types.h"\
+
-"$(INTDIR)\regfree.obj" : $(SOURCE) $(DEP_CPP_REGFR) "$(INTDIR)"
+"$(INTDIR)\regfree.obj" "$(INTDIR)\regfree.sbr" : $(SOURCE)
$(DEP_CPP_REGFR)\
+ "$(INTDIR)"
-"$(INTDIR)\regfree.sbr" : $(SOURCE) $(DEP_CPP_REGFR) "$(INTDIR)"
+!ENDIF
+
+SOURCE=.\engine.c
!ENDIF
-# End Source File
-# End Target
-# End Project
-################################################################################
