--- ray/src/util/Rmakefile	2004/05/19 14:44:06	2.37
+++ ray/src/util/Rmakefile	2008/02/07 23:02:14	2.47
@@ -1,4 +1,4 @@
-# RCSid: $Id: Rmakefile,v 2.37 2004/05/19 14:44:06 greg Exp $
+# RCSid: $Id: Rmakefile,v 2.47 2008/02/07 23:02:14 greg Exp $
 #
 # Radiance makefile for utility programs
 #
@@ -9,6 +9,8 @@ OPT = -O
 
 CFLAGS = -I../common -I../rt -L../lib $(OPT) $(MACH)
 
+MLIB = -lm
+
 CC = cc
 
 SPECIAL =
@@ -18,12 +20,13 @@ INSTDIR = /usr/local/bin
 LIBDIR = /usr/local/lib/ray
 
 PROGS = findglare glarendx rpiece rad ranimate ranimove vwright getinfo \
-		vwrays xglaresrc
+		vwrays xglaresrc rtcontrib
 
 all:	$(PROGS)
 
 install:	all $(SPECIAL) objview.csh objpict.csh glare.csh dayfact.csh \
-rlux.csh raddepend.csh trad.wsh objline.csh compamb.csh
+rlux.csh raddepend.csh trad.wsh objline.csh compamb.csh vinfo.csh \
+genambpos.csh fieldcomb.csh
 	cp $(PROGS) $(INSTDIR)
 	cp objview.csh $(INSTDIR)/objview
 	cp objline.csh $(INSTDIR)/objline
@@ -36,109 +39,93 @@ rlux.csh raddepend.csh trad.wsh objline.csh compamb.cs
 	cp compamb.csh $(INSTDIR)/compamb
 	cp vinfo.csh $(INSTDIR)/vinfo
 	cp genambpos.csh $(INSTDIR)/genambpos
+	cp fieldcomb.csh $(INSTDIR)/fieldcomb
 	chmod 755 $(INSTDIR)/objview $(INSTDIR)/objpict \
 		$(INSTDIR)/glare $(INSTDIR)/dayfact $(INSTDIR)/debugcal \
 		$(INSTDIR)/rlux $(INSTDIR)/raddepend $(INSTDIR)/objline \
-		$(INSTDIR)/compamb $(INSTDIR)/vinfo $(INSTDIR)/genambpos
+		$(INSTDIR)/compamb $(INSTDIR)/vinfo $(INSTDIR)/genambpos \
+		$(INSTDIR)/fieldcomb
 	csh -f tradinstall.csh $(INSTDIR) $(LIBDIR)/tcl
 
 clean:
-	set nonomatch; rm -f *.o $(PROGS) glrad core
+	set nonomatch; rm -f *.o $(PROGS) glrad core Version.c x11findwind.c
 
 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
+setscan.o -lrtrad $(MLIB)
 
 glarendx:	glarendx.o
-	$(CC) $(CFLAGS) -o glarendx glarendx.o -lrt -lm
+	$(CC) $(CFLAGS) -o glarendx glarendx.o -lrtrad $(MLIB)
 
 xglaresrc:	xglaresrc.o x11findwind.o
 	$(CC) $(CFLAGS) -o xglaresrc xglaresrc.o \
-x11findwind.o -lrt -lX11 -lm
+x11findwind.o -lrtrad -lX11 $(MLIB)
 
 rad:	rad.o
-	$(CC) $(CFLAGS) -o rad rad.o -lrt -lm
+	$(CC) $(CFLAGS) -o rad rad.o -lrtrad $(MLIB)
 
 ranimate:	ranimate.o netproc.o
-	$(CC) $(CFLAGS) -o ranimate ranimate.o netproc.o -lrt -lm
+	$(CC) $(CFLAGS) -o ranimate ranimate.o netproc.o -lrtrad $(MLIB)
 
 ranimove:	ranimove.o ranimove1.o ranimove2.o
 	$(CC) $(CFLAGS) -o ranimove ranimove.o ranimove1.o ranimove2.o \
--lraycalls -lradiance -lrt -lm
+-lraycalls -lradiance -lrtrad $(MLIB)
 
 rpiece:	rpiece.o Version.o
-	$(CC) $(CFLAGS) -o rpiece rpiece.o Version.o -lrt -lm
+	$(CC) $(CFLAGS) -o rpiece rpiece.o Version.o -lrtrad $(MLIB)
 
+rtcontrib:	rtcontrib.o Version.o
+	$(CC) $(CFLAGS) -o rtcontrib rtcontrib.o Version.o -lrtrad $(MLIB)
+
 vwright:	vwright.o
-	$(CC) $(CFLAGS) -o vwright vwright.o -lrt -lm
+	$(CC) $(CFLAGS) -o vwright vwright.o -lrtrad $(MLIB)
 
 vwrays:		vwrays.o
-	$(CC) $(CFLAGS) -o vwrays vwrays.o -lrt -lm
+	$(CC) $(CFLAGS) -o vwrays vwrays.o -lrtrad $(MLIB)
 
 getinfo:	getinfo.o
-	$(CC) $(CFLAGS) -o getinfo getinfo.o -lrt
+	$(CC) $(CFLAGS) -o getinfo getinfo.o -lrtrad
 
 glrad:	glrad.o
-	$(CC) $(CFLAGS) -o glrad glrad.o -lrgl -lrt -lGLU -lGL \
--lX11 -lXext -lm
+	$(CC) $(CFLAGS) -o glrad glrad.o -lrgl -lrtrad -lGLU -lGL \
+-lX11 -lXext
 
-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
 
 rpiece.o:	../common/color.h ../common/view.h ../common/resolu.h
 
-rad.o ranimate.o rpiece.o xglaresrc.o:	../common/standard.h \
+rtcontrib.o:	../common/platform.h ../common/rtprocess.h \
+../common/color.h ../common/resolu.h ../common/lookup.h \
+../common/calcomp.h ../common/selcall.h
+
+rad.o ranimate.o rpiece.o rtcontrib.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
 
-ranimove1.o ranimove2.o:	../common/random.h
+ranimove1.o ranimove2.o vwrays.o:	../common/random.h
 
 rad.o:	../common/paths.h
 
@@ -153,7 +140,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
@@ -164,7 +151,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 .