b1a99b763d15ce616e7c3d712f5d87a0de88548c braney Mon May 15 15:00:56 2017 -0700 make it so userApps is not dependent on optimalLib diff --git src/makefile src/makefile index 4d9abc7..2669553 100644 --- src/makefile +++ src/makefile @@ -8,47 +8,49 @@ beta: check-beta clean cgi-beta # do a git update and clean update: git pull ${MAKE} clean topLibs: @./checkUmask.sh @MACHTYPE=${MACHTYPE} ./machTest.sh cd lib && ${MAKE} cd jkOwnLib && ${MAKE} cd parasol/lib && ${MAKE} cd htslib && ${MAKE} + +optLib: cd optimalLeaf && ${MAKE} hgLib: @./hg/sqlEnvTest.sh cd hg/lib && ${MAKE} libs: topLibs hgLib -cgi: libs +cgi: libs optLib cd hg && ${MAKE} cgi cd utils/bedToBigBed && ${MAKE} cgi -cgi-alpha: libs +cgi-alpha: libs optLib cd hg && ${MAKE} alpha cd utils/bedToBigBed && ${MAKE} alpha -cgi-beta: check-beta libs +cgi-beta: check-beta libs optLib cd hg && ${MAKE} beta cd utils/bedToBigBed && ${MAKE} beta check-beta: # this will fail if we are not in a beta checkout: git branch | egrep '\* v[0-9]+_branch' > /dev/null blatSuite: topLibs hgLib cd blat && ${MAKE} cd gfClient && ${MAKE} cd gfServer && ${MAKE} cd webBlat && ${MAKE} cd hg/pslPretty && ${MAKE} cd hg/pslReps && ${MAKE} cd hg/pslSort && ${MAKE}