--- ray/src/util/Rmakefile	2004/10/27 23:23:48	2.38
+++ ray/src/util/Rmakefile	2005/09/19 04:26:09	2.43
@@ -1,4 +1,4 @@
-# RCSid: $Id: Rmakefile,v 2.38 2004/10/27 23:23:48 greg Exp $
+# RCSid: $Id: Rmakefile,v 2.43 2005/09/19 04:26:09 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:
@@ -48,20 +51,10 @@ clean:
 ogl:	glrad
 	cp glrad $(INSTDIR)
 
-x10:
-
-aed:
-
 sgi:
 
 sun:
 
-scanner:	scanner.o
-	$(CC) $(CFLAGS) -o scanner scanner.o -lm
-
-makedist:	makedist.o setscan.o
-	$(CC) $(CFLAGS) -o makedist makedist.o setscan.o -lrt -lm
-
 findglare:	findglare.o glareval.o glaresrc.o setscan.o
 	$(CC) $(CFLAGS) -o findglare findglare.o glareval.o glaresrc.o \
 setscan.o -lrt -lm
@@ -86,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
 
@@ -99,21 +95,8 @@ glrad:	glrad.o
 	$(CC) $(CFLAGS) -o glrad glrad.o -lrgl -lrt -lGLU -lGL \
 -lX11 -lXext -lm
 
-contour:	contour.o
-	$(CC) $(CFLAGS) -o contour contour.o -lm
+setscan.o:	setscan.h
 
-pranim:	pranim.o client/libclient.a
-	$(CC) $(CFLAGS) -o pranim pranim.o \
-client/libclient.a -lrpcsvc
-
-t16anim:	t16anim.o client/libclient.a
-	$(CC) $(CFLAGS) -o t16anim t16anim.o \
-client/libclient.a -lrpcsvc
-
-t16anim.o pranim.o:	client/clnt.h
-
-setscan.o makedist.o:	setscan.h
-
 findglare.o glareval.o \
 glaresrc.o:	glare.h ../common/standard.h \
 ../common/rtmisc.h ../common/rtio.h \
@@ -125,20 +108,22 @@ 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
 
 xglaresrc.o:	../common/view.h
 
-swaprasheader.o:	../common/rasterfile.h
-
 glareval.o xglaresrc.o:	../common/resolu.h
 
 rad.o ranimate.o:	../common/vars.h
 
-ranimove1.o ranimove2.o:	../common/random.h
+ranimove1.o ranimove2.o vwrays.o:	../common/random.h
 
 rad.o:	../common/paths.h