From: Charles Plessy <charles@anx178.gsc.riken.jp>
Date: Tue, 17 Nov 2009 01:33:36 +0000 (+0900)
Subject: Merge commit 'upstream/0.1.7a.dfsg'
X-Git-Url: http://woldlab.caltech.edu/gitweb/?p=samtools.git;a=commitdiff_plain;h=8af6e7eac6605aab3bd8b1a1f874309b59789b08;hp=78995536f1be9cc7ca111a6dae8f40e77d7e0242

Merge commit 'upstream/0.1.7a.dfsg'
---

diff --git a/Makefile b/Makefile
index 246ac5c..f3fb7a0 100644
--- a/Makefile
+++ b/Makefile
@@ -38,8 +38,8 @@ libbam.a:$(LOBJS)
 samtools:lib $(AOBJS)
 		$(CC) $(CFLAGS) -o $@ $(AOBJS) -lm $(LIBPATH) $(LIBCURSES) -lz -L. -lbam
 
-razip:razip.o razf.o
-		$(CC) $(CFLAGS) -o $@ razf.o razip.o -lz
+razip:razip.o razf.o knetfile.o
+		$(CC) $(CFLAGS) -o $@ razf.o razip.o knetfile.o -lz
 
 bgzip:bgzip.o bgzf.o
 		$(CC) $(CFLAGS) -o $@ bgzf.o bgzip.o -lz
diff --git a/Makefile.mingw b/Makefile.mingw
index eb6ed47..f1ae1be 100644
--- a/Makefile.mingw
+++ b/Makefile.mingw
@@ -7,7 +7,7 @@ LOBJS=		bgzf.o kstring.o bam_aux.o bam.o bam_import.o sam.o bam_index.o	\
 			knetfile.o
 AOBJS=		bam_tview.o bam_maqcns.o bam_plcmd.o sam_view.o	\
 			bam_rmdup.o bam_rmdupse.o bam_mate.o bam_stat.o bam_color.o	\
-			bamtk.o
+			bamtk.o kaln.o sam_header.o
 PROG=		samtools
 INCLUDES=	-Iwin32
 SUBDIRS=	.
@@ -28,8 +28,8 @@ libbam.a:$(LOBJS)
 samtools:lib $(AOBJS)
 		$(CC) $(CFLAGS) -o $@ $(AOBJS) $(LIBPATH) -lm -L. -lbam -Lwin32 -lz -lcurses -lws2_32
 
-razip:razip.o razf.o
-		$(CC) $(CFLAGS) -o $@ razf.o razip.o -lz
+razip:razip.o razf.o knetfile.o
+		$(CC) $(CFLAGS) -o $@ razf.o razip.o knetfile.o -lz
 
 bgzip:bgzip.o bgzf.o
 		$(CC) $(CFLAGS) -o $@ bgzf.o bgzip.o -lz