9a67d40fbebefe0bb2b2fba60d65b4215a7478ba max Fri Jun 4 03:12:41 2021 -0700 actually fixing the makefile bug, refs #27614 diff --git src/makefile src/makefile index 4a5838a..739f31d 100644 --- src/makefile +++ src/makefile @@ -97,31 +97,31 @@ destBin: ${MKDIR} ${DESTBINDIR} clean: @for D in ${DIRS} x; do \ if test "$$D" != "x" && test -d "$$D" ; then \ ( cd $$D && echo $$D && ${MAKE} clean ) ;\ x=$$? ; if [ $$x -ne 0 ]; then exit $$x ; fi \ fi ;\ done cd parasol && ${MAKE} clean cd lib && ${MAKE} clean cd hg && ${MAKE} clean cd hg && ${MAKE} clean_utils -ifneq ($(wildcard src/jkOwnLib/*),) +ifneq ($(wildcard jkOwnLib/*),) cd jkOwnLib && ${MAKE} clean endif cd htslib && ${MAKE} clean cd utils && ${MAKE} clean if test -d webBlat ; then cd webBlat && ${MAKE} clean ; fi if test -d isPcr ; then cd isPcr && ${MAKE} clean ; fi touch non-empty-rm.o - find . -name \*.o -print | xargs rm rm -f tags TAGS rm -f cscope.out cscope.files cscope.po.out testDirs = lib utils blat gfServer hg test:: $(testDirs:%=%.test) %.test: cd $* && ${MAKE} test @@ -153,48 +153,48 @@ # 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/*),) +ifneq ($(wildcard 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/*),) +ifneq ($(wildcard 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)