--- ray/src/util/Rmakefile	1991/06/05 10:04:13	1.11
+++ ray/src/util/Rmakefile	1995/06/27 12:29:39	2.15
@@ -1,59 +1,90 @@
 #
 # SCCSid "$SunId$ LBL"
+# Radiance makefile for utility programs
 #
 
-MACH = -f68881 /usr/lib/libm.il -DIEEE -DBSD -DSTRUCTASSIGN
+MACH = -DBSD
 
 OPT = -O
 
-CFLAGS = $(MACH) $(OPT)
+CFLAGS = $(MACH) $(OPT) -I../common -L../lib
 
-INSTDIR = /lumen/lumen/ray/bin.sun3
+CC = cc
 
-PROGS = makedist swaprasheader findglare xglaresrc glarendx
+INSTDIR = /usr/local/bin
 
+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)/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
 
 scanner:	scanner.o
-	cc $(CFLAGS) -o scanner scanner.o -lm
+	$(CC) $(CFLAGS) -o scanner scanner.o -lm
 
-makedist:	makedist.o fvect.o setscan.o
-	cc $(CFLAGS) -o makedist makedist.o fvect.o setscan.o -lm
+makedist:	makedist.o setscan.o
+	$(CC) $(CFLAGS) -o makedist makedist.o setscan.o -lrt -lm
 
-findglare:	findglare.o glareval.o glaresrc.o color.o fvect.o image.o \
-header.o resolu.o setscan.o linregr.o
-	cc $(CFLAGS) -o findglare findglare.o glareval.o glaresrc.o \
-color.o fvect.o image.o header.o resolu.o setscan.o linregr.o -lm
+findglare:	findglare.o glareval.o glaresrc.o setscan.o
+	$(CC) $(CFLAGS) -o findglare findglare.o glareval.o glaresrc.o \
+setscan.o -lrt -lm
 
-glarendx:	glarendx.o image.o header.o erf.o fvect.o resolu.o
-	cc $(CFLAGS) -o glarendx glarendx.o image.o header.o fvect.o \
-erf.o resolu.o -lm
+glarendx:	glarendx.o
+	$(CC) $(CFLAGS) -o glarendx glarendx.o -lrt -lm
 
-xglaresrc:	xglaresrc.o fvect.o image.o resolu.o header.o x11findwind.o
-	cc $(CFLAGS) -o xglaresrc xglaresrc.o fvect.o image.o \
-header.o resolu.o x11findwind.o -lm -lX11
+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
+	$(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
@@ -61,14 +92,20 @@ t16anim.o pranim.o:	client/clnt.h
 setscan.o makedist.o:	setscan.h
 
 findglare.o glareval.o \
-glaresrc.o:	glare.h standard.h mat4.h fvect.h view.h color.h setscan.h
+glaresrc.o:	glare.h ../common/standard.h ../common/mat4.h \
+../common/fvect.h ../common/view.h ../common/color.h setscan.h
 
-glaresrc.o linregr.o:	linregr.h
+glaresrc.o:	../common/linregr.h
 
-image.o xglaresrc.o:	standard.h mat4.h fvect.h view.h
+rpiece.o:	../common/color.h ../common/view.h ../common/resolu.h
 
-fvect.o:	fvect.h
+rad.o rpiece.o xglaresrc.o:	../common/standard.h \
+../common/mat4.h ../common/fvect.h
 
-resolu.o:	color.h
+xglaresrc.o:	../common/view.h
 
-swaprasheader.o:	rasterfile.h
+swaprasheader.o:	../common/rasterfile.h
+
+glareval.o xglaresrc.o:	../common/resolu.h
+
+xglaresrc.o:	../common/vfork.h