--- ray/src/hd/Rmakefile	1997/11/19 17:05:29	3.2
+++ ray/src/hd/Rmakefile	1997/12/01 16:33:30	3.6
@@ -28,24 +28,26 @@ install:	all $(DEVS)
 clean:
 	set nonomatch; rm -f *.o $(PROGS) core
 
-rholo:	rholo.o rholo2.o rholo2l.o rholo3.o rholo4.o holo.o holofile.o
+rholo:	rholo.o rholo2.o rholo2l.o rholo3.o rholo4.o holo.o holofile.o Version.o
 	$(CC) $(CFLAGS) -o rholo rholo.o rholo2.o rholo2l.o rholo3.o rholo4.o \
-holo.o holofile.o -lrt -lm
+holo.o holofile.o Version.o -lrt -lm
 
 $(DEVDIR)/x11h.hdisp:	$(DEVDIR)/x11.hdisp
 	rm -f $(DEVDIR)/x11h.hdisp
 	ln $(DEVDIR)/x11.hdisp $(DEVDIR)/x11h.hdisp
 
 $(DEVDIR)/x11.hdisp:	rhdisp.o rhdisp2.o rhdisp3.o rhd_x11.o rhd_qtree.o \
-rhd_ctab.o holo.o
+rhd_qtree2r.o rhd_ctab.o holo.o
 	$(CC) $(CFLAGS) -o $(DEVDIR)/x11.hdisp rhdisp.o rhdisp2.o rhdisp3.o \
-rhd_x11.o rhd_qtree.o rhd_ctab.o holo.o -lrt -lX11 -lm
+rhd_x11.o rhd_qtree.o rhd_qtree2r.o rhd_ctab.o holo.o -lrt -lX11 -lm
 
 rholo.o rholo2.o rholo2l.o rholo3.o rholo4.o \
 rhdisp.o rhdisp2.o rhdisp3.o:	rholo.h
 
+rholo2l.o:	../common/paths.h
+
 rholo4.o:	rhdisp.h rholo4.c
-	$(CC) $(CFLAGS) -DDEVPATH=\"$(DEVDIR)\" -c rholo4.c
+	$(CC) $(CFLAGS) -c rholo4.c
 
 rhdisp.o rhdisp2.o:	rhdisp.h rhdriver.h ../common/view.h
 
@@ -56,9 +58,10 @@ rholo.o rholo2.o rholo2l.o rholo3.o rholo4.o:	holo.h \
 ../common/vars.h ../common/color.h \
 ../common/standard.h ../common/mat4.h ../common/fvect.h
 
-rhd_x11.o rhd_qtree.o:	../common/standard.h ../common/mat4.h ../common/fvect.h
+rhd_x11.o rhd_qtree.o rhd_qtree2r.o:	../common/standard.h \
+../common/mat4.h ../common/fvect.h
 
-rhd_x11.o rhd_qtree.o:	rhd_qtree.h rhdriver.h \
+rhd_x11.o rhd_qtree.o rhd_qtree2r.o:	rhd_qtree.h rhdriver.h \
 ../common/tonemap.h ../common/color.h
 
 rhd_x11.o:	x11icon.h