7e42e4a4e7d04de185735814ebecd913d0ab829c angie Mon Feb 28 23:13:59 2011 -0800 Feature #2820 (tabix: add as optional linked library in kent/src):added common.mk variables analogous to those for samtools: TABIXDIR, USE_TABIX, TABIXINC, TABIXLIB. When compiling with tabix, also set KNETFILE_HOOKS so tabix will use udc like samtools. diff --git src/inc/common.mk src/inc/common.mk index b93b4d1..c7fc557 100644 --- src/inc/common.mk +++ src/inc/common.mk @@ -38,59 +38,89 @@ PNGLIB=/usr/lib/libpng.a endif endif ifeq (${PNGLIB},) PNGLIB=-lpng endif L+=${PNGLIB} HG_INC+=${PNGINCL} # 32-bit color enabled by default ifneq (${COLOR32},0) HG_DEFS+=-DCOLOR32 endif -# autodetect if bam is installed +# autodetect local installation of samtools: ifeq (${SAMDIR},) SAMDIR = /hive/data/outside/samtools/svn_${MACHTYPE}/samtools ifneq ($(wildcard ${SAMDIR}),) KNETFILE_HOOKS=1 endif endif ifeq (${USE_BAM},) ifneq ($(wildcard ${SAMDIR}),) USE_BAM=1 endif endif # libbam (samtools, and Angie's KNETFILE_HOOKS extension to it): disabled by default ifeq (${USE_BAM},1) ifeq (${SAMINC},) SAMINC = ${SAMDIR} endif ifeq (${SAMLIB},) SAMLIB = ${SAMDIR}/libbam.a endif HG_INC += -I${SAMINC} L+=${SAMLIB} HG_DEFS+=-DUSE_BAM ifeq (${KNETFILE_HOOKS},1) HG_DEFS+=-DKNETFILE_HOOKS endif endif +# As we do for bam/samtools, so do for tabix. autodetect local installation: +ifeq (${TABIXDIR},) + TABIXDIR = /hive/data/outside/tabix/tabix-0.2.3/${MACHTYPE} + ifneq ($(wildcard ${TABIXDIR}),) + KNETFILE_HOOKS=1 + endif +endif +ifeq (${USE_TABIX},) + ifneq ($(wildcard ${TABIXDIR}),) + USE_TABIX=1 + endif +endif + +# libtabix and Angie's KNETFILE_HOOKS extension to it: disabled by default +ifeq (${USE_TABIX},1) + ifeq (${TABIXINC},) + TABIXINC = ${TABIXDIR} + endif + ifeq (${TABIXLIB},) + TABIXLIB = ${TABIXDIR}/libtabix.a + endif + HG_INC += -I${TABIXINC} + L+=${TABIXLIB} + HG_DEFS+=-DUSE_TABIX + ifeq (${KNETFILE_HOOKS},1) + HG_DEFS+=-DKNETFILE_HOOKS + endif +endif + + SYS = $(shell uname -s) ifeq (${HG_WARN},) ifeq (${SYS},Darwin) HG_WARN = -Wall -Wno-unused-variable HG_WARN_UNINIT= else ifeq (${SYS},SunOS) HG_WARN = -Wall -Wformat -Wimplicit -Wreturn-type HG_WARN_UNINIT=-Wuninitialized else HG_WARN = -Wall -Werror -Wformat -Wimplicit -Wreturn-type # HG_WARN = -Wall -Wformat -Wimplicit -Wreturn-type HG_WARN_UNINIT=-Wuninitialized endif