5aa41d849c2e4e5c42e9c949e1b6743148905f81 kent Thu Jun 17 16:46:30 2010 -0700 Rearranging things so that hgTracks.c module is not so severely changed by the web service stuff. diff --git src/hg/hgTracks/makefile src/hg/hgTracks/makefile index e57f1a9..d1e3e4b 100644 --- src/hg/hgTracks/makefile +++ src/hg/hgTracks/makefile @@ -8,8 +8,8 @@ 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 doMiddle.o \ - expRatioTracks.o factorSource.o goldTrack.o loweLabTracks.o \ + coverageTrack.o cytoBandTrack.o cutterTrack.o \ + expRatioTracks.o factorSource.o hgTracks.o goldTrack.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 \ @@ -17,7 +17,7 @@ rnaFoldTrack.o retroGene.o hapmapTrack.o rnaPLFoldTrack.o\ wiki.o wikiTrack.o imageV2.o -O = $A.o ${COMMONO} +O = mainMain.o ${COMMONO} include ../../inc/cgi_build_rules.mk @@ -37,11 +37,17 @@ mgsc: strip mv $A ${CGI_BIN}/$A -compile: $O +RENDERO = renderMain.o ${COMMONO} +RENDERA = ${CGI_BIN}/hgRenderTracks + +compile: compileMain ${RENDERA} + +compileMain: $O ${CC} -o $A $O ${MYLIBS} ${L} -hgTrackRender: hgTrackRender.o ${COMMONO} - ${CC} -o hgTrackRender hgTrackRender.o ${COMMONO} ${MYLIBS} ${L} +${RENDERA}: ${RENDERO} + ${CC} -o ${RENDERA} ${RENDERO} ${MYLIBS} ${L} +# mv ${RENDERA} ${CGI_BIN}/ wigTrack.o: wigCommon.h bedGraph.o: wigCommon.h