]> git.donarmstrong.com Git - samtools.git/commitdiff
Merge remote branch 'main/master'
authorPetr Danecek <pd3@sanger.ac.uk>
Wed, 4 Apr 2012 09:07:27 +0000 (10:07 +0100)
committerPetr Danecek <pd3@sanger.ac.uk>
Wed, 4 Apr 2012 09:07:27 +0000 (10:07 +0100)
Conflicts:
misc/Makefile
misc/bamcheck.c

misc/Makefile

index 8a50ea30c9d4f6cfde4a77c0ce3efc00488e269e..e1a5add06a0fb6bc475ec6658d7c8d94e468411e 100644 (file)
@@ -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