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/combineFiles/makefile src/utils/combineFiles/makefile index b68c983..f9ae675 100644 --- src/utils/combineFiles/makefile +++ src/utils/combineFiles/makefile @@ -1,14 +1,15 @@ +kentSrc = ../.. include ../../inc/common.mk L += -lm MYLIBDIR = ../../lib/${MACHTYPE} MYLIBS = $(MYLIBDIR)/jkweb.a O = combineFiles.o combineFiles: $O ${MYLIBS} ${CC} ${COPT} -o ${BINDIR}/combineFiles $O ${MYLIBS} $L ${STRIP} ${BINDIR}/combineFiles${EXE} clean: rm -f $O