11e45667d4e291b3038ccda729a1cdf5bcaf004a
braney
  Mon Jul 11 15:46:54 2016 -0700
incorporate htslib in kent src, remove USE_BAM, USE_SAMTABIX, USE_TABIX
defines, modify a bunch of makefiles to include kentSrc variable
pointing to top of the tree.

diff --git src/utils/raMerge/makefile src/utils/raMerge/makefile
index 164b801..b495ba8 100644
--- src/utils/raMerge/makefile
+++ src/utils/raMerge/makefile
@@ -1,18 +1,19 @@
+kentSrc = ../..
 include ../../inc/common.mk
 
 L += -lm
 MYLIBDIR = ../../lib/${MACHTYPE}
 MYLIBS =  ${MYLIBDIR}/jkweb.a
 
 O = raMerge.o
 
 raMerge: $O ${MYLIBS}
 	${CC} ${COPT} -o ${BINDIR}/raMerge $O ${MYLIBS} $L
 	${STRIP} ${BINDIR}/raMerge${EXE}
 
 test:
 	raMerge name in1.ra in2.ra in3.ra > out.ra
 	diff expected.ra out.ra
 
 clean:
 	rm -f $O