src/makefile 1.57

Index: src/makefile
===================================================================
RCS file: /projects/compbio/cvsroot/kent/src/makefile,v
retrieving revision 1.56
retrieving revision 1.57
diff -b -B -U 1000000 -r1.56 -r1.57
--- src/makefile	24 Mar 2009 23:01:41 -0000	1.56
+++ src/makefile	26 Mar 2009 20:19:29 -0000	1.57
@@ -1,123 +1,126 @@
 all: utils cgi blatSuite
 
 alpha: clean utils-alpha cgi-alpha blatSuite
 
 beta: check-beta clean cgi-beta
 
 # do a cvs update and clean
 update:
 	cvs update -d -P
 	${MAKE} clean
 
 topLibs:
 	@./machTest.sh
 	cd lib && ${MAKE}
 	cd jkOwnLib && ${MAKE}
 
 hgLib:
 	@./hg/sqlEnvTest.sh
 	cd hg/lib && ${MAKE}
 
 libs: topLibs hgLib
 	cd hg/protein/lib && ${MAKE}
 
 cgi: libs
 	cd hg && ${MAKE} cgi
 
 cgi-alpha: libs
 	cd hg && ${MAKE} alpha
 
 cgi-beta: check-beta libs
 	cd hg && ${MAKE} beta
 
 check-beta:
 	# this will fail if we are not in a beta checkout:
 	cvs status makefile | egrep 'v[0-9]+_branch' > /dev/null	
 
 blatSuite: topLibs 
 	cd blat && ${MAKE}
 	cd gfClient && ${MAKE}
 	cd gfServer && ${MAKE}
 	cd webBlat && ${MAKE}
 	cd hg/pslPretty && ${MAKE}
 	cd hg/pslReps && ${MAKE}
 	cd hg/pslSort && ${MAKE}
 	cd utils/nibFrag && ${MAKE}
 	cd utils/faToNib && ${MAKE}
 	cd utils/faToTwoBit && ${MAKE}
 	cd utils/twoBitToFa && ${MAKE}
 	cd utils/twoBitInfo && ${MAKE}
 	cd isPcr && ${MAKE}
 	cd blatz && ${MAKE}
 
+# all of these application makefiles have been updated to include use
+#	of DESTDIR and BINDIR
+
 UTILS_APPLIST = bedToBigBed bigBedSummary bigBedToBed bigWigSummary \
 	bigWigToBedGraph faSize faFrag faRandomize faOneRecord faSomeRecords \
 	faToNib faToTwoBit gtfToGenePred htmlCheck nibFrag textHistogram \
-	twoBitInfo twoBitToFa wigToBigWig
+	twoBitInfo twoBitToFa userApps wigToBigWig
 
 userApps: topLibs
 	@for P in ${UTILS_APPLIST}; do \
 	    ( cd utils/$${P} && echo utils/$${P} && $(MAKE) ) ; \
 	done
 
 clean:
 	cd lib && ${MAKE} clean 
 	cd hg && ${MAKE} clean
 	cd jkOwnLib && ${MAKE} clean
 	cd utils && ${MAKE} clean
 	touch non-empty-rm.o
 	- find . -name \*.o -print | xargs rm
 	rm -f tags TAGS
 
 testDirs = lib blat gfServer hg
 test:: $(testDirs:%=%.test)
 %.test:
 	cd $* && ${MAKE} test
 
 LIB_TAGS_IN = lib/*.[hc] hg/lib/*.[hc] jkOwnLib/*.c inc/*.h hg/inc/*.h
 
 # build tags for libraries
 .PHONY: tags
 tags:
 	ctags ${LIB_TAGS_IN}
 
 # build emacs tags for libraries
 .PHONY: etags
 etags:
 	etags ${LIB_TAGS_IN}
 
 # build tags for all files
 .PHONY: tags-all
 tags-all:
 	find . -name '*.[ch]' | ctags -L -
 
 # build emacs tags for all files
 .PHONY: etags-all
 etags-all:
 	find . -name '*.[ch]' | etags -
 
 utils: libs
 	@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
 
 utils-alpha: libs
 	@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} alpha
 	cd hg && ${MAKE} utils
 
 DIRS = ameme blat cdnaAli index reformat xenoAli \
        dnaDust protDust idbQuery scanIntrons tracks weblet \
        aladdin getgene primeMate wormAli