stoddard 99/09/13 10:06:16
Modified: src/ap ap.dsp ap.mak
Log:
Add path to APR include files. Remove files that are now in APR.
Revision Changes Path
1.3 +2 -22 apache-2.0/src/ap/ap.dsp
Index: ap.dsp
===================================================================
RCS file: /home/cvs/apache-2.0/src/ap/ap.dsp,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- ap.dsp 1999/08/27 22:56:51 1.2
+++ ap.dsp 1999/09/13 17:06:15 1.3
@@ -39,7 +39,7 @@
# PROP Intermediate_Dir "Release"
# PROP Target_Dir ""
# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /YX
/FD /c
-# ADD CPP /nologo /MD /W3 /GX /O2 /I "../include" /D "WIN32" /D "NDEBUG" /D
"_WINDOWS" /YX /FD /c
+# ADD CPP /nologo /MD /W3 /GX /O2 /I "../include" /I "../lib/apr/include" /D
"WIN32" /D "NDEBUG" /D "_WINDOWS" /YX /FD /c
BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
@@ -60,7 +60,7 @@
# PROP Intermediate_Dir "Debug"
# PROP Target_Dir ""
# ADD BASE CPP /nologo /W3 /GX /Z7 /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS"
/YX /FD /c
-# ADD CPP /nologo /MDd /W3 /GX /Z7 /Od /I "../include" /D "WIN32" /D
"_DEBUG" /D "_WINDOWS" /YX /FD /c
+# ADD CPP /nologo /MDd /W3 /GX /Z7 /Od /I "../include" /I
"../lib/apr/include" /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /YX /FD /c
BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
@@ -79,27 +79,7 @@
# PROP Default_Filter ""
# Begin Source File
-SOURCE=.\ap_cpystrn.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\ap_fnmatch.c
-# End Source File
-# Begin Source File
-
SOURCE=.\ap_hooks.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\ap_signal.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\ap_slack.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\ap_snprintf.c
# End Source File
# End Group
# Begin Group "Header Files"
1.4 +49 -208 apache-2.0/src/ap/ap.mak
Index: ap.mak
===================================================================
RCS file: /home/cvs/apache-2.0/src/ap/ap.mak,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- ap.mak 1999/09/07 15:31:56 1.3
+++ ap.mak 1999/09/13 17:06:15 1.4
@@ -25,6 +25,8 @@
NULL=nul
!ENDIF
+CPP=cl.exe
+
!IF "$(CFG)" == "ap - Win32 Release"
OUTDIR=.\Release
@@ -46,56 +48,20 @@
CLEAN :
[EMAIL PROTECTED] "$(INTDIR)\ap_base64.obj"
[EMAIL PROTECTED] "$(INTDIR)\ap_checkpass.obj"
- [EMAIL PROTECTED] "$(INTDIR)\ap_cpystrn.obj"
- [EMAIL PROTECTED] "$(INTDIR)\ap_fnmatch.obj"
[EMAIL PROTECTED] "$(INTDIR)\ap_hooks.obj"
[EMAIL PROTECTED] "$(INTDIR)\ap_md5c.obj"
[EMAIL PROTECTED] "$(INTDIR)\ap_sha1.obj"
- [EMAIL PROTECTED] "$(INTDIR)\ap_signal.obj"
- [EMAIL PROTECTED] "$(INTDIR)\ap_slack.obj"
- [EMAIL PROTECTED] "$(INTDIR)\ap_snprintf.obj"
[EMAIL PROTECTED] "$(INTDIR)\vc50.idb"
[EMAIL PROTECTED] "$(OUTDIR)\ap.lib"
"$(OUTDIR)" :
if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
-CPP=cl.exe
-CPP_PROJ=/nologo /MD /W3 /GX /O2 /I "../include" /D "WIN32" /D "NDEBUG" /D\
- "_WINDOWS" /Fp"$(INTDIR)\ap.pch" /YX /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD
/c
+CPP_PROJ=/nologo /MD /W3 /GX /O2 /I "../include" /I "../lib/apr/include" /D\
+ "WIN32" /D "NDEBUG" /D "_WINDOWS" /Fp"$(INTDIR)\ap.pch" /YX
/Fo"$(INTDIR)\\"\
+ /Fd"$(INTDIR)\\" /FD /c
CPP_OBJS=.\Release/
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) $<
-<<
-
BSC32=bscmake.exe
BSC32_FLAGS=/nologo /o"$(OUTDIR)\ap.bsc"
BSC32_SBRS= \
@@ -105,14 +71,9 @@
LIB32_OBJS= \
"$(INTDIR)\ap_base64.obj" \
"$(INTDIR)\ap_checkpass.obj" \
- "$(INTDIR)\ap_cpystrn.obj" \
- "$(INTDIR)\ap_fnmatch.obj" \
"$(INTDIR)\ap_hooks.obj" \
"$(INTDIR)\ap_md5c.obj" \
- "$(INTDIR)\ap_sha1.obj" \
- "$(INTDIR)\ap_signal.obj" \
- "$(INTDIR)\ap_slack.obj" \
- "$(INTDIR)\ap_snprintf.obj"
+ "$(INTDIR)\ap_sha1.obj"
"$(OUTDIR)\ap.lib" : "$(OUTDIR)" $(DEF_FILE) $(LIB32_OBJS)
$(LIB32) @<<
@@ -140,26 +101,40 @@
CLEAN :
[EMAIL PROTECTED] "$(INTDIR)\ap_base64.obj"
[EMAIL PROTECTED] "$(INTDIR)\ap_checkpass.obj"
- [EMAIL PROTECTED] "$(INTDIR)\ap_cpystrn.obj"
- [EMAIL PROTECTED] "$(INTDIR)\ap_fnmatch.obj"
[EMAIL PROTECTED] "$(INTDIR)\ap_hooks.obj"
[EMAIL PROTECTED] "$(INTDIR)\ap_md5c.obj"
[EMAIL PROTECTED] "$(INTDIR)\ap_sha1.obj"
- [EMAIL PROTECTED] "$(INTDIR)\ap_signal.obj"
- [EMAIL PROTECTED] "$(INTDIR)\ap_slack.obj"
- [EMAIL PROTECTED] "$(INTDIR)\ap_snprintf.obj"
[EMAIL PROTECTED] "$(INTDIR)\vc50.idb"
[EMAIL PROTECTED] "$(OUTDIR)\ap.lib"
"$(OUTDIR)" :
if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
-CPP=cl.exe
-CPP_PROJ=/nologo /MDd /W3 /GX /Z7 /Od /I "../include" /D "WIN32" /D "_DEBUG"
/D\
- "_WINDOWS" /Fp"$(INTDIR)\ap.pch" /YX /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD
/c
+CPP_PROJ=/nologo /MDd /W3 /GX /Z7 /Od /I "../include" /I
"../lib/apr/include"\
+ /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /Fp"$(INTDIR)\ap.pch" /YX
/Fo"$(INTDIR)\\"\
+ /Fd"$(INTDIR)\\" /FD /c
CPP_OBJS=.\Debug/
CPP_SBRS=.
+BSC32=bscmake.exe
+BSC32_FLAGS=/nologo /o"$(OUTDIR)\ap.bsc"
+BSC32_SBRS= \
+
+LIB32=link.exe -lib
+LIB32_FLAGS=/nologo /out:"$(OUTDIR)\ap.lib"
+LIB32_OBJS= \
+ "$(INTDIR)\ap_base64.obj" \
+ "$(INTDIR)\ap_checkpass.obj" \
+ "$(INTDIR)\ap_hooks.obj" \
+ "$(INTDIR)\ap_md5c.obj" \
+ "$(INTDIR)\ap_sha1.obj"
+"$(OUTDIR)\ap.lib" : "$(OUTDIR)" $(DEF_FILE) $(LIB32_OBJS)
+ $(LIB32) @<<
+ $(LIB32_FLAGS) $(DEF_FLAGS) $(LIB32_OBJS)
+<<
+
+!ENDIF
+
.c{$(CPP_OBJS)}.obj::
$(CPP) @<<
$(CPP_PROJ) $<
@@ -190,99 +165,12 @@
$(CPP_PROJ) $<
<<
-BSC32=bscmake.exe
-BSC32_FLAGS=/nologo /o"$(OUTDIR)\ap.bsc"
-BSC32_SBRS= \
-
-LIB32=link.exe -lib
-LIB32_FLAGS=/nologo /out:"$(OUTDIR)\ap.lib"
-LIB32_OBJS= \
- "$(INTDIR)\ap_base64.obj" \
- "$(INTDIR)\ap_checkpass.obj" \
- "$(INTDIR)\ap_cpystrn.obj" \
- "$(INTDIR)\ap_fnmatch.obj" \
- "$(INTDIR)\ap_hooks.obj" \
- "$(INTDIR)\ap_md5c.obj" \
- "$(INTDIR)\ap_sha1.obj" \
- "$(INTDIR)\ap_signal.obj" \
- "$(INTDIR)\ap_slack.obj" \
- "$(INTDIR)\ap_snprintf.obj"
-"$(OUTDIR)\ap.lib" : "$(OUTDIR)" $(DEF_FILE) $(LIB32_OBJS)
- $(LIB32) @<<
- $(LIB32_FLAGS) $(DEF_FLAGS) $(LIB32_OBJS)
-<<
-
-!ENDIF
-
-
!IF "$(CFG)" == "ap - Win32 Release" || "$(CFG)" == "ap - Win32 Debug"
-SOURCE=.\ap_cpystrn.c
-DEP_CPP_AP_CP=\
- "..\include\ap.h"\
- "..\include\ap_config.h"\
- "..\include\ap_ctype.h"\
- "..\include\ap_iol.h"\
- "..\include\ap_mmn.h"\
- "..\include\apr.h"\
- "..\include\buff.h"\
- "..\include\hsregex.h"\
- "..\include\httpd.h"\
- "..\include\util_uri.h"\
- "..\os\win32\os.h"\
- {$(INCLUDE)}"sys\stat.h"\
- {$(INCLUDE)}"sys\types.h"\
-
-NODEP_CPP_AP_CP=\
- "..\include\ap_config_auto.h"\
- "..\include\apr_general.h"\
- "..\include\apr_lib.h"\
- "..\include\ebcdic.h"\
- "..\include\os.h"\
-
-
-"$(INTDIR)\ap_cpystrn.obj" : $(SOURCE) $(DEP_CPP_AP_CP) "$(INTDIR)"
-
-
-SOURCE=.\ap_fnmatch.c
+SOURCE=.\ap_hooks.c
!IF "$(CFG)" == "ap - Win32 Release"
-DEP_CPP_AP_FN=\
- "..\include\ap_config.h"\
- "..\include\ap_ctype.h"\
- "..\include\ap_mmn.h"\
- "..\include\fnmatch.h"\
- "..\include\hsregex.h"\
- "..\os\win32\os.h"\
- {$(INCLUDE)}"sys\stat.h"\
- {$(INCLUDE)}"sys\types.h"\
-
-NODEP_CPP_AP_FN=\
- "..\include\ap_config_auto.h"\
- "..\include\os.h"\
-
-
-"$(INTDIR)\ap_fnmatch.obj" : $(SOURCE) $(DEP_CPP_AP_FN) "$(INTDIR)"
-
-
-!ELSEIF "$(CFG)" == "ap - Win32 Debug"
-
-DEP_CPP_AP_FN=\
- "..\include\ap_config.h"\
- "..\include\ap_ctype.h"\
- "..\include\ap_mmn.h"\
- "..\include\fnmatch.h"\
- "..\include\hsregex.h"\
- "..\os\win32\os.h"\
-
-
-"$(INTDIR)\ap_fnmatch.obj" : $(SOURCE) $(DEP_CPP_AP_FN) "$(INTDIR)"
-
-
-!ENDIF
-
-SOURCE=.\ap_hooks.c
DEP_CPP_AP_HO=\
"..\include\ap.h"\
"..\include\ap_config.h"\
@@ -295,102 +183,55 @@
"..\include\hsregex.h"\
"..\include\httpd.h"\
"..\include\util_uri.h"\
+ "..\lib\apr\file_io\win32\readdir.h"\
+ "..\lib\apr\include\apr_errno.h"\
+ "..\lib\apr\include\apr_file_io.h"\
+ "..\lib\apr\include\apr_general.h"\
+ "..\lib\apr\include\apr_lib.h"\
+ "..\lib\apr\include\apr_win.h"\
+ "..\lib\apr\include\hsregex.h"\
"..\os\win32\os.h"\
{$(INCLUDE)}"sys\stat.h"\
{$(INCLUDE)}"sys\types.h"\
NODEP_CPP_AP_HO=\
"..\include\ap_config_auto.h"\
- "..\include\apr_general.h"\
- "..\include\apr_lib.h"\
"..\include\ebcdic.h"\
"..\include\os.h"\
+ "..\lib\apr\include\apr_config.h"\
"$(INTDIR)\ap_hooks.obj" : $(SOURCE) $(DEP_CPP_AP_HO) "$(INTDIR)"
-
-SOURCE=.\ap_signal.c
-DEP_CPP_AP_SI=\
- "..\include\ap.h"\
- "..\include\ap_config.h"\
- "..\include\ap_ctype.h"\
- "..\include\ap_iol.h"\
- "..\include\ap_mmn.h"\
- "..\include\apr.h"\
- "..\include\buff.h"\
- "..\include\hsregex.h"\
- "..\include\httpd.h"\
- "..\include\util_uri.h"\
- "..\os\win32\os.h"\
- {$(INCLUDE)}"sys\stat.h"\
- {$(INCLUDE)}"sys\types.h"\
-
-NODEP_CPP_AP_SI=\
- "..\include\ap_config_auto.h"\
- "..\include\apr_general.h"\
- "..\include\apr_lib.h"\
- "..\include\ebcdic.h"\
- "..\include\os.h"\
-
-
-"$(INTDIR)\ap_signal.obj" : $(SOURCE) $(DEP_CPP_AP_SI) "$(INTDIR)"
+!ELSEIF "$(CFG)" == "ap - Win32 Debug"
-SOURCE=.\ap_slack.c
-DEP_CPP_AP_SL=\
+DEP_CPP_AP_HO=\
"..\include\ap.h"\
"..\include\ap_config.h"\
"..\include\ap_ctype.h"\
+ "..\include\ap_hooks.h"\
"..\include\ap_iol.h"\
"..\include\ap_mmn.h"\
"..\include\apr.h"\
"..\include\buff.h"\
"..\include\hsregex.h"\
- "..\include\http_log.h"\
"..\include\httpd.h"\
"..\include\util_uri.h"\
+ "..\lib\apr\file_io\win32\readdir.h"\
+ "..\lib\apr\include\apr_errno.h"\
+ "..\lib\apr\include\apr_file_io.h"\
+ "..\lib\apr\include\apr_general.h"\
+ "..\lib\apr\include\apr_lib.h"\
+ "..\lib\apr\include\apr_win.h"\
+ "..\lib\apr\include\hsregex.h"\
"..\os\win32\os.h"\
- {$(INCLUDE)}"sys\stat.h"\
- {$(INCLUDE)}"sys\types.h"\
-NODEP_CPP_AP_SL=\
- "..\include\ap_config_auto.h"\
- "..\include\apr_general.h"\
- "..\include\apr_lib.h"\
- "..\include\ebcdic.h"\
- "..\include\os.h"\
-
-
-"$(INTDIR)\ap_slack.obj" : $(SOURCE) $(DEP_CPP_AP_SL) "$(INTDIR)"
+"$(INTDIR)\ap_hooks.obj" : $(SOURCE) $(DEP_CPP_AP_HO) "$(INTDIR)"
-SOURCE=.\ap_snprintf.c
-DEP_CPP_AP_SN=\
- "..\include\ap.h"\
- "..\include\ap_config.h"\
- "..\include\ap_ctype.h"\
- "..\include\ap_iol.h"\
- "..\include\ap_mmn.h"\
- "..\include\apr.h"\
- "..\include\buff.h"\
- "..\include\hsregex.h"\
- "..\include\httpd.h"\
- "..\include\util_uri.h"\
- "..\os\win32\os.h"\
- {$(INCLUDE)}"sys\stat.h"\
- {$(INCLUDE)}"sys\types.h"\
-
-NODEP_CPP_AP_SN=\
- "..\include\ap_config_auto.h"\
- "..\include\apr_general.h"\
- "..\include\apr_lib.h"\
- "..\include\ebcdic.h"\
- "..\include\os.h"\
-
-
-"$(INTDIR)\ap_snprintf.obj" : $(SOURCE) $(DEP_CPP_AP_SN) "$(INTDIR)"
+!ENDIF
SOURCE=.\ap_base64.c
