src/inc/common.mk 1.76

1.76 2010/02/24 01:10:23 angie
I have added some hooks into knetfile.c in our local copy of samtools, so that knetfile can serve as a wrapper on udc (or any other suitable code). If KNETFILE_HOOKS=1 (in addition to USE_BAM=1) this will bring the benefits of udc to bam tracks.

Index: src/inc/common.mk
===================================================================
RCS file: /projects/compbio/cvsroot/kent/src/inc/common.mk,v
retrieving revision 1.75
retrieving revision 1.76
diff -b -B -U 4 -r1.75 -r1.76
--- src/inc/common.mk	31 Jan 2010 17:47:37 -0000	1.75
+++ src/inc/common.mk	24 Feb 2010 01:10:23 -0000	1.76
@@ -31,15 +31,15 @@
     HG_DEFS+=-DUSE_PNG
     HG_INC+=${PNGINCL}
 endif
 
-# libbam: disabled by default
+# libbam (samtools, and Angie's KNETFILE_HOOKS extension to it): disabled by default
 ifeq (${USE_BAM},)
     USE_BAM=0
 endif
 ifeq (${USE_BAM},1)
     ifeq (${SAMDIR},)
-      SAMDIR = /hive/data/outside/samtools/samtools/${MACHTYPE}
+      SAMDIR = /hive/data/outside/samtools/svn_${MACHTYPE}/samtools
     endif
     ifeq (${SAMINC},)
         SAMINC = ${SAMDIR}
     endif
@@ -49,8 +49,11 @@
     HG_INC += -I${SAMINC}
     L+=${SAMLIB}
     HG_DEFS+=-DUSE_BAM
 endif
+ifeq (${KNETFILE_HOOKS},1)
+    HG_DEFS+=-DKNETFILE_HOOKS
+endif
 
 # libfuse: disabled by default
 ifeq (${USE_FUSE},)
     USE_FUSE=0