r46532 - /packages/cbp2make/trunk/debian/patches/Makefile.patch

[olebole-guest at users.alioth.debian.org]

Author: olebole-guest
Date: Mon Feb 17 12:05:03 2014
New Revision: 46532

URL: http://svn.debian.org/wsvn/debian-science/?sc=1&rev=46532
Log:
Remove remaining tinyxml object targets and include path

Modified:
    packages/cbp2make/trunk/debian/patches/Makefile.patch

Modified: packages/cbp2make/trunk/debian/patches/Makefile.patch
URL: http://svn.debian.org/wsvn/debian-science/packages/cbp2make/trunk/debian/patches/Makefile.patch?rev=46532&op=diff
==============================================================================
--- packages/cbp2make/trunk/debian/patches/Makefile.patch	(original)
+++ packages/cbp2make/trunk/debian/patches/Makefile.patch	Mon Feb 17 12:05:03 2014
@@ -12,7 +12,7 @@
 -LIBDIR = 
 -LIB = 
 -LDFLAGS = 
-+INC +=  -Ilib -Ilib/tinyxml -Isrc
++INC +=  -Ilib -Isrc
 +CFLAGS +=  -Wall -fexceptions -fno-strict-aliasing -Wno-write-strings
 +RESINC +=
 +LIBDIR +=
@@ -22,6 +22,17 @@
  
  INC_DEBUG =  $(INC)
  CFLAGS_DEBUG =  $(CFLAGS) -g
+@@ -104,10 +105,6 @@
+ 	$(OBJDIR_RELEASE)/lib/stlstrings.o \
+ 	$(OBJDIR_RELEASE)/lib/stlvariables.o \
+ 	$(OBJDIR_RELEASE)/lib/stringhash.o \
+-	$(OBJDIR_RELEASE)/lib/tinyxml/tinystr.o \
+-	$(OBJDIR_RELEASE)/lib/tinyxml/tinyxml.o \
+-	$(OBJDIR_RELEASE)/lib/tinyxml/tinyxmlerror.o \
+-	$(OBJDIR_RELEASE)/lib/tinyxml/tinyxmlparser.o \
+ 	$(OBJDIR_RELEASE)/src/buildtools.o \
+ 	$(OBJDIR_RELEASE)/src/cbbuildcfg.o \
+ 	$(OBJDIR_RELEASE)/src/cbbuildmgr.o \
 @@ -139,7 +136,7 @@
  	$(OBJDIR_PROFILE)/src/cbbuildmgr.o \
  	$(OBJDIR_PROFILE)/src/cbglobalvar.o