--- ray/src/rt/Rmakefile	2023/07/31 23:14:02	2.89
+++ ray/src/rt/Rmakefile	2023/11/17 20:02:07	2.93
@@ -1,4 +1,4 @@
-# RCSid: $Id: Rmakefile,v 2.89 2023/07/31 23:14:02 greg Exp $
+# RCSid: $Id: Rmakefile,v 2.93 2023/11/17 20:02:07 greg Exp $
 #
 # Compiles for ray tracing programs.
 #
@@ -60,8 +60,8 @@ RVSRC = rvmain.c rview.c rv2.c rv3.c $(DSRC)
 RCOBJS = rcmain.o rcontrib.o rc2.o rc3.o
 RCSRC = rcmain.c rcontrib.c rc2.c rc3.c
 
-RATOBJS = ratmain.o ratrace.o RtraceSimulManager.o
-RATSRC = ratmain.cpp ratrace.cpp RtraceSimulManager.cpp
+RATOBJS = rxtmain.o rxtrace.o RtraceSimulManager.o
+RATSRC = rxtmain.cpp rxtrace.cpp RtraceSimulManager.cpp
 
 RLOBJS = raycalls.o raypcalls.o rayfifo.o
 RLSRC = raycalls.c raypcalls.c rayfifo.c
@@ -110,7 +110,7 @@ HEADERS = ambient.h ray.h data.h otspecial.h source.h
 #
 
 PROGS = $(DESTDIR)/rtrace $(DESTDIR)/rpict $(DESTDIR)/rvu $(DESTDIR)/rcontrib \
-$(DESTDIR)/ratrace $(DESTDIR)/lookamb $(DESTDIR)/mkpmap $(DESTDIR)/pmapdump
+$(DESTDIR)/lookamb $(DESTDIR)/mkpmap $(DESTDIR)/pmapdump
 
 all:	$(PROGS) $(RCLIB) $(SPECIAL)
 
@@ -144,8 +144,8 @@ $(RLIB) $(LIBS) $(DLIBS)
 $(DESTDIR)/rcontrib:      $(RCOBJS) $(RLIB)
 	$(CC) $(CFLAGS) -o $(DESTDIR)/rcontrib $(RCOBJS) $(RLIB) $(LIBS)
 
-$(DESTDIR)/ratrace:	$(RATOBJS) $(RCLIB) $(RLIB)
-	$(CXX) $(CXXFLAGS) -o $(DESTDIR)/ratrace $(RATOBJS) $(RCLIB) \
+$(DESTDIR)/rxtrace:	$(RATOBJS) $(RCLIB) $(RLIB)
+	$(CXX) $(CXXFLAGS) -o $(DESTDIR)/rxtrace $(RATOBJS) $(RCLIB) \
 $(RLIB) $(LIBS)
 
 $(DESTDIR)/lookamb:	lookamb.o ambio.o
@@ -213,7 +213,7 @@ initotypes.o m_brdf.o m_bsdf.o m_direct.o m_mirror.o n
 preload.o raycalls.o raytrace.o rtrace.o rv2.o source.o sphere.o \
 srcsupp.o text.o srcdraw.o srcobstr.o virtuals.o:	../common/otypes.h
 
-ambient.o ambcomp.o aniso.o ashikhmin.o normal.o raycalls.o raytrace.o \
+ambient.o ambcomp.o aniso.o ashikhmin.o normal.o p_func.o raycalls.o raytrace.o \
 rpict.o rvmain.o rtmain.o rpmain.o rcmain.o persist.o source.o rv3.o \
 srcsamp.o virtuals.o:	../common/random.h
 
@@ -441,4 +441,4 @@ oocbuild.o: oocbuild.c oocbuild.h oocsort.h oococt.h
 
 oocnn.o: oocnn.c oocnn.h oococt.h oocsort.h
 
-RtraceSimulManager.o ratrace.o:	RtraceSimulManager.h
+RtraceSimulManager.o rxtrace.o:	RtraceSimulManager.h