--- ray/src/hd/Rmakefile	2003/02/22 02:07:24	3.21
+++ ray/src/hd/Rmakefile	2006/03/10 19:40:12	3.27
@@ -1,4 +1,4 @@
-# RCSid: $Id: Rmakefile,v 3.21 2003/02/22 02:07:24 greg Exp $
+# RCSid: $Id: Rmakefile,v 3.27 2006/03/10 19:40:12 schorsch Exp $
 #
 # Radiance makefile for holodeck programs
 #
@@ -47,46 +47,39 @@ sun:
 rholo:	rholo.o rholo2.o rholo2l.o rholo3.o rholo4.o holo.o holofile.o \
 viewbeams.o Version.o
 	$(CC) $(CFLAGS) -o rholo rholo.o rholo2.o rholo2l.o rholo3.o rholo4.o \
-holo.o holofile.o viewbeams.o Version.o -lrt -lm
+holo.o holofile.o viewbeams.o Version.o -lrtrad -lm
 
 rhpict:	rhpict.o rhpict2.o holo.o holofile.o viewbeams.o Version.o
 	$(CC) $(CFLAGS) -o rhpict rhpict.o rhpict2.o holo.o holofile.o \
-viewbeams.o Version.o -lrt -lm
+viewbeams.o Version.o -lrtrad -lm
 
 rhcopy:	rhcopy.o clumpbeams.o holo.o holofile.o
 	$(CC) $(CFLAGS) -o rhcopy rhcopy.o clumpbeams.o \
-holo.o holofile.o -lrt -lm
+holo.o holofile.o -lrtrad -lm
 
 rhoptimize:	rhoptimize.o clumpbeams.o holo.o holofile.o
 	$(CC) $(CFLAGS) -o rhoptimize rhoptimize.o clumpbeams.o \
-holo.o holofile.o -lrt -lm
+holo.o holofile.o -lrtrad -lm
 
 rhinfo:	rhinfo.o holo.o holofile.o
-	$(CC) $(CFLAGS) -o rhinfo rhinfo.o holo.o holofile.o -lrt -lm
+	$(CC) $(CFLAGS) -o rhinfo rhinfo.o holo.o holofile.o -lrtrad -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
+	$(CC) $(CFLAGS) -o genrhgrid genrhgrid.o holo.o -lrtrad -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 viewbeams.o rhd_x11.o rhd_qtree.o \
-rhd_qtree2r.o rhd_ctab.o dircode.o holo.o
+rhd_qtree2r.o rhd_ctab.o holo.o
 	$(CC) $(CFLAGS) -o $(DEVDIR)/x11.hdi rhdisp.o rhdisp2.o viewbeams.o \
-rhd_x11.o rhd_qtree.o rhd_qtree2r.o rhd_ctab.o holo.o dircode.o -lrt -lX11 -lm
+rhd_x11.o rhd_qtree.o rhd_qtree2r.o rhd_ctab.o holo.o -lrtrad -lX11 -lm
 
 $(DEVDIR)/glx1h.hdi:	$(DEVDIR)/glx1.hdi
 	rm -f $(DEVDIR)/glx1h.hdi
 	ln $(DEVDIR)/glx1.hdi $(DEVDIR)/glx1h.hdi
 
-$(DEVDIR)/glxh.hdi:	$(DEVDIR)/glx.hdi
-	rm -f $(DEVDIR)/glxh.hdi
-	ln $(DEVDIR)/glx.hdi $(DEVDIR)/glxh.hdi
-
 $(DEVDIR)/glxoh.hdi:	$(DEVDIR)/glxo.hdi
 	rm -f $(DEVDIR)/glxoh.hdi
 	ln $(DEVDIR)/glxo.hdi $(DEVDIR)/glxoh.hdi
@@ -116,83 +109,34 @@ $(DEVDIR)/oglsoh.hdi:	$(DEVDIR)/oglso.hdi
 	ln $(DEVDIR)/oglso.hdi $(DEVDIR)/oglsoh.hdi
 
 $(DEVDIR)/glx1.hdi:	rhd_glx1.o rhdisp.o rhdisp2.o viewbeams.o \
-rhd_qtree.o rhd_qtree2c.o dircode.o holo.o
+rhd_qtree.o rhd_qtree2c.o holo.o
 	rm -f $(DEVDIR)/glx1.hdi
 	$(CC) $(CFLAGS) -o $(DEVDIR)/glx1.hdi rhd_glx1.o rhdisp.o rhdisp2.o \
-viewbeams.o holo.o rhd_qtree.o rhd_qtree2c.o dircode.o -lrt -lGLU -lGL -lX11 -lm
+viewbeams.o holo.o rhd_qtree.o rhd_qtree2c.o -lrtrad -lGLU -lGL -lX11 -lm
 
-$(DEVDIR)/glx.hdi:	rhd_glx0.o rhdisp.o rhdisp2.o viewbeams.o \
-sm_samp.o sm_qtree.o sm_stree.o sm_geom.o sm_list.o sm_del.o \
-sm_ogl.o sm.o sm_usets.o dircode.o holo.o
-	rm -f $(DEVDIR)/glx.hdi
-	$(CC) $(CFLAGS) -o $(DEVDIR)/glx.hdi rhd_glx0.o rhdisp.o rhdisp2.o \
-viewbeams.o holo.o sm_samp.o sm_qtree.o sm_stree.o sm_geom.o sm_list.o sm_del.o \
-sm_ogl.o sm.o sm_usets.o dircode.o -lrt -lGLU -lGL -lX11 -lm
-
-$(DEVDIR)/glxo.hdi:	rhd_glxo.o rhdisp.o rhdisp2.o viewbeams.o \
-sm_samp.o sm_qtree.o sm_stree.o sm_geom.o sm_list.o sm_del.o \
-sm_ogl.o sm_usets.o sm.o dircode.o holo.o rhdobj.o 
-	rm -f $(DEVDIR)/glxo.hdi
-	$(CC) $(CFLAGS) -o $(DEVDIR)/glxo.hdi rhd_glxo.o rhdisp.o rhdisp2.o \
-viewbeams.o holo.o sm_samp.o sm_qtree.o sm_stree.o sm_geom.o sm_list.o sm_del.o \
-sm_ogl.o sm_usets.o sm.o dircode.o rhdobj.o -lrgl -lrt -lGLU -lGL -lX11 -lm
-
-$(DEVDIR)/glxs.hdi:	rhd_glxs.o rhdisp.o rhdisp2.o viewbeams.o \
-sm_samp.o sm_qtree.o sm_stree.o sm_geom.o sm_list.o sm_del.o \
-sm_ogl.o sm_usets.o sm.o dircode.o holo.o
-	rm -f $(DEVDIR)/glxs.hdi
-	$(CC) $(CFLAGS) -o $(DEVDIR)/glxs.hdi rhd_glxs.o rhdisp.o rhdisp2.o \
-viewbeams.o holo.o sm_samp.o sm_qtree.o sm_stree.o sm_geom.o sm_list.o sm_del.o \
-sm_ogl.o sm_usets.o sm.o dircode.o -lrt -lGLU -lGL -lX11 -lXext -lm
-
-$(DEVDIR)/glxso.hdi:	rhd_glxso.o rhdisp.o rhdisp2.o viewbeams.o \
-sm_samp.o sm_qtree.o sm_stree.o sm_geom.o sm_list.o sm_del.o \
-sm_ogl.o sm_usets.o sm.o dircode.o holo.o rhdobj.o
-	rm -f $(DEVDIR)/glxso.hdi
-	$(CC) $(CFLAGS) -o $(DEVDIR)/glxso.hdi rhd_glxso.o rhdisp.o rhdisp2.o \
-viewbeams.o holo.o sm_samp.o sm_qtree.o sm_stree.o sm_geom.o sm_list.o sm_del.o \
-sm_ogl.o sm_usets.o sm.o dircode.o rhdobj.o \
--lrgl -lrt -lGLU -lGL -lX11 -lXext -lm
-
 $(DEVDIR)/ogl.hdi:	rhd_ogl0.o rhdisp.o rhdisp2.o viewbeams.o \
 rhd_odraw.o rhd_geom.o holo.o
 	$(CC) $(CFLAGS) -o $(DEVDIR)/ogl.hdi rhd_ogl0.o rhdisp.o rhdisp2.o \
-viewbeams.o holo.o rhd_odraw.o rhd_geom.o -lrgl -lrt -lGLU -lGL -lX11 -lm
+viewbeams.o holo.o rhd_odraw.o rhd_geom.o -lrgl -lrtrad -lGLU -lGL -lX11 -lm
 
 $(DEVDIR)/oglo.hdi:	rhd_oglo.o rhdisp.o rhdisp2.o viewbeams.o \
 rhd_odraw.o rhd_geom.o holo.o rhdobj.o
 	$(CC) $(CFLAGS) -o $(DEVDIR)/oglo.hdi rhd_oglo.o rhdisp.o \
 rhdisp2.o viewbeams.o holo.o rhd_odraw.o rhd_geom.o rhdobj.o \
--lrgl -lrt -lGLU -lGL -lX11 -lm
+-lrgl -lrtrad -lGLU -lGL -lX11 -lm
 
 $(DEVDIR)/ogls.hdi:	rhd_ogls.o rhdisp.o rhdisp2.o viewbeams.o \
 rhd_odraw.o rhd_geom.o holo.o
 	$(CC) $(CFLAGS) -o $(DEVDIR)/ogls.hdi rhd_ogls.o rhdisp.o rhdisp2.o \
 viewbeams.o holo.o rhd_odraw.o rhd_geom.o \
--lrgl -lrt -lGLU -lGL -lX11 -lXext -lm
+-lrgl -lrtrad -lGLU -lGL -lX11 -lXext -lm
 
 $(DEVDIR)/oglso.hdi:	rhd_oglso.o rhdisp.o rhdisp2.o viewbeams.o \
 rhd_odraw.o rhd_geom.o holo.o rhdobj.o
 	$(CC) $(CFLAGS) -o $(DEVDIR)/oglso.hdi rhd_oglso.o rhdisp.o rhdisp2.o \
 viewbeams.o holo.o rhd_odraw.o rhd_geom.o rhdobj.o \
--lrgl -lrt -lGLU -lGL -lX11 -lXext -lm
+-lrgl -lrtrad -lGLU -lGL -lX11 -lXext -lm
 
-rhd_glx0.o:	rhd_glx.c
-	$(CC) $(CFLAGS) -c rhd_glx.c
-	mv -f rhd_glx.o rhd_glx0.o
-
-rhd_glxo.o:	rhd_glx.c
-	$(CC) $(CFLAGS) -DDOBJ -c rhd_glx.c
-	mv -f rhd_glx.o rhd_glxo.o
-
-rhd_glxs.o:	rhd_glx.c
-	$(CC) $(CFLAGS) -DSTEREO -c rhd_glx.c
-	mv -f rhd_glx.o rhd_glxs.o
-
-rhd_glxso.o:	rhd_glx.c
-	$(CC) $(CFLAGS) -DDOBJ -DSTEREO -c rhd_glx.c
-	mv -f rhd_glx.o rhd_glxso.o
-
 rhd_ogl0.o:	rhd_ogl.c
 	$(CC) $(CFLAGS) -c rhd_ogl.c
 	mv -f rhd_ogl.o rhd_ogl0.o
@@ -224,60 +168,41 @@ viewbeams.o:	../common/view.h ../common/random.h
 
 rhpict.o:	../common/view.h ../common/resolu.h
 
-holo.o holofile.o rhdisp.o rhdisp2.o viewbeams.o genrhenv.o genrhgrid.o \
+holo.o holofile.o rhdisp.o rhdisp2.o viewbeams.o genrhgrid.o \
 rhcopy.o rholo.o rholo2.o rholo2l.o rholo3.o rholo4.o \
 rhinfo.o clumpbeams.o rhoptimize.o rhpict.o rhpict2.o:	holo.h \
 ../common/vars.h ../common/color.h \
-../common/standard.h ../common/mat4.h ../common/fvect.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
 
 rhcopy.o:	../common/resolu.h ../common/view.h
 
 rhd_x11.o rhd_qtree.o rhd_sets.o rhd_qtree2r.o rhd_odraw.o rhd_ogl0.o \
 rhd_oglo.o rhd_ogls.o rhd_oglso.o:	../common/standard.h \
-../common/mat4.h ../common/fvect.h
+../common/rtmisc.h ../common/rtio.h \
+../common/rtmath.h ../common/mat4.h ../common/fvect.h \
+../common/rterror.h
 
 rhd_x11.o rhd_qtree.o rhd_qtree2r.o:	rhd_qtree.h rhdriver.h \
 ../common/view.h ../common/tonemap.h ../common/color.h
 
 rhd_x11.o:	x11icon.h
 
-rhd_glx0.o rhd_glxo.o rhd_glxs.o rhd_glxso.o:	rhd_sample.h rhdriver.h \
-x11icon.h ../common/tonemap.h ../common/view.h \
-../common/standard.h ../common/mat4.h ../common/fvect.h
-
 rhd_glxo.o rhd_glxso.o rhdobj.o:	rhdobj.h
 
 rhdobj.o:	rhdisp.h rhdriver.h ../common/view.h ../common/tonemap.h \
-../common/radogl.h ../common/standard.h ../common/fvect.h ../common/mat4.h \
+../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/object.h ../common/otypes.h ../common/lookup.h
 
-sm_samp.o sm_qtree.o sm_stree.o sm_geom.o sm_list.o sm_del.o \
-sm_ogl.o sm.o:	sm.h rhd_sample.h \
-../common/standard.h ../common/mat4.h ../common/fvect.h
-
-sm.o:		sm_flag.h
-
-sm_samp.o: 	sm_flag.h
-
-sm_usets.o:	sm_flag.h sm_qtree.h ../common/object.h
-
-sm_del.o:	sm_flag.h sm_list.h sm_geom.h
-
-sm_geom.o:	sm_geom.h
-
-sm_list.o:	sm_list.h
-
-sm_ogl.o:	sm_flag.h sm_geom.h ../common/object.h
-
-sm_qtree.o:	sm_flag.h sm_geom.h sm_qtree.h ../common/object.h
-
-sm_stree.o:	sm_flag.h sm_stree.h sm_qtree.h sm_geom.h ../common/object.h
-
-dircode.o:	../common/fvect.h
-
 rhd_glx1.o:	rhd_qtree.h rhdriver.h x11icon.h ../common/view.h \
-../common/color.h ../common/tonemap.h ../common/standard.h ../common/fvect.h \
-../common/mat4.h
+../common/color.h ../common/tonemap.h \
+../common/standard.h ../common/rtmisc.h ../common/rtio.h \
+../common/rtmath.h ../common/mat4.h ../common/fvect.h \
+../common/rterror.h
 
 rhd_odraw.o rhd_ogl0.o rhd_oglo.o rhd_ogls.o rhd_oglso.o:	rhd_odraw.h \
 rhdriver.h ../common/view.h ../common/color.h ../common/tonemap.h
@@ -287,8 +212,9 @@ rhd_ogl0.o rhd_oglo.o rhd_ogls.o rhd_oglso.o:	x11icon.
 rhd_oglo.o rhd_oglso.o:	rhdobj.h
 
 rhd_geom.o:	rhdriver.h ../common/view.h \
-../common/radogl.h ../common/standard.h ../common/fvect.h \
-../common/mat4.h ../common/object.h ../common/otypes.h ../common/lookup.h
+../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/object.h ../common/otypes.h ../common/lookup.h
 
 Version.c:	../rt/Version.c
 	cp ../rt/Version.c .