f92648822a44b6a4e186a022cd6a79f8973d5641
Merge parents 912cb8e f727744
chinhli
  Fri Apr 13 09:42:15 2012 -0700
Merge branch 'master' into chinhli-hgLogin
diff --cc src/hg/makefile
index a54a1cb,a92857c..a2a9117
--- src/hg/makefile
+++ src/hg/makefile
@@@ -1,27 -1,28 +1,28 @@@
  # Build all directories in utils
  
  # 	$Id: makefile,v 1.156 2010/03/03 02:53:30 markd Exp $
  
 -BROWSER_BINS=cartReset das hgBlat makeDb/hgCgiData hgConvert hgHubConnect \
 +BROWSER_BINS=hgLogin cartReset das hgBlat makeDb/hgCgiData hgConvert hgHubConnect \
          hgGateway hgGene hgGenome hgPcr hgSession hgSuggest hgTables hgTracks \
  	hgTrackUi hgc hgApi cartDump near/hgNear \
  	protein/pbGateway protein/pbTracks protein/pbGlobal \
  	hgLiftOver visiGene/hgVisiGene \
  	encode/mkEncodeFrameset encode/hgEncodeDataVersions \
- 	encode/hgEncodeVocab phyloGif hgCustom hgPal hgFileUi  hgFileSearch\
- 	makeDb/hgCgiData js htdocs/style
+ 	encode/hgEncodeVocab encode/hgEncodeApi \
+ 	phyloGif hgCustom hgPal hgFileUi hgFileSearch\
+ 	makeDb/hgCgiData js htdocs/style 
  
  ifdef LOWELAB
      BROWSER_BINS += $(HOME)/lowelab/src/browser/tooltip $(HOME)/lowelab/src/browser/chooseorg 
  endif
  
  BROWSER_LOADERS = makeDb/hgLoadBed makeDb/hgLoadWiggle makeDb/hgLoadMaf
  
  ifneq ($(findstring $(shell hostname),hgwdev hgwbeta),)
      ENCODE_FILES =
  endif
  
  
  TEST_DIRS = lib autoDtd autoSql blastToPsl checkTableCoords embossToPsl \
              genePredSingleCover genePredHisto genePredToGtf \
  	    genePredToMafFrames gbGetEntries hgGetAnn liftAcross \