Complete prior commit

[bamtools.git] / Makefile

diff --git a/Makefile b/Makefile
index 6ae2a4e3388ddf0b24f02412b4bd0168c848ff54..fd08519662b2ded1054eba175717679a4c4d8e1f 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,35 +1,21 @@
-CC=            gcc
-CXX=           g++
-CFLAGS=                -Wall -pg -O3 -m64
-CXXFLAGS=      $(CFLAGS)
-DFLAGS=                -D_IOLIB=2 #-D_NDEBUG
-OBJS=          BamReader.o bgzf.o
-PROG=          BamReaderTest
-INCLUDES=       
-ARFLAGS=       -crs
-LIBS=          -lz
-SUBDIRS=       .
-
-.SUFFIXES:.c .cpp .o
-
-.c.o:
-               $(CC) -c $(CFLAGS) $(DFLAGS) $(INCLUDES) $< -o $@
-
-.cpp.o:
-               $(CXX) -c $(CXXFLAGS) $(DFLAGS) $(INCLUDES) $< -o $@
-
-all: $(PROG) BamConversion
-
-lib:libbambc.a
-
-libbambc.a:$(OBJS)
-               $(AR) $(ARFLAGS) $@ $(OBJS)
-
-BamReaderTest:lib BamReaderMain.o
-               $(CXX) $(CXXFLAGS) -o $@ BamReaderMain.o $(LIBS) -L. -lbambc
-
-BamConversion: lib BamWriter.o BamConversionMain.o
-       $(CXX) $(CXXFLAGS) -o $@ BamWriter.o BamConversionMain.o $(LIBS) -L. -lbambc
-
-clean:
-               rm -fr gmon.out *.o *.a a.out $(PROG) BamConversion *~
+CXX=           g++\r
+CXXFLAGS=      -Wall -O3\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
+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 *~ $(PROG)\r