--- ray/src/util/Rmakefile	2014/04/15 22:36:25	2.71
+++ ray/src/util/Rmakefile	2014/05/31 05:02:37	2.74
@@ -1,4 +1,4 @@
-# RCSid: $Id: Rmakefile,v 2.71 2014/04/15 22:36:25 greg Exp $
+# RCSid: $Id: Rmakefile,v 2.74 2014/05/31 05:02:37 greg Exp $
 #
 # Radiance makefile for utility programs
 #
@@ -21,14 +21,16 @@ LIBDIR = /usr/local/lib/ray
 
 PROGS = findglare glarendx rpiece rad ranimate ranimove vwright getinfo \
 		vwrays xglaresrc rsensor dctimestep rttree_reduce rcollate \
-		eplus_adduvf
+		eplus_adduvf rmtxop
 
+LIBFILES = rambpos.cal ambpos.cal tregsamp.dat
+
 all:	$(PROGS)
 
 install:	all $(SPECIAL) objview.pl objpict.pl glare.csh dayfact.csh \
 rlux.csh raddepend.csh trad.wsh objline.csh compamb.csh vinfo.csh \
-ltview.pl ltpict.pl genambpos.csh fieldcomb.csh genklemsamp.pl \
-genskyvec.pl genBSDF.pl tregsamp.dat
+ltview.pl ltpict.pl genambpos.pl fieldcomb.csh genklemsamp.pl \
+genskyvec.pl genBSDF.pl $(LIBFILES)
 	cp $(PROGS) $(INSTDIR)
 	cp objview.pl $(INSTDIR)/objview
 	cp objline.csh $(INSTDIR)/objline
@@ -40,7 +42,7 @@ genskyvec.pl genBSDF.pl tregsamp.dat
 	cp raddepend.csh $(INSTDIR)/raddepend
 	cp compamb.csh $(INSTDIR)/compamb
 	cp vinfo.csh $(INSTDIR)/vinfo
-	cp genambpos.csh $(INSTDIR)/genambpos
+	cp genambpos.pl $(INSTDIR)/genambpos
 	cp fieldcomb.csh $(INSTDIR)/fieldcomb
 	cp genklemsamp.pl $(INSTDIR)/genklemsamp
 	cp genskyvec.pl $(INSTDIR)/genskyvec
@@ -51,11 +53,12 @@ genskyvec.pl genBSDF.pl tregsamp.dat
 		glare dayfact debugcal rlux raddepend objline \
 		compamb vinfo genambpos fieldcomb genklemsamp \
 		genskyvec genBSDF
-	cp tregsamp.dat $(LIBDIR)
+	cd $(LIBDIR) && rm -f $(LIBFILES)
+	cp $(LIBFILES) $(LIBDIR)
 	csh -f tradinstall.csh $(INSTDIR) $(LIBDIR)/tcl
 
 clean:
-	set nonomatch; rm -f *.o $(PROGS) glrad core Version.c x11findwind.c
+	set nonomatch; rm -f *.o $(PROGS) glrad Version.c x11findwind.c
 
 ogl:	glrad
 	cp glrad $(INSTDIR)
@@ -119,6 +122,10 @@ eplus_adduvf:	eplus_adduvf.o eplus_idf.o
 	$(CC) $(CFLAGS) -o eplus_adduvf eplus_adduvf.o eplus_idf.o \
 -lrtrad $(MLIB)
 
+rmtxop:	rmtxop.o rmatrix.o cmatrix.o cmbsdf.o
+	$(CC) $(CFLAGS) -o rmtxop rmtxop.o rmatrix.o cmatrix.o cmbsdf.o \
+-lrtrad $(MLIB)
+
 setscan.o:	setscan.h
 
 eplus_adduvf.o:	../common/triangulate.h ../common/rtprocess.h \
@@ -211,3 +218,7 @@ x11findwind.c:	../common/x11findwind.c
 	cp ../common/x11findwind.c .
 
 rttree_reduce.o:	../common/rtio.h ../common/rterror.h
+
+rmatrix.o:	rmatrix.h cmatrix.h ../common/resolu.h
+
+rmtxop.o:	rmatrix.h cmatrix.h ../common/rtio.h ../common/resolu.h