httpd-cvs mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From wr...@locus.apache.org
Subject cvs commit: apache-1.3/src/ap ap.mak
Date Fri, 23 Jun 2000 00:28:59 GMT
wrowe       00/06/22 17:28:58

  Modified:    src/ap   ap.mak
  Log:
    Back and forth... seems I transposed a .dsp for ap.mak, this unwinds
    that and applies all the intents of the last patch to ap.mak.
  
  Revision  Changes    Path
  1.11      +321 -77   apache-1.3/src/ap/ap.mak
  
  Index: ap.mak
  ===================================================================
  RCS file: /home/cvs/apache-1.3/src/ap/ap.mak,v
  retrieving revision 1.10
  retrieving revision 1.11
  diff -u -r1.10 -r1.11
  --- ap.mak	2000/06/23 00:17:56	1.10
  +++ ap.mak	2000/06/23 00:28:56	1.11
  @@ -1,15 +1,11 @@
  -# Microsoft Developer Studio Project File - Name="ap" - Package Owner=<4>
  -# Microsoft Developer Studio Generated Build File, Format Version 5.00
  -# ** DO NOT EDIT **
  -
  -# TARGTYPE "Win32 (x86) Static Library" 0x0104
  -
  +# Microsoft Developer Studio Generated NMAKE File, Based on ap.dsp
  +!IF "$(CFG)" == ""
   CFG=ap - Win32 Debug
  -!MESSAGE This is not a valid makefile. To build this project using NMAKE,
  -!MESSAGE use the Export Makefile command and run
  -!MESSAGE 
  -!MESSAGE NMAKE /f "ap.mak".
  -!MESSAGE 
  +!MESSAGE No configuration specified. Defaulting to ap - Win32 Debug.
  +!ENDIF 
  +
  +!IF "$(CFG)" != "ap - Win32 Release" && "$(CFG)" != "ap - Win32 Debug"
  +!MESSAGE Invalid configuration "$(CFG)" specified.
   !MESSAGE You can specify a configuration when running NMAKE
   !MESSAGE by defining the macro CFG on the command line. For example:
   !MESSAGE 
  @@ -20,103 +16,351 @@
   !MESSAGE "ap - Win32 Release" (based on "Win32 (x86) Static Library")
   !MESSAGE "ap - Win32 Debug" (based on "Win32 (x86) Static Library")
   !MESSAGE 
  +!ERROR An invalid configuration is specified.
  +!ENDIF 
  +
  +!IF "$(OS)" == "Windows_NT"
  +NULL=
  +!ELSE 
  +NULL=nul
  +!ENDIF 
   
  -# Begin Project
  -# PROP Scc_ProjName ""
  -# PROP Scc_LocalPath ""
   CPP=cl.exe
   
   !IF  "$(CFG)" == "ap - Win32 Release"
  +
  +OUTDIR=.\Release
  +INTDIR=.\Release
  +# Begin Custom Macros
  +OutDir=.\Release
  +# End Custom Macros
  +
  +!IF "$(RECURSE)" == "0" 
  +
  +ALL : "$(OUTDIR)\ap.lib"
   
  -# 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 ""
  -# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /FD /c
  -# ADD CPP /nologo /MD /W3 /GX /O2 /I "..\include" /I "..\os\win32" /D "WIN32" /D "NDEBUG"
/D "_WINDOWS" /FD /c
  +!ELSE 
  +
  +ALL : "$(OUTDIR)\ap.lib"
  +
  +!ENDIF 
  +
  +CLEAN :
  +	-@erase "$(INTDIR)\ap_base64.obj"
  +	-@erase "$(INTDIR)\ap_checkpass.obj"
  +	-@erase "$(INTDIR)\ap_cpystrn.obj"
  +	-@erase "$(INTDIR)\ap_fnmatch.obj"
  +	-@erase "$(INTDIR)\ap_md5c.obj"
  +	-@erase "$(INTDIR)\ap_sha1.obj"
  +	-@erase "$(INTDIR)\ap_signal.obj"
  +	-@erase "$(INTDIR)\ap_slack.obj"
  +	-@erase "$(INTDIR)\ap_snprintf.obj"
  +	-@erase "$(INTDIR)\vc50.idb"
  +	-@erase "$(OUTDIR)\ap.lib"
  +
  +"$(OUTDIR)" :
  +    if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
  +
  +CPP_PROJ=/nologo /MD /W3 /GX /O2 /I "..\include" /I "..\os\win32" /D "WIN32" /D\
  + "NDEBUG" /D "_WINDOWS" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
  +CPP_OBJS=.\Release/
  +CPP_SBRS=.
   BSC32=bscmake.exe
  -# ADD BASE BSC32 /nologo
  -# ADD BSC32 /nologo
  +BSC32_FLAGS=/nologo /o"$(OUTDIR)\ap.bsc" 
  +BSC32_SBRS= \
  +	
   LIB32=link.exe -lib
  -# ADD BASE LIB32 /nologo
  -# ADD LIB32 /nologo
  +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_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)
  +<<
   
   !ELSEIF  "$(CFG)" == "ap - Win32 Debug"
  +
  +OUTDIR=.\Debug
  +INTDIR=.\Debug
  +# Begin Custom Macros
  +OutDir=.\Debug
  +# End Custom Macros
  +
  +!IF "$(RECURSE)" == "0" 
  +
  +ALL : "$(OUTDIR)\ap.lib"
  +
  +!ELSE 
  +
  +ALL : "$(OUTDIR)\ap.lib"
  +
  +!ENDIF 
   
  -# 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 ""
  -# ADD BASE CPP /nologo /W3 /GX /Z7 /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /FD /c
  -# ADD CPP /nologo /MDd /W3 /GX /Z7 /Od /I "..\include" /I "..\os\win32" /D "WIN32" /D "_DEBUG"
/D "_WINDOWS" /FD /c
  +CLEAN :
  +	-@erase "$(INTDIR)\ap_base64.obj"
  +	-@erase "$(INTDIR)\ap_checkpass.obj"
  +	-@erase "$(INTDIR)\ap_cpystrn.obj"
  +	-@erase "$(INTDIR)\ap_fnmatch.obj"
  +	-@erase "$(INTDIR)\ap_md5c.obj"
  +	-@erase "$(INTDIR)\ap_sha1.obj"
  +	-@erase "$(INTDIR)\ap_signal.obj"
  +	-@erase "$(INTDIR)\ap_slack.obj"
  +	-@erase "$(INTDIR)\ap_snprintf.obj"
  +	-@erase "$(INTDIR)\vc50.idb"
  +	-@erase "$(OUTDIR)\ap.lib"
  +
  +"$(OUTDIR)" :
  +    if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
  +
  +CPP_PROJ=/nologo /MDd /W3 /GX /Z7 /Od /I "..\include" /I "..\os\win32" /D\
  + "WIN32" /D "_DEBUG" /D "_WINDOWS" /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
  +CPP_OBJS=.\Debug/
  +CPP_SBRS=.
   BSC32=bscmake.exe
  -# ADD BASE BSC32 /nologo
  -# ADD BSC32 /nologo
  +BSC32_FLAGS=/nologo /o"$(OUTDIR)\ap.bsc" 
  +BSC32_SBRS= \
  +	
   LIB32=link.exe -lib
  -# ADD BASE LIB32 /nologo
  -# ADD LIB32 /nologo
  +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_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 
   
  -# Begin Target
  +.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) $< 
  +<<
   
  -# Name "ap - Win32 Release"
  -# Name "ap - Win32 Debug"
  -# Begin Group "Source Files"
   
  -# PROP Default_Filter ""
  -# Begin Source File
  -
  +!IF "$(CFG)" == "ap - Win32 Release" || "$(CFG)" == "ap - Win32 Debug"
   SOURCE=.\ap_base64.c
  -# End Source File
  -# Begin Source File
  +DEP_CPP_AP_BA=\
  +	"..\include\ap.h"\
  +	"..\include\ap_config.h"\
  +	"..\include\ap_ctype.h"\
  +	"..\include\ap_mmn.h"\
  +	"..\include\hsregex.h"\
  +	"..\os\win32\os.h"\
  +	
  +NODEP_CPP_AP_BA=\
  +	"..\include\ap_config_auto.h"\
  +	".\ebcdic.h"\
  +	
  +
  +"$(INTDIR)\ap_base64.obj" : $(SOURCE) $(DEP_CPP_AP_BA) "$(INTDIR)"
  +
   
   SOURCE=.\ap_checkpass.c
  -# End Source File
  -# Begin Source File
  +DEP_CPP_AP_CH=\
  +	"..\include\ap.h"\
  +	"..\include\ap_config.h"\
  +	"..\include\ap_ctype.h"\
  +	"..\include\ap_md5.h"\
  +	"..\include\ap_mmn.h"\
  +	"..\include\ap_sha1.h"\
  +	"..\include\hsregex.h"\
  +	"..\os\win32\os.h"\
  +	
  +NODEP_CPP_AP_CH=\
  +	"..\include\ap_config_auto.h"\
  +	
   
  +"$(INTDIR)\ap_checkpass.obj" : $(SOURCE) $(DEP_CPP_AP_CH) "$(INTDIR)"
  +
  +
   SOURCE=.\ap_cpystrn.c
  -# End Source File
  -# Begin Source File
  +DEP_CPP_AP_CP=\
  +	"..\include\ap.h"\
  +	"..\include\ap_alloc.h"\
  +	"..\include\ap_config.h"\
  +	"..\include\ap_ctype.h"\
  +	"..\include\ap_mmn.h"\
  +	"..\include\buff.h"\
  +	"..\include\hsregex.h"\
  +	"..\include\httpd.h"\
  +	"..\include\util_uri.h"\
  +	"..\os\win32\os.h"\
  +	"..\os\win32\readdir.h"\
  +	
  +NODEP_CPP_AP_CP=\
  +	"..\include\ap_config_auto.h"\
  +	"..\include\ebcdic.h"\
  +	"..\include\sfio.h"\
  +	
  +
  +"$(INTDIR)\ap_cpystrn.obj" : $(SOURCE) $(DEP_CPP_AP_CP) "$(INTDIR)"
   
  +
   SOURCE=.\ap_fnmatch.c
  -# End Source File
  -# Begin Source File
  +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"\
  +	
  +NODEP_CPP_AP_FN=\
  +	"..\include\ap_config_auto.h"\
  +	
  +
  +"$(INTDIR)\ap_fnmatch.obj" : $(SOURCE) $(DEP_CPP_AP_FN) "$(INTDIR)"
  +
   
   SOURCE=.\ap_md5c.c
  -# End Source File
  -# Begin Source File
  +DEP_CPP_AP_MD=\
  +	"..\include\ap.h"\
  +	"..\include\ap_config.h"\
  +	"..\include\ap_ctype.h"\
  +	"..\include\ap_md5.h"\
  +	"..\include\ap_mmn.h"\
  +	"..\include\hsregex.h"\
  +	"..\os\win32\os.h"\
  +	
  +NODEP_CPP_AP_MD=\
  +	"..\include\ap_config_auto.h"\
  +	".\ebcdic.h"\
  +	
   
  +"$(INTDIR)\ap_md5c.obj" : $(SOURCE) $(DEP_CPP_AP_MD) "$(INTDIR)"
  +
  +
   SOURCE=.\ap_sha1.c
  -# End Source File
  -# Begin Source File
  +DEP_CPP_AP_SH=\
  +	"..\include\ap.h"\
  +	"..\include\ap_config.h"\
  +	"..\include\ap_ctype.h"\
  +	"..\include\ap_mmn.h"\
  +	"..\include\ap_sha1.h"\
  +	"..\include\hsregex.h"\
  +	"..\os\win32\os.h"\
  +	
  +NODEP_CPP_AP_SH=\
  +	"..\include\ap_config_auto.h"\
  +	".\ebcdic.h"\
  +	
  +
  +"$(INTDIR)\ap_sha1.obj" : $(SOURCE) $(DEP_CPP_AP_SH) "$(INTDIR)"
   
  +
   SOURCE=.\ap_signal.c
  -# End Source File
  -# Begin Source File
  +DEP_CPP_AP_SI=\
  +	"..\include\ap.h"\
  +	"..\include\ap_alloc.h"\
  +	"..\include\ap_config.h"\
  +	"..\include\ap_ctype.h"\
  +	"..\include\ap_mmn.h"\
  +	"..\include\buff.h"\
  +	"..\include\hsregex.h"\
  +	"..\include\httpd.h"\
  +	"..\include\util_uri.h"\
  +	"..\os\win32\os.h"\
  +	"..\os\win32\readdir.h"\
  +	
  +NODEP_CPP_AP_SI=\
  +	"..\include\ap_config_auto.h"\
  +	"..\include\ebcdic.h"\
  +	"..\include\sfio.h"\
  +	
  +
  +"$(INTDIR)\ap_signal.obj" : $(SOURCE) $(DEP_CPP_AP_SI) "$(INTDIR)"
  +
   
   SOURCE=.\ap_slack.c
  -# End Source File
  -# Begin Source File
  +DEP_CPP_AP_SL=\
  +	"..\include\ap.h"\
  +	"..\include\ap_alloc.h"\
  +	"..\include\ap_config.h"\
  +	"..\include\ap_ctype.h"\
  +	"..\include\ap_mmn.h"\
  +	"..\include\buff.h"\
  +	"..\include\hsregex.h"\
  +	"..\include\http_log.h"\
  +	"..\include\httpd.h"\
  +	"..\include\util_uri.h"\
  +	"..\os\win32\os.h"\
  +	"..\os\win32\readdir.h"\
  +	
  +NODEP_CPP_AP_SL=\
  +	"..\include\ap_config_auto.h"\
  +	"..\include\ebcdic.h"\
  +	"..\include\sfio.h"\
  +	
   
  +"$(INTDIR)\ap_slack.obj" : $(SOURCE) $(DEP_CPP_AP_SL) "$(INTDIR)"
  +
  +
   SOURCE=.\ap_snprintf.c
  -# End Source File
  -# End Group
  -# Begin Group "Header Files"
  -
  -# PROP Default_Filter ""
  -# End Group
  -# End Target
  -# End Project
  +DEP_CPP_AP_SN=\
  +	"..\include\ap.h"\
  +	"..\include\ap_alloc.h"\
  +	"..\include\ap_config.h"\
  +	"..\include\ap_ctype.h"\
  +	"..\include\ap_mmn.h"\
  +	"..\include\buff.h"\
  +	"..\include\hsregex.h"\
  +	"..\include\httpd.h"\
  +	"..\include\util_uri.h"\
  +	"..\os\win32\os.h"\
  +	"..\os\win32\readdir.h"\
  +	
  +NODEP_CPP_AP_SN=\
  +	"..\include\ap_config_auto.h"\
  +	"..\include\ebcdic.h"\
  +	"..\include\sfio.h"\
  +	
  +
  +"$(INTDIR)\ap_snprintf.obj" : $(SOURCE) $(DEP_CPP_AP_SN) "$(INTDIR)"
  +
  +
  +
  +!ENDIF 
  +
  
  
  

Mime
View raw message