87360a6477ec5f82407c9b4ae29ab80873454566 angie Tue May 20 10:31:38 2014 -0700 Removed jshint.exclude file. Removed some unnecessary ifdef's frommakefile, removed the jshint command that used jshint.exclude, and made doInstall depend on jshint. diff --git src/hg/js/makefile src/hg/js/makefile index 3804488..b66622c 100644 --- src/hg/js/makefile +++ src/hg/js/makefile @@ -41,35 +41,28 @@ ${MAKE} doInstall DEST=${DOCUMENTROOT}/js/${USER}; \ fi alpha: ${GITUP} ${MAKE} doInstall DEST=${DOCUMENTROOT}/js beta: ${GITUP} ${MAKE} doInstall DEST=${DOCUMENTROOT}-beta/js extra=-forceVersionNumbers clean: compile: -jshint: -ifdef JSHINT - ${JSHINT} --exclude-path=jshint.exclude *.js -else - @echo Need JSHINT environment variable defined first. -endif - install: ${MAKE} doInstall DEST=${DOCUMENTROOT}/js -doInstall: -ifdef JSHINT +jshint: ${JSHINT} ${UCSC_JS_FILES} ${STATIC_FILES} -endif + +doInstall: jshint @mkdir -p ${DEST}/ ../utils/cpAndLinkToResourceFiles.pl ${extra} -exclude='makefile' \ -versionFile=../inc/versionInfo.h -destDir=${DEST} ${SYMLINKED_FILES} for file in ${STATIC_FILES}; do \ rsync -a $$file ${DEST}/; \ done