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/hg/geoIp/makefile src/hg/geoIp/makefile index 978047e..f2d0b50 100644 --- src/hg/geoIp/makefile +++ src/hg/geoIp/makefile @@ -1,21 +1,22 @@ +kentSrc = ../.. include ../../inc/common.mk HG_INC+=-I../../inc L += -lm ${SOCKETLIB} MYLIBDIR = ../../lib/${MACHTYPE} MYLIBS = $(MYLIBDIR)/jkweb.a A = geoIpToCountry O = $(A).o $(A): ${O} ${MYLIBS} @${MKDIR} "${DESTDIR}${BINDIR}" ${CC} ${COPT} ${CFLAGS} -o ${DESTDIR}${BINDIR}/${A}${EXE} $O ${MYLIBS} ${L} ${STRIP} ${DESTDIR}${BINDIR}/${A}${EXE} clean:: rm -f ${O} rm *.sql