apr-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From wr...@apache.org
Subject cvs commit: apr-util aprutil.mak libaprutil.mak aprutil.dsp libaprutil.dsp
Date Wed, 23 May 2001 05:16:30 GMT
wrowe       01/05/22 22:16:30

  Modified:    .        aprutil.mak libaprutil.mak aprutil.dsp
                        libaprutil.dsp
  Log:
    Get aprutil building with uri_delims
  
  Revision  Changes    Path
  1.13      +96 -26    apr-util/aprutil.mak
  
  Index: aprutil.mak
  ===================================================================
  RCS file: /home/cvs/apr-util/aprutil.mak,v
  retrieving revision 1.12
  retrieving revision 1.13
  diff -u -r1.12 -r1.13
  --- aprutil.mak	2001/05/22 22:33:57	1.12
  +++ aprutil.mak	2001/05/23 05:16:22	1.13
  @@ -40,12 +40,14 @@
   
   !ELSE 
   
  -ALL : "xml - Win32 Release" "apr - Win32 Release" "$(OUTDIR)\aprutil.lib"
  +ALL : "xml - Win32 Release" "gen_uri_delims - Win32 Release"\
  + "apr - Win32 Release" "$(OUTDIR)\aprutil.lib"
   
   !ENDIF 
   
   !IF "$(RECURSE)" == "1" 
  -CLEAN :"apr - Win32 ReleaseCLEAN" "xml - Win32 ReleaseCLEAN" 
  +CLEAN :"apr - Win32 ReleaseCLEAN" "gen_uri_delims - Win32 ReleaseCLEAN"\
  + "xml - Win32 ReleaseCLEAN" 
   !ELSE 
   CLEAN :
   !ENDIF 
  @@ -167,12 +169,14 @@
   
   !ELSE 
   
  -ALL : "xml - Win32 Debug" "apr - Win32 Debug" "$(OUTDIR)\aprutil.lib"
  +ALL : "xml - Win32 Debug" "gen_uri_delims - Win32 Debug" "apr - Win32 Debug"\
  + "$(OUTDIR)\aprutil.lib"
   
   !ENDIF 
   
   !IF "$(RECURSE)" == "1" 
  -CLEAN :"apr - Win32 DebugCLEAN" "xml - Win32 DebugCLEAN" 
  +CLEAN :"apr - Win32 DebugCLEAN" "gen_uri_delims - Win32 DebugCLEAN"\
  + "xml - Win32 DebugCLEAN" 
   !ELSE 
   CLEAN :
   !ENDIF 
  @@ -598,9 +602,10 @@
   	".\dbm\sdbm\sdbm_private.h"\
   	".\dbm\sdbm\sdbm_tune.h"\
   	".\include\apr_sdbm.h"\
  +	".\include\apu.h"\
   	
   
  -"$(INTDIR)\sdbm.obj" : $(SOURCE) $(DEP_CPP_SDBM_) "$(INTDIR)"
  +"$(INTDIR)\sdbm.obj" : $(SOURCE) $(DEP_CPP_SDBM_) "$(INTDIR)" ".\include\apu.h"
   	$(CPP) $(CPP_PROJ) $(SOURCE)
   
   
  @@ -614,10 +619,13 @@
   	"..\apr\include\apr_time.h"\
   	"..\apr\include\apr_user.h"\
   	"..\apr\include\apr_want.h"\
  +	".\dbm\sdbm\sdbm_private.h"\
   	".\include\apr_sdbm.h"\
  +	".\include\apu.h"\
   	
   
  -"$(INTDIR)\sdbm_hash.obj" : $(SOURCE) $(DEP_CPP_SDBM_H) "$(INTDIR)"
  +"$(INTDIR)\sdbm_hash.obj" : $(SOURCE) $(DEP_CPP_SDBM_H) "$(INTDIR)"\
  + ".\include\apu.h"
   	$(CPP) $(CPP_PROJ) $(SOURCE)
   
   
  @@ -632,10 +640,13 @@
   	"..\apr\include\apr_user.h"\
   	"..\apr\include\apr_want.h"\
   	".\dbm\sdbm\sdbm_private.h"\
  +	".\dbm\sdbm\sdbm_tune.h"\
   	".\include\apr_sdbm.h"\
  +	".\include\apu.h"\
   	
   
  -"$(INTDIR)\sdbm_lock.obj" : $(SOURCE) $(DEP_CPP_SDBM_L) "$(INTDIR)"
  +"$(INTDIR)\sdbm_lock.obj" : $(SOURCE) $(DEP_CPP_SDBM_L) "$(INTDIR)"\
  + ".\include\apu.h"
   	$(CPP) $(CPP_PROJ) $(SOURCE)
   
   
  @@ -653,9 +664,11 @@
   	".\dbm\sdbm\sdbm_private.h"\
   	".\dbm\sdbm\sdbm_tune.h"\
   	".\include\apr_sdbm.h"\
  +	".\include\apu.h"\
   	
   
  -"$(INTDIR)\sdbm_pair.obj" : $(SOURCE) $(DEP_CPP_SDBM_P) "$(INTDIR)"
  +"$(INTDIR)\sdbm_pair.obj" : $(SOURCE) $(DEP_CPP_SDBM_P) "$(INTDIR)"\
  + ".\include\apu.h"
   	$(CPP) $(CPP_PROJ) $(SOURCE)
   
   
  @@ -704,9 +717,10 @@
   	"..\apr\include\apr_hash.h"\
   	"..\apr\include\apr_pools.h"\
   	"..\apr\include\apr_tables.h"\
  -	".\include\apr_generic_hook.h"\
  +	"..\apr\include\apr_want.h"\
   	".\include\apr_hooks.h"\
   	".\include\apr_optional.h"\
  +	".\include\apr_optional_hooks.h"\
   	".\include\apu.h"\
   	
   
  @@ -716,22 +730,25 @@
   
   
   SOURCE=.\uri\apr_uri.c
  -DEP_CPP_APR_X=\
  +DEP_CPP_APR_U=\
   	"..\apr\include\apr.h"\
   	"..\apr\include\apr_errno.h"\
  +	"..\apr\include\apr_file_info.h"\
  +	"..\apr\include\apr_file_io.h"\
  +	"..\apr\include\apr_general.h"\
  +	"..\apr\include\apr_network_io.h"\
   	"..\apr\include\apr_pools.h"\
   	"..\apr\include\apr_strings.h"\
  +	"..\apr\include\apr_time.h"\
  +	"..\apr\include\apr_user.h"\
   	"..\apr\include\apr_want.h"\
   	".\include\apr_uri.h"\
   	".\include\apu.h"\
  -	".\include\private\apu_config.h"\
  -	
  -NODEP_CPP_APR_X=\
   	".\uri\uri_delims.h"\
   	
   
  -"$(INTDIR)\apr_xml.obj" : $(SOURCE) $(DEP_CPP_APR_X) "$(INTDIR)"\
  - ".\include\private\apu_config.h" ".\include\apu.h"
  +"$(INTDIR)\apr_uri.obj" : $(SOURCE) $(DEP_CPP_APR_U) "$(INTDIR)"\
  + ".\include\apu.h" ".\uri\uri_delims.h"
   	$(CPP) $(CPP_PROJ) $(SOURCE)
   
   
  @@ -809,7 +826,7 @@
   
   ".\include\private\apu_select_dbm.h"	 : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
   	copy .\include\private\apu_select_dbm.hw .\include\private\apu_select_dbm.h >\
  -  nul 
  + nul 
   	echo Created apu_select_dbm.h from apu_select_dbm.hw 
   	
   
  @@ -819,36 +836,89 @@
   
   ".\include\private\apu_select_dbm.h"	 : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
   	copy .\include\private\apu_select_dbm.hw .\include\private\apu_select_dbm.h >\
  -  nul 
  + nul 
   	echo Created apu_select_dbm.h from apu_select_dbm.hw 
   	
   
   !ENDIF 
   
  +SOURCE=.\uri\gen_uri_delims.exe
  +
   !IF  "$(CFG)" == "aprutil - Win32 Release"
   
  +InputPath=.\uri\gen_uri_delims.exe
  +
  +".\uri\uri_delims.h"	 : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
  +	.\uri\gen_uri_delims.exe >.\uri\uri_delims.h 
  +	echo Generated uri_delims.h from gen_uri_delims.exe 
  +	
  +
  +!ELSEIF  "$(CFG)" == "aprutil - Win32 Debug"
  +
  +InputPath=.\uri\gen_uri_delims.exe
  +
  +".\uri\uri_delims.h"	 : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
  +	.\uri\gen_uri_delims.exe >.\uri\uri_delims.h 
  +	echo Generated uri_delims.h from gen_uri_delims.exe 
  +	
  +
  +!ENDIF 
  +
  +!IF  "$(CFG)" == "aprutil - Win32 Release"
  +
   "apr - Win32 Release" : 
  -   cd "..\apr"
  -   $(MAKE) /$(MAKEFLAGS) /F .\apr.mak CFG="apr - Win32 Release" 
  +   cd "..\..\srclib\apr"
  +   $(MAKE) /$(MAKEFLAGS) /F ".\apr.mak" CFG="apr - Win32 Release" 
      cd "..\apr-util"
   
   "apr - Win32 ReleaseCLEAN" : 
  -   cd "..\apr"
  -   $(MAKE) /$(MAKEFLAGS) CLEAN /F .\apr.mak CFG="apr - Win32 Release" RECURSE=1\
  - 
  +   cd "..\..\srclib\apr"
  +   $(MAKE) /$(MAKEFLAGS) CLEAN /F ".\apr.mak" CFG="apr - Win32 Release"\
  + RECURSE=1 
      cd "..\apr-util"
   
   !ELSEIF  "$(CFG)" == "aprutil - Win32 Debug"
   
   "apr - Win32 Debug" : 
  -   cd "..\apr"
  -   $(MAKE) /$(MAKEFLAGS) /F .\apr.mak CFG="apr - Win32 Debug" 
  +   cd "..\..\srclib\apr"
  +   $(MAKE) /$(MAKEFLAGS) /F ".\apr.mak" CFG="apr - Win32 Debug" 
      cd "..\apr-util"
   
   "apr - Win32 DebugCLEAN" : 
  -   cd "..\apr"
  -   $(MAKE) /$(MAKEFLAGS) CLEAN /F .\apr.mak CFG="apr - Win32 Debug" RECURSE=1 
  +   cd "..\..\srclib\apr"
  +   $(MAKE) /$(MAKEFLAGS) CLEAN /F ".\apr.mak" CFG="apr - Win32 Debug" RECURSE=1\
  + 
      cd "..\apr-util"
  +
  +!ENDIF 
  +
  +!IF  "$(CFG)" == "aprutil - Win32 Release"
  +
  +"gen_uri_delims - Win32 Release" : 
  +   cd ".\uri"
  +   $(MAKE) /$(MAKEFLAGS) /F ".\gen_uri_delims.mak"\
  + CFG="gen_uri_delims - Win32 Release" 
  +   cd ".."
  +
  +"gen_uri_delims - Win32 ReleaseCLEAN" : 
  +   cd ".\uri"
  +   $(MAKE) /$(MAKEFLAGS) CLEAN /F ".\gen_uri_delims.mak"\
  + CFG="gen_uri_delims - Win32 Release" RECURSE=1 
  +   cd ".."
  +
  +!ELSEIF  "$(CFG)" == "aprutil - Win32 Debug"
  +
  +"gen_uri_delims - Win32 Debug" : 
  +   cd ".\uri"
  +   $(MAKE) /$(MAKEFLAGS) /F ".\gen_uri_delims.mak"\
  + CFG="gen_uri_delims - Win32 Debug" 
  +   cd ".."
  +
  +"gen_uri_delims - Win32 DebugCLEAN" : 
  +   cd ".\uri"
  +   $(MAKE) /$(MAKEFLAGS) CLEAN /F ".\gen_uri_delims.mak"\
  + CFG="gen_uri_delims - Win32 Debug" RECURSE=1 
  +   cd ".."
   
   !ENDIF 
   
  
  
  
  1.11      +110 -17   apr-util/libaprutil.mak
  
  Index: libaprutil.mak
  ===================================================================
  RCS file: /home/cvs/apr-util/libaprutil.mak,v
  retrieving revision 1.10
  retrieving revision 1.11
  diff -u -r1.10 -r1.11
  --- libaprutil.mak	2001/04/05 09:21:45	1.10
  +++ libaprutil.mak	2001/05/23 05:16:23	1.11
  @@ -42,12 +42,14 @@
   
   !ELSE 
   
  -ALL : "xml - Win32 Release" "libapr - Win32 Release" "$(OUTDIR)\libaprutil.dll"
  +ALL : "xml - Win32 Release" "gen_uri_delims - Win32 Release"\
  + "libapr - Win32 Release" "$(OUTDIR)\libaprutil.dll"
   
   !ENDIF 
   
   !IF "$(RECURSE)" == "1" 
  -CLEAN :"libapr - Win32 ReleaseCLEAN" "xml - Win32 ReleaseCLEAN" 
  +CLEAN :"libapr - Win32 ReleaseCLEAN" "gen_uri_delims - Win32 ReleaseCLEAN"\
  + "xml - Win32 ReleaseCLEAN" 
   !ELSE 
   CLEAN :
   !ENDIF 
  @@ -67,6 +69,7 @@
   	-@erase "$(INTDIR)\apr_dbm.obj"
   	-@erase "$(INTDIR)\apr_hooks.obj"
   	-@erase "$(INTDIR)\apr_sha1.obj"
  +	-@erase "$(INTDIR)\apr_uri.obj"
   	-@erase "$(INTDIR)\apr_xml.obj"
   	-@erase "$(INTDIR)\aprutil.idb"
   	-@erase "$(INTDIR)\sdbm.obj"
  @@ -148,6 +151,7 @@
   	"$(INTDIR)\apr_dbm.obj" \
   	"$(INTDIR)\apr_hooks.obj" \
   	"$(INTDIR)\apr_sha1.obj" \
  +	"$(INTDIR)\apr_uri.obj" \
   	"$(INTDIR)\apr_xml.obj" \
   	"$(INTDIR)\sdbm.obj" \
   	"$(INTDIR)\sdbm_hash.obj" \
  @@ -175,12 +179,14 @@
   
   !ELSE 
   
  -ALL : "xml - Win32 Debug" "libapr - Win32 Debug" "$(OUTDIR)\libaprutil.dll"
  +ALL : "xml - Win32 Debug" "gen_uri_delims - Win32 Debug" "libapr - Win32 Debug"\
  + "$(OUTDIR)\libaprutil.dll"
   
   !ENDIF 
   
   !IF "$(RECURSE)" == "1" 
  -CLEAN :"libapr - Win32 DebugCLEAN" "xml - Win32 DebugCLEAN" 
  +CLEAN :"libapr - Win32 DebugCLEAN" "gen_uri_delims - Win32 DebugCLEAN"\
  + "xml - Win32 DebugCLEAN" 
   !ELSE 
   CLEAN :
   !ENDIF 
  @@ -200,6 +206,7 @@
   	-@erase "$(INTDIR)\apr_dbm.obj"
   	-@erase "$(INTDIR)\apr_hooks.obj"
   	-@erase "$(INTDIR)\apr_sha1.obj"
  +	-@erase "$(INTDIR)\apr_uri.obj"
   	-@erase "$(INTDIR)\apr_xml.obj"
   	-@erase "$(INTDIR)\aprutil.idb"
   	-@erase "$(INTDIR)\aprutil.pdb"
  @@ -284,6 +291,7 @@
   	"$(INTDIR)\apr_dbm.obj" \
   	"$(INTDIR)\apr_hooks.obj" \
   	"$(INTDIR)\apr_sha1.obj" \
  +	"$(INTDIR)\apr_uri.obj" \
   	"$(INTDIR)\apr_xml.obj" \
   	"$(INTDIR)\sdbm.obj" \
   	"$(INTDIR)\sdbm_hash.obj" \
  @@ -614,9 +622,10 @@
   	".\dbm\sdbm\sdbm_private.h"\
   	".\dbm\sdbm\sdbm_tune.h"\
   	".\include\apr_sdbm.h"\
  +	".\include\apu.h"\
   	
   
  -"$(INTDIR)\sdbm.obj" : $(SOURCE) $(DEP_CPP_SDBM_) "$(INTDIR)"
  +"$(INTDIR)\sdbm.obj" : $(SOURCE) $(DEP_CPP_SDBM_) "$(INTDIR)" ".\include\apu.h"
   	$(CPP) $(CPP_PROJ) $(SOURCE)
   
   
  @@ -630,10 +639,13 @@
   	"..\apr\include\apr_time.h"\
   	"..\apr\include\apr_user.h"\
   	"..\apr\include\apr_want.h"\
  +	".\dbm\sdbm\sdbm_private.h"\
   	".\include\apr_sdbm.h"\
  +	".\include\apu.h"\
   	
   
  -"$(INTDIR)\sdbm_hash.obj" : $(SOURCE) $(DEP_CPP_SDBM_H) "$(INTDIR)"
  +"$(INTDIR)\sdbm_hash.obj" : $(SOURCE) $(DEP_CPP_SDBM_H) "$(INTDIR)"\
  + ".\include\apu.h"
   	$(CPP) $(CPP_PROJ) $(SOURCE)
   
   
  @@ -648,10 +660,13 @@
   	"..\apr\include\apr_user.h"\
   	"..\apr\include\apr_want.h"\
   	".\dbm\sdbm\sdbm_private.h"\
  +	".\dbm\sdbm\sdbm_tune.h"\
   	".\include\apr_sdbm.h"\
  +	".\include\apu.h"\
   	
   
  -"$(INTDIR)\sdbm_lock.obj" : $(SOURCE) $(DEP_CPP_SDBM_L) "$(INTDIR)"
  +"$(INTDIR)\sdbm_lock.obj" : $(SOURCE) $(DEP_CPP_SDBM_L) "$(INTDIR)"\
  + ".\include\apu.h"
   	$(CPP) $(CPP_PROJ) $(SOURCE)
   
   
  @@ -669,9 +684,11 @@
   	".\dbm\sdbm\sdbm_private.h"\
   	".\dbm\sdbm\sdbm_tune.h"\
   	".\include\apr_sdbm.h"\
  +	".\include\apu.h"\
   	
   
  -"$(INTDIR)\sdbm_pair.obj" : $(SOURCE) $(DEP_CPP_SDBM_P) "$(INTDIR)"
  +"$(INTDIR)\sdbm_pair.obj" : $(SOURCE) $(DEP_CPP_SDBM_P) "$(INTDIR)"\
  + ".\include\apu.h"
   	$(CPP) $(CPP_PROJ) $(SOURCE)
   
   
  @@ -720,9 +737,10 @@
   	"..\apr\include\apr_hash.h"\
   	"..\apr\include\apr_pools.h"\
   	"..\apr\include\apr_tables.h"\
  -	".\include\apr_generic_hook.h"\
  +	"..\apr\include\apr_want.h"\
   	".\include\apr_hooks.h"\
   	".\include\apr_optional.h"\
  +	".\include\apr_optional_hooks.h"\
   	".\include\apu.h"\
   	
   
  @@ -731,6 +749,29 @@
   	$(CPP) $(CPP_PROJ) $(SOURCE)
   
   
  +SOURCE=.\uri\apr_uri.c
  +DEP_CPP_APR_U=\
  +	"..\apr\include\apr.h"\
  +	"..\apr\include\apr_errno.h"\
  +	"..\apr\include\apr_file_info.h"\
  +	"..\apr\include\apr_file_io.h"\
  +	"..\apr\include\apr_general.h"\
  +	"..\apr\include\apr_network_io.h"\
  +	"..\apr\include\apr_pools.h"\
  +	"..\apr\include\apr_strings.h"\
  +	"..\apr\include\apr_time.h"\
  +	"..\apr\include\apr_user.h"\
  +	"..\apr\include\apr_want.h"\
  +	".\include\apr_uri.h"\
  +	".\include\apu.h"\
  +	".\uri\uri_delims.h"\
  +	
  +
  +"$(INTDIR)\apr_uri.obj" : $(SOURCE) $(DEP_CPP_APR_U) "$(INTDIR)"\
  + ".\include\apu.h" ".\uri\uri_delims.h"
  +	$(CPP) $(CPP_PROJ) $(SOURCE)
  +
  +
   SOURCE=.\xml\apr_xml.c
   DEP_CPP_APR_X=\
   	"..\apr\include\apr.h"\
  @@ -821,31 +862,83 @@
   
   !ENDIF 
   
  +SOURCE=.\uri\gen_uri_delims.exe
  +
  +!IF  "$(CFG)" == "libaprutil - Win32 Release"
  +
  +InputPath=.\uri\gen_uri_delims.exe
  +
  +".\uri\uri_delims.h"	 : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
  +	.\uri\gen_uri_delims.exe >.\uri\uri_delims.h 
  +	echo Generated uri_delims.h from gen_uri_delims.exe 
  +	
  +
  +!ELSEIF  "$(CFG)" == "libaprutil - Win32 Debug"
  +
  +InputPath=.\uri\gen_uri_delims.exe
  +
  +".\uri\uri_delims.h"	 : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
  +	.\uri\gen_uri_delims.exe >.\uri\uri_delims.h 
  +	echo Generated uri_delims.h from gen_uri_delims.exe 
  +	
  +
  +!ENDIF 
  +
   !IF  "$(CFG)" == "libaprutil - Win32 Release"
   
   "libapr - Win32 Release" : 
  -   cd "..\apr"
  -   $(MAKE) /$(MAKEFLAGS) /F .\libapr.mak CFG="libapr - Win32 Release" 
  +   cd "..\..\srclib\apr"
  +   $(MAKE) /$(MAKEFLAGS) /F ".\libapr.mak" CFG="libapr - Win32 Release" 
      cd "..\apr-util"
   
   "libapr - Win32 ReleaseCLEAN" : 
  -   cd "..\apr"
  -   $(MAKE) /$(MAKEFLAGS) CLEAN /F .\libapr.mak CFG="libapr - Win32 Release"\
  +   cd "..\..\srclib\apr"
  +   $(MAKE) /$(MAKEFLAGS) CLEAN /F ".\libapr.mak" CFG="libapr - Win32 Release"\
    RECURSE=1 
      cd "..\apr-util"
   
   !ELSEIF  "$(CFG)" == "libaprutil - Win32 Debug"
   
   "libapr - Win32 Debug" : 
  -   cd "..\apr"
  -   $(MAKE) /$(MAKEFLAGS) /F .\libapr.mak CFG="libapr - Win32 Debug" 
  +   cd "..\..\srclib\apr"
  +   $(MAKE) /$(MAKEFLAGS) /F ".\libapr.mak" CFG="libapr - Win32 Debug" 
      cd "..\apr-util"
   
   "libapr - Win32 DebugCLEAN" : 
  -   cd "..\apr"
  -   $(MAKE) /$(MAKEFLAGS) CLEAN /F .\libapr.mak CFG="libapr - Win32 Debug"\
  +   cd "..\..\srclib\apr"
  +   $(MAKE) /$(MAKEFLAGS) CLEAN /F ".\libapr.mak" CFG="libapr - Win32 Debug"\
    RECURSE=1 
      cd "..\apr-util"
  +
  +!ENDIF 
  +
  +!IF  "$(CFG)" == "libaprutil - Win32 Release"
  +
  +"gen_uri_delims - Win32 Release" : 
  +   cd ".\uri"
  +   $(MAKE) /$(MAKEFLAGS) /F ".\gen_uri_delims.mak"\
  + CFG="gen_uri_delims - Win32 Release" 
  +   cd ".."
  +
  +"gen_uri_delims - Win32 ReleaseCLEAN" : 
  +   cd ".\uri"
  +   $(MAKE) /$(MAKEFLAGS) CLEAN /F ".\gen_uri_delims.mak"\
  + CFG="gen_uri_delims - Win32 Release" RECURSE=1 
  +   cd ".."
  +
  +!ELSEIF  "$(CFG)" == "libaprutil - Win32 Debug"
  +
  +"gen_uri_delims - Win32 Debug" : 
  +   cd ".\uri"
  +   $(MAKE) /$(MAKEFLAGS) /F ".\gen_uri_delims.mak"\
  + CFG="gen_uri_delims - Win32 Debug" 
  +   cd ".."
  +
  +"gen_uri_delims - Win32 DebugCLEAN" : 
  +   cd ".\uri"
  +   $(MAKE) /$(MAKEFLAGS) CLEAN /F ".\gen_uri_delims.mak"\
  + CFG="gen_uri_delims - Win32 Debug" RECURSE=1 
  +   cd ".."
   
   !ENDIF 
   
  
  
  
  1.27      +43 -10    apr-util/aprutil.dsp
  
  Index: aprutil.dsp
  ===================================================================
  RCS file: /home/cvs/apr-util/aprutil.dsp,v
  retrieving revision 1.26
  retrieving revision 1.27
  diff -u -r1.26 -r1.27
  --- aprutil.dsp	2001/05/10 14:46:20	1.26
  +++ aprutil.dsp	2001/05/23 05:16:24	1.27
  @@ -1,5 +1,5 @@
   # Microsoft Developer Studio Project File - Name="aprutil" - Package Owner=<4>
  -# Microsoft Developer Studio Generated Build File, Format Version 6.00
  +# Microsoft Developer Studio Generated Build File, Format Version 5.00
   # ** DO NOT EDIT **
   
   # TARGTYPE "Win32 (x86) Static Library" 0x0104
  @@ -22,11 +22,9 @@
   !MESSAGE 
   
   # Begin Project
  -# PROP AllowPerConfigDependencies 0
   # PROP Scc_ProjName ""
   # PROP Scc_LocalPath ""
   CPP=cl.exe
  -RSC=rc.exe
   
   !IF  "$(CFG)" == "aprutil - Win32 Release"
   
  @@ -40,10 +38,11 @@
   # PROP Output_Dir "LibR"
   # PROP Intermediate_Dir "LibR"
   # PROP Target_Dir ""
  -# ADD BASE CPP /nologo /MD /W3 /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /FD /c
  -# ADD CPP /nologo /MD /W3 /O2 /I "./include" /I "../apr/include" /I "./include/private"
/I "./dbm/sdbm" /I "./xml/expat/lib" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "APR_DECLARE_STATIC"
/D "APU_DECLARE_STATIC" /D "APU_USE_SDBM" /Fd"LibR\aprutil" /FD /c
  +RSC=rc.exe
   # ADD BASE RSC /l 0x409
   # ADD RSC /l 0x409
  +# ADD BASE CPP /nologo /MD /W3 /O2 /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /FD /c
  +# ADD CPP /nologo /MD /W3 /O2 /I "./include" /I "../apr/include" /I "./include/private"
/I "./dbm/sdbm" /I "./xml/expat/lib" /D "NDEBUG" /D "WIN32" /D "_WINDOWS" /D "APR_DECLARE_STATIC"
/D "APU_DECLARE_STATIC" /D "APU_USE_SDBM" /Fd"LibR\aprutil" /FD /c
   BSC32=bscmake.exe
   # ADD BASE BSC32 /nologo
   # ADD BSC32 /nologo
  @@ -64,10 +63,11 @@
   # PROP Intermediate_Dir "LibD"
   # PROP Ignore_Export_Lib 0
   # PROP Target_Dir ""
  -# ADD BASE CPP /nologo /MDd /W3 /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /FD /c
  -# ADD CPP /nologo /MDd /W3 /GX /ZI /Od /I "./include" /I "../apr/include" /I "./include/private"
/I "./dbm/sdbm" /I "./xml/expat/lib" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "APR_DECLARE_STATIC"
/D "APU_DECLARE_STATIC" /D "APU_USE_SDBM" /Fd"LibD\aprutil" /FD /c
  +RSC=rc.exe
   # ADD BASE RSC /l 0x409
   # ADD RSC /l 0x409
  +# ADD BASE CPP /nologo /MDd /W3 /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /FD /c
  +# ADD CPP /nologo /MDd /W3 /GX /Zi /Od /I "./include" /I "../apr/include" /I "./include/private"
/I "./dbm/sdbm" /I "./xml/expat/lib" /D "_DEBUG" /D "WIN32" /D "_WINDOWS" /D "APR_DECLARE_STATIC"
/D "APU_DECLARE_STATIC" /D "APU_USE_SDBM" /Fd"LibD\aprutil" /FD /c
   BSC32=bscmake.exe
   # ADD BASE BSC32 /nologo
   # ADD BSC32 /nologo
  @@ -203,6 +203,10 @@
   # Begin Group "uri"
   
   # PROP Default_Filter ""
  +# Begin Source File
  +
  +SOURCE=.\uri\apr_uri.c
  +# End Source File
   # End Group
   # Begin Group "xml"
   
  @@ -213,7 +217,7 @@
   # End Source File
   # End Group
   # End Group
  -# Begin Group "Generated Headers"
  +# Begin Group "Generated"
   
   # PROP Default_Filter ""
   # Begin Source File
  @@ -288,7 +292,7 @@
   InputPath=.\include\private\apu_select_dbm.hw
   
   ".\include\private\apu_select_dbm.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
  -	copy .\include\private\apu_select_dbm.hw .\include\private\apu_select_dbm.h >  nul

  +	copy .\include\private\apu_select_dbm.hw .\include\private\apu_select_dbm.h > nul 
   	echo Created apu_select_dbm.h from apu_select_dbm.hw 
   	
   # End Custom Build
  @@ -299,8 +303,37 @@
   InputPath=.\include\private\apu_select_dbm.hw
   
   ".\include\private\apu_select_dbm.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
  -	copy .\include\private\apu_select_dbm.hw .\include\private\apu_select_dbm.h >  nul

  +	copy .\include\private\apu_select_dbm.hw .\include\private\apu_select_dbm.h > nul 
   	echo Created apu_select_dbm.h from apu_select_dbm.hw 
  +	
  +# End Custom Build
  +
  +!ENDIF 
  +
  +# End Source File
  +# Begin Source File
  +
  +SOURCE=.\uri\gen_uri_delims.exe
  +
  +!IF  "$(CFG)" == "aprutil - Win32 Release"
  +
  +# Begin Custom Build - Generating uri_delims.h
  +InputPath=.\uri\gen_uri_delims.exe
  +
  +".\uri\uri_delims.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
  +	.\uri\gen_uri_delims.exe >.\uri\uri_delims.h 
  +	echo Generated uri_delims.h from gen_uri_delims.exe 
  +	
  +# End Custom Build
  +
  +!ELSEIF  "$(CFG)" == "aprutil - Win32 Debug"
  +
  +# Begin Custom Build - Generating uri_delims.h
  +InputPath=.\uri\gen_uri_delims.exe
  +
  +".\uri\uri_delims.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
  +	.\uri\gen_uri_delims.exe >.\uri\uri_delims.h 
  +	echo Generated uri_delims.h from gen_uri_delims.exe 
   	
   # End Custom Build
   
  
  
  
  1.18      +37 -5     apr-util/libaprutil.dsp
  
  Index: libaprutil.dsp
  ===================================================================
  RCS file: /home/cvs/apr-util/libaprutil.dsp,v
  retrieving revision 1.17
  retrieving revision 1.18
  diff -u -r1.17 -r1.18
  --- libaprutil.dsp	2001/05/10 14:46:22	1.17
  +++ libaprutil.dsp	2001/05/23 05:16:25	1.18
  @@ -1,5 +1,5 @@
   # Microsoft Developer Studio Project File - Name="libaprutil" - Package Owner=<4>
  -# Microsoft Developer Studio Generated Build File, Format Version 6.00
  +# Microsoft Developer Studio Generated Build File, Format Version 5.00
   # ** DO NOT EDIT **
   
   # TARGTYPE "Win32 (x86) Dynamic-Link Library" 0x0102
  @@ -22,7 +22,6 @@
   !MESSAGE 
   
   # Begin Project
  -# PROP AllowPerConfigDependencies 0
   # PROP Scc_ProjName ""
   # PROP Scc_LocalPath ""
   CPP=cl.exe
  @@ -68,8 +67,8 @@
   # PROP Intermediate_Dir "Debug"
   # PROP Ignore_Export_Lib 0
   # PROP Target_Dir ""
  -# ADD BASE CPP /nologo /MDd /W3 /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /FD /c
  -# ADD CPP /nologo /MDd /W3 /GX /ZI /Od /I "./include" /I "../apr/include" /I "./include/private"
/I "./dbm/sdbm" /I "./xml/expat/lib" /I "./expat/lib" /D "_DEBUG" /D "WIN32" /D "_WINDOWS"
/D "APU_DECLARE_EXPORT" /D "APU_USE_SDBM" /Fd"Debug\aprutil" /FD /c
  +# ADD BASE CPP /nologo /MDd /W3 /GX /Zi /Od /D "WIN32" /D "_DEBUG" /D "_WINDOWS" /FD /c
  +# ADD CPP /nologo /MDd /W3 /GX /Zi /Od /I "./include" /I "../apr/include" /I "./include/private"
/I "./dbm/sdbm" /I "./xml/expat/lib" /I "./expat/lib" /D "_DEBUG" /D "WIN32" /D "_WINDOWS"
/D "APU_DECLARE_EXPORT" /D "APU_USE_SDBM" /Fd"Debug\aprutil" /FD /c
   # ADD BASE MTL /nologo /D "_DEBUG" /mktyplib203 /o /win32 "NUL"
   # ADD MTL /nologo /D "_DEBUG" /mktyplib203 /o /win32 "NUL"
   # ADD BASE RSC /l 0x409 /d "_DEBUG"
  @@ -209,6 +208,10 @@
   # Begin Group "uri"
   
   # PROP Default_Filter ""
  +# Begin Source File
  +
  +SOURCE=.\uri\apr_uri.c
  +# End Source File
   # End Group
   # Begin Group "xml"
   
  @@ -219,7 +222,7 @@
   # End Source File
   # End Group
   # End Group
  -# Begin Group "Generated Headers"
  +# Begin Group "Generated"
   
   # PROP Default_Filter ""
   # Begin Source File
  @@ -307,6 +310,35 @@
   ".\include\private\apu_select_dbm.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
   	copy .\include\private\apu_select_dbm.hw .\include\private\apu_select_dbm.h >  nul

   	echo Created apu_select_dbm.h from apu_select_dbm.hw 
  +	
  +# End Custom Build
  +
  +!ENDIF 
  +
  +# End Source File
  +# Begin Source File
  +
  +SOURCE=.\uri\gen_uri_delims.exe
  +
  +!IF  "$(CFG)" == "libaprutil - Win32 Release"
  +
  +# Begin Custom Build - Generating uri_delims.h
  +InputPath=.\uri\gen_uri_delims.exe
  +
  +".\uri\uri_delims.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
  +	.\uri\gen_uri_delims.exe >.\uri\uri_delims.h 
  +	echo Generated uri_delims.h from gen_uri_delims.exe 
  +	
  +# End Custom Build
  +
  +!ELSEIF  "$(CFG)" == "libaprutil - Win32 Debug"
  +
  +# Begin Custom Build - Generating uri_delims.h
  +InputPath=.\uri\gen_uri_delims.exe
  +
  +".\uri\uri_delims.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
  +	.\uri\gen_uri_delims.exe >.\uri\uri_delims.h 
  +	echo Generated uri_delims.h from gen_uri_delims.exe 
   	
   # End Custom Build
   
  
  
  

Mime
View raw message