Author: Andreas Tille <tille@debian.org>
Last-Update: Fri, 01 Dec 2017 19:42:59 +0100
Description: Use Debian packaged tinyxml

--- a/Makefile.am
+++ b/Makefile.am
@@ -72,21 +72,6 @@ lam_conv_rc.o   :       $(top_srcdir)/re
 ## to this list
 LDADD				=
 
-noinst_LIBRARIES		= libtinyxml.a
-
-libtinyxml_a_CXXFLAGS		= -DTIXML_USE_STL
-if LAMARC_APP_OSX
-   libtinyxml_a_CXXFLAGS	+= -mmacosx-version-min=10.7
-endif
-
-libtinyxml_a_SOURCES	= \
-			tinyxml/tinyxml.h \
-			tinyxml/tinyxml.cpp \
-			tinyxml/tinyxmlerror.cpp \
-			tinyxml/tinyxmlparser.cpp \
-			tinyxml/tinystr.h \
-			tinyxml/tinystr.cpp
-
 ## ############################################################
 ## setting up compiler flags
 ## ############################################################
@@ -117,8 +102,7 @@ lamarc_includes         = \
 			-I $(lamarc_srcdir)/ui_vars \
 			-I $(lamarc_srcdir)/xml \
 			-I $(top_srcdir)/boost \
-			-I $(top_srcdir)/resources \
-			-I $(top_srcdir)/tinyxml
+			-I $(top_srcdir)/resources
 
 
 ## include resource file if needed
@@ -610,14 +594,6 @@ xml_sources     =   \
 		    src/xml/toxml.cpp \
 		    $(xml_core_sources)
 
-tinyxml_sources =   \
-		    tinyxml/tinyxml.h \
-		    tinyxml/tinyxml.cpp \
-		    tinyxml/tinyxmlerror.cpp \
-		    tinyxml/tinyxmlparser.cpp \
-		    tinyxml/tinystr.h \
-		    tinyxml/tinystr.cpp
-
 config_sources  =   \
 		    config/conf.h
 
@@ -640,7 +616,7 @@ lamarc_SOURCES  =   $(lamarcgcov_sources
 					$(lamarc_resources) \
 					$(config_sources)
 
-lamarc_LDADD	= libtinyxml.a
+lamarc_LDADD	= -ltinyxml
 
 old_lam_conv_core       = \
 			src/conversion/ConverterIf.cpp \
@@ -950,12 +926,12 @@ lam_conv_SOURCES        = \
 
 lam_conv_LDADD          = @WX_LIBS@
 if LAMARC_APP_OSX
-   lam_conv_LDADD      += libtinyxml.a 
+   lam_conv_LDADD      += -linyxml 
 else
-   lam_conv_LDADD      += -lX11 libtinyxml.a 
+   lam_conv_LDADD      += -lX11 -ltinyxml 
 endif
 
-EXTRA_lam_conv_SOURCES  = $(tinyxml_suite) $(lam_conv_icons)
+EXTRA_lam_conv_SOURCES  = $(lam_conv_icons)
 
 batch_lam_conv_core     = \
 			src/guiconv/batchconverter.h \
@@ -974,8 +950,6 @@ batch_lam_conv_SOURCES	=	\
 
 batch_lam_conv_LDADD = lam_conv_LDADD
 
-EXTRA_batch_lam_conv_SOURCES = $(tinyxml_suite)
-
 ## ############################################################
 ## To make OSX executables for wxWindows stuff
 ## ############################################################
@@ -1201,7 +1175,6 @@ EXTRA_DIST                      = \
 			Makefile.am \
 			configure.ac \
 			boost \
-			tinyxml \
 			$(license_info) \
 			$(wx_curr) \
 			$(scripts_to_dist) \