Description: Use shared libs
Subject: use-shared-libs
From: Debian Med Packaging Team <debian-med-packaging@lists.alioth.debian.org>
---
 kmer_counter/fastq_reader.h | 8 ++++----
 makefile                    | 8 ++------
 2 files changed, 6 insertions(+), 10 deletions(-)

--- a/kmer_counter/fastq_reader.h
+++ b/kmer_counter/fastq_reader.h
@@ -16,8 +16,8 @@
 #include <stdio.h>
 #include <iostream>
 
-#include "libs/zlib.h"
-#include "libs/bzlib.h"
+#include <zlib.h>
+#include <bzlib.h>
 
 
 using namespace std;
--- a/makefile
+++ b/makefile
@@ -30,10 +30,6 @@
 $(KMC_MAIN_DIR)/kmer.o \
 $(KMC_MAIN_DIR)/prob_qual.o
 
-KMC_LIBS = \
-$(KMC_MAIN_DIR)/libs/libz.a \
-$(KMC_MAIN_DIR)/libs/libbz2.a
-
 KMC_DUMP_OBJS = \
 $(KMC_DUMP_DIR)/nc_utils.o \
 $(KMC_API_DIR)/mmer.o \
@@ -56,19 +52,8 @@
 $(KMC_TOOLS_DIR)/fastq_writer.o \
 $(KMC_TOOLS_DIR)/percent_progress.o
 
-KMC_TOOLS_LIBS = \
-$(KMC_TOOLS_DIR)/libs/libz.a \
-$(KMC_TOOLS_DIR)/libs/libbz2.a 
-
-ifeq ($(DISABLE_ASMLIB),true)
-	CFLAGS += -DDISABLE_ASMLIB
-	KMC_TOOLS_CFLAGS += -DDISABLE_ASMLIB
-else
-	KMC_LIBS += \
-	$(KMC_MAIN_DIR)/libs/alibelf64.a 
-	KMC_TOOLS_LIBS += \
-	$(KMC_TOOLS_DIR)/libs/alibelf64.a 
-endif 	
+CFLAGS += -DDISABLE_ASMLIB
+KMC_TOOLS_CFLAGS += -DDISABLE_ASMLIB
 
 $(KMC_OBJS) $(KMC_DUMP_OBJS) $(KMC_API_OBJS): %.o: %.cpp
 	$(CC) $(CFLAGS) -c $< -o $@
@@ -79,14 +64,14 @@
 	
 kmc: $(KMC_OBJS)
 	-mkdir -p $(KMC_BIN_DIR)
-	$(CC) $(CLINK) -o $(KMC_BIN_DIR)/$@ $^ $(KMC_LIBS)
+	$(CC) $(CLINK) -o $(KMC_BIN_DIR)/$@ $^
 kmc_dump: $(KMC_DUMP_OBJS) $(KMC_API_OBJS)
 	-mkdir -p $(KMC_BIN_DIR)
 	$(CC) $(CLINK) -o $(KMC_BIN_DIR)/$@ $^
 	
 kmc_tools: $(KMC_TOOLS_OBJS) $(KMC_API_OBJS)
 	-mkdir -p $(KMC_BIN_DIR)
-	$(CC) $(KMC_TOOLS_CLINK) -o $(KMC_BIN_DIR)/$@ $^ $(KMC_TOOLS_LIBS)
+	$(CC) $(KMC_TOOLS_CLINK) -o $(KMC_BIN_DIR)/$@ $^ 
 	
 clean:
 	-rm $(KMC_MAIN_DIR)/*.o
--- a/kmc_tools/fastq_reader.h
+++ b/kmc_tools/fastq_reader.h
@@ -17,8 +17,8 @@
 #include <stdio.h>
 #include <iostream>
 
-#include "libs/zlib.h"
-#include "libs/bzlib.h"
+#include <zlib.h>
+#include <bzlib.h>
 
 
 using namespace std;
@@ -93,4 +93,4 @@
 
 #endif
 
-// ***** EOF
\ No newline at end of file
+// ***** EOF
