Complete prior commit

[bamtools.git] / Makefile

diff --git a/Makefile b/Makefile
index 8d5aaab06a0d9f8fb5b406dc4216727013704807..fd08519662b2ded1054eba175717679a4c4d8e1f 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,18 +1,21 @@
 CXX=           g++\r
 CXXFLAGS=      -Wall -O3\r
-PROG=          BamConversion BamDump BamTrim\r
+PROG=          BamConversion BamDump BamTrim bamtools\r
 LIBS=          -lz\r
 \r
 all: $(PROG)\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
+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
-BamDump: BGZF.o BamReader.o BamDumpMain.o\r
-       $(CXX) $(CXXFLAGS) -o $@ BGZF.o BamReader.o BamDumpMain.o $(LIBS)\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
-BamTrim: BGZF.o BamReader.o BamWriter.o BamTrimMain.o\r
-       $(CXX) $(CXXFLAGS) -o $@ BGZF.o BamReader.o BamWriter.o BamTrimMain.o $(LIBS)\r
+BamDump:  BGZF.o BamReader.o BamDumpMain.o\r
+       $(CXX) $(CXXFLAGS) -o $@  BGZF.o BamReader.o BamDumpMain.o $(LIBS)\r
+\r
+BamTrim:  BGZF.o BamReader.o BamWriter.o BamTrimMain.o\r
+       $(CXX) $(CXXFLAGS) -o $@  BGZF.o BamReader.o BamWriter.o BamTrimMain.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