--- ray/src/util/Rmakefile	2003/11/10 16:52:24	2.36
+++ ray/src/util/Rmakefile	2004/11/05 03:31:39	2.39
@@ -1,4 +1,4 @@
-# RCSid: $Id: Rmakefile,v 2.36 2003/11/10 16:52:24 greg Exp $
+# RCSid: $Id: Rmakefile,v 2.39 2004/11/05 03:31:39 greg Exp $
 #
 # Radiance makefile for utility programs
 #
@@ -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
@@ -98,26 +89,13 @@ 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 \
 ../common/rtmath.h ../common/mat4.h ../common/fvect.h \
-../common/rterror.h \
+../common/rterror.h ../common/tifftypes.h \
 ../common/view.h ../common/color.h setscan.h
 
 glaresrc.o:	../common/linregr.h
@@ -127,12 +105,10 @@ rpiece.o:	../common/color.h ../common/view.h ../common
 rad.o ranimate.o rpiece.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/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
@@ -152,7 +128,7 @@ rad.o ranimate.o ranimove.o:	../common/view.h ../commo
 glrad.o:	../common/radogl.h \
 ../common/standard.h ../common/rtmisc.h ../common/rtio.h \
 ../common/rtmath.h ../common/mat4.h ../common/fvect.h \
-../common/rterror.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
@@ -163,7 +139,7 @@ ranimove.o ranimove1.o ranimove2.o:	ranimove.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/rterror.h ../common/tifftypes.h
 
 Version.c:	../rt/Version.c
 	cp ../rt/Version.c .