5cc9ef29260486771e65ce4d78e90c90712d61f5
Merge parents b9d5de3 454b3da
kate
  Fri Jun 5 15:44:03 2015 -0700
Conflict resolution

diff --cc src/hg/hgTracks/makefile
index 38747a0,e5f7fff..9f9c03b
--- src/hg/hgTracks/makefile
+++ src/hg/hgTracks/makefile
@@@ -1,38 -1,37 +1,38 @@@
  include ../../inc/common.mk
  
  L += ${HALLIBS} ${MYSQLLIBS} -lm
  MYLIBDIR = ../../lib/${MACHTYPE}
  MYLIBS =  ${MYLIBDIR}/jkhgap.a ${MYLIBDIR}/jkweb.a
  
  A = hgTracks
  RENDERA = hgRenderTracks
  
- COMMONO = pubsTracks.o altGraphXTrack.o bamTrack.o bedGraph.o bedTrack.o \
+ COMMONO = adjacencyTrack.o pubsTracks.o altGraphXTrack.o bamTrack.o bedGraph.o bedTrack.o \
  	bigBedTrack.o bigWarn.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 gencodeTracks.o goldTrack.o gvfTrack.o \
 +        expRatioTracks.o factorSource.o hgTracks.o \
 +	gencodeTracks.o goldTrack.o gtexTracks.o gvfTrack.o \
  	loweLabTracks.o lrgTrack.o \
  	mafTrack.o makeItemsTrack.o menu.o multiWig.o netTrack.o peptideAtlasTrack.o pslTrack.o \
  	rmskJoinedTrack.o rmskTrack.o \
  	sampleTracks.o searchTracks.o simpleTracks.o snakeTrack.o switchGear.o transMapTracks.o \
  	wabaTrack.o wigTrack.o cds.o \
  	wigMafTrack.o encode.o variation.o vcfTrack.o transcriptome.o\
  	rnaFoldTrack.o retroGene.o hapmapTrack.o rnaPLFoldTrack.o\
- 	wiki.o wikiTrack.o imageV2.o
+ 	wiki.o wikiTrack.o imageV2.o extTools.o
  
  O = mainMain.o ${COMMONO} 
  
  export RENDERO = renderMain.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=