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
Date Sun, 25 Feb 2001 21:02:25 GMT
wrowe       01/02/25 13:02:25

  Modified:    .        aprutil.mak
  Log:
    Yuck.  Absolute cd / statements [first I ever noticed them!]  I'll
    scratch up some perl code to fix them relative to the build directory.
  
    Why has this never bitten us?  Simple - we don't use the recursive
    build mechanism - we actually go through the .mak targets with norecurse.
  
  Revision  Changes    Path
  1.4       +49 -19    apr-util/aprutil.mak
  
  Index: aprutil.mak
  ===================================================================
  RCS file: /home/cvs/apr-util/aprutil.mak,v
  retrieving revision 1.3
  retrieving revision 1.4
  diff -u -r1.3 -r1.4
  --- aprutil.mak	2001/02/25 02:53:30	1.3
  +++ aprutil.mak	2001/02/25 21:02:25	1.4
  @@ -40,12 +40,12 @@
   
   !ELSE 
   
  -ALL : "libexpat - Win32 Release" "$(OUTDIR)\aprutil.lib"
  +ALL : "apr - Win32 Release" "expat - Win32 Release" "$(OUTDIR)\aprutil.lib"
   
   !ENDIF 
   
   !IF "$(RECURSE)" == "1" 
  -CLEAN :"libexpat - Win32 ReleaseCLEAN" 
  +CLEAN :"expat - Win32 ReleaseCLEAN" "apr - Win32 ReleaseCLEAN" 
   !ELSE 
   CLEAN :
   !ENDIF 
  @@ -143,7 +143,8 @@
   	"$(INTDIR)\sdbm_hash.obj" \
   	"$(INTDIR)\sdbm_lock.obj" \
   	"$(INTDIR)\sdbm_pair.obj" \
  -	"..\expat-lite\Release\libexpat.lib"
  +	"..\apr\LibR\apr.lib" \
  +	"..\expat-lite\LibR\expat.lib"
   
   "$(OUTDIR)\aprutil.lib" : "$(OUTDIR)" $(DEF_FILE) $(LIB32_OBJS)
       $(LIB32) @<<
  @@ -164,12 +165,12 @@
   
   !ELSE 
   
  -ALL : "libexpat - Win32 Debug" "$(OUTDIR)\aprutil.lib"
  +ALL : "apr - Win32 Debug" "expat - Win32 Debug" "$(OUTDIR)\aprutil.lib"
   
   !ENDIF 
   
   !IF "$(RECURSE)" == "1" 
  -CLEAN :"libexpat - Win32 DebugCLEAN" 
  +CLEAN :"expat - Win32 DebugCLEAN" "apr - Win32 DebugCLEAN" 
   !ELSE 
   CLEAN :
   !ENDIF 
  @@ -268,7 +269,8 @@
   	"$(INTDIR)\sdbm_hash.obj" \
   	"$(INTDIR)\sdbm_lock.obj" \
   	"$(INTDIR)\sdbm_pair.obj" \
  -	"..\expat-lite\Debug\libexpat.lib"
  +	"..\apr\LibD\apr.lib" \
  +	"..\expat-lite\LibD\expat.lib"
   
   "$(OUTDIR)\aprutil.lib" : "$(OUTDIR)" $(DEF_FILE) $(LIB32_OBJS)
       $(LIB32) @<<
  @@ -798,28 +800,56 @@
   
   !IF  "$(CFG)" == "aprutil - Win32 Release"
   
  -"libexpat - Win32 Release" : 
  -   cd "\clean\httpd-2.0\srclib\expat-lite"
  -   $(MAKE) /$(MAKEFLAGS) /F ".\libexpat.mak" CFG="libexpat - Win32 Release" 
  +"expat - Win32 Release" : 
  +   cd "\spiffy\httpd-2.0\srclib\expat-lite"
  +   $(MAKE) /$(MAKEFLAGS) /F ".\expat.mak" CFG="expat - Win32 Release" 
      cd "..\apr-util"
   
  -"libexpat - Win32 ReleaseCLEAN" : 
  -   cd "\clean\httpd-2.0\srclib\expat-lite"
  -   $(MAKE) /$(MAKEFLAGS) CLEAN /F ".\libexpat.mak"\
  - CFG="libexpat - Win32 Release" RECURSE=1 
  +"expat - Win32 ReleaseCLEAN" : 
  +   cd "\spiffy\httpd-2.0\srclib\expat-lite"
  +   $(MAKE) /$(MAKEFLAGS) CLEAN /F ".\expat.mak" CFG="expat - Win32 Release"\
  + RECURSE=1 
      cd "..\apr-util"
   
   !ELSEIF  "$(CFG)" == "aprutil - Win32 Debug"
  +
  +"expat - Win32 Debug" : 
  +   cd "\spiffy\httpd-2.0\srclib\expat-lite"
  +   $(MAKE) /$(MAKEFLAGS) /F ".\expat.mak" CFG="expat - Win32 Debug" 
  +   cd "..\apr-util"
  +
  +"expat - Win32 DebugCLEAN" : 
  +   cd "\spiffy\httpd-2.0\srclib\expat-lite"
  +   $(MAKE) /$(MAKEFLAGS) CLEAN /F ".\expat.mak" CFG="expat - Win32 Debug"\
  + RECURSE=1 
  +   cd "..\apr-util"
  +
  +!ENDIF 
   
  -"libexpat - Win32 Debug" : 
  -   cd "\clean\httpd-2.0\srclib\expat-lite"
  -   $(MAKE) /$(MAKEFLAGS) /F ".\libexpat.mak" CFG="libexpat - Win32 Debug" 
  +!IF  "$(CFG)" == "aprutil - Win32 Release"
  +
  +"apr - Win32 Release" : 
  +   cd "\spiffy\httpd-2.0\srclib\apr"
  +   $(MAKE) /$(MAKEFLAGS) /F ".\apr.mak" CFG="apr - Win32 Release" 
      cd "..\apr-util"
   
  -"libexpat - Win32 DebugCLEAN" : 
  -   cd "\clean\httpd-2.0\srclib\expat-lite"
  -   $(MAKE) /$(MAKEFLAGS) CLEAN /F ".\libexpat.mak" CFG="libexpat - Win32 Debug"\
  +"apr - Win32 ReleaseCLEAN" : 
  +   cd "\spiffy\httpd-2.0\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 "\spiffy\httpd-2.0\srclib\apr"
  +   $(MAKE) /$(MAKEFLAGS) /F ".\apr.mak" CFG="apr - Win32 Debug" 
  +   cd "..\apr-util"
  +
  +"apr - Win32 DebugCLEAN" : 
  +   cd "\spiffy\httpd-2.0\srclib\apr"
  +   $(MAKE) /$(MAKEFLAGS) CLEAN /F ".\apr.mak" CFG="apr - Win32 Debug" RECURSE=1\
  + 
      cd "..\apr-util"
   
   !ENDIF 
  
  
  

Mime
View raw message