--- ray/src/hd/Rmakefile	1997/12/26 13:29:13	3.11
+++ ray/src/hd/Rmakefile	2004/10/27 23:23:47	3.24
@@ -1,5 +1,5 @@
+# RCSid: $Id: Rmakefile,v 3.24 2004/10/27 23:23:47 greg Exp $
 #
-# SCCSid "$SunId$ SGI"
 # Radiance makefile for holodeck programs
 #
 
@@ -7,80 +7,300 @@ MACH = -DBSD
 
 OPT = -O
 
-CFLAGS = $(MACH) $(OPT) -I../common -L../lib
+CFLAGS = -I../common -L../lib $(OPT) $(MACH)
 
 CC = cc
 
+SPECIAL =
+
 INSTDIR = /usr/local/bin
 DEVDIR = $(INSTDIR)/dev
 
 LIBDIR = /usr/local/lib/ray
 
-PROGS = rholo rhcopy
+PROGS = rholo rhpict rhcopy genrhgrid rhoptimize rhinfo
 
-DEVS = $(DEVDIR)/x11.hdi $(DEVDIR)/x11h.hdi \
-$(DEVDIR)/glx.hdi $(DEVDIR)/glxh.hdi
+DEVS = $(DEVDIR)/x11.hdi $(DEVDIR)/x11h.hdi
 
 all:	$(PROGS)
 
-install:	all $(DEVS)
+install:	all $(DEVS) $(SPECIAL)
 	cp $(PROGS) $(INSTDIR)
 
 clean:
 	set nonomatch; rm -f *.o $(PROGS) core
 
-rholo:	rholo.o rholo2.o rholo2l.o rholo3.o rholo4.o holo.o holofile.o Version.o
+ogl:	$(DEVDIR)/ogl.hdi $(DEVDIR)/oglh.hdi \
+	$(DEVDIR)/oglo.hdi $(DEVDIR)/ogloh.hdi \
+	$(DEVDIR)/ogls.hdi $(DEVDIR)/oglsh.hdi \
+	$(DEVDIR)/oglso.hdi $(DEVDIR)/oglsoh.hdi \
+	$(DEVDIR)/glx1.hdi $(DEVDIR)/glx1h.hdi
+
+x10:
+
+aed:
+
+sgi:
+
+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 Version.o -lrt -lm
+holo.o holofile.o viewbeams.o Version.o -lrt -lm
 
-rhcopy:	rhcopy.o holo.o holofile.o
-	$(CC) $(CFLAGS) -o rhcopy rhcopy.o holo.o holofile.o -lrt -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
 
+rhcopy:	rhcopy.o clumpbeams.o holo.o holofile.o
+	$(CC) $(CFLAGS) -o rhcopy rhcopy.o clumpbeams.o \
+holo.o holofile.o -lrt -lm
+
+rhoptimize:	rhoptimize.o clumpbeams.o holo.o holofile.o
+	$(CC) $(CFLAGS) -o rhoptimize rhoptimize.o clumpbeams.o \
+holo.o holofile.o -lrt -lm
+
+rhinfo:	rhinfo.o holo.o holofile.o
+	$(CC) $(CFLAGS) -o rhinfo rhinfo.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 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 dircode.o -lrt -lX11 -lm
+$(DEVDIR)/x11.hdi:	rhdisp.o rhdisp2.o viewbeams.o rhd_x11.o rhd_qtree.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 -lrt -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)/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
+$(DEVDIR)/glxoh.hdi:	$(DEVDIR)/glxo.hdi
+	rm -f $(DEVDIR)/glxoh.hdi
+	ln $(DEVDIR)/glxo.hdi $(DEVDIR)/glxoh.hdi
 
+$(DEVDIR)/glxsh.hdi:	$(DEVDIR)/glxs.hdi
+	rm -f $(DEVDIR)/glxsh.hdi
+	ln $(DEVDIR)/glxs.hdi $(DEVDIR)/glxsh.hdi
+
+$(DEVDIR)/glxsoh.hdi:	$(DEVDIR)/glxso.hdi
+	rm -f $(DEVDIR)/glxsoh.hdi
+	ln $(DEVDIR)/glxso.hdi $(DEVDIR)/glxsoh.hdi
+
+$(DEVDIR)/oglh.hdi:	$(DEVDIR)/ogl.hdi
+	rm -f $(DEVDIR)/oglh.hdi
+	ln $(DEVDIR)/ogl.hdi $(DEVDIR)/oglh.hdi
+
+$(DEVDIR)/ogloh.hdi:	$(DEVDIR)/oglo.hdi
+	rm -f $(DEVDIR)/ogloh.hdi
+	ln $(DEVDIR)/oglo.hdi $(DEVDIR)/ogloh.hdi
+
+$(DEVDIR)/oglsh.hdi:	$(DEVDIR)/ogls.hdi
+	rm -f $(DEVDIR)/oglsh.hdi
+	ln $(DEVDIR)/ogls.hdi $(DEVDIR)/oglsh.hdi
+
+$(DEVDIR)/oglsoh.hdi:	$(DEVDIR)/oglso.hdi
+	rm -f $(DEVDIR)/oglsoh.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 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 -lrt -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 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 -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 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 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 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 -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 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 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
+
+$(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
+
+$(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
+
+$(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
+
+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
+
+rhd_oglo.o:	rhd_ogl.c
+	$(CC) $(CFLAGS) -DDOBJ -c rhd_ogl.c
+	mv -f rhd_ogl.o rhd_oglo.o
+
+rhd_ogls.o:	rhd_ogl.c
+	$(CC) $(CFLAGS) -DSTEREO -c rhd_ogl.c
+	mv -f rhd_ogl.o rhd_ogls.o
+
+rhd_oglso.o:	rhd_ogl.c
+	$(CC) $(CFLAGS) -DDOBJ -DSTEREO -c rhd_ogl.c
+	mv -f rhd_ogl.o rhd_oglso.o
+
 rholo.o rholo2.o rholo2l.o rholo3.o rholo4.o \
-rhdisp.o rhdisp2.o rhdisp3.o:	rholo.h
+rhdisp.o rhdisp2.o rhpict.o viewbeams.o:	rholo.h
 
 rholo2l.o:	../common/paths.h
 
-rholo4.o:	rhdisp.h rholo4.c
-	$(CC) $(CFLAGS) -c rholo4.c
+rhpict2.o rholo3.o:	../common/view.h
 
+rholo4.o:	rhdisp.h
+
 rhdisp.o rhdisp2.o:	rhdisp.h rhdriver.h ../common/view.h
 
-rhdisp3.o:	rhdisp.h ../common/view.h
+viewbeams.o:	../common/view.h ../common/random.h
 
-holo.o holofile.o rhdisp.o rhdisp2.o rhdisp3.o \
-rhcopy.o rholo.o rholo2.o rholo2l.o rholo3.o rholo4.o:	holo.h \
+rhpict.o:	../common/view.h ../common/resolu.h
+
+holo.o holofile.o rhdisp.o rhdisp2.o viewbeams.o genrhenv.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
+rhcopy.o:	../common/resolu.h ../common/view.h
 
-rhcopy.o:	../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/rtmisc.h ../common/rtio.h \
+../common/rtmath.h ../common/mat4.h ../common/fvect.h \
+../common/rterror.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 \
+../common/view.h ../common/tonemap.h ../common/color.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
+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/rtmisc.h ../common/rtio.h \
+../common/rtmath.h ../common/mat4.h ../common/fvect.h \
+../common/rterror.h
 
-dircode.o:	../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/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/rtmisc.h ../common/rtio.h \
+../common/rtmath.h ../common/mat4.h ../common/fvect.h \
+../common/rterror.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
+
+rhd_glx1.o:	rhd_qtree.h rhdriver.h x11icon.h ../common/view.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
+
+rhd_ogl0.o rhd_oglo.o rhd_ogls.o rhd_oglso.o:	x11icon.h
+
+rhd_oglo.o rhd_oglso.o:	rhdobj.h
+
+rhd_geom.o:	rhdriver.h ../common/view.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 .