Major overhaul of BamReader. No longer relying on bgzf.* API. Sped up random-access...

[bamtools.git] / Makefile

diff --git a/Makefile b/Makefile
index 41ba8204439f25ede6492ac72f7a9eb7822e99d6..40e3ecdfe9afcd48a0adad9964a334c3c3245276 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -1,35 +1,18 @@
-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) *~
+CXX=           g++\r
+CXXFLAGS=      -Wall -O3\r
+PROG=          BamReaderTest BamConversion\r
+LIBS=          -lz\r
+\r
+all: $(PROG)\r
+\r
+BamReaderTest: BamReader.o BamReaderMain.o\r
+       $(CXX) $(CXXFLAGS) -o $@ BamReader.o BamReaderMain.o $(LIBS)\r
+\r
+BamConversion: BamReader.o BamWriter.o BamConversionMain.o\r
+       $(CXX) $(CXXFLAGS) -o $@ BamReader.o BamWriter.o BamConversionMain.o $(LIBS)\r
+\r
+BamMerge: BamReader.o BamWriter.o BamMerge.o\r
+       $(CXX) $(CXXFLAGS) -o $@ BamReader.o BamWriter.o BamMerge.o $(LIBS)\r
+\r
+clean:\r
+               rm -fr gmon.out *.o *.a a.out *~\r