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
Date Thu, 08 Mar 2001 16:06:08 GMT
wrowe       01/03/08 08:06:08

  Modified:    .        aprutil.mak libaprutil.mak
  Log:
    Completed changes for apr-util/xml/expat/lib
  
  Revision  Changes    Path
  1.8       +38 -38    apr-util/aprutil.mak
  
  Index: aprutil.mak
  ===================================================================
  RCS file: /home/cvs/apr-util/aprutil.mak,v
  retrieving revision 1.7
  retrieving revision 1.8
  diff -u -r1.7 -r1.8
  --- aprutil.mak	2001/03/08 05:37:35	1.7
  +++ aprutil.mak	2001/03/08 16:06:00	1.8
  @@ -40,12 +40,12 @@
   
   !ELSE 
   
  -ALL : "apr - Win32 Release" "expat - Win32 Release" "$(OUTDIR)\aprutil.lib"
  +ALL : "xml - Win32 Release" "apr - Win32 Release" "$(OUTDIR)\aprutil.lib"
   
   !ENDIF 
   
   !IF "$(RECURSE)" == "1" 
  -CLEAN :"expat - Win32 ReleaseCLEAN" "apr - Win32 ReleaseCLEAN" 
  +CLEAN :"apr - Win32 ReleaseCLEAN" "xml - Win32 ReleaseCLEAN" 
   !ELSE 
   CLEAN :
   !ENDIF 
  @@ -144,7 +144,7 @@
   	"$(INTDIR)\sdbm_lock.obj" \
   	"$(INTDIR)\sdbm_pair.obj" \
   	"..\apr\LibR\apr.lib" \
  -	"..\expat-lite\LibR\expat.lib"
  +	".\xml\expat\lib\LibR\xml.lib"
   
   "$(OUTDIR)\aprutil.lib" : "$(OUTDIR)" $(DEF_FILE) $(LIB32_OBJS)
       $(LIB32) @<<
  @@ -165,12 +165,12 @@
   
   !ELSE 
   
  -ALL : "apr - Win32 Debug" "expat - Win32 Debug" "$(OUTDIR)\aprutil.lib"
  +ALL : "xml - Win32 Debug" "apr - Win32 Debug" "$(OUTDIR)\aprutil.lib"
   
   !ENDIF 
   
   !IF "$(RECURSE)" == "1" 
  -CLEAN :"expat - Win32 DebugCLEAN" "apr - Win32 DebugCLEAN" 
  +CLEAN :"apr - Win32 DebugCLEAN" "xml - Win32 DebugCLEAN" 
   !ELSE 
   CLEAN :
   !ENDIF 
  @@ -270,7 +270,7 @@
   	"$(INTDIR)\sdbm_lock.obj" \
   	"$(INTDIR)\sdbm_pair.obj" \
   	"..\apr\LibD\apr.lib" \
  -	"..\expat-lite\LibD\expat.lib"
  +	".\xml\expat\lib\LibD\xml.lib"
   
   "$(OUTDIR)\aprutil.lib" : "$(OUTDIR)" $(DEF_FILE) $(LIB32_OBJS)
       $(LIB32) @<<
  @@ -719,13 +719,13 @@
   	"..\apr\include\apr_strings.h"\
   	"..\apr\include\apr_tables.h"\
   	"..\apr\include\apr_want.h"\
  -	"..\expat-lite\xmlparse.h"\
   	".\include\apr_xml.h"\
   	".\include\apu.h"\
   	
   NODEP_CPP_APR_X=\
   	".\xml\apu_config.h"\
   	".\xml\expat.h"\
  +	".\xml\xmlparse.h"\
   	
   
   "$(INTDIR)\apr_xml.obj" : $(SOURCE) $(DEP_CPP_APR_X) "$(INTDIR)"\
  @@ -781,57 +781,57 @@
   
   !IF  "$(CFG)" == "aprutil - Win32 Release"
   
  -"expat - Win32 Release" : 
  -   cd "..\..\srclib\expat-lite"
  -   $(MAKE) /$(MAKEFLAGS) /F ".\expat.mak" CFG="expat - Win32 Release" 
  +"apr - Win32 Release" : 
  +   cd "..\apr"
  +   $(MAKE) /$(MAKEFLAGS) /F ".\apr.mak" CFG="apr - Win32 Release" 
      cd "..\apr-util"
   
  -"expat - Win32 ReleaseCLEAN" : 
  -   cd "..\..\srclib\expat-lite"
  -   $(MAKE) /$(MAKEFLAGS) CLEAN /F ".\expat.mak" CFG="expat - Win32 Release"\
  +"apr - Win32 ReleaseCLEAN" : 
  +   cd "..\apr"
  +   $(MAKE) /$(MAKEFLAGS) CLEAN /F ".\apr.mak" CFG="apr - Win32 Release"\
    RECURSE=1 
      cd "..\apr-util"
   
   !ELSEIF  "$(CFG)" == "aprutil - Win32 Debug"
   
  -"expat - Win32 Debug" : 
  -   cd "..\..\srclib\expat-lite"
  -   $(MAKE) /$(MAKEFLAGS) /F ".\expat.mak" CFG="expat - Win32 Debug" 
  +"apr - Win32 Debug" : 
  +   cd "..\apr"
  +   $(MAKE) /$(MAKEFLAGS) /F ".\apr.mak" CFG="apr - Win32 Debug" 
      cd "..\apr-util"
   
  -"expat - Win32 DebugCLEAN" : 
  -   cd "..\..\srclib\expat-lite"
  -   $(MAKE) /$(MAKEFLAGS) CLEAN /F ".\expat.mak" CFG="expat - Win32 Debug"\
  - RECURSE=1 
  +"apr - Win32 DebugCLEAN" : 
  +   cd "..\apr"
  +   $(MAKE) /$(MAKEFLAGS) CLEAN /F ".\apr.mak" CFG="apr - Win32 Debug" RECURSE=1\
  + 
      cd "..\apr-util"
   
   !ENDIF 
   
   !IF  "$(CFG)" == "aprutil - Win32 Release"
  -
  -"apr - Win32 Release" : 
  -   cd "..\..\srclib\apr"
  -   $(MAKE) /$(MAKEFLAGS) /F ".\apr.mak" CFG="apr - Win32 Release" 
  -   cd "..\apr-util"
   
  -"apr - Win32 ReleaseCLEAN" : 
  -   cd "..\..\srclib\apr"
  -   $(MAKE) /$(MAKEFLAGS) CLEAN /F ".\apr.mak" CFG="apr - Win32 Release"\
  +"xml - Win32 Release" : 
  +   cd ".\xml\expat\lib"
  +   $(MAKE) /$(MAKEFLAGS) /F ".\xml.mak" CFG="xml - Win32 Release" 
  +   cd "..\..\.."
  +
  +"xml - Win32 ReleaseCLEAN" : 
  +   cd ".\xml\expat\lib"
  +   $(MAKE) /$(MAKEFLAGS) CLEAN /F ".\xml.mak" CFG="xml - Win32 Release"\
    RECURSE=1 
  -   cd "..\apr-util"
  +   cd "..\..\.."
   
   !ELSEIF  "$(CFG)" == "aprutil - Win32 Debug"
  -
  -"apr - Win32 Debug" : 
  -   cd "..\..\srclib\apr"
  -   $(MAKE) /$(MAKEFLAGS) /F ".\apr.mak" CFG="apr - Win32 Debug" 
  -   cd "..\apr-util"
   
  -"apr - Win32 DebugCLEAN" : 
  -   cd "..\..\srclib\apr"
  -   $(MAKE) /$(MAKEFLAGS) CLEAN /F ".\apr.mak" CFG="apr - Win32 Debug" RECURSE=1\
  +"xml - Win32 Debug" : 
  +   cd ".\xml\expat\lib"
  +   $(MAKE) /$(MAKEFLAGS) /F ".\xml.mak" CFG="xml - Win32 Debug" 
  +   cd "..\..\.."
  +
  +"xml - Win32 DebugCLEAN" : 
  +   cd ".\xml\expat\lib"
  +   $(MAKE) /$(MAKEFLAGS) CLEAN /F ".\xml.mak" CFG="xml - Win32 Debug" RECURSE=1\
    
  -   cd "..\apr-util"
  +   cd "..\..\.."
   
   !ENDIF 
   
  
  
  
  1.7       +31 -33    apr-util/libaprutil.mak
  
  Index: libaprutil.mak
  ===================================================================
  RCS file: /home/cvs/apr-util/libaprutil.mak,v
  retrieving revision 1.6
  retrieving revision 1.7
  diff -u -r1.6 -r1.7
  --- libaprutil.mak	2001/03/08 05:37:35	1.6
  +++ libaprutil.mak	2001/03/08 16:06:02	1.7
  @@ -42,13 +42,12 @@
   
   !ELSE 
   
  -ALL : "libexpat - Win32 Release" "libapr - Win32 Release"\
  - "$(OUTDIR)\libaprutil.dll"
  +ALL : "xml - Win32 Release" "libapr - Win32 Release" "$(OUTDIR)\libaprutil.dll"
   
   !ENDIF 
   
   !IF "$(RECURSE)" == "1" 
  -CLEAN :"libapr - Win32 ReleaseCLEAN" "libexpat - Win32 ReleaseCLEAN" 
  +CLEAN :"libapr - Win32 ReleaseCLEAN" "xml - Win32 ReleaseCLEAN" 
   !ELSE 
   CLEAN :
   !ENDIF 
  @@ -155,7 +154,7 @@
   	"$(INTDIR)\sdbm_lock.obj" \
   	"$(INTDIR)\sdbm_pair.obj" \
   	"..\apr\Release\libapr.lib" \
  -	"..\expat-lite\Release\libexpat.lib"
  +	".\xml\expat\lib\LibR\xml.lib"
   
   "$(OUTDIR)\libaprutil.dll" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
       $(LINK32) @<<
  @@ -176,13 +175,12 @@
   
   !ELSE 
   
  -ALL : "libexpat - Win32 Debug" "libapr - Win32 Debug"\
  - "$(OUTDIR)\libaprutil.dll"
  +ALL : "xml - Win32 Debug" "libapr - Win32 Debug" "$(OUTDIR)\libaprutil.dll"
   
   !ENDIF 
   
   !IF "$(RECURSE)" == "1" 
  -CLEAN :"libapr - Win32 DebugCLEAN" "libexpat - Win32 DebugCLEAN" 
  +CLEAN :"libapr - Win32 DebugCLEAN" "xml - Win32 DebugCLEAN" 
   !ELSE 
   CLEAN :
   !ENDIF 
  @@ -292,7 +290,7 @@
   	"$(INTDIR)\sdbm_lock.obj" \
   	"$(INTDIR)\sdbm_pair.obj" \
   	"..\apr\Debug\libapr.lib" \
  -	"..\expat-lite\Debug\libexpat.lib"
  +	".\xml\expat\lib\LibD\xml.lib"
   
   "$(OUTDIR)\libaprutil.dll" : "$(OUTDIR)" $(DEF_FILE) $(LINK32_OBJS)
       $(LINK32) @<<
  @@ -741,13 +739,13 @@
   	"..\apr\include\apr_strings.h"\
   	"..\apr\include\apr_tables.h"\
   	"..\apr\include\apr_want.h"\
  -	"..\expat-lite\xmlparse.h"\
   	".\include\apr_xml.h"\
   	".\include\apu.h"\
   	
   NODEP_CPP_APR_X=\
   	".\xml\apu_config.h"\
   	".\xml\expat.h"\
  +	".\xml\xmlparse.h"\
   	
   
   "$(INTDIR)\apr_xml.obj" : $(SOURCE) $(DEP_CPP_APR_X) "$(INTDIR)"\
  @@ -804,12 +802,12 @@
   !IF  "$(CFG)" == "libaprutil - Win32 Release"
   
   "libapr - Win32 Release" : 
  -   cd "..\..\srclib\apr"
  +   cd "..\apr"
      $(MAKE) /$(MAKEFLAGS) /F ".\libapr.mak" CFG="libapr - Win32 Release" 
      cd "..\apr-util"
   
   "libapr - Win32 ReleaseCLEAN" : 
  -   cd "..\..\srclib\apr"
  +   cd "..\apr"
      $(MAKE) /$(MAKEFLAGS) CLEAN /F ".\libapr.mak" CFG="libapr - Win32 Release"\
    RECURSE=1 
      cd "..\apr-util"
  @@ -817,12 +815,12 @@
   !ELSEIF  "$(CFG)" == "libaprutil - Win32 Debug"
   
   "libapr - Win32 Debug" : 
  -   cd "..\..\srclib\apr"
  +   cd "..\apr"
      $(MAKE) /$(MAKEFLAGS) /F ".\libapr.mak" CFG="libapr - Win32 Debug" 
      cd "..\apr-util"
   
   "libapr - Win32 DebugCLEAN" : 
  -   cd "..\..\srclib\apr"
  +   cd "..\apr"
      $(MAKE) /$(MAKEFLAGS) CLEAN /F ".\libapr.mak" CFG="libapr - Win32 Debug"\
    RECURSE=1 
      cd "..\apr-util"
  @@ -831,29 +829,29 @@
   
   !IF  "$(CFG)" == "libaprutil - Win32 Release"
   
  -"libexpat - Win32 Release" : 
  -   cd "..\..\srclib\expat-lite"
  -   $(MAKE) /$(MAKEFLAGS) /F ".\libexpat.mak" CFG="libexpat - Win32 Release" 
  -   cd "..\apr-util"
  -
  -"libexpat - Win32 ReleaseCLEAN" : 
  -   cd "..\..\srclib\expat-lite"
  -   $(MAKE) /$(MAKEFLAGS) CLEAN /F ".\libexpat.mak"\
  - CFG="libexpat - Win32 Release" RECURSE=1 
  -   cd "..\apr-util"
  +"xml - Win32 Release" : 
  +   cd ".\xml\expat\lib"
  +   $(MAKE) /$(MAKEFLAGS) /F ".\xml.mak" CFG="xml - Win32 Release" 
  +   cd "..\..\.."
  +
  +"xml - Win32 ReleaseCLEAN" : 
  +   cd ".\xml\expat\lib"
  +   $(MAKE) /$(MAKEFLAGS) CLEAN /F ".\xml.mak" CFG="xml - Win32 Release"\
  + RECURSE=1 
  +   cd "..\..\.."
   
   !ELSEIF  "$(CFG)" == "libaprutil - Win32 Debug"
   
  -"libexpat - Win32 Debug" : 
  -   cd "..\..\srclib\expat-lite"
  -   $(MAKE) /$(MAKEFLAGS) /F ".\libexpat.mak" CFG="libexpat - Win32 Debug" 
  -   cd "..\apr-util"
  -
  -"libexpat - Win32 DebugCLEAN" : 
  -   cd "..\..\srclib\expat-lite"
  -   $(MAKE) /$(MAKEFLAGS) CLEAN /F ".\libexpat.mak" CFG="libexpat - Win32 Debug"\
  - RECURSE=1 
  -   cd "..\apr-util"
  +"xml - Win32 Debug" : 
  +   cd ".\xml\expat\lib"
  +   $(MAKE) /$(MAKEFLAGS) /F ".\xml.mak" CFG="xml - Win32 Debug" 
  +   cd "..\..\.."
  +
  +"xml - Win32 DebugCLEAN" : 
  +   cd ".\xml\expat\lib"
  +   $(MAKE) /$(MAKEFLAGS) CLEAN /F ".\xml.mak" CFG="xml - Win32 Debug" RECURSE=1\
  + 
  +   cd "..\..\.."
   
   !ENDIF 
   
  
  
  

Mime
View raw message