4f1496f25e2388a703aef7b2976bef37497fa9a0 braney Sat Apr 20 14:26:04 2013 -0700 a tweak to common.mk to look for stdc++ library, and to snakeTrack to keep track of mapName diff --git src/inc/common.mk src/inc/common.mk index daee873..22ab672 100644 --- src/inc/common.mk +++ src/inc/common.mk @@ -16,34 +16,33 @@ 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 + 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 -lstdc++ 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},)