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/webBlat/makefile src/webBlat/makefile index 6956ad5..5b321ea 100644 --- src/webBlat/makefile +++ src/webBlat/makefile @@ -1,27 +1,28 @@ +kentSrc = .. include ../inc/common.mk L += -lm $(SOCKETLIB) MYLIBDIR = ../lib/${MACHTYPE} MYLIBS = ${MYLIBDIR}/jkOwnLib.a ${MYLIBDIR}/jkweb.a O = webBlat.o webBlat: $O ${MYLIBS} ${CC} ${COPT} -o webBlat $O ${MYLIBS} ${L} ${STRIP} webBlat${EXE} installOsX: webBlat cp webBlat /Library/WebServer/CGI-Executables cp webBlat.cfg /Library/WebServer/CGI-Executables installUcsc: webBlat cp webBlat /usr/local/apache/cgi-bin-$(USER) cp webBlat.cfg /usr/local/apache/cgi-bin-$(USER) installAlpha: webBlat cp webBlat /usr/local/apache/cgi-bin cp webBlat.cfg /usr/local/apache/cgi-bin clean: rm -f $O webBlat