a3616feb00b8f200afb7379d2f8e5fa3107eebd1 angie Fri Nov 11 20:05:02 2016 +0000 Add -lz after htslib -- without it, couldn't link on GBiB. diff --git src/inc/common.mk src/inc/common.mk index 1204208..e2416eb 100644 --- src/inc/common.mk +++ src/inc/common.mk @@ -13,31 +13,31 @@ ifneq (,$(findstring -,$(MACHTYPE))) # $(info MACHTYPE has - sign ${MACHTYPE}) MACHTYPE:=$(shell uname -m) # $(info MACHTYPE has - sign set to: ${MACHTYPE}) endif HG_DEFS=-D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE -D_GNU_SOURCE -DMACHTYPE_${MACHTYPE} HG_INC+=-I../inc -I../../inc -I../../../inc -I../../../../inc -I../../../../../inc -I$(kentSrc)/htslib # to check for Mac OSX Darwin specifics: UNAME_S := $(shell uname -s) # to check for builds on hgwdev FULLWARN = $(shell uname -n) #global external libraries -L=$(kentSrc)/htslib/libhts.a +L=$(kentSrc)/htslib/libhts.a -lz # pthreads is required ifneq ($(UNAME_S),Darwin) L+=-pthread endif # autodetect if openssl is installed ifeq (${SSLDIR},) SSLDIR = /usr/include/openssl endif ifeq (${USE_SSL},) ifneq ($(wildcard ${SSLDIR}),) USE_SSL=1 endif endif