--- ray/src/util/Rmakefile	2003/06/06 18:38:19	2.34
+++ ray/src/util/Rmakefile	2005/05/26 17:53:28	2.41
@@ -1,4 +1,4 @@
-# RCSid: $Id: Rmakefile,v 2.34 2003/06/06 18:38:19 greg Exp $
+# RCSid: $Id: Rmakefile,v 2.41 2005/05/26 17:53:28 greg Exp $
 #
 # Radiance makefile for utility programs
 #
@@ -18,7 +18,7 @@ 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)
 
@@ -35,10 +35,11 @@ rlux.csh raddepend.csh trad.wsh objline.csh compamb.cs
 	cp raddepend.csh $(INSTDIR)/raddepend
 	cp compamb.csh $(INSTDIR)/compamb
 	cp vinfo.csh $(INSTDIR)/vinfo
+	cp genambpos.csh $(INSTDIR)/genambpos
 	chmod 755 $(INSTDIR)/objview $(INSTDIR)/objpict \
 		$(INSTDIR)/glare $(INSTDIR)/dayfact $(INSTDIR)/debugcal \
 		$(INSTDIR)/rlux $(INSTDIR)/raddepend $(INSTDIR)/objline \
-		$(INSTDIR)/compamb $(INSTDIR)/vinfo
+		$(INSTDIR)/compamb $(INSTDIR)/vinfo $(INSTDIR)/genambpos
 	csh -f tradinstall.csh $(INSTDIR) $(LIBDIR)/tcl
 
 clean:
@@ -47,20 +48,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
@@ -85,6 +76,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
 
@@ -98,40 +92,32 @@ 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/mat4.h \
-../common/fvect.h ../common/view.h ../common/color.h setscan.h
+glaresrc.o:	glare.h ../common/standard.h \
+../common/rtmisc.h ../common/rtio.h \
+../common/rtmath.h ../common/mat4.h ../common/fvect.h \
+../common/rterror.h ../common/tifftypes.h \
+../common/view.h ../common/color.h setscan.h
 
 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 \
-../common/mat4.h ../common/fvect.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
 
-xglaresrc.o:	../common/vfork.h
-
 rad.o ranimate.o:	../common/vars.h
 
 ranimove1.o ranimove2.o:	../common/random.h
@@ -147,15 +133,20 @@ netproc.o:	../common/paths.h
 rad.o ranimate.o ranimove.o:	../common/view.h ../common/resolu.h
 
 glrad.o:	../common/radogl.h \
-../common/standard.h ../common/mat4.h ../common/fvect.h \
+../common/standard.h ../common/rtmisc.h ../common/rtio.h \
+../common/rtmath.h ../common/mat4.h ../common/fvect.h \
+../common/rterror.h ../common/tifftypes.h \
 ../common/color.h ../common/object.h ../common/otypes.h ../common/lookup.h
 
 glrad.o:	glradicon.h ../common/view.h ../common/paths.h
 
 ranimove.o ranimove1.o ranimove2.o:	ranimove.h \
 ../common/vars.h ../common/view.h \
-../rt/ray.h ../common/standard.h ../common/octree.h \
-../common/mat4.h ../common/fvect.h ../common/object.h ../common/color.h
+../rt/ray.h ../common/octree.h \
+../common/object.h ../common/color.h \
+../common/standard.h ../common/rtmisc.h ../common/rtio.h \
+../common/rtmath.h ../common/mat4.h ../common/fvect.h \
+../common/rterror.h ../common/tifftypes.h
 
 Version.c:	../rt/Version.c
 	cp ../rt/Version.c .