cc637f96e3371545bdd7587d3ac51ff47c94bf47 max Wed Apr 30 13:39:43 2014 -0700 correcting too many ifs after code review, refs #13154 diff --git src/inc/common.mk src/inc/common.mk index 448b60b..1341b85 100644 --- src/inc/common.mk +++ src/inc/common.mk @@ -190,39 +190,35 @@ ifneq (${COLOR32},0) HG_DEFS+=-DCOLOR32 endif # autodetect UCSC installation of samtabix: ifeq (${SAMTABIXDIR},) SAMTABIXDIR = /hive/data/outside/samtabix/${MACHTYPE} ifneq ($(wildcard ${SAMTABIXDIR}),) ifeq (${USE_SAMTABIX},) USE_SAMTABIX=1 endif endif endif # autodetect UCSC additional source code with password for some external tracks on gbib -ifeq (${GBIB_PWD_SRC},) GBIBDIR = /hive/groups/browser/gbib/ ifneq ($(wildcard ${GBIBDIR}/*.c),) - ifeq (${GBIB_PWD_SRC},) HG_DEFS+=-DUSE_GBIB_PWD HG_INC += -I${GBIBDIR} endif - endif -endif # libsamtabix (samtools + tabix + Angie's KNETFILE_HOOKS extension to it): disabled by default ifeq (${USE_SAMTABIX},1) KNETFILE_HOOKS=1 USE_BAM=1 USE_TABIX=1 ifeq (${SAMTABIXINC},) SAMTABIXINC = ${SAMTABIXDIR} endif ifeq (${SAMTABIXLIB},) SAMTABIXLIB = ${SAMTABIXDIR}/libsamtabix.a endif HG_INC += -I${SAMTABIXINC} L+=${SAMTABIXLIB} -lz HG_DEFS+=-DUSE_SAMTABIX -DUSE_BAM -DUSE_TABIX -DKNETFILE_HOOKS