* Merge from branches/dev/

[samtools.git] / Makefile

diff --git a/Makefile b/Makefile
index 32e4c41aa15cb717424cf85f5459b9510db712b1..aff7eaa0b2991157d336ce748638060cf26f5882 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -2,9 +2,10 @@ CC=                    gcc
 CXX=           g++
 CFLAGS=                -g -Wall -O2 -m64 #-arch ppc
 CXXFLAGS=      $(CFLAGS)
-DFLAGS=                -D_IOLIB=2 -D_FILE_OFFSET_BITS=64 -DHAVE_RAZF #-D_NO_CURSES
+DFLAGS=                -D_IOLIB=2 -D_FILE_OFFSET_BITS=64 #-D_NO_RAZF #-D_NO_CURSES
 OBJS=          bam.o bam_import.o bam_pileup.o bam_lpileup.o bam_sort.o bam_index.o \
-                       razf.o bgzf.o faidx.o bam_tview.o bam_maqcns.o bam_aux.o bam_plcmd.o
+                       razf.o bgzf.o faidx.o bam_tview.o bam_maqcns.o bam_aux.o bam_plcmd.o \
+                       bam_mate.o bam_rmdup.o glf.o
 PROG=          razip bgzip samtools
 INCLUDES=      
 LIBS=          -lm -lz