ea0720bc6efa1e0d09989ae7c1febc3af1c07e68 max Wed Jun 2 06:23:21 2021 -0700 make utils should work now in kent-core, refs #27614 diff --git src/makefile src/makefile index c3f08e9..288e194 100644 --- src/makefile +++ src/makefile @@ -15,32 +15,34 @@ topLibs: @./checkUmask.sh @MACHTYPE=${MACHTYPE} ./machTest.sh cd lib && ${MAKE} ifneq ($(wildcard src/jkOwnLib/*),) cd jkOwnLib && ${MAKE} endif cd parasol/lib && ${MAKE} cd htslib && ${MAKE} optLib: cd optimalLeaf && ${MAKE} hgLib: +ifneq ($(wildcard src/hg/makefile),) @./hg/sqlEnvTest.sh cd hg/lib && ${MAKE} +endif libs: topLibs hgLib optLib cgi: libs cd hg && ${MAKE} cgi cd utils/bedToBigBed && ${MAKE} cgi cgi-alpha: check-alpha libs logUser cd hg && ${MAKE} alpha cd utils/bedToBigBed && ${MAKE} alpha cgi-beta: check-beta libs logUser cd hg && ${MAKE} beta cd utils/bedToBigBed && ${MAKE} beta @@ -151,45 +153,53 @@ # build emacs tags for all files .PHONY: etags-all etags-all: find . -name '*.[ch]' | etags - utils: libs destBin ${MKDIR} ${SCRIPTS} cd parasol && ${MAKE} @for D in ${DIRS} x; do \ if test "$$D" != "x" ; then \ ( cd $$D && echo $$D && ${MAKE} ) ;\ x=$$? ; if [ $$x -ne 0 ]; then exit $$x ; fi \ fi ;\ done cd utils && ${MAKE} +ifneq ($(wildcard src/jkOwnLib/*),) cd hg && ${MAKE} utils +endif utils-alpha: check-alpha libs destBin ${MKDIR} ${SCRIPTS} cd parasol && ${MAKE} @for D in ${DIRS} x; do \ if test "$$D" != "x" ; then \ ( cd $$D && echo $$D && ${MAKE} ) ;\ x=$$? ; if [ $$x -ne 0 ]; then exit $$x ; fi \ fi ;\ done cd utils && ${MAKE} cd hg && ${MAKE} utils + +ifneq ($(wildcard src/jkOwnLib/*),) DIRS = ameme blat index dnaDust protDust weblet aladdin primeMate fuse meta tagStorm tabFile +else +DIRS = ameme index dnaDust protDust weblet aladdin primeMate fuse meta tagStorm tabFile +endif + ## cellar archive for obsolete programs cellarDirs = cdnaAli getgene idbQuery reformat scanIntrons tracks wormAli \ xenoAli buildCellar: $(cellarDirs:%=%.cellar) %.cellar: libs destBin cd $* && echo $* && $(MAKE) cleanCellar: $(cellarDirs:%=%.cellarClean) %.cellarClean: cd $* && echo $* && $(MAKE) clean