b1b4bdec2ae76dfc7798ab4d5ea905a2572aa2a5
hiram
  Tue Jun 4 14:17:37 2013 -0700
updating userApps to make the fetchSource a separate step refs #9149
diff --git src/userApps/Makefile src/userApps/Makefile
index a30e3a4..f720b76 100644
--- src/userApps/Makefile
+++ src/userApps/Makefile
@@ -1,54 +1,49 @@
 #  Makefile for userApps project
 #  performs the operations of fetching selected directories from
 #  the kent source tree using 'git' and then building the utilities
 #  in the kent source tree.  All build results will be kept locally
 #  in this directory.
 
-DESTDIR = ${CURDIR}
-BINDIR = /bin
-MACHTYPE = local
-CGI_BIN = ${DESTDIR}/cgi-bin
-DOCUMENTROOT = ${DESTDIR}/htdocs
-SCRIPTS = ${DESTDIR}/scripts
-SAMTABIXDIR = ${DESTDIR}/samtabix
-USE_SAMTABIX = 1
-USE_SSL = 1
-NOSQLTEST = 1
-
-envVars = DESTDIR=${DESTDIR} BINDIR=${BINDIR} MACHTYPE=${MACHTYPE} \
-	CGI_BIN=${CGI_BIN} DOCUMENTROOT=${DOCUMENTROOT} SCRIPTS=${SCRIPTS} \
-	SAMTABIXDIR=${SAMTABIXDIR} USE_SAMTABIX=1 USE_SSL=1 NOSQLTEST=1
+export DESTDIR = ${CURDIR}
+export BINDIR = /bin
+export MACHTYPE = local
+export CGI_BIN = ${DESTDIR}/cgi-bin
+export DOCUMENTROOT = ${DESTDIR}/htdocs
+export SCRIPTS = ${DESTDIR}/scripts
+export SAMTABIXDIR = ${DESTDIR}/samtabix
+export USE_SAMTABIX = 1
+export USE_SSL = 1
+export NOSQLTEST = 1
 
 all:  utils
 
 utils: libs
-	cd kent/src && ${envVars} ${MAKE} userApps
-	cd kent/src/parasol && ${envVars} ${MAKE}
+	cd kent/src && ${MAKE} userApps
+	cd kent/src/parasol && ${MAKE}
 	./kent/src/utils/userApps/mkREADME.sh ${DESTDIR}/${BINDIR} ${CURDIR}/kentUtils.Documentation.txt
 
-libs: part5Src.zip
-	cd samtabix && ${envVars} ${MAKE}
-	cd kent/src && ${envVars} ${MAKE} libs
+libs:
+	cd samtabix && ${MAKE}
+	cd kent/src && ${MAKE} libs
 
 clean:
-	cd kent/src && ${envVars} ${MAKE} -i -k clean
+	cd kent/src && ${MAKE} -i -k clean
 	rm -f part1Src.zip part2Src.zip part3Src.zip part4Src.zip part5Src.zip
 	rm -f userApps.zip
 
-part5Src.zip: fetchSource
-
 fetchSource:
 	./fetchKentSource.sh
 	@echo -n "size of fetched kent source tree: "
 	@du -hs kent
 	@echo -n "number of files in kent source tree: "
 	@find ./kent -type f | wc -l
 
 update: clean userApps
+	${MAKE} fetchSource
 	${MAKE} utils
 
 userApps:
 	git archive --format=zip -9 \
 	    --remote=git://genome-source.cse.ucsc.edu/kent.git \
 	    HEAD src/userApps > userApps.zip
 	unzip -q -o -d . -j userApps.zip