Reorganization of toolkit. Split subtools out to own headers. Added custom getopt...

[bamtools.git] / Makefile

diff --git a/Makefile b/Makefile
index fd08519662b2ded1054eba175717679a4c4d8e1f..d3d8ad287ae2df95d1bd0cbee54122ca92771513 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,21 +1,13 @@
 CXX=           g++\r
 CXXFLAGS=      -Wall -O3\r
-PROG=          BamConversion BamDump BamTrim bamtools\r
+PROG=          bamtools bamtools_test\r
 LIBS=          -lz\r
+OBJS=          BGZF.o BamReader.o BamWriter.o BamMultiReader.o bamtools.o
 \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
-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
+bamtools: $(OBJS)\r
+       $(CXX) $(CXXFLAGS) -o $@ $(OBJS) $(LIBS)\r
 \r
 clean:\r
-       rm -fr gmon.out *.o *.a a.out *~ $(PROG)\r
+       rm -fr gmon.out *.o *.a a.out *~\r