Description: Use Debian's libgenometools instead of static lib
 Vmatch was intended to be built as a static binary in a defined build
 directory with a copy of libgenometools.a in a specific place.
 In Debian, we have a shared library, so let's use this in the build setup.
Author: Sascha Steinbiss <satta@debian.org>
Last-Update: 2020-01-03
--- a/src/Mkvtree/Makefile
+++ b/src/Mkvtree/Makefile
@@ -1,10 +1,10 @@
 include ../Makedef
 
 MAINFLAGS=-DWITHLCP # ${DEFINESUFFIXPTR}
-CFLAGS=${DEFINECFLAGS} ${DEFINECPPFLAGS} ${MAINFLAGS}
+CFLAGS+=${DEFINECFLAGS} ${DEFINECPPFLAGS} ${MAINFLAGS}
 SPLINTFLAGS=${MAINFLAGS} ${DEFINESPLINTFLAGS}
 VPATH=${COMPILEDIRPREFIX}
-LDFLAGS=-L${COMPILEDIRPREFIX} ${DEFINELDFLAGS}
+LDFLAGS+=-L${COMPILEDIRPREFIX} ${DEFINELDFLAGS}
 LDLIBS=${DEFINELDLIBS}
 COMPILEDIR=${COMPILEDIRPREFIX}/Mkvtree/
 #EXECDIR=${EXECDIRPREFIX}/Mkvtree/
@@ -13,12 +13,10 @@
   CFLAGS += -I../../../licensemanager/src \
             -I../../../genometools/src
   LDLIBS = ${CURDIR}/../../../licensemanager/lib/$(BIT)/liblicensemanager.a \
-           ${CURDIR}/../../../genometools/lib/libgenometools.a \
-           ${DEFINELDLIBS}
+           ${DEFINELDLIBS} -lgenometools -lz -lbz2
 else
   CFLAGS += -DNOLICENSEMANAGER
-  LDLIBS = ${CURDIR}/../../../genometools/lib/libgenometools.a \
-           ${DEFINELDLIBS}
+  LDLIBS = ${DEFINELDLIBS} -lgenometools -lz -lbz2
 endif
 
 MKVTREEOBJ=${COMPILEDIR}mkvtree.o\
--- a/src/Vmatch/Makefile
+++ b/src/Vmatch/Makefile
@@ -2,11 +2,11 @@
 
 #DEFINEVMATCHDB=-DVMATCHDB
 #DISTRIBUTEDDFS=-DDISTRIBUTEDDFS
-CFLAGS=${DEFINECFLAGS} ${DEFINECPPFLAGS} -I../Vmengine ${DEFINEVMATCHDB} ${DISTRIBUTEDDFS}
+CFLAGS+=${DEFINECFLAGS} ${DEFINECPPFLAGS} -I../Vmengine ${DEFINEVMATCHDB} ${DISTRIBUTEDDFS}
 SPLINTFLAGS=${DEFINESPLINTFLAGS} -I../Vmengine
 #CFLAGS=-DCOUNT
 #LIBELECTRICFENCE=-lefence
-LDFLAGS=${DEFINELDFLAGS} ${LIBELECTRICFENCE}
+LDFLAGS+=${DEFINELDFLAGS} ${LIBELECTRICFENCE}
 LDLIBS=${DEFINELDLIBS}
 COMPILEDIR=${COMPILEDIRPREFIX}/Vmatch/
 #EXECDIR=${EXECDIRPREFIX}/Vmatch/
@@ -15,12 +15,10 @@
   CFLAGS += -I../../../licensemanager/src \
             -I../../../genometools/src
   LDLIBS = ${CURDIR}/../../../licensemanager/lib/$(BIT)/liblicensemanager.a \
-           ${CURDIR}/../../../genometools/lib/libgenometools.a \
-           ${DEFINELDLIBS}
+           ${DEFINELDLIBS} -lgenometools -lz -lbz2
 else
   CFLAGS += -DNOLICENSEMANAGER
-  LDLIBS = ${CURDIR}/../../../genometools/lib/libgenometools.a \
-           ${DEFINELDLIBS}
+  LDLIBS = ${DEFINELDLIBS} -lgenometools -lz -lbz2
 endif
 
 LIBS=${LIBVMATCH}\