--- ray/src/util/Rmakefile	2006/03/10 19:40:14	2.44
+++ ray/src/util/Rmakefile	2009/06/16 04:54:08	2.52
@@ -1,4 +1,4 @@
-# RCSid: $Id: Rmakefile,v 2.44 2006/03/10 19:40:14 schorsch Exp $
+# RCSid: $Id: Rmakefile,v 2.52 2009/06/16 04:54:08 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,13 +20,13 @@ INSTDIR = /usr/local/bin
 LIBDIR = /usr/local/lib/ray
 
 PROGS = findglare glarendx rpiece rad ranimate ranimove vwright getinfo \
-		vwrays xglaresrc rtcontrib
+		vwrays xglaresrc rtcontrib rsensor
 
 all:	$(PROGS)
 
 install:	all $(SPECIAL) objview.csh objpict.csh glare.csh dayfact.csh \
 rlux.csh raddepend.csh trad.wsh objline.csh compamb.csh vinfo.csh \
-genambpos.csh fieldcomb.csh
+genambpos.csh fieldcomb.csh genklemsamp.pl gentregvec.pl tregsamp.dat
 	cp $(PROGS) $(INSTDIR)
 	cp objview.csh $(INSTDIR)/objview
 	cp objline.csh $(INSTDIR)/objline
@@ -38,15 +40,16 @@ genambpos.csh fieldcomb.csh
 	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)/fieldcomb
+	cp genklemsamp.pl $(INSTDIR)/genklemsamp
+	cp gentregvec.pl $(INSTDIR)/gentregvec
+	cd $(INSTDIR) ; chmod 755 objview objpict \
+		glare dayfact debugcal rlux raddepend objline \
+		compamb vinfo genambpos fieldcomb genklemsamp gentregvec
+	cp tregsamp.dat $(LIBDIR)
 	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)
@@ -57,43 +60,47 @@ sun:
 
 findglare:	findglare.o glareval.o glaresrc.o setscan.o
 	$(CC) $(CFLAGS) -o findglare findglare.o glareval.o glaresrc.o \
-setscan.o -lrtrad -lm
+setscan.o -lrtrad $(MLIB)
 
 glarendx:	glarendx.o
-	$(CC) $(CFLAGS) -o glarendx glarendx.o -lrtrad -lm
+	$(CC) $(CFLAGS) -o glarendx glarendx.o -lrtrad $(MLIB)
 
 xglaresrc:	xglaresrc.o x11findwind.o
 	$(CC) $(CFLAGS) -o xglaresrc xglaresrc.o \
-x11findwind.o -lrtrad -lX11 -lm
+x11findwind.o -lrtrad -lX11 $(MLIB)
 
 rad:	rad.o
-	$(CC) $(CFLAGS) -o rad rad.o -lrtrad -lm
+	$(CC) $(CFLAGS) -o rad rad.o -lrtrad $(MLIB)
 
 ranimate:	ranimate.o netproc.o
-	$(CC) $(CFLAGS) -o ranimate ranimate.o netproc.o -lrtrad -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 -lrtrad -lm
+-lraycalls -lradiance -lrtrad $(MLIB)
 
+rsensor:	rsensor.o
+	$(CC) $(CFLAGS) -o rsensor rsensor.o \
+-lraycalls -lradiance -lrtrad $(MLIB)
+
 rpiece:	rpiece.o Version.o
-	$(CC) $(CFLAGS) -o rpiece rpiece.o Version.o -lrtrad -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 -lm
+	$(CC) $(CFLAGS) -o rtcontrib rtcontrib.o Version.o -lrtrad $(MLIB)
 
 vwright:	vwright.o
-	$(CC) $(CFLAGS) -o vwright vwright.o -lrtrad -lm
+	$(CC) $(CFLAGS) -o vwright vwright.o -lrtrad $(MLIB)
 
 vwrays:		vwrays.o
-	$(CC) $(CFLAGS) -o vwrays vwrays.o -lrtrad -lm
+	$(CC) $(CFLAGS) -o vwrays vwrays.o -lrtrad $(MLIB)
 
 getinfo:	getinfo.o
 	$(CC) $(CFLAGS) -o getinfo getinfo.o -lrtrad
 
 glrad:	glrad.o
 	$(CC) $(CFLAGS) -o glrad glrad.o -lrgl -lrtrad -lGLU -lGL \
--lX11 -lXext -lm
+-lX11 -lXext $(MLIB)
 
 setscan.o:	setscan.h
 
@@ -101,8 +108,7 @@ 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/tifftypes.h \
-../common/view.h ../common/color.h setscan.h
+../common/rterror.h ../common/view.h ../common/color.h setscan.h
 
 glaresrc.o:	../common/linregr.h
 
@@ -115,7 +121,7 @@ rtcontrib.o:	../common/platform.h ../common/rtprocess.
 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/tifftypes.h
+../common/rterror.h
 
 xglaresrc.o:	../common/view.h
 
@@ -137,8 +143,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/tifftypes.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
@@ -149,7 +154,15 @@ 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/tifftypes.h
+../common/rterror.h
+
+rsensor.o:	../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
+
+rsensor.o:	../common/view.h ../common/resolu.h ../rt/source.h
 
 Version.c:	../rt/Version.c
 	cp ../rt/Version.c .