[med-svn] [seqtools] 01/02: dynamic linking for all tools

[Andreas Tille]

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

tille pushed a commit to branch master
in repository seqtools.

commit 944bb3a9d41e5a60a62de6fded500e0a9b09a45a
Author: Andreas Tille <tille at debian.org>
Date:   Thu Oct 26 13:47:09 2017 +0200

    dynamic linking for all tools
---
 debian/patches/dynamic-lib.patch | 51 +++++++++++++++++++++++++++++++++++++---
 1 file changed, 48 insertions(+), 3 deletions(-)

diff --git a/debian/patches/dynamic-lib.patch b/debian/patches/dynamic-lib.patch
index bce34a3..dd538f7 100644
--- a/debian/patches/dynamic-lib.patch
+++ b/debian/patches/dynamic-lib.patch
@@ -4,7 +4,7 @@ Description: Create dynamic library
 
 --- a/gbtools/configure.ac
 +++ b/gbtools/configure.ac
-@@ -36,7 +36,9 @@
+@@ -36,7 +36,9 @@ fi
  
  AC_CONFIG_MACRO_DIR([m4])
  
@@ -15,7 +15,7 @@ Description: Create dynamic library
  
  LT_LANG([C++])
  
-@@ -66,7 +68,7 @@
+@@ -66,7 +68,7 @@ AC_FUNC_MALLOC
  AC_CHECK_FUNCS([dup2 floor gethostbyname memset socket sqrt strcasecmp strchr strcspn strerror strncasecmp strrchr strstr strtol uname])
  
  # Check for dependencies required by all executables
@@ -26,7 +26,7 @@ Description: Create dynamic library
  AX_CHECK_OPENSSL()
 --- a/belvuApp/Makefile.am
 +++ b/belvuApp/Makefile.am
-@@ -19,13 +19,13 @@
+@@ -19,13 +19,13 @@ belvu_LDADD = $(top_builddir)/seqtoolsUt
  
  # If gbtools is in a subdirectory, add it; otherwise look for a local installation
  if USE_GBTOOLS
@@ -42,3 +42,48 @@ Description: Create dynamic library
  
  # Extra files to remove for the maintainer-clean target.
  #
+--- a/blixemApp/Makefile.am
++++ b/blixemApp/Makefile.am
+@@ -11,13 +11,13 @@ BLX_LIBS = $(top_builddir)/seqtoolsUtils
+ 
+ # If gbtools is in a subdirectory, add it; otherwise look for a local installation
+ if USE_GBTOOLS
+-BLX_LIBS += $(top_builddir)/gbtools/.libs/libgbtools.a
++BLX_LIBS += -L$(top_builddir)/gbtools/.libs -lgbtools
+ else
+ BLX_LIBS += -lgbtools
+ endif
+ 
+ # the gtk deps etc. must go at the end so that gbtools can pick them up
+-BLX_LIBS += $(DEPS_LIBS) $(X_LIB)
++BLX_LIBS += $(DEPS_LIBS) $(X_LIB) -lcurl
+ 
+ # use sqlite for blixem if it's available
+ if USE_SQLITE3
+@@ -44,7 +44,7 @@ blixemh_CPPFLAGS = $(blixem_CPPFLAGS) -D
+ #blixemh_LDADD = $(top_builddir)/libpfetch/libpfetch.a $(BLX_LIBS) -lcurl
+ 
+ # but I've commented it back in ....need to try a compile....
+-blixemh_LDADD =  $(BLX_LIBS) -lcurl
++blixemh_LDADD =  $(BLX_LIBS)
+ 
+ endif
+ 
+--- a/dotterApp/Makefile.am
++++ b/dotterApp/Makefile.am
+@@ -12,13 +12,13 @@ dotter_LDADD = $(top_builddir)/seqtoolsU
+ 
+ # If gbtools is in a subdirectory, add it; otherwise look for a local installation
+ if USE_GBTOOLS
+-dotter_LDADD += $(top_builddir)/gbtools/.libs/libgbtools.a            
++dotter_LDADD += -L$(top_builddir)/gbtools/.libs -lgbtools
+ else
+ dotter_LDADD += -lgbtools
+ endif
+ 
+ # the gtk deps etc. must go at the end so that gbtools can pick them up
+-dotter_LDADD += $(DEPS_LIBS) $(X_LIB)
++dotter_LDADD += $(DEPS_LIBS) $(X_LIB) -lcurl
+ 
+ # Extra files to remove for the maintainer-clean target.
+ #

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