pcs 98/02/05 05:09:31
Modified: src/ap ap.dsp ap.mak
Log:
Use single "include" directory
Revision Changes Path
1.2 +2 -2 apache-1.3/src/ap/ap.dsp
Index: ap.dsp
===================================================================
RCS file: /export/home/cvs/apache-1.3/src/ap/ap.dsp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ap.dsp 1998/01/04 13:03:50 1.1
+++ ap.dsp 1998/02/05 13:09:30 1.2
@@ -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 /W3 /GX /O2 /I "../main" /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
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 "../main" /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
BSC32=bscmake.exe
# ADD BASE BSC32 /nologo
# ADD BSC32 /nologo
1.2 +55 -14 apache-1.3/src/ap/ap.mak
Index: ap.mak
===================================================================
RCS file: /export/home/cvs/apache-1.3/src/ap/ap.mak,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- ap.mak 1998/01/04 13:03:51 1.1
+++ ap.mak 1998/02/05 13:09:30 1.2
@@ -47,6 +47,8 @@
CLEAN :
[EMAIL PROTECTED] "$(INTDIR)\ap_cpystrn.obj"
+ [EMAIL PROTECTED] "$(INTDIR)\ap_signal.obj"
+ [EMAIL PROTECTED] "$(INTDIR)\ap_slack.obj"
[EMAIL PROTECTED] "$(INTDIR)\ap_snprintf.obj"
[EMAIL PROTECTED] "$(INTDIR)\ap_strings.obj"
[EMAIL PROTECTED] "$(INTDIR)\vc50.idb"
@@ -55,7 +57,7 @@
"$(OUTDIR)" :
if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
-CPP_PROJ=/nologo /ML /W3 /GX /O2 /I "../main" /D "WIN32" /D "NDEBUG" /D\
+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_OBJS=.\Release/
CPP_SBRS=.
@@ -67,6 +69,8 @@
LIB32_FLAGS=/nologo /out:"$(OUTDIR)\ap.lib"
LIB32_OBJS= \
"$(INTDIR)\ap_cpystrn.obj" \
+ "$(INTDIR)\ap_signal.obj" \
+ "$(INTDIR)\ap_slack.obj" \
"$(INTDIR)\ap_snprintf.obj" \
"$(INTDIR)\ap_strings.obj"
@@ -95,6 +99,8 @@
CLEAN :
[EMAIL PROTECTED] "$(INTDIR)\ap_cpystrn.obj"
+ [EMAIL PROTECTED] "$(INTDIR)\ap_signal.obj"
+ [EMAIL PROTECTED] "$(INTDIR)\ap_slack.obj"
[EMAIL PROTECTED] "$(INTDIR)\ap_snprintf.obj"
[EMAIL PROTECTED] "$(INTDIR)\ap_strings.obj"
[EMAIL PROTECTED] "$(INTDIR)\vc50.idb"
@@ -103,7 +109,7 @@
"$(OUTDIR)" :
if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
-CPP_PROJ=/nologo /MDd /W3 /GX /Z7 /Od /I "../main" /D "WIN32" /D "_DEBUG" /D\
+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_OBJS=.\Debug/
CPP_SBRS=.
@@ -115,6 +121,8 @@
LIB32_FLAGS=/nologo /out:"$(OUTDIR)\ap.lib"
LIB32_OBJS= \
"$(INTDIR)\ap_cpystrn.obj" \
+ "$(INTDIR)\ap_signal.obj" \
+ "$(INTDIR)\ap_slack.obj" \
"$(INTDIR)\ap_snprintf.obj" \
"$(INTDIR)\ap_strings.obj"
@@ -159,23 +167,55 @@
!IF "$(CFG)" == "ap - Win32 Release" || "$(CFG)" == "ap - Win32 Debug"
SOURCE=.\ap_cpystrn.c
DEP_CPP_AP_CP=\
- "..\main\alloc.h"\
- "..\main\buff.h"\
- "..\main\conf.h"\
- "..\main\httpd.h"\
+ "..\include\alloc.h"\
+ "..\include\ap.h"\
+ "..\include\buff.h"\
+ "..\include\conf.h"\
+ "..\include\hsregex.h"\
+ "..\include\httpd.h"\
"..\os\win32\os.h"\
"..\os\win32\readdir.h"\
- "..\regex\regex.h"\
"$(INTDIR)\ap_cpystrn.obj" : $(SOURCE) $(DEP_CPP_AP_CP) "$(INTDIR)"
+SOURCE=.\ap_signal.c
+DEP_CPP_AP_SI=\
+ "..\include\alloc.h"\
+ "..\include\ap.h"\
+ "..\include\buff.h"\
+ "..\include\conf.h"\
+ "..\include\hsregex.h"\
+ "..\include\httpd.h"\
+ "..\os\win32\os.h"\
+ "..\os\win32\readdir.h"\
+
+
+"$(INTDIR)\ap_signal.obj" : $(SOURCE) $(DEP_CPP_AP_SI) "$(INTDIR)"
+
+
+SOURCE=.\ap_slack.c
+DEP_CPP_AP_SL=\
+ "..\include\alloc.h"\
+ "..\include\ap.h"\
+ "..\include\buff.h"\
+ "..\include\conf.h"\
+ "..\include\hsregex.h"\
+ "..\include\http_log.h"\
+ "..\include\httpd.h"\
+ "..\os\win32\os.h"\
+ "..\os\win32\readdir.h"\
+
+
+"$(INTDIR)\ap_slack.obj" : $(SOURCE) $(DEP_CPP_AP_SL) "$(INTDIR)"
+
+
SOURCE=.\ap_snprintf.c
DEP_CPP_AP_SN=\
- "..\main\conf.h"\
+ "..\include\conf.h"\
+ "..\include\hsregex.h"\
"..\os\win32\os.h"\
- "..\regex\regex.h"\
"$(INTDIR)\ap_snprintf.obj" : $(SOURCE) $(DEP_CPP_AP_SN) "$(INTDIR)"
@@ -183,13 +223,14 @@
SOURCE=.\ap_strings.c
DEP_CPP_AP_ST=\
- "..\main\alloc.h"\
- "..\main\buff.h"\
- "..\main\conf.h"\
- "..\main\httpd.h"\
+ "..\include\alloc.h"\
+ "..\include\ap.h"\
+ "..\include\buff.h"\
+ "..\include\conf.h"\
+ "..\include\hsregex.h"\
+ "..\include\httpd.h"\
"..\os\win32\os.h"\
"..\os\win32\readdir.h"\
- "..\regex\regex.h"\
"$(INTDIR)\ap_strings.obj" : $(SOURCE) $(DEP_CPP_AP_ST) "$(INTDIR)"
