[med-svn] [lamarc] 01/02: Add missing library to linker

[Andreas Tille]

This is an automated email from the git hooks/post-receive script.

tille pushed a commit to branch master
in repository lamarc.

commit 3f800fe901e6deb16371441e3f322bd641f5d0b9
Author: Andreas Tille <tille at debian.org>
Date:   Tue Dec 5 09:37:09 2017 +0100

    Add missing library to linker
---
 debian/patches/use_debian_packaged_tinyxml.patch | 14 +++++++-------
 1 file changed, 7 insertions(+), 7 deletions(-)

diff --git a/debian/patches/use_debian_packaged_tinyxml.patch b/debian/patches/use_debian_packaged_tinyxml.patch
index 1231be1..e45ae14 100644
--- a/debian/patches/use_debian_packaged_tinyxml.patch
+++ b/debian/patches/use_debian_packaged_tinyxml.patch
@@ -48,16 +48,16 @@ Description: Use Debian packaged tinyxml
  config_sources  =   \
  		    config/conf.h
  
-@@ -634,8 +613,6 @@ lamarc_SOURCES  =   $(lamarcgcov_sources
+@@ -634,7 +613,7 @@ lamarc_SOURCES  =   $(lamarcgcov_sources
  					$(lamarc_resources) \
  					$(config_sources)
  
 -lamarc_LDADD	= libtinyxml.a
--
++lamarc_LDADD	= -ltinyxml
+ 
  old_lam_conv_core       = \
  			src/conversion/ConverterIf.cpp \
- 			src/conversion/Converter_ConverterIf.h \
-@@ -942,9 +919,9 @@ lam_conv_SOURCES        = \
+@@ -942,9 +921,9 @@ lam_conv_SOURCES        = \
  			$(lam_conv_core) \
  			$(lam_conv_resources)
  
@@ -69,7 +69,7 @@ Description: Use Debian packaged tinyxml
  
  batch_lam_conv_core     = \
  			src/guiconv/batchconverter.h \
-@@ -961,9 +938,7 @@ batch_lam_conv_testable = \
+@@ -961,9 +940,7 @@ batch_lam_conv_testable = \
  batch_lam_conv_SOURCES	=	\
  			$(batch_lam_conv_testable)
  
@@ -80,7 +80,7 @@ Description: Use Debian packaged tinyxml
  
  ## ############################################################
  ## To make OSX executables for wxWindows stuff
-@@ -1191,7 +1166,6 @@ EXTRA_DIST                      = \
+@@ -1191,7 +1168,6 @@ EXTRA_DIST                      = \
  			Makefile.am \
  			configure.ac \
  			boost \
@@ -88,7 +88,7 @@ Description: Use Debian packaged tinyxml
  			$(license_info) \
  			$(wx_curr) \
  			$(scripts_to_dist) \
-@@ -1217,7 +1191,6 @@ EXTRA_DIST                      = \
+@@ -1217,7 +1193,6 @@ EXTRA_DIST                      = \
  
  dist-hook:
  	rm -rf `find $(distdir)/boost -name CVS`

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-med/lamarc.git