--- ray/src/hd/Rmakefile	1997/12/22 17:42:02	3.8
+++ ray/src/hd/Rmakefile	1998/01/06 17:19:51	3.13
@@ -16,9 +16,10 @@ DEVDIR = $(INSTDIR)/dev
 
 LIBDIR = /usr/local/lib/ray
 
-PROGS = rholo rhcopy
+PROGS = rholo rhcopy genrhenv genrhgrid
 
-DEVS = $(DEVDIR)/x11.hdi $(DEVDIR)/x11h.hdi
+DEVS = $(DEVDIR)/x11.hdi $(DEVDIR)/x11h.hdi \
+$(DEVDIR)/glx.hdi $(DEVDIR)/glxh.hdi
 
 all:	$(PROGS)
 
@@ -35,15 +36,30 @@ holo.o holofile.o Version.o -lrt -lm
 rhcopy:	rhcopy.o holo.o holofile.o
 	$(CC) $(CFLAGS) -o rhcopy rhcopy.o holo.o holofile.o -lrt -lm
 
+genrhenv:	genrhenv.o holo.o holofile.o
+	$(CC) $(CFLAGS) -o genrhenv genrhenv.o holo.o holofile.o -lrt -lm
+
+genrhgrid:	genrhgrid.o holo.o
+	$(CC) $(CFLAGS) -o genrhgrid genrhgrid.o holo.o -lrt -lm
+
 $(DEVDIR)/x11h.hdi:	$(DEVDIR)/x11.hdi
 	rm -f $(DEVDIR)/x11h.hdi
 	ln $(DEVDIR)/x11.hdi $(DEVDIR)/x11h.hdi
 
 $(DEVDIR)/x11.hdi:	rhdisp.o rhdisp2.o rhdisp3.o rhd_x11.o rhd_qtree.o \
-rhd_qtree2r.o rhd_ctab.o holo.o
+rhd_qtree2r.o rhd_ctab.o dircode.o holo.o
 	$(CC) $(CFLAGS) -o $(DEVDIR)/x11.hdi rhdisp.o rhdisp2.o rhdisp3.o \
-rhd_x11.o rhd_qtree.o rhd_qtree2r.o rhd_ctab.o holo.o -lrt -lX11 -lm
+rhd_x11.o rhd_qtree.o rhd_qtree2r.o rhd_ctab.o holo.o dircode.o -lrt -lX11 -lm
 
+$(DEVDIR)/glxh.hdi:	$(DEVDIR)/glx.hdi
+	rm -f $(DEVDIR)/glxh.hdi
+	ln $(DEVDIR)/glx.hdi $(DEVDIR)/glxh.hdi
+
+$(DEVDIR)/glx.hdi:	rhdisp.o rhdisp2.o rhdisp3.o rhd_glx.o \
+rhd_qtree.o rhd_qtree2c.o dircode.o holo.o
+	$(CC) $(CFLAGS) -o $(DEVDIR)/glx.hdi rhdisp.o rhdisp2.o rhdisp3.o \
+rhd_glx.o holo.o rhd_qtree.o rhd_qtree2c.o dircode.o -lrt -lGLU -lGL -lX11 -lm
+
 rholo.o rholo2.o rholo2l.o rholo3.o rholo4.o \
 rhdisp.o rhdisp2.o rhdisp3.o:	rholo.h
 
@@ -56,7 +72,7 @@ rhdisp.o rhdisp2.o:	rhdisp.h rhdriver.h ../common/view
 
 rhdisp3.o:	rhdisp.h ../common/view.h
 
-holo.o holofile.o rhdisp.o rhdisp2.o rhdisp3.o \
+holo.o holofile.o rhdisp.o rhdisp2.o rhdisp3.o genrhenv.o genrhgrid.o \
 rhcopy.o 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
@@ -65,10 +81,12 @@ rhcopy.o:	../common/resolu.h
 
 rhcopy.o:	../common/view.h
 
-rhd_x11.o rhd_qtree.o rhd_qtree2r.o:	../common/standard.h \
+rhd_glx.o 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_qtree2r.o:	rhd_qtree.h rhdriver.h \
+rhd_glx.o 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
+rhd_glx.o rhd_x11.o:	x11icon.h
+
+dircode.o:	../common/fvect.h