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/olly/makefile src/olly/makefile index 62a7528..95b1c02 100644 --- src/olly/makefile +++ src/olly/makefile @@ -1,15 +1,16 @@ +kentSrc = .. include ../inc/common.mk L += -lm MYLIBDIR = ../lib/$(MACHTYPE) MYLIBS = $(MYLIBDIR)/jkhgap.a $(MYLIBDIR)/jkweb.a O = olly.o olly: $O $(MYLIBS) # ${CC} ${COPT} ${CFLAGS} -o olly $O $(MYLIBS) $L ${CC} ${COPT} ${CFLAGS} -o ${BINDIR}/olly $O $(MYLIBS) $L # ${STRIP} ${BINDIR}/olly${EXE} clean:: rm -f ${O}