95efc27edf24bba8d0c7e53d2ef4aead59982826
braney
  Mon Jun 15 18:29:39 2020 -0700
Merging in our gencode merge code to master branch

diff --git src/hg/lib/makefile src/hg/lib/makefile
index 19994ba..2fe5052 100644
--- src/hg/lib/makefile
+++ src/hg/lib/makefile
@@ -105,31 +105,37 @@
     sqlProg.o tfbsCons.o tfbsConsSites.o tablesTables.o \
     tableDescriptions.o tableStatus.o targetDb.o tfbsConsMap.o tagRepo.o \
     taxonDivision.o taxonGeneticCode.o taxonName.o taxonNode.o taxonXref.o \
     tigrCmrGene.o tigrOperon.o tilingPath.o traceInfo.o trackDb.o \
     trackDbCustom.o trackDbCache.o trackHub.o trackLayout.o trackTable.o trackVersion.o trashDir.o \
     transRegCode.o transRegCodeCondition.o \
     transRegCodeProbe.o txAliDiff.o txCluster.o txCommon.o txEdgeBed.o \
     txEdgeOrtho.o txGraph.o txInfo.o txRnaAccs.o ucscRetroInfo.o ucscRetroOrtho.o \
     variant.o variantProjector.o vcfUi.o \
     vegaInfo.o vegaInfoZfish.o visiGene.o vntr.o \
     wabAli.o web.o ncRna.o wgRna.o wigAsciiToBinary.o wigDataStream.o wiggle.o \
     wiggleCart.o wiggleUtils.o wikiLink.o wikiTrack.o yaleGencodeAssoc.o \
     zdobnovSynt.o oreganno.o \
     oregannoUi.o gvUi.o gv.o omicia.o protVar.o pgSnp.o \
     alignInfo.o cddInfo.o loweutils.o cddDesc.o arCOGs.o arcogdesc.o geneTree.o \
-    megablastInfo.o pgPhenoAssoc.o pgSiftPred.o pgPolyphenPred.o userRegions.o variome.o
+    megablastInfo.o pgPhenoAssoc.o pgSiftPred.o pgPolyphenPred.o userRegions.o variome.o \
+    gencodeAnnotationRemark.o gencodeAttrs.o gencodeToEntrezGene.o \
+    gencodeExonSupport.o gencodeGeneSource.o gencodeToGeneSymbol.o gencodeToPdb.o \
+    gencodeToPubMed.o gencodeToRefSeq.o gencodeTag.o \
+    gencodeTranscriptionSupportLevel.o gencodeTranscriptSource.o \
+    gencodeTranscriptSupport.o gencodeToUniProt.o
+
 
 ifeq (${USE_HIC}, 1)
   O += straw.o
 endif
 
 ifeq (${GBROWSE}, 1)
   GBROWSE_D=-DGBROWSE
 else
   GBROWSE_D=
 endif
 
 %.o: %.c
 	${CC} ${COPT} ${CFLAGS} ${GBROWSE_D} ${LOWELAB_DEFS} ${HG_DEFS} ${HG_WARN} ${HG_INC} ${XINC} -o $@ -c $<
 
 ../../lib/$(MACHTYPE)/jkhgap.a: $(O)