a3dc6f427dd906f15647f68eda2fb4b75ece6ffd markd Mon Feb 10 15:22:59 2025 -0800 fixed a broken makefile and so other improvements from code review diff --git src/inc/common.mk src/inc/common.mk index da630b60b57..f2c71f621c0 100644 --- src/inc/common.mk +++ src/inc/common.mk @@ -168,31 +168,31 @@ FREETYPECFLAGS += -DUSE_FREETYPE endif HG_INC += ${FREETYPECFLAGS} L += ${FREETYPELIBS} endif ifeq (${PTHREADLIB},) PTHREADLIB=-lpthread endif ifneq ($(UNAME_S),Darwin) L+=${PTHREADLIB} ifneq ($(filter 3.%, ${KERNEL_REL}),) # older linux needed libconv - XXXICONVLIB=-liconv + ICONVLIB=-liconv endif else ifeq (${ICONVLIB},) ICONVLIB=-liconv endif endif # autodetect UCSC installation of hal: ifeq (${HALDIR},) # ONLY on hgwdev, not any other machine here (i.e. hgcompute-01) ifeq (${IS_HGWDEV},yes) HALDIR = /hive/groups/browser/hal/build/hal.2024-12-12 #HALDIR = /hive/groups/browser/hal/build/rocky9/hal.2024-12-18 ifneq ($(wildcard ${HALDIR}),) ifeq (${USE_HAL},) @@ -343,31 +343,31 @@ ifneq (${SSLLIB},) L+=${SSLLIB} else L+=-lssl endif ifneq (${CRYPTOLIB},) L+=${CRYPTOLIB} else L+=-lcrypto endif endif endif #global external libraries L += $(kentSrc)/htslib/libhts.a -L+=${PNGLIB} ${MLIB} ${ZLIB} ${BZ2LIB} ${ICONVLIB} +L+=${PNGLIB} ${ZLIB} ${BZ2LIB} ${ICONVLIB} HG_INC+=${PNGINCL} # NOTE: these must be last libraries and must be dynamic. # We switched by to dynamic with SEMI_STATIC ifeq (${SEMI_STATIC},yes) # switch back to dynamic libraries DYNAMIC_PRE = -Wl,-Bdynamic endif DYNAMIC_LIBS = ${DYNAMIC_PRE} -ldl -lm -lc L+= ${DYNAMIC_LIBS} # pass through COREDUMP ifneq (${COREDUMP},)