88af4cb287894068f2c49013a1c79fd8ed9bea3a markd Mon Oct 15 11:38:09 2018 -0700 Added library to get HAL integration to link. Not sure why this worked for others diff --git src/inc/common.mk src/inc/common.mk index 0899530..b8cf5c28 100644 --- src/inc/common.mk +++ src/inc/common.mk @@ -52,31 +52,31 @@ ifeq (${SSLDIR},) SSLDIR = /usr/include/openssl endif # autodetect UCSC installation of hal: ifeq (${HALDIR},) HALDIR = /hive/groups/browser/hal/halRelease ifneq ($(wildcard ${HALDIR}),) ifeq (${USE_HAL},) USE_HAL=1 endif endif endif ifeq (${USE_HAL},1) - HALLIBS=${HALDIR}/lib/halMaf.a ${HALDIR}/lib/halChain.a ${HALDIR}/lib/halMaf.a ${HALDIR}/lib/halLiftover.a ${HALDIR}/lib/halLod.a ${HALDIR}/lib/halLib.a ${HALDIR}/lib/sonLib.a ${HALDIR}/lib/libhdf5_cpp.a ${HALDIR}/lib/libhdf5.a ${HALDIR}/lib/libhdf5_hl.a + HALLIBS=${HALDIR}/lib/halMaf.a ${HALDIR}/lib/halChain.a ${HALDIR}/lib/halMaf.a ${HALDIR}/lib/halLiftover.a ${HALDIR}/lib/halLod.a ${HALDIR}/lib/halLib.a ${HALDIR}/lib/sonLib.a ${HALDIR}/lib/libhdf5_cpp.a ${HALDIR}/lib/libhdf5.a ${HALDIR}/lib/libhdf5_hl.a -lstdc++ HG_DEFS+=-DUSE_HAL HG_INC+=-I${HALDIR}/inc endif # libssl: disabled by default ifneq (${SSL_DIR}, "/usr/include/openssl") ifneq ($(UNAME_S),Darwin) ifneq ($(wildcard ${SSL_DIR}),) L+=-L${SSL_DIR}/lib endif endif HG_INC+=-I${SSL_DIR}/include endif # on hgwdev, already using the static library with mysqllient.