dbbc85fe1ded040b85b123282425606bba9674f8 braney Sat Apr 20 13:44:01 2013 -0700 polishing some of the snake track code, added support for HAL snakes in assembly hubs. refs #10637 diff --git src/inc/common.mk src/inc/common.mk index dcd0250..daee873 100644 --- src/inc/common.mk +++ src/inc/common.mk @@ -14,30 +14,38 @@ # pthreads is required L+=-pthread # autodetect if openssl is installed ifeq (${SSLDIR},) SSLDIR = /usr/include/openssl endif ifeq (${USE_SSL},) ifneq ($(wildcard ${SSLDIR}),) USE_SSL=1 endif endif +# libhal: disabled by default +ifeq (${USE_HAL},1) + L+=/cluster/home/braney/hal/lib/halChain.a /cluster/home/braney/hal/lib/halLod.a /cluster/home/braney/hal/lib/halLib.a /cluster/home/braney/sonLib/lib/sonLib.a /hive/groups/recon/local/lib/libhdf5_cpp.a /hive/groups/recon/local/lib/libhdf5.a /hive/groups/recon/local/lib/libhdf5_hl.a /hive/groups/recon/local/lib/libsz.a + HG_DEFS+=-DUSE_HAL + HG_INC+=-I/cluster/home/braney/hal/chain/inc/ + CFLAGS += -fno-inline -lstdc++ +endif + # libssl: disabled by default ifeq (${USE_SSL},1) L+=-lssl -lcrypto HG_DEFS+=-DUSE_SSL endif # autodetect where png is installed ifeq (${PNGLIB},) ifneq ($(wildcard /usr/lib64/libpng.a),) PNGLIB=/usr/lib64/libpng.a endif endif ifeq (${PNGLIB},) ifneq ($(wildcard /usr/lib/libpng.a),) PNGLIB=/usr/lib/libpng.a