--- ray/src/util/Rmakefile	1991/10/23 10:48:43	1.14
+++ ray/src/util/Rmakefile	2004/05/19 14:44:06	2.37
@@ -1,57 +1,113 @@
+# RCSid: $Id: Rmakefile,v 2.37 2004/05/19 14:44:06 greg Exp $
 #
-# SCCSid "$SunId$ LBL"
+# Radiance makefile for utility programs
 #
 
-MACH = -DBSD -DSTRUCTASSIGN
+MACH = -DBSD
 
 OPT = -O
 
-CFLAGS = $(MACH) $(OPT) -I../common -L../lib
+CFLAGS = -I../common -I../rt -L../lib $(OPT) $(MACH)
 
+CC = cc
+
+SPECIAL =
+
 INSTDIR = /usr/local/bin
 
-PROGS = findglare xglaresrc glarendx
+LIBDIR = /usr/local/lib/ray
 
+PROGS = findglare glarendx rpiece rad ranimate ranimove vwright getinfo \
+		vwrays xglaresrc
+
 all:	$(PROGS)
 
-install:	all objview.csh objpict.csh proj.csh glare.csh dayfact.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
 	cp objpict.csh $(INSTDIR)/objpict
 	cp glare.csh $(INSTDIR)/glare
 	cp dayfact.csh $(INSTDIR)/dayfact
+	cp debugcal.csh $(INSTDIR)/debugcal
+	cp rlux.csh $(INSTDIR)/rlux
+	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)/glare $(INSTDIR)/dayfact $(INSTDIR)/debugcal \
+		$(INSTDIR)/rlux $(INSTDIR)/raddepend $(INSTDIR)/objline \
+		$(INSTDIR)/compamb $(INSTDIR)/vinfo $(INSTDIR)/genambpos
+	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)
+
+x10:
+
+aed:
+
+sgi:
+
+sun:
+
 scanner:	scanner.o
-	cc $(CFLAGS) -o scanner scanner.o -lm
+	$(CC) $(CFLAGS) -o scanner scanner.o -lm
 
 makedist:	makedist.o setscan.o
-	cc $(CFLAGS) -o makedist makedist.o setscan.o -lrt -lm
+	$(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 \
+	$(CC) $(CFLAGS) -o findglare findglare.o glareval.o glaresrc.o \
 setscan.o -lrt -lm
 
 glarendx:	glarendx.o
-	cc $(CFLAGS) -o glarendx glarendx.o -lrt -lm
+	$(CC) $(CFLAGS) -o glarendx glarendx.o -lrt -lm
 
 xglaresrc:	xglaresrc.o x11findwind.o
-	cc $(CFLAGS) -o xglaresrc xglaresrc.o \
+	$(CC) $(CFLAGS) -o xglaresrc xglaresrc.o \
 x11findwind.o -lrt -lX11 -lm
 
+rad:	rad.o
+	$(CC) $(CFLAGS) -o rad rad.o -lrt -lm
+
+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
+
+vwright:	vwright.o
+	$(CC) $(CFLAGS) -o vwright vwright.o -lrt -lm
+
+vwrays:		vwrays.o
+	$(CC) $(CFLAGS) -o vwrays vwrays.o -lrt -lm
+
+getinfo:	getinfo.o
+	$(CC) $(CFLAGS) -o getinfo getinfo.o -lrt
+
+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
+	$(CC) $(CFLAGS) -o contour contour.o -lm
 
 pranim:	pranim.o client/libclient.a
-	cc $(CFLAGS) -o pranim pranim.o \
+	$(CC) $(CFLAGS) -o pranim pranim.o \
 client/libclient.a -lrpcsvc
 
 t16anim:	t16anim.o client/libclient.a
-	cc $(CFLAGS) -o t16anim t16anim.o \
+	$(CC) $(CFLAGS) -o t16anim t16anim.o \
 client/libclient.a -lrpcsvc
 
 t16anim.o pranim.o:	client/clnt.h
@@ -59,12 +115,59 @@ 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
 
-image.o xglaresrc.o:	../common/standard.h ../common/mat4.h \
-../common/fvect.h ../common/view.h
+rpiece.o:	../common/color.h ../common/view.h ../common/resolu.h
 
+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
+
+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
+
+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 ranimove.o:	../common/view.h ../common/resolu.h
+
+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/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 .