f716b228d26ba0908c6bfeca4b01d428cb0efd42 markd Wed Apr 23 11:56:42 2025 -0700 fixed make loop removal problem with top level run of make userApps [hiram owed lunch] diff --git src/makefile src/makefile index 4e19a24f53c..8071b6a4add 100644 --- src/makefile +++ src/makefile @@ -79,38 +79,43 @@ hg/pslSort utils/nibFrag utils/faToNib utils/faToTwoBit utils/twoBitToFa \ utils/twoBitInfo isPcr blatz blatSuite: ${BLAT_SUITE_DIRS:%=%.blatSuite} %.blatSuite: topLibs hgLib ${MAKE} -C $* # all of these application makefiles have been updated to include use # of DESTDIR and BINDIR # common subdirs uses by multiple targets STD_DIRS = ameme index dnaDust protDust weblet aladdin primeMate fuse meta tagStorm \ tabFile parasol blat -USER_APP_DIRS = blat gfClient gfServer isPcr utils parasol hg hg/utils \ - hg/makeDb ameme index/ixIxx tabFile utils/userApps +USER_APP_DIRS = utils parasol hg hg/utils \ + hg/makeDb tabFile +ALMOST_USER_APP_DIRS = blat gfClient gfServer isPcr ameme index/ixIxx utils/userApps -userApps: ${USER_APP_DIRS:%=%.userApps} +userApps: ${USER_APP_DIRS:%=%.userApps} ${ALMOST_USER_APP_DIRS:%=%.almostUserApps} %.userApps: topLibs hgLib destBin ${MAKE} -C $* userApps +# these dont have userApps targets +%.almostUserApps: topLibs hgLib destBin + ${MAKE} -C $* + destBin: ${MKDIR} ${DESTBINDIR} CLEAN_DIRS = ${STD_DIRS} lib hg jkOwnLib htslib utils webBat isPcr clean: ${CLEAN_DIRS:%=%.clean} find . -name \*.o -print | xargs --no-run-if-empty rm rm -f tags TAGS rm -f cscope.out cscope.files cscope.po.out %.clean: if [ -e "$*/makefile" ] ; then ${MAKE} -C $* clean ; fi TEST_DIRS = blat gfServer hg lib utils