14bd3b4e737b599508510c1192885d3ba044b12a max Wed Jun 2 06:04:23 2021 -0700 ignoring jkOwnLib, refs #27614 diff --git src/makefile src/makefile index 76aa885..c3f08e9 100644 --- src/makefile +++ src/makefile @@ -5,31 +5,33 @@ alpha: check-alpha clean ${MAKE} utils-alpha cgi-alpha blatSuite 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} +ifneq ($(wildcard src/jkOwnLib/*),) cd jkOwnLib && ${MAKE} +endif cd parasol/lib && ${MAKE} cd htslib && ${MAKE} optLib: cd optimalLeaf && ${MAKE} hgLib: @./hg/sqlEnvTest.sh cd hg/lib && ${MAKE} libs: topLibs hgLib optLib cgi: libs cd hg && ${MAKE} cgi cd utils/bedToBigBed && ${MAKE} cgi @@ -93,31 +95,33 @@ 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/*),) 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 LIB_TAGS_IN = lib/*.[hc] */lib/*.[hc] */*/lib/*.[hc] */*/*/lib/*.[hc] jkOwnLib/*.c \