--- ray/src/util/Rmakefile	1992/08/06 17:16:30	2.5
+++ ray/src/util/Rmakefile	1995/06/27 12:29:39	2.15
@@ -1,5 +1,6 @@
 #
 # SCCSid "$SunId$ LBL"
+# Radiance makefile for utility programs
 #
 
 MACH = -DBSD
@@ -12,19 +13,39 @@ CC = cc
 
 INSTDIR = /usr/local/bin
 
-PROGS = findglare xglaresrc glarendx rpiece
+LIBDIR = /usr/local/lib/ray
 
+PROGS = findglare xglaresrc glarendx rpiece rad vwright
+
+TLIBFILES = do_action.tcl do_file.tcl do_options.tcl do_results.tcl \
+		do_scene.tcl do_views.tcl do_zone.tcl \
+		getfile.tcl gethelp.tcl util.tcl tclIndex \
+		trad.hlp help.hlp file.hlp trad.icon
+
 all:	$(PROGS)
 
-install:	all objview.csh objpict.csh proj.csh glare.csh dayfact.csh
+install:	all objview.csh objpict.csh glare.csh dayfact.csh rlux.csh \
+raddepend.csh ivprep.csh ivpict.csh trad.wsh
 	cp $(PROGS) $(INSTDIR)
 	cp objview.csh $(INSTDIR)/objview
 	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 ivprep.csh $(INSTDIR)/ivprep
+	cp ivpict.csh $(INSTDIR)/ivpict
 	chmod 755 $(INSTDIR)/objview $(INSTDIR)/objpict \
-		$(INSTDIR)/glare $(INSTDIR)/dayfact $(INSTDIR)/debugcal
+		$(INSTDIR)/glare $(INSTDIR)/dayfact $(INSTDIR)/debugcal \
+		$(INSTDIR)/rlux $(INSTDIR)/raddepend $(INSTDIR)/ivprep \
+		$(INSTDIR)/ivpict
+	sed -e "1s|/usr/local/bin/wish|`which wish`|" \
+		-e "s|^set radlib .*|set radlib $(LIBDIR)/tcl|" \
+		trad.wsh > $(INSTDIR)/trad
+	chmod 755 $(INSTDIR)/trad
+	cd $(LIBDIR)/tcl ; rm -f $(TLIBFILES)
+	cp $(TLIBFILES) $(LIBDIR)/tcl
 
 clean:
 	set nonomatch; rm -f *.o $(PROGS) core
@@ -46,9 +67,15 @@ xglaresrc:	xglaresrc.o x11findwind.o
 	$(CC) $(CFLAGS) -o xglaresrc xglaresrc.o \
 x11findwind.o -lrt -lX11 -lm
 
+rad:	rad.o
+	$(CC) $(CFLAGS) -o rad rad.o -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
+
 contour:	contour.o
 	$(CC) $(CFLAGS) -o contour contour.o -lm
 
@@ -72,8 +99,8 @@ glaresrc.o:	../common/linregr.h
 
 rpiece.o:	../common/color.h ../common/view.h ../common/resolu.h
 
-rpiece.o xglaresrc.o:	../common/standard.h ../common/mat4.h \
-../common/fvect.h
+rad.o rpiece.o xglaresrc.o:	../common/standard.h \
+../common/mat4.h ../common/fvect.h
 
 xglaresrc.o:	../common/view.h