d8f346942ae2454e5f1aa0f862a02496a2ee33cc hiram Thu Nov 7 14:02:24 2013 -0800 eliminate useless -L/lib directive on Mac OSX refs #12106 diff --git src/inc/common.mk src/inc/common.mk index f642afe..0a0e55a 100644 --- src/inc/common.mk +++ src/inc/common.mk @@ -39,31 +39,33 @@ USE_HAL=1 endif endif endif ifeq (${USE_HAL},1) HALLIBS=${HALDIR}/hal/lib/halMaf.a ${HALDIR}/hal/lib/halChain.a ${HALDIR}/hal/lib/halMaf.a ${HALDIR}/hal/lib/halLiftover.a ${HALDIR}/hal/lib/halLod.a ${HALDIR}/hal/lib/halLib.a ${HALDIR}/sonLib/lib/sonLib.a ${HALDIR}/hdf5-1.8.11/hdf5//lib/libhdf5_cpp.a ${HALDIR}/hdf5-1.8.11/hdf5//lib/libhdf5.a ${HALDIR}/hdf5-1.8.11/hdf5//lib/libhdf5_hl.a HG_DEFS+=-DUSE_HAL HG_INC+=-I${HALDIR}/hal/chain/inc/ endif # libssl: disabled by default ifeq (${USE_SSL},1) ifneq (${SSL_DIR}, "/usr/include/openssl") + ifneq ($(UNAME_S),Darwin) L+=-L${SSL_DIR}/lib + endif HG_INC+=-I${SSL_DIR}/include endif # on hgwdev, already using the static library with mysqllient. ifeq (${FULLWARN},hgwdev) L+=/usr/lib64/libssl.a /usr/lib64/libcrypto.a -lkrb5 else L+=-lssl -lcrypto endif HG_DEFS+=-DUSE_SSL endif # autodetect where png is installed ifeq (${PNGLIB},) ifneq ($(wildcard /usr/lib64/libpng.a),) PNGLIB=/usr/lib64/libpng.a