ed73c098917f65c69ea7fe71cdc0009791e88c6c chmalee Thu Apr 18 09:27:29 2019 -0700 Fixing cgi compilation error by adding a global hgwdev rule to include the hal libraries diff --git src/inc/common.mk src/inc/common.mk index 493d085..54fdafc 100644 --- src/inc/common.mk +++ src/inc/common.mk @@ -65,30 +65,34 @@ # 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 -lstdc++ HG_DEFS+=-DUSE_HAL HG_INC+=-I${HALDIR}/inc endif +# on hgwdev, include HAL by defaults +ifeq (${IS_HGWDEV},yes) + L+=${HALLIBS} +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. ifeq (${IS_HGWDEV},yes) L+=/usr/lib64/libssl.a /usr/lib64/libcrypto.a -lkrb5 -lk5crypto -ldl else