--- ray/src/util/Rmakefile 2004/11/05 03:31:39 2.39 +++ ray/src/util/Rmakefile 2005/09/02 04:15:42 2.42 @@ -1,4 +1,4 @@ -# RCSid: $Id: Rmakefile,v 2.39 2004/11/05 03:31:39 greg Exp $ +# RCSid: $Id: Rmakefile,v 2.42 2005/09/02 04:15:42 greg Exp $ # # Radiance makefile for utility programs # @@ -18,12 +18,13 @@ INSTDIR = /usr/local/bin LIBDIR = /usr/local/lib/ray PROGS = findglare glarendx rpiece rad ranimate ranimove vwright getinfo \ - vwrays xglaresrc + vwrays xglaresrc rtcontrib all: $(PROGS) install: all $(SPECIAL) objview.csh objpict.csh glare.csh dayfact.csh \ -rlux.csh raddepend.csh trad.wsh objline.csh compamb.csh +rlux.csh raddepend.csh trad.wsh objline.csh compamb.csh vinfo.csh \ +genambpos.csh fieldcomb.csh cp $(PROGS) $(INSTDIR) cp objview.csh $(INSTDIR)/objview cp objline.csh $(INSTDIR)/objline @@ -36,10 +37,12 @@ rlux.csh raddepend.csh trad.wsh objline.csh compamb.cs cp compamb.csh $(INSTDIR)/compamb cp vinfo.csh $(INSTDIR)/vinfo cp genambpos.csh $(INSTDIR)/genambpos + cp fieldcomb.csh $(INSTDIR)/fieldcomb chmod 755 $(INSTDIR)/objview $(INSTDIR)/objpict \ $(INSTDIR)/glare $(INSTDIR)/dayfact $(INSTDIR)/debugcal \ $(INSTDIR)/rlux $(INSTDIR)/raddepend $(INSTDIR)/objline \ - $(INSTDIR)/compamb $(INSTDIR)/vinfo $(INSTDIR)/genambpos + $(INSTDIR)/compamb $(INSTDIR)/vinfo $(INSTDIR)/genambpos \ + $(INSTDIR)/fieldcomb csh -f tradinstall.csh $(INSTDIR) $(LIBDIR)/tcl clean: @@ -76,6 +79,9 @@ ranimove: ranimove.o ranimove1.o ranimove2.o rpiece: rpiece.o Version.o $(CC) $(CFLAGS) -o rpiece rpiece.o Version.o -lrt -lm +rtcontrib: rtcontrib.o Version.o + $(CC) $(CFLAGS) -o rtcontrib rtcontrib.o Version.o -lrt -lm + vwright: vwright.o $(CC) $(CFLAGS) -o vwright vwright.o -lrt -lm @@ -102,7 +108,11 @@ glaresrc.o: ../common/linregr.h rpiece.o: ../common/color.h ../common/view.h ../common/resolu.h -rad.o ranimate.o rpiece.o xglaresrc.o: ../common/standard.h \ +rtcontrib.o: ../common/platform.h ../common/rtprocess.h \ +../common/color.h ../common/resolu.h ../common/lookup.h \ +../common/calcomp.h ../common/selcall.h + +rad.o ranimate.o rpiece.o rtcontrib.o xglaresrc.o: ../common/standard.h \ ../common/rtmisc.h ../common/rtio.h \ ../common/rtmath.h ../common/mat4.h ../common/fvect.h \ ../common/rterror.h ../common/tifftypes.h