From eb0a758a723f217450eaafc229289522d4a5aa34 Mon Sep 17 00:00:00 2001 From: Douglas Clowes Date: Fri, 27 Apr 2012 14:42:52 +1000 Subject: [PATCH] Prefer static libs to dynamic ones, TCL 8.4 to 8.5 r3540 | dcl | 2012-04-27 14:42:52 +1000 (Fri, 27 Apr 2012) | 1 line --- site_ansto/Makefile | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/site_ansto/Makefile b/site_ansto/Makefile index 1c4045f5..0ae16b02 100644 --- a/site_ansto/Makefile +++ b/site_ansto/Makefile @@ -46,11 +46,11 @@ INCFLAGS = -Ihardsup -I.. $(INC_HDF5) $(INC_TCL8) # libraries required in descending order of preference. # TCL 8.4 or 8.5 -LIB_TCL8 := $(firstword $(wildcard /usr/lib/libtcl.so /usr/lib/libtcl8.4.so /usr/lib/libtcl8.5.so)) +LIB_TCL8 := $(firstword $(wildcard /usr/lib/libtcl8.4.a /usr/lib/libtcl8.5.a /usr/lib/libtcl.so /usr/lib/libtcl8.4.so /usr/lib/libtcl8.5.so)) ifeq (,$(LIB_TCL8)) $(warning LIB_TCL8 not found) else - LIB_TCL8 := -L$(dir $(LIB_TCL8)) -l$(subst lib,,$(basename $(notdir $(LIB_TCL8)))) + XLIB_TCL8 := -L$(dir $(LIB_TCL8)) -l$(subst lib,,$(basename $(notdir $(LIB_TCL8)))) # $(info LIB_TCL8 = $(LIB_TCL8)) endif # @@ -63,7 +63,7 @@ else endif # HDF5 -LIB_HDF5 := $(firstword $(wildcard /usr/lib/libhdf5.so /usr/lib/libhdf5.a /usr/local/lib/libhdf5.a)) +LIB_HDF5 := $(firstword $(wildcard /usr/lib/libhdf5.a /usr/lib/libhdf5.so /usr/local/lib/libhdf5.a)) ifeq (,$(LIB_HDF5)) $(warning LIB_HDF5 not found) endif @@ -76,7 +76,7 @@ else endif # JSON-C -LIB_JSON := $(firstword $(wildcard /usr/lib/libjson.so /usr/lib/libjson.a /usr/local/lib/libjson.a)) +LIB_JSON := $(firstword $(wildcard /usr/lib/libjson.a /usr/lib/libjson.so /usr/local/lib/libjson.a)) ifeq (,$(LIB_JSON)) $(warning LIB_JSON not found) endif