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

[bamtools.git] / Makefile

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