6031d05b102c1cb34c9e8394a8acf5809a8eca8f
angie
  Mon Jan 31 16:19:37 2011 -0800
Track #34 (dbVar for human): Added new track type gvf with basichandlers in hgTracks and hgc.  dbVar's GVF attributes are recognized,
esp. var_type is used to color items, and items are sorted using
the Parent keyword so that parents appear immediately before their
children, and children are sorted by var_type.  Attributes are
displayed in hgc; need to do a bit better for the Start_range and
End_range (e.g. translate "." to "inner start unknown" etc.).

diff --git src/hg/hgTracks/makefile src/hg/hgTracks/makefile
index 053a297..6377e91 100644
--- src/hg/hgTracks/makefile
+++ src/hg/hgTracks/makefile
@@ -1,71 +1,71 @@
 include ../../inc/common.mk
 
 L += ${MYSQLLIBS} -lm
 MYLIBDIR = ../../lib/${MACHTYPE}
 MYLIBS =  ${MYLIBDIR}/jkhgap.a ${MYLIBDIR}/jkweb.a
 
 A = hgTracks
 
 COMMONO = altGraphXTrack.o bamTrack.o bedGraph.o bedTrack.o bigBedTrack.o bigWigTrack.o \
 	chainTrack.o cgapSageTrack.o chromGraphTrack.o config.o container.o contigTrack.o \
 	coverageTrack.o cytoBandTrack.o cutterTrack.o \
-        expRatioTracks.o factorSource.o hgTracks.o goldTrack.o loweLabTracks.o \
+        expRatioTracks.o factorSource.o hgTracks.o goldTrack.o gvfTrack.o loweLabTracks.o \
 	mafTrack.o makeItemsTrack.o multiWig.o netTrack.o pslTrack.o rmskTrack.o \
 	sampleTracks.o searchTracks.o simpleTracks.o switchGear.o transMapTracks.o \
 	wabaTrack.o wigTrack.o cds.o \
 	wigMafTrack.o encode.o variation.o transcriptome.o\
 	rnaFoldTrack.o retroGene.o hapmapTrack.o rnaPLFoldTrack.o\
 	wiki.o wikiTrack.o imageV2.o
 
 O = mainMain.o ${COMMONO} 
 
 include ../../inc/cgi_build_rules.mk
 
 ifeq (${GBROWSE}, 1)
   GBROWSE_D=-DGBROWSE
   A = gbrowseTest
   O = $A.o oneTrack.o \
       bedGraph.o cds.o chainTrack.o mafTrack.o netTrack.o pslTrack.o \
       simpleTracks.o wigMafTrack.o wigTrack.o imageV2.o
 else
   GBROWSE_D=
 endif
 
 %.o: %.c
 	${CC} ${COPT} ${CFLAGS} ${GBROWSE_D} ${LOWELAB_DEFS} ${HG_DEFS} ${HG_WARN} ${HG_INC} ${XINC} -o $@ -c $<
 
 mgsc: strip
 	mv $A ${CGI_BIN}/$A
 
 RENDERO = renderMain.o ${COMMONO}
 RENDERA = ./hgRenderTracks
 
 # when it is time to deliver hgRenderTracks, remove the rm and echo below
 compile: compileMain
 	@rm -f ${RENDERA}
 	@echo "run 'make hgRenderTracks' to obtain that binary"
 
 compileMain: $O
 	${CC} -o $A $O ${MYLIBS} ${L}
 
 ${RENDERA}: ${RENDERO}
 	${CC} -o ${RENDERA} ${RENDERO} ${MYLIBS} ${L}
 
 # install of RENDERA is not enabled yet.
 #	When it is desired, would need three different targets:
 #	my:: - for personal browser into ${CGI_BIN}-${USER}
 #	alpha:: - for browser into ${CGI_BIN}
 #	beta:: - for browser into ${CGI_BIN}-beta
 #	install:: - into DESTDIR/CGI_BIN
 
 wigTrack.o:	wigCommon.h
 bedGraph.o:	wigCommon.h
 
 switchGear.o:	switchGear.h
 cds.o:		cds.h
 hgTracks.o:	cds.h
 pslTrack.o:	cds.h
 
 clean::
 	rm -f ct_hgwdev_*.bed hgtIdeo_*.gif hgt_*.gif
 	rm -f ${RENDERA} ${RENDERO}