From: Petr Danecek <pd3@sanger.ac.uk>
Date: Wed, 4 Apr 2012 09:07:27 +0000 (+0100)
Subject: Merge remote branch 'main/master'
X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=5941304148f69879e1df9fbbdc749117a5bf2fac;hp=0fab6afce9da36c2e488b6933baf3b97561a8b37;p=samtools.git

Merge remote branch 'main/master'

Conflicts:
	misc/Makefile
	misc/bamcheck.c
---

diff --git a/misc/Makefile b/misc/Makefile
index 8a50ea3..e1a5add 100644
--- a/misc/Makefile
+++ b/misc/Makefile
@@ -28,7 +28,7 @@ lib-recur all-recur clean-recur cleanlocal-recur install-recur:
 lib:
 
 bamcheck:bamcheck.o
-		$(CC) $(CFLAGS) -o $@ bamcheck.o -lm -lz -L.. -lbam
+		$(CC) $(CFLAGS) -o $@ bamcheck.o -lm -lz -L.. -lbam -lpthread
 
 bamcheck.o:bamcheck.c ../faidx.h ../khash.h ../sam.h ../razf.h
 		$(CC) $(CFLAGS) -c -I.. -o $@ bamcheck.c