ben 97/12/24 04:37:08
Modified: src ApacheCore.dsp ApacheCore.mak
Log:
Deal with util_snprintf.c -> ap_snprintf.c move.
Revision Changes Path
1.15 +4 -4 apachen/src/ApacheCore.dsp
Index: ApacheCore.dsp
===================================================================
RCS file: /export/home/cvs/apachen/src/ApacheCore.dsp,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -r1.14 -r1.15
--- ApacheCore.dsp 1997/11/23 18:10:01 1.14
+++ ApacheCore.dsp 1997/12/24 12:37:07 1.15
@@ -97,6 +97,10 @@
# End Source File
# Begin Source File
+SOURCE=.\ap\ap_snprintf.c
+# End Source File
+# Begin Source File
+
SOURCE=.\ApacheCore.def
# End Source File
# Begin Source File
@@ -262,10 +266,6 @@
# Begin Source File
SOURCE=.\main\util_script.c
-# End Source File
-# Begin Source File
-
-SOURCE=.\main\util_snprintf.c
# End Source File
# Begin Source File
1.22 +34 -35 apachen/src/ApacheCore.mak
Index: ApacheCore.mak
===================================================================
RCS file: /export/home/cvs/apachen/src/ApacheCore.mak,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -r1.21 -r1.22
--- ApacheCore.mak 1997/11/16 15:43:11 1.21
+++ ApacheCore.mak 1997/12/24 12:37:07 1.22
@@ -48,6 +48,7 @@
CLEAN :
[EMAIL PROTECTED] "$(INTDIR)\alloc.obj"
+ [EMAIL PROTECTED] "$(INTDIR)\ap_snprintf.obj"
[EMAIL PROTECTED] "$(INTDIR)\buff.obj"
[EMAIL PROTECTED] "$(INTDIR)\buildmark.obj"
[EMAIL PROTECTED] "$(INTDIR)\explain.obj"
@@ -89,7 +90,6 @@
[EMAIL PROTECTED] "$(INTDIR)\util_date.obj"
[EMAIL PROTECTED] "$(INTDIR)\util_md5.obj"
[EMAIL PROTECTED] "$(INTDIR)\util_script.obj"
- [EMAIL PROTECTED] "$(INTDIR)\util_snprintf.obj"
[EMAIL PROTECTED] "$(INTDIR)\util_win32.obj"
[EMAIL PROTECTED] "$(INTDIR)\vc50.idb"
[EMAIL PROTECTED] "$(OUTDIR)\ApacheCore.dll"
@@ -153,6 +153,7 @@
".\ApacheCore.def"
LINK32_OBJS= \
"$(INTDIR)\alloc.obj" \
+ "$(INTDIR)\ap_snprintf.obj" \
"$(INTDIR)\buff.obj" \
"$(INTDIR)\buildmark.obj" \
"$(INTDIR)\explain.obj" \
@@ -194,7 +195,6 @@
"$(INTDIR)\util_date.obj" \
"$(INTDIR)\util_md5.obj" \
"$(INTDIR)\util_script.obj" \
- "$(INTDIR)\util_snprintf.obj" \
"$(INTDIR)\util_win32.obj"
"$(OUTDIR)\ApacheCore.dll" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
@@ -223,6 +223,8 @@
CLEAN :
[EMAIL PROTECTED] "$(INTDIR)\alloc.obj"
[EMAIL PROTECTED] "$(INTDIR)\alloc.sbr"
+ [EMAIL PROTECTED] "$(INTDIR)\ap_snprintf.obj"
+ [EMAIL PROTECTED] "$(INTDIR)\ap_snprintf.sbr"
[EMAIL PROTECTED] "$(INTDIR)\buff.obj"
[EMAIL PROTECTED] "$(INTDIR)\buff.sbr"
[EMAIL PROTECTED] "$(INTDIR)\buildmark.obj"
@@ -305,8 +307,6 @@
[EMAIL PROTECTED] "$(INTDIR)\util_md5.sbr"
[EMAIL PROTECTED] "$(INTDIR)\util_script.obj"
[EMAIL PROTECTED] "$(INTDIR)\util_script.sbr"
- [EMAIL PROTECTED] "$(INTDIR)\util_snprintf.obj"
- [EMAIL PROTECTED] "$(INTDIR)\util_snprintf.sbr"
[EMAIL PROTECTED] "$(INTDIR)\util_win32.obj"
[EMAIL PROTECTED] "$(INTDIR)\util_win32.sbr"
[EMAIL PROTECTED] "$(INTDIR)\vc50.idb"
@@ -365,6 +365,7 @@
BSC32_FLAGS=/nologo /o"$(OUTDIR)\ApacheCore.bsc"
BSC32_SBRS= \
"$(INTDIR)\alloc.sbr" \
+ "$(INTDIR)\ap_snprintf.sbr" \
"$(INTDIR)\buff.sbr" \
"$(INTDIR)\buildmark.sbr" \
"$(INTDIR)\explain.sbr" \
@@ -406,7 +407,6 @@
"$(INTDIR)\util_date.sbr" \
"$(INTDIR)\util_md5.sbr" \
"$(INTDIR)\util_script.sbr" \
- "$(INTDIR)\util_snprintf.sbr" \
"$(INTDIR)\util_win32.sbr"
"$(OUTDIR)\ApacheCore.bsc" : "$(OUTDIR)" $(BSC32_SBRS)
@@ -424,6 +424,7 @@
".\ApacheCore.def"
LINK32_OBJS= \
"$(INTDIR)\alloc.obj" \
+ "$(INTDIR)\ap_snprintf.obj" \
"$(INTDIR)\buff.obj" \
"$(INTDIR)\buildmark.obj" \
"$(INTDIR)\explain.obj" \
@@ -465,7 +466,6 @@
"$(INTDIR)\util_date.obj" \
"$(INTDIR)\util_md5.obj" \
"$(INTDIR)\util_script.obj" \
- "$(INTDIR)\util_snprintf.obj" \
"$(INTDIR)\util_win32.obj"
"$(OUTDIR)\ApacheCore.dll" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
@@ -519,6 +519,34 @@
!ENDIF
+SOURCE=.\ap\ap_snprintf.c
+
+!IF "$(CFG)" == "ApacheCore - Win32 Release"
+
+DEP_CPP_AP_SN=\
+ ".\main\conf.h"\
+ ".\os\win32\os.h"\
+ ".\regex\regex.h"\
+ {$(INCLUDE)}"sys\stat.h"\
+ {$(INCLUDE)}"sys\types.h"\
+
+NODEP_CPP_AP_SN=\
+ ".\main\os.h"\
+
+
+"$(INTDIR)\ap_snprintf.obj" : $(SOURCE) $(DEP_CPP_AP_SN) "$(INTDIR)"
+ $(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+!ELSEIF "$(CFG)" == "ApacheCore - Win32 Debug"
+
+
+"$(INTDIR)\ap_snprintf.obj" "$(INTDIR)\ap_snprintf.sbr" : $(SOURCE)
"$(INTDIR)"
+ $(CPP) $(CPP_PROJ) $(SOURCE)
+
+
+!ENDIF
+
SOURCE=.\main\buff.c
!IF "$(CFG)" == "ApacheCore - Win32 Release"
@@ -2250,35 +2278,6 @@
"$(INTDIR)\util_script.obj" "$(INTDIR)\util_script.sbr" : $(SOURCE)\
$(DEP_CPP_UTIL_S) "$(INTDIR)"
- $(CPP) $(CPP_PROJ) $(SOURCE)
-
-
-!ENDIF
-
-SOURCE=.\main\util_snprintf.c
-
-!IF "$(CFG)" == "ApacheCore - Win32 Release"
-
-DEP_CPP_UTIL_SN=\
- ".\main\conf.h"\
- ".\os\win32\os.h"\
- ".\regex\regex.h"\
-
-
-"$(INTDIR)\util_snprintf.obj" : $(SOURCE) $(DEP_CPP_UTIL_SN) "$(INTDIR)"
- $(CPP) $(CPP_PROJ) $(SOURCE)
-
-
-!ELSEIF "$(CFG)" == "ApacheCore - Win32 Debug"
-
-DEP_CPP_UTIL_SN=\
- ".\main\conf.h"\
- ".\os\win32\os.h"\
- ".\regex\regex.h"\
-
-
-"$(INTDIR)\util_snprintf.obj" "$(INTDIR)\util_snprintf.sbr" :
$(SOURCE)\
- $(DEP_CPP_UTIL_SN) "$(INTDIR)"
$(CPP) $(CPP_PROJ) $(SOURCE)