Changed GetNextAlignmentCore() calls to GetNextAlignment() in FilterTool

[bamtools.git] / Makefile

diff --git a/Makefile b/Makefile
index 39873b1aaab20b448cf1946927f65a2f21de7041..f282c204d9081563820daccd0d112a57cf15454b 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -5,32 +5,37 @@
 # top-level
 # ==========================
 
+# define current BamTools version
+BT_MAJOR_VER = 0
+BT_MINOR_VER = 8
+BT_BUILD_VER = 1025
+export BT_VERSION = $(BT_MAJOR_VER).$(BT_MINOR_VER).$(BT_BUILD_VER)
+
 # define main directories
 export OBJ_DIR  = obj
 export BIN_DIR  = bin
 export SRC_DIR  = src
 
 # define compile/link flags
-export CXX      = g++\r
-export CXXFLAGS = -Wall -O3 -D_FILE_OFFSET_BITS=64
+export CXX      = g++
+export CXXFLAGS = -Wall -O3 -D_FILE_OFFSET_BITS=64 -DBT_VERSION=$(BT_VERSION)
 export LIBS     = -lz
 
-# define current BamTools version
-export BAMTOOLS_VERSION = 0.7.0812
-
 # define source subdirectories
 SUBDIRS = $(SRC_DIR)/api \
           $(SRC_DIR)/utils \
-          $(SRC_DIR)/toolkit
+          $(SRC_DIR)/third_party \
+          $(SRC_DIR)/toolkit 
 
 all:
        @echo "Building BamTools:"
-       @echo "Version: $$BAMTOOLS_VERSION"
+       @echo "Version: $$BT_VERSION"
        @echo "========================================================="
-       
-       mkdir -p $(BIN_DIR)
-       mkdir -p $(OBJ_DIR)
-
+       @echo ""
+       @echo "- Creating target directories"
+       @mkdir -p $(BIN_DIR)
+       @mkdir -p $(OBJ_DIR)
+       @echo ""
        @for dir in $(SUBDIRS); do \
                echo "- Building in $$dir"; \
                $(MAKE) --no-print-directory -C $$dir; \