--- ray/src/hd/Rmakefile 1998/12/18 11:58:30 3.17 +++ ray/src/hd/Rmakefile 2003/06/27 06:53:22 3.23 @@ -1,5 +1,5 @@ +# RCSid: $Id: Rmakefile,v 3.23 2003/06/27 06:53:22 greg Exp $ # -# SCCSid "$SunId$ SGI" # Radiance makefile for holodeck programs # @@ -7,7 +7,7 @@ MACH = -DBSD OPT = -O -CFLAGS = $(MACH) $(OPT) -I../common -L../lib +CFLAGS = -I../common -L../lib $(OPT) $(MACH) CC = cc @@ -18,7 +18,7 @@ DEVDIR = $(INSTDIR)/dev LIBDIR = /usr/local/lib/ray -PROGS = rholo rhcopy genrhgrid rhoptimize +PROGS = rholo rhpict rhcopy genrhgrid rhoptimize rhinfo DEVS = $(DEVDIR)/x11.hdi $(DEVDIR)/x11h.hdi @@ -30,17 +30,12 @@ install: all $(DEVS) $(SPECIAL) clean: set nonomatch; rm -f *.o $(PROGS) core -ogl: $(DEVDIR)/glx.hdi $(DEVDIR)/glxh.hdi \ - $(DEVDIR)/glxo.hdi $(DEVDIR)/glxoh.hdi \ - $(DEVDIR)/glxs.hdi $(DEVDIR)/glxsh.hdi \ - $(DEVDIR)/glxso.hdi $(DEVDIR)/glxsoh.hdi \ - $(DEVDIR)/glx1.hdi $(DEVDIR)/glx1h.hdi \ - $(DEVDIR)/ogl.hdi $(DEVDIR)/oglh.hdi \ +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)/oglso.hdi $(DEVDIR)/oglsoh.hdi \ + $(DEVDIR)/glx1.hdi $(DEVDIR)/glx1h.hdi - x10: aed: @@ -50,10 +45,14 @@ sgi: sun: rholo: rholo.o rholo2.o rholo2l.o rholo3.o rholo4.o holo.o holofile.o \ -malloc.o Version.o +viewbeams.o Version.o $(CC) $(CFLAGS) -o rholo rholo.o rholo2.o rholo2l.o rholo3.o rholo4.o \ -holo.o holofile.o malloc.o Version.o -lrt -lm +holo.o holofile.o viewbeams.o Version.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 @@ -62,6 +61,9 @@ rhoptimize: rhoptimize.o clumpbeams.o holo.o holofile. $(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 @@ -72,10 +74,10 @@ $(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 @@ -113,70 +115,66 @@ $(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 rhdisp3.o \ -rhd_qtree.o rhd_qtree2c.o dircode.o holo.o +$(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 \ -rhdisp3.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 -lrt -lGLU -lGL -lX11 -lm -$(DEVDIR)/glx.hdi: rhd_glx0.o rhdisp.o rhdisp2.o rhdisp3.o \ +$(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 +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 \ -rhdisp3.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 +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 rhdisp3.o \ +$(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 +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 \ -rhdisp3.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 +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 rhdisp3.o \ +$(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 +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 \ -rhdisp3.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 +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 rhdisp3.o \ +$(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 +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 \ -rhdisp3.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 \ +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 rhdisp3.o \ -rhd_odraw.o rhd_octree.o holo.o - rm -f $(DEVDIR)/ogl.hdi +$(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 \ -rhdisp3.o holo.o rhd_odraw.o rhd_octree.o -lrgl -lrt -lGLU -lGL -lX11 -lm +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 rhdisp3.o \ -rhd_odraw.o rhd_octree.o holo.o rhdobj.o - rm -f $(DEVDIR)/oglo.hdi +$(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 rhdisp3.o holo.o rhd_odraw.o rhd_octree.o rhdobj.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 rhdisp3.o \ -rhd_odraw.o rhd_octree.o holo.o - rm -f $(DEVDIR)/ogls.hdi +$(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 \ -rhdisp3.o holo.o rhd_odraw.o rhd_octree.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 rhdisp3.o \ -rhd_odraw.o rhd_octree.o holo.o rhdobj.o - rm -f $(DEVDIR)/oglso.hdi +$(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 \ -rhdisp3.o holo.o rhd_odraw.o rhd_octree.o rhdobj.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 @@ -211,32 +209,36 @@ rhd_oglso.o: rhd_ogl.c $(CC) $(CFLAGS) -DDOBJ -DSTEREO -c rhd_ogl.c mv -f rhd_ogl.o rhd_oglso.o -malloc.o: malloc.c - $(CC) $(CFLAGS) -DMCOMP -c malloc.c - 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 genrhenv.o genrhgrid.o \ +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 \ -clumpbeams.o rhoptimize.o: holo.h \ +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 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 @@ -245,23 +247,30 @@ 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 +../common/standard.h ../common/rtmisc.h ../common/rtio.h \ +../common/rtmath.h ../common/mat4.h ../common/fvect.h \ +../common/rterror.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 +../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_usets.o: sm_flag.h sm_qtree.h ../common/object.h sm_del.o: sm_flag.h sm_list.h sm_geom.h @@ -275,17 +284,23 @@ sm_qtree.o: sm_flag.h sm_geom.h sm_qtree.h ../common/o 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 -rhdisp2.o: ../common/random.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 .