Date: 5 Feb 1998 11:26:32 -0000
Message-ID: <19980205112632.29598.qmail@hyperreal.org>
From: pcs@hyperreal.org
To: apache-1.3-cvs@hyperreal.org
Subject: cvs commit: apache-1.3/src/regex regex.dsp regex.mak
Sender: apache-cvs-owner@apache.org
Precedence: bulk
Reply-To: new-httpd@apache.org

pcs         98/02/05 03:26:32

  Modified:    src/regex regex.mak
  Added:       src/regex regex.dsp
  Log:
  Add a project file (regex.dsp) for the regex build. Update the project
  and makefile to build with the new include\hsregex.h header file location.
  
  Revision  Changes    Path
  1.4       +25 -63    apache-1.3/src/regex/regex.mak
  
  Index: regex.mak
  ===================================================================
  RCS file: /export/home/cvs/apache-1.3/src/regex/regex.mak,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- regex.mak	1997/08/13 08:37:42	1.3
  +++ regex.mak	1998/02/05 11:26:31	1.4
  @@ -1,7 +1,7 @@
   # Microsoft Developer Studio Generated NMAKE File, Based on regex.dsp
   !IF "$(CFG)" == ""
  -CFG=regex - Win32 Release
  -!MESSAGE No configuration specified. Defaulting to regex - Win32 Release.
  +CFG=regex - Win32 Debug
  +!MESSAGE No configuration specified. Defaulting to regex - Win32 Debug.
   !ENDIF 
   
   !IF "$(CFG)" != "regex - Win32 Release" && "$(CFG)" != "regex - Win32 Debug"
  @@ -9,7 +9,7 @@
   !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 Release"
  +!MESSAGE NMAKE /f "regex.mak" CFG="regex - Win32 Debug"
   !MESSAGE 
   !MESSAGE Possible choices for configuration are:
   !MESSAGE 
  @@ -32,7 +32,7 @@
   OUTDIR=.\Release
   INTDIR=.\Release
   # Begin Custom Macros
  -OutDir=.\.\Release
  +OutDir=.\Release
   # End Custom Macros
   
   !IF "$(RECURSE)" == "0" 
  @@ -56,8 +56,9 @@
   "$(OUTDIR)" :
       if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
   
  -CPP_PROJ=/nologo /MD /W3 /GX /O2 /I "." /D "WIN32" /D "NDEBUG" /D "_WINDOWS"\
  - /Fp"$(INTDIR)\regex.pch" /YX /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
  +CPP_PROJ=/nologo /MD /W3 /GX /O2 /I "..\include" /D "WIN32" /D "NDEBUG" /D\
  + "_WINDOWS" /Fp"$(INTDIR)\regex.pch" /YX /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD\
  + /c 
   CPP_OBJS=.\Release/
   CPP_SBRS=.
   BSC32=bscmake.exe
  @@ -82,53 +83,39 @@
   OUTDIR=.\Debug
   INTDIR=.\Debug
   # Begin Custom Macros
  -OutDir=.\.\Debug
  +OutDir=.\Debug
   # End Custom Macros
   
   !IF "$(RECURSE)" == "0" 
   
  -ALL : "$(OUTDIR)\regex.lib" "$(OUTDIR)\regex.bsc"
  +ALL : "$(OUTDIR)\regex.lib"
   
   !ELSE 
   
  -ALL : "$(OUTDIR)\regex.lib" "$(OUTDIR)\regex.bsc"
  +ALL : "$(OUTDIR)\regex.lib"
   
   !ENDIF 
   
   CLEAN :
   	-@erase "$(INTDIR)\regcomp.obj"
  -	-@erase "$(INTDIR)\regcomp.sbr"
   	-@erase "$(INTDIR)\regerror.obj"
  -	-@erase "$(INTDIR)\regerror.sbr"
   	-@erase "$(INTDIR)\regexec.obj"
  -	-@erase "$(INTDIR)\regexec.sbr"
   	-@erase "$(INTDIR)\regfree.obj"
  -	-@erase "$(INTDIR)\regfree.sbr"
   	-@erase "$(INTDIR)\vc50.idb"
  -	-@erase "$(OUTDIR)\regex.bsc"
   	-@erase "$(OUTDIR)\regex.lib"
   
   "$(OUTDIR)" :
       if not exist "$(OUTDIR)/$(NULL)" mkdir "$(OUTDIR)"
   
  -CPP_PROJ=/nologo /MDd /W3 /GX /Z7 /Od /I "." /D "WIN32" /D "_DEBUG" /D\
  - "_WINDOWS" /FR"$(INTDIR)\\" /Fp"$(INTDIR)\regex.pch" /YX /Fo"$(INTDIR)\\"\
  - /Fd"$(INTDIR)\\" /FD /c 
  +CPP_PROJ=/nologo /MDd /W3 /GX /Z7 /Od /I "..\include" /D "WIN32" /D "_DEBUG" /D\
  + "_WINDOWS" /Fp"$(INTDIR)\regex.pch" /YX /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD\
  + /c 
   CPP_OBJS=.\Debug/
  -CPP_SBRS=.\Debug/
  +CPP_SBRS=.
   BSC32=bscmake.exe
   BSC32_FLAGS=/nologo /o"$(OUTDIR)\regex.bsc" 
   BSC32_SBRS= \
  -	"$(INTDIR)\regcomp.sbr" \
  -	"$(INTDIR)\regerror.sbr" \
  -	"$(INTDIR)\regexec.sbr" \
  -	"$(INTDIR)\regfree.sbr"
  -
  -"$(OUTDIR)\regex.bsc" : "$(OUTDIR)" $(BSC32_SBRS)
  -    $(BSC32) @<<
  -  $(BSC32_FLAGS) $(BSC32_SBRS)
  -<<
  -
  +	
   LIB32=link.exe -lib
   LIB32_FLAGS=/nologo /out:"$(OUTDIR)\regex.lib" 
   LIB32_OBJS= \
  @@ -181,10 +168,10 @@
   !IF  "$(CFG)" == "regex - Win32 Release"
   
   DEP_CPP_REGCO=\
  +	"..\include\hsregex.h"\
   	".\cclass.h"\
   	".\cname.h"\
   	".\regcomp.ih"\
  -	".\regex.h"\
   	".\regex2.h"\
   	".\utils.h"\
   	
  @@ -195,17 +182,15 @@
   !ELSEIF  "$(CFG)" == "regex - Win32 Debug"
   
   DEP_CPP_REGCO=\
  +	"..\include\hsregex.h"\
   	".\cclass.h"\
   	".\cname.h"\
   	".\regcomp.ih"\
  -	".\regex.h"\
   	".\regex2.h"\
   	".\utils.h"\
  -	{$(INCLUDE)}"sys\types.h"\
   	
   
  -"$(INTDIR)\regcomp.obj"	"$(INTDIR)\regcomp.sbr" : $(SOURCE) $(DEP_CPP_REGCO)\
  - "$(INTDIR)"
  +"$(INTDIR)\regcomp.obj" : $(SOURCE) $(DEP_CPP_REGCO) "$(INTDIR)"
   
   
   !ENDIF 
  @@ -215,8 +200,8 @@
   !IF  "$(CFG)" == "regex - Win32 Release"
   
   DEP_CPP_REGER=\
  +	"..\include\hsregex.h"\
   	".\regerror.ih"\
  -	".\regex.h"\
   	".\utils.h"\
   	
   
  @@ -226,14 +211,12 @@
   !ELSEIF  "$(CFG)" == "regex - Win32 Debug"
   
   DEP_CPP_REGER=\
  +	"..\include\hsregex.h"\
   	".\regerror.ih"\
  -	".\regex.h"\
   	".\utils.h"\
  -	{$(INCLUDE)}"sys\types.h"\
   	
   
  -"$(INTDIR)\regerror.obj"	"$(INTDIR)\regerror.sbr" : $(SOURCE) $(DEP_CPP_REGER)\
  - "$(INTDIR)"
  +"$(INTDIR)\regerror.obj" : $(SOURCE) $(DEP_CPP_REGER) "$(INTDIR)"
   
   
   !ENDIF 
  @@ -243,9 +226,9 @@
   !IF  "$(CFG)" == "regex - Win32 Release"
   
   DEP_CPP_REGEX=\
  +	"..\include\hsregex.h"\
   	".\engine.c"\
   	".\engine.ih"\
  -	".\regex.h"\
   	".\regex2.h"\
   	".\utils.h"\
   	
  @@ -256,26 +239,21 @@
   !ELSEIF  "$(CFG)" == "regex - Win32 Debug"
   
   DEP_CPP_REGEX=\
  +	"..\include\hsregex.h"\
   	".\engine.c"\
   	".\engine.ih"\
  -	".\regex.h"\
   	".\regex2.h"\
   	".\utils.h"\
  -	{$(INCLUDE)}"sys\types.h"\
   	
   
  -"$(INTDIR)\regexec.obj"	"$(INTDIR)\regexec.sbr" : $(SOURCE) $(DEP_CPP_REGEX)\
  - "$(INTDIR)"
  +"$(INTDIR)\regexec.obj" : $(SOURCE) $(DEP_CPP_REGEX) "$(INTDIR)"
   
   
   !ENDIF 
   
   SOURCE=.\regfree.c
  -
  -!IF  "$(CFG)" == "regex - Win32 Release"
  -
   DEP_CPP_REGFR=\
  -	".\regex.h"\
  +	"..\include\hsregex.h"\
   	".\regex2.h"\
   	".\utils.h"\
   	
  @@ -283,22 +261,6 @@
   "$(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"	"$(INTDIR)\regfree.sbr" : $(SOURCE) $(DEP_CPP_REGFR)\
  - "$(INTDIR)"
  -
  -
  -!ENDIF 
  -
  -SOURCE=.\engine.c
   
   !ENDIF 
   
  
  
  
  1.1                  apache-1.3/src/regex/regex.dsp
  
  Index: regex.dsp
  ===================================================================
  # Microsoft Developer Studio Project File - Name="regex" - Package Owner=<4>
  # Microsoft Developer Studio Generated Build File, Format Version 5.00
  # ** DO NOT EDIT **
  
  # TARGTYPE "Win32 (x86) Static Library" 0x0104
  
  CFG=regex - 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 "regex.mak".
  !MESSAGE 
  !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 
  !MESSAGE Possible choices for configuration are:
  !MESSAGE 
  !MESSAGE "regex - Win32 Release" (based on "Win32 (x86) Static Library")
  !MESSAGE "regex - Win32 Debug" (based on "Win32 (x86) Static Library")
  !MESSAGE 
  
  # Begin Project
  # PROP Scc_ProjName ""
  # PROP Scc_LocalPath ""
  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 ""
  # 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
  BSC32=bscmake.exe
  # ADD BASE BSC32 /nologo
  # ADD BSC32 /nologo
  LIB32=link.exe -lib
  # ADD BASE LIB32 /nologo
  # ADD LIB32 /nologo
  
  !ELSEIF  "$(CFG)" == "regex - Win32 Debug"
  
  # PROP BASE Use_MFC 0
  # PROP BASE Use_Debug_Libraries 1
  # PROP BASE Output_Dir "regex___"
  # PROP BASE Intermediate_Dir "regex___"
  # 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" /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
  LIB32=link.exe -lib
  # ADD BASE LIB32 /nologo
  # ADD LIB32 /nologo
  
  !ENDIF 
  
  # Begin Target
  
  # Name "regex - Win32 Release"
  # Name "regex - Win32 Debug"
  # Begin Group "Source Files"
  
  # PROP Default_Filter "*.c"
  # Begin Source File
  
  SOURCE=.\regcomp.c
  # End Source File
  # Begin Source File
  
  SOURCE=.\regerror.c
  # End Source File
  # Begin Source File
  
  SOURCE=.\regexec.c
  # End Source File
  # Begin Source File
  
  SOURCE=.\regfree.c
  # End Source File
  # End Group
  # Begin Group "Header Files"
  
  # PROP Default_Filter "*.h"
  # Begin Source File
  
  SOURCE=.\cclass.h
  # End Source File
  # Begin Source File
  
  SOURCE=.\cname.h
  # End Source File
  # Begin Source File
  
  SOURCE=.\regex2.h
  # End Source File
  # End Group
  # End Target
  # End Project