d3ca83766e2f8db6cd177298991766503ef2b0d8
Merge parents d247275 806d2c5
tdreszer
  Fri Sep 23 16:17:08 2011 -0700
Merge branch 'master' into tdreszer-subCfg
diff --cc src/hg/js/makefile
index 5fe5966,1c00d22..41be479
--- src/hg/js/makefile
+++ src/hg/js/makefile
@@@ -1,46 -1,46 +1,46 @@@
  include ../../inc/common.mk
  
  # recursive target to do install to DEST, with extra excludes EXCL.
  
  JQUERY_FILES=jquery-1.2.6.pack.js jquery.js jquery.tablednd.js \
      jquery.imgareaselect.js jquery-ui.js jquery.contextmenu.js \
      ui.dropdownchecklist.js \
-     jquery.cookie.js
+     jquery.cookie.js jquery.watermarkinput.js
  
  JS_FILES=ajax.js autocomplete.js hgGateway.js hgHubConnect.js hgTracks.js \
 -    hui.js utils.js ddcl.js \
 +    hui.js utils.js ddcl.js subCfg.js \
      encodeProject.js encodeDataSummary.js encodeDataMatrix.js encodeChipMatrix.js \
      ${JQUERY_FILES}
  
  STATIC_FILES=staticDoc.js jquery.js
  
  ifdef LOWELAB
      JS_FILES += lowetooltip.js loweautocomplete.js
  endif
  
  user:
  	if test -d ${DOCUMENTROOT}-${USER}; then \
  	    ${MAKE} doInstall DEST=${DOCUMENTROOT}-${USER}/js/${USER}; \
  		cp ${STATIC_FILES} ${DOCUMENTROOT}-${USER}/js; \
  	else \
  	    ${MAKE} doInstall DEST=${DOCUMENTROOT}/js/${USER}; \
  	fi
  
  alpha:
  	${GITUP}
  	${MAKE} doInstall DEST=${DOCUMENTROOT}/js
  
  beta:
  	${GITUP} 
  	${MAKE} doInstall DEST=${DOCUMENTROOT}/js
  
  clean:
  
  compile:
  
  install:
  	${MAKE} doInstall DEST=${DOCUMENTROOT}/js
  
  doInstall:
  	@mkdir -p ${DEST}/
  	../utils/cpAndLinkToResourceFiles.pl -exclude='makefile' -versionFile=../inc/versionInfo.h -destDir=${DEST} ${JS_FILES}