Complete prior commit

[bamtools.git] / Makefile

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