--- ray/src/util/Rmakefile	1998/06/09 16:19:02	2.28
+++ ray/src/util/Rmakefile	2003/06/27 06:53:23	2.35
@@ -1,5 +1,5 @@
+# RCSid: $Id: Rmakefile,v 2.35 2003/06/27 06:53:23 greg Exp $
 #
-# SCCSid "$SunId$ SGI"
 # Radiance makefile for utility programs
 #
 
@@ -7,7 +7,7 @@ MACH = -DBSD
 
 OPT = -O
 
-CFLAGS = $(MACH) $(OPT) -I../common -L../lib
+CFLAGS = -I../common -I../rt -L../lib $(OPT) $(MACH)
 
 CC = cc
 
@@ -17,12 +17,13 @@ INSTDIR = /usr/local/bin
 
 LIBDIR = /usr/local/lib/ray
 
-PROGS = findglare xglaresrc glarendx rpiece rad ranimate vwright getinfo vwrays
+PROGS = findglare glarendx rpiece rad ranimate ranimove vwright getinfo \
+		vwrays xglaresrc
 
-all:	$(PROGS) $(SPECIAL)
+all:	$(PROGS)
 
-install:	all objview.csh objpict.csh glare.csh dayfact.csh rlux.csh \
-raddepend.csh trad.wsh objline.csh compamb.csh
+install:	all $(SPECIAL) objview.csh objpict.csh glare.csh dayfact.csh \
+rlux.csh raddepend.csh trad.wsh objline.csh compamb.csh
 	cp $(PROGS) $(INSTDIR)
 	cp objview.csh $(INSTDIR)/objview
 	cp objline.csh $(INSTDIR)/objline
@@ -33,14 +34,15 @@ raddepend.csh trad.wsh objline.csh compamb.csh
 	cp rlux.csh $(INSTDIR)/rlux
 	cp raddepend.csh $(INSTDIR)/raddepend
 	cp compamb.csh $(INSTDIR)/compamb
+	cp vinfo.csh $(INSTDIR)/vinfo
 	chmod 755 $(INSTDIR)/objview $(INSTDIR)/objpict \
 		$(INSTDIR)/glare $(INSTDIR)/dayfact $(INSTDIR)/debugcal \
 		$(INSTDIR)/rlux $(INSTDIR)/raddepend $(INSTDIR)/objline \
-		$(INSTDIR)/compamb
+		$(INSTDIR)/compamb $(INSTDIR)/vinfo
 	csh -f tradinstall.csh $(INSTDIR) $(LIBDIR)/tcl
 
 clean:
-	set nonomatch; rm -f *.o $(PROGS) core
+	set nonomatch; rm -f *.o $(PROGS) glrad core
 
 ogl:	glrad
 	cp glrad $(INSTDIR)
@@ -76,6 +78,10 @@ rad:	rad.o
 ranimate:	ranimate.o netproc.o
 	$(CC) $(CFLAGS) -o ranimate ranimate.o netproc.o -lrt -lm
 
+ranimove:	ranimove.o ranimove1.o ranimove2.o
+	$(CC) $(CFLAGS) -o ranimove ranimove.o ranimove1.o ranimove2.o \
+-lraycalls -lradiance -lrt -lm
+
 rpiece:	rpiece.o Version.o
 	$(CC) $(CFLAGS) -o rpiece rpiece.o Version.o -lrt -lm
 
@@ -89,7 +95,8 @@ getinfo:	getinfo.o
 	$(CC) $(CFLAGS) -o getinfo getinfo.o -lrt
 
 glrad:	glrad.o
-	$(CC) $(CFLAGS) -o glrad glrad.o -lrgl -lrt -lGLU -lGL -lX11 -lm
+	$(CC) $(CFLAGS) -o glrad glrad.o -lrgl -lrt -lGLU -lGL \
+-lX11 -lXext -lm
 
 contour:	contour.o
 	$(CC) $(CFLAGS) -o contour contour.o -lm
@@ -107,15 +114,20 @@ 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/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
+../common/rtmisc.h ../common/rtio.h \
+../common/rtmath.h ../common/mat4.h ../common/fvect.h \
+../common/rterror.h
 
 xglaresrc.o:	../common/view.h
 
@@ -127,16 +139,36 @@ xglaresrc.o:	../common/vfork.h
 
 rad.o ranimate.o:	../common/vars.h
 
+ranimove1.o ranimove2.o:	../common/random.h
+
 rad.o:	../common/paths.h
 
 ranimate.o netproc.o:	netproc.h
 
+ranimove1.o:	../common/otypes.h
+
 netproc.o:	../common/paths.h
 
-rad.o ranimate.o:	../common/view.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/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/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
+
+Version.c:	../rt/Version.c
+	cp ../rt/Version.c .
+
+x11findwind.c:	../common/x11findwind.c
+	cp ../common/x11findwind.c .