X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=Makefile;h=fd08519662b2ded1054eba175717679a4c4d8e1f;hb=320649eff43c8092ce9ef548179905dccfeb1c42;hp=7abd53b5d31e9c8f14472924b8717f3ea4c710b4;hpb=77f7ccd20d2a255f5f2f4200b458500144551ad6;p=bamtools.git

diff --git a/Makefile b/Makefile
index 7abd53b..fd08519 100644
--- a/Makefile
+++ b/Makefile
@@ -1,10 +1,13 @@
 CXX=		g++
 CXXFLAGS=	-Wall -O3
-PROG=		BamConversion BamDump BamTrim BamMultiMerge
+PROG= 		BamConversion BamDump BamTrim bamtools
 LIBS=		-lz
 
 all: $(PROG)
 
+bamtools: BGZF.o BamReader.o BamWriter.o BamMultiReader.o bamtools.o
+	$(CXX) $(CXXFLAGS) -o $@ BGZF.o BamReader.o BamWriter.o BamMultiReader.o bamtools.o $(LIBS)
+
 BamConversion:  BGZF.o BamReader.o BamWriter.o BamConversionMain.o
 	$(CXX) $(CXXFLAGS) -o $@  BGZF.o BamReader.o BamWriter.o BamConversionMain.o $(LIBS)
 
@@ -14,8 +17,5 @@ BamDump:  BGZF.o BamReader.o BamDumpMain.o
 BamTrim:  BGZF.o BamReader.o BamWriter.o BamTrimMain.o
 	$(CXX) $(CXXFLAGS) -o $@  BGZF.o BamReader.o BamWriter.o BamTrimMain.o $(LIBS)
 
-BamMultiMerge: BGZF.o BamMultiReader.o BamReader.o BamWriter.o BamMultiMergeMain.o
-	$(CXX) $(CXXFLAGS) -o $@ BGZF.o BamMultiReader.o BamReader.o BamWriter.o BamMultiMergeMain.o $(LIBS)
-
 clean:
-	rm -fr gmon.out *.o *.a a.out *~
+	rm -fr gmon.out *.o *.a a.out *~ $(PROG)