--- Makefile.orig 2015-11-14 00:48:48 UTC +++ Makefile @@ -4,7 +4,7 @@ # (c) 2009 Aaron Quinlan # ========================== -SHELL := /bin/bash -e +SHELL := /bin/sh -e VERSION_FILE=./src/utils/version/version_git.h RELEASED_VERSION_FILE=./src/utils/version/version_release.txt @@ -16,11 +16,11 @@ export OBJ_DIR = obj export BIN_DIR = bin export SRC_DIR = src export UTIL_DIR = src/utils -export CXX = g++ +export CXX = c++ #ifeq ($(DEBUG),1) #export CXXFLAGS = -Wall -O0 -g -fno-inline -fkeep-inline-functions -D_FILE_OFFSET_BITS=64 -fPIC -DDEBUG -D_DEBUG #else -export CXXFLAGS = -Wall -O2 -D_FILE_OFFSET_BITS=64 -fPIC $(INCLUDES) +export CXXFLAGS += -Wall -D_FILE_OFFSET_BITS=64 -fPIC $(INCLUDES) #endif export LIBS = -lz export BT_ROOT = src/utils/BamTools/ @@ -129,20 +129,17 @@ INCLUDES = -I$(SRC_DIR)/utils/bedFile \ -I$(SRC_DIR)/utils/GenomeFile \ -I$(SRC_DIR)/utils/RecordOutputMgr \ -I$(SRC_DIR)/utils/ToolBase \ - -I$(SRC_DIR)/utils/driver \ - + -I$(SRC_DIR)/utils/driver all: print_banner $(OBJ_DIR) $(BIN_DIR) autoversion $(UTIL_SUBDIRS) $(SUBDIRS) @echo "- Building main bedtools binary." @$(CXX) $(CXXFLAGS) $(CPPFLAGS) -c src/bedtools.cpp -o obj/bedtools.o $(INCLUDES) @$(CXX) $(CXXFLAGS) $(CPPFLAGS) -o $(BIN_DIR)/bedtools $(BUILT_OBJECTS) -L$(UTIL_DIR)/BamTools/lib/ -lbamtools $(LIBS) $(LDFLAGS) $(INCLUDES) @echo "done." - @echo "- Creating executables for old CLI." @python scripts/makeBashScripts.py @chmod +x bin/* @echo "done." - .PHONY: all @@ -183,7 +180,7 @@ clean: .PHONY: clean test: all - @cd test; bash test.sh + @cd test; $(SHELL) test.sh .PHONY: test