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/xml/expat/lib xml.mak
Date Thu, 22 Mar 2001 05:38:48 GMT
wrowe       01/03/21 21:38:47

  Modified:    .        aprutil.dsp libaprutil.dsp
               xml/expat/lib xml.mak
  Log:
    Commit conflicts are a great thing - all sorts of goodies lurking
  
  Revision  Changes    Path
  1.23      +10 -1     apr-util/aprutil.dsp
  
  Index: aprutil.dsp
  ===================================================================
  RCS file: /home/cvs/apr-util/aprutil.dsp,v
  retrieving revision 1.22
  retrieving revision 1.23
  diff -u -r1.22 -r1.23
  --- aprutil.dsp	2001/03/16 19:27:17	1.22
  +++ aprutil.dsp	2001/03/22 05:38:44	1.23
  @@ -253,7 +253,16 @@
   
   SOURCE=.\include\private\apu_config.hw
   
  -!IF  "$(CFG)" == "aprutil - Win32 Release"
  +!IF  "$(CFG)" == "libaprutil - Win32 Release"
  +
  +# Begin Custom Build
  +InputPath=.\include\private\apu_config.hw
  +
  +".\include\private\apu_config.h" : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
  +	copy .\include\private\apu_config.hw .\include\private\apu_config.h > nul 
  +	echo Created apu_config.h from apu_config.hw 
  +	
  +# End Custom Build
   
   !ELSEIF  "$(CFG)" == "aprutil - Win32 Debug"
   
  
  
  
  1.15      +1 -1      apr-util/libaprutil.dsp
  
  Index: libaprutil.dsp
  ===================================================================
  RCS file: /home/cvs/apr-util/libaprutil.dsp,v
  retrieving revision 1.14
  retrieving revision 1.15
  diff -u -r1.14 -r1.15
  --- libaprutil.dsp	2001/03/14 20:56:29	1.14
  +++ libaprutil.dsp	2001/03/22 05:38:45	1.15
  @@ -43,7 +43,7 @@
   # PROP Ignore_Export_Lib 0
   # 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" /I "./expat/lib" /D "NDEBUG" /D "WIN32" /D "_WINDOWS"
/D "APU_DECLARE_EXPORT" /D "APU_USE_SDBM" /Fd"Release\aprutil" /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 "APU_DECLARE_EXPORT"
/D "APU_USE_SDBM" /Fd"Release\aprutil" /FD /c
   # ADD BASE MTL /nologo /D "NDEBUG" /mktyplib203 /o /win32 "NUL"
   # ADD MTL /nologo /D "NDEBUG" /mktyplib203 /o /win32 "NUL"
   # ADD BASE RSC /l 0x409 /d "NDEBUG"
  
  
  
  1.3       +17 -11    apr-util/xml/expat/lib/xml.mak
  
  Index: xml.mak
  ===================================================================
  RCS file: /home/cvs/apr-util/xml/expat/lib/xml.mak,v
  retrieving revision 1.2
  retrieving revision 1.3
  diff -u -r1.2 -r1.3
  --- xml.mak	2001/03/08 18:43:52	1.2
  +++ xml.mak	2001/03/22 05:38:46	1.3
  @@ -56,8 +56,9 @@
   RSC=rc.exe
   CPP=cl.exe
   CPP_PROJ=/nologo /MD /W3 /O2 /I "." /D "WIN32" /D "NDEBUG" /D "_WINDOWS" /D\
  - "_MBCS" /D VERSION=\"expat_1.95.1\" /D XML_MAJOR_VERSION=1 /D XML_MINOR_VERSION=95\
  - /D XML_MICRO_VERSION=1 /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\" /FD /c 
  + "_MBCS" /D VERSION=\"expat_1.95.1\" /D XML_MAJOR_VERSION=1 /D\
  + XML_MINOR_VERSION=95 /D XML_MICRO_VERSION=1 /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\"\
  + /FD /c 
   CPP_OBJS=.\LibR/
   CPP_SBRS=.
   
  @@ -127,7 +128,6 @@
   
   CLEAN :
   	-@erase "$(INTDIR)\vc50.idb"
  -	-@erase "$(INTDIR)\vc50.pdb"
   	-@erase "$(INTDIR)\xmlparse.obj"
   	-@erase "$(INTDIR)\xmlrole.obj"
   	-@erase "$(INTDIR)\xmltok.obj"
  @@ -138,10 +138,10 @@
   
   RSC=rc.exe
   CPP=cl.exe
  -CPP_PROJ=/nologo /MDd /W3 /GX /Zi /Od /I "." /D "WIN32" /D "_DEBUG" /D\
  - "_WINDOWS" /D "_MBCS" /D VERSION=\"expat_1.95.1\" /D XML_MAJOR_VERSION=1\
  - /D XML_MINOR_VERSION=95 /D XML_MICRO_VERSION=1 /Fo"$(INTDIR)\\"\
  - /Fd"$(INTDIR)\\" /FD /c 
  +CPP_PROJ=/nologo /MDd /W3 /GX /Od /I "." /D "WIN32" /D "_DEBUG" /D "_WINDOWS"\
  + /D "_MBCS" /D VERSION=\"expat_1.95.1\" /D XML_MAJOR_VERSION=1 /D\
  + XML_MINOR_VERSION=95 /D XML_MICRO_VERSION=1 /Fo"$(INTDIR)\\" /Fd"$(INTDIR)\\"\
  + /FD /ZI /c 
   CPP_OBJS=.\LibD/
   CPP_SBRS=.
   
  @@ -215,11 +215,13 @@
   DEP_CPP_XMLPA=\
   	".\config.h"\
   	".\expat.h"\
  +	".\winconfig.h"\
   	".\xmlrole.h"\
   	".\xmltok.h"\
   	
   
  -"$(INTDIR)\xmlparse.obj" : $(SOURCE) $(DEP_CPP_XMLPA) "$(INTDIR)" ".\config.h"
  +"$(INTDIR)\xmlparse.obj" : $(SOURCE) $(DEP_CPP_XMLPA) "$(INTDIR)"\
  + ".\winconfig.h" ".\expat.h" ".\config.h"
   
   
   !ENDIF 
  @@ -243,11 +245,13 @@
   DEP_CPP_XMLRO=\
   	".\ascii.h"\
   	".\config.h"\
  +	".\winconfig.h"\
   	".\xmlrole.h"\
   	".\xmltok.h"\
   	
   
  -"$(INTDIR)\xmlrole.obj" : $(SOURCE) $(DEP_CPP_XMLRO) "$(INTDIR)" ".\config.h"
  +"$(INTDIR)\xmlrole.obj" : $(SOURCE) $(DEP_CPP_XMLRO) "$(INTDIR)"\
  + ".\winconfig.h" ".\config.h"
   
   
   !ENDIF 
  @@ -283,13 +287,15 @@
   	".\latin1tab.h"\
   	".\nametab.h"\
   	".\utf8tab.h"\
  +	".\winconfig.h"\
   	".\xmltok.h"\
   	".\xmltok_impl.c"\
   	".\xmltok_impl.h"\
   	".\xmltok_ns.c"\
   	
   
  -"$(INTDIR)\xmltok.obj" : $(SOURCE) $(DEP_CPP_XMLTO) "$(INTDIR)" ".\config.h"
  +"$(INTDIR)\xmltok.obj" : $(SOURCE) $(DEP_CPP_XMLTO) "$(INTDIR)" ".\winconfig.h"\
  + ".\config.h"
   
   
   !ENDIF 
  @@ -311,7 +317,7 @@
   
   InputPath=.\expat.h.in
   
  -".\config.h"	 : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
  +".\expat.h"	 : $(SOURCE) "$(INTDIR)" "$(OUTDIR)"
   	copy .\expat.h.in .\expat.h > nul 
   	echo Created expat.h from expat.h.in 
   	
  
  
  

Mime
View raw message