diff -ur ray.orig/src/cal/calc/Makefile ray/src/cal/calc/Makefile
---- ray.orig/src/cal/calc/Makefile Fri Dec 10 02:24:21 1993
-+++ ray/src/cal/calc/Makefile Sun Jun 17 17:16:16 2001
+--- ray.orig/src/cal/calc/Makefile Sat Jul 6 18:20:18 2002
++++ ray/src/cal/calc/Makefile Sat Jul 6 22:31:06 2002
@@ -24,7 +24,7 @@
caldefn.o calfunc.o calprnt.o ealloc.o savestr.o $(COMPAT) $(MLIB)
clean:
set nonomatch; rm -f *.o calc
diff -ur ray.orig/src/cal/calc/Rmakefile ray/src/cal/calc/Rmakefile
---- ray.orig/src/cal/calc/Rmakefile Fri Dec 10 02:24:21 1993
-+++ ray/src/cal/calc/Rmakefile Sun Jun 17 17:16:16 2001
+--- ray.orig/src/cal/calc/Rmakefile Sat Jul 6 18:20:18 2002
++++ ray/src/cal/calc/Rmakefile Sat Jul 6 22:31:06 2002
@@ -24,7 +24,7 @@
caldefn.o calfunc.o calprnt.o ealloc.o savestr.o $(COMPAT) $(MLIB)
clean:
set nonomatch; rm -f *.o calc
diff -ur ray.orig/src/cal/ev/Makefile ray/src/cal/ev/Makefile
---- ray.orig/src/cal/ev/Makefile Fri Dec 10 02:24:58 1993
-+++ ray/src/cal/ev/Makefile Sun Jun 17 17:16:16 2001
+--- ray.orig/src/cal/ev/Makefile Sat Jul 6 18:20:18 2002
++++ ray/src/cal/ev/Makefile Sat Jul 6 22:31:06 2002
@@ -21,7 +21,7 @@
calfunc.o ealloc.o savestr.o $(MLIB)
clean:
set nonomatch; rm -f *.o ev
diff -ur ray.orig/src/cal/ev/Rmakefile ray/src/cal/ev/Rmakefile
---- ray.orig/src/cal/ev/Rmakefile Fri Dec 10 02:24:58 1993
-+++ ray/src/cal/ev/Rmakefile Sun Jun 17 17:16:16 2001
+--- ray.orig/src/cal/ev/Rmakefile Sat Jul 6 18:20:18 2002
++++ ray/src/cal/ev/Rmakefile Sat Jul 6 22:31:06 2002
@@ -21,7 +21,7 @@
calfunc.o ealloc.o savestr.o $(MLIB)
clean:
set nonomatch; rm -f *.o ev
diff -ur ray.orig/src/cal/rcalc/Makefile ray/src/cal/rcalc/Makefile
---- ray.orig/src/cal/rcalc/Makefile Fri Dec 10 02:24:36 1993
-+++ ray/src/cal/rcalc/Makefile Sun Jun 17 17:16:16 2001
+--- ray.orig/src/cal/rcalc/Makefile Sat Jul 6 18:20:18 2002
++++ ray/src/cal/rcalc/Makefile Sat Jul 6 22:31:06 2002
@@ -24,7 +24,7 @@
caldefn.o calfunc.o ealloc.o savestr.o $(COMPAT) $(MLIB)
clean:
set nonomatch; rm -f *.o rcalc
diff -ur ray.orig/src/cal/rcalc/Rmakefile ray/src/cal/rcalc/Rmakefile
---- ray.orig/src/cal/rcalc/Rmakefile Fri Dec 10 02:24:36 1993
-+++ ray/src/cal/rcalc/Rmakefile Sun Jun 17 17:16:16 2001
+--- ray.orig/src/cal/rcalc/Rmakefile Sat Jul 6 18:20:18 2002
++++ ray/src/cal/rcalc/Rmakefile Sat Jul 6 22:31:06 2002
@@ -24,7 +24,7 @@
caldefn.o calfunc.o ealloc.o savestr.o $(COMPAT) $(MLIB)
clean:
set nonomatch; rm -f *.o rcalc
diff -ur ray.orig/src/cal/util/Makefile ray/src/cal/util/Makefile
---- ray.orig/src/cal/util/Makefile Fri Sep 6 05:47:47 1996
-+++ ray/src/cal/util/Makefile Sun Jun 17 17:16:16 2001
-@@ -17,7 +17,7 @@
+--- ray.orig/src/cal/util/Makefile Sat Jul 6 18:20:18 2002
++++ ray/src/cal/util/Makefile Sat Jul 6 22:31:06 2002
+@@ -19,7 +19,7 @@
all: $(PROGS)
install: $(PROGS)
clean:
set nonomatch; rm -f *.o $(PROGS)
diff -ur ray.orig/src/cal/util/Rmakefile ray/src/cal/util/Rmakefile
---- ray.orig/src/cal/util/Rmakefile Wed Jan 28 01:59:42 1998
-+++ ray/src/cal/util/Rmakefile Sun Jun 17 17:16:16 2001
+--- ray.orig/src/cal/util/Rmakefile Sat Jul 6 18:20:18 2002
++++ ray/src/cal/util/Rmakefile Sat Jul 6 22:31:06 2002
@@ -19,7 +19,7 @@
all: $(PROGS)
clean:
set nonomatch; rm -f *.o $(PROGS)
diff -ur ray.orig/src/common/Rmakefile ray/src/common/Rmakefile
---- ray.orig/src/common/Rmakefile Wed Apr 16 01:53:33 1997
-+++ ray/src/common/Rmakefile Sun Jun 17 17:16:16 2001
-@@ -30,9 +30,10 @@
- librt.a: $(RTOBJ) $(PICOBJ) $(STDOBJ) $(SYSOBJ)
- ar rc librt.a $(RTOBJ) $(PICOBJ) $(STDOBJ) $(SYSOBJ)
- -ranlib librt.a
-+ cp librt.a ../lib/librayt.a
-
- install: librt.a
-- mv librt.a ../lib/librt.a
-+ mv librt.a ../lib/librayt.a
+--- ray.orig/src/common/Rmakefile Sat Jul 6 18:20:18 2002
++++ ray/src/common/Rmakefile Sat Jul 6 22:31:06 2002
+@@ -31,17 +31,18 @@
- clean:
- rm -f *.o librt.a
-diff -ur ray.orig/src/common/error.c ray/src/common/error.c
---- ray.orig/src/common/error.c Sat Apr 6 01:48:19 1996
-+++ ray/src/common/error.c Sun Jun 17 17:16:16 2001
-@@ -10,7 +10,9 @@
+ OGLOBJ = rglfile.o rglmat.o rgldomat.o rglsurf.o rglinst.o rglsrc.o
- #include "standard.h"
+-all: librt.a $(SPECIAL)
++all: librayt.a $(SPECIAL)
-+#ifndef linux
- extern char *sys_errlist[]; /* system error list */
-+#endif
- extern int sys_nerr; /* number of system errors */
+-librt.a: $(RTOBJ) $(PICOBJ) $(STDOBJ) $(SYSOBJ)
+- ar rc librt.a $(RTOBJ) $(PICOBJ) $(STDOBJ) $(SYSOBJ)
+- -ranlib librt.a
++librayt.a: $(RTOBJ) $(PICOBJ) $(STDOBJ) $(SYSOBJ)
++ ar rc librayt.a $(RTOBJ) $(PICOBJ) $(STDOBJ) $(SYSOBJ)
++ -ranlib librayt.a
++ cp librayt.a ../lib/librayt.a
- char errmsg[512]; /* global error message buffer */
+ install: all
+- mv librt.a ../lib/librt.a
++ mv librayt.a ../lib/librayt.a
+
+ clean:
+- rm -f *.o librt.a
++ rm -f *.o librayt.a
+
+ ogl: $(OGLOBJ)
+ ar rc librgl.a $(OGLOBJ)
diff -ur ray.orig/src/common/lookup.h ray/src/common/lookup.h
---- ray.orig/src/common/lookup.h Wed Jan 28 01:59:42 1998
-+++ ray/src/common/lookup.h Sun Jun 17 17:16:16 2001
+--- ray.orig/src/common/lookup.h Sat Jul 6 18:20:18 2002
++++ ray/src/common/lookup.h Sat Jul 6 22:31:06 2002
@@ -5,6 +5,7 @@
/*
* Header file for general associative table lookup routines
+#include <string.h>
typedef struct {
- char *key; /* key name */
-@@ -73,4 +74,3 @@
+ char *key; /* key name */
+@@ -80,4 +81,3 @@
extern void lu_done();
- extern long lu_shash();
+ extern unsigned long lu_shash();
-extern int strcmp();
diff -ur ray.orig/src/cv/Rmakefile ray/src/cv/Rmakefile
---- ray.orig/src/cv/Rmakefile Fri Jan 19 18:47:36 1996
-+++ ray/src/cv/Rmakefile Sun Jun 17 17:16:16 2001
+--- ray.orig/src/cv/Rmakefile Sat Jul 6 18:20:18 2002
++++ ray/src/cv/Rmakefile Sat Jul 6 22:31:06 2002
@@ -22,12 +22,14 @@
LIBFILES = source.cal tilt.cal lamp.tab tmesh.cal
mgfilt:
cd mgflib ; rm -f mgfilt ; \
@@ -75,7 +77,7 @@
- CFLAGS="$(OPT) $(MACH) '-DMEM_PTR=char *' -DNOPROTO" ; \
+ CFLAGS="$(OPT) $(MACH) -DNOPROTO" ; \
mv mgf2inv ..
-MGF_LIB:
+$(MGF_LIB):
cd mgflib ; rm -f libmgf.a ; \
make libmgf.a CC=$(CC) \
- CFLAGS="$(OPT) $(MACH) '-DMEM_PTR=char *' -DNOPROTO" ; \
-diff -ur ray.orig/src/cv/mgf2rad.c ray/src/cv/mgf2rad.c
---- ray.orig/src/cv/mgf2rad.c Wed Jul 24 22:07:53 1996
-+++ ray/src/cv/mgf2rad.c Sun Jun 17 17:20:06 2001
-@@ -23,7 +23,7 @@
-
- double emult = 1.; /* emitter multiplier */
-
--FILE *matfp = stdout; /* material output file */
-+FILE *matfp;// = stdout; /* material output file */
-
- int r_comment(), r_cone(), r_cyl(), r_face(), r_ies(), r_ring(), r_sph();
- char *material(), *object(), *addarg();
-@@ -34,6 +34,8 @@
- char *argv[];
- {
- int i;
-+ matfp=stdout;
-+
- /* print out parser version */
- printf("## Translated from MGF Version %d.%d\n", MG_VMAJOR, MG_VMINOR);
- /* initialize dispatch table */
+ CFLAGS="$(OPT) $(MACH) -DNOPROTO" ; \
diff -ur ray.orig/src/gen/Rmakefile ray/src/gen/Rmakefile
---- ray.orig/src/gen/Rmakefile Tue Mar 19 21:37:46 1996
-+++ ray/src/gen/Rmakefile Sun Jun 17 17:16:16 2001
+--- ray.orig/src/gen/Rmakefile Sat Jul 6 18:20:18 2002
++++ ray/src/gen/Rmakefile Sat Jul 6 22:31:06 2002
@@ -22,9 +22,9 @@
all: $(PROGS)
genclock: genclock.o
$(CC) $(CFLAGS) -o genclock genclock.o $(MLIB)
+diff -ur ray.orig/src/hd/Rmakefile ray/src/hd/Rmakefile
+--- ray.orig/src/hd/Rmakefile Sat Jul 6 18:20:18 2002
++++ ray/src/hd/Rmakefile Sat Jul 6 22:46:00 2002
+@@ -14,31 +14,30 @@
+ SPECIAL =
+
+ INSTDIR = /usr/local/bin
+-DEVDIR = $(INSTDIR)/dev
+
+ LIBDIR = /usr/local/lib/ray
+
+ PROGS = rholo rhpict rhcopy genrhgrid rhoptimize rhinfo
+
+-DEVS = $(DEVDIR)/x11.hdi $(DEVDIR)/x11h.hdi
++DEVS = x11.hdi x11h.hdi
+
+ all: $(PROGS)
+
+ install: all $(DEVS) $(SPECIAL)
+- cp $(PROGS) $(INSTDIR)
++ install $(PROGS) $(DESTDIR)$(INSTDIR)
+
+ 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 \
+- $(DEVDIR)/oglo.hdi $(DEVDIR)/ogloh.hdi \
+- $(DEVDIR)/ogls.hdi $(DEVDIR)/oglsh.hdi \
+- $(DEVDIR)/oglso.hdi $(DEVDIR)/oglsoh.hdi
++ogl: glx.hdi glxh.hdi \
++ glxo.hdi glxoh.hdi \
++ glxs.hdi glxsh.hdi \
++ glxso.hdi glxsoh.hdi \
++ glx1.hdi glx1h.hdi \
++ ogl.hdi oglh.hdi \
++ oglo.hdi ogloh.hdi \
++ ogls.hdi oglsh.hdi \
++ oglso.hdi oglsoh.hdi
+
+ x10:
+
+@@ -51,135 +50,135 @@
+ rholo: rholo.o rholo2.o rholo2l.o rholo3.o rholo4.o holo.o holofile.o \
+ viewbeams.o malloc.o Version.o
+ $(CC) $(CFLAGS) -o rholo rholo.o rholo2.o rholo2l.o rholo3.o rholo4.o \
+-holo.o holofile.o viewbeams.o malloc.o Version.o -lrt -lm
++holo.o holofile.o viewbeams.o malloc.o Version.o -lrayt -lm
+
+ rhpict: rhpict.o rhpict2.o holo.o holofile.o viewbeams.o malloc.o Version.o
+ $(CC) $(CFLAGS) -o rhpict rhpict.o rhpict2.o holo.o holofile.o \
+-viewbeams.o malloc.o Version.o -lrt -lm
++viewbeams.o malloc.o Version.o -lrayt -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 -lrayt -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 -lrayt -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 -lrayt -lm
+
+ genrhenv: genrhenv.o holo.o holofile.o
+- $(CC) $(CFLAGS) -o genrhenv genrhenv.o holo.o holofile.o -lrt -lm
++ $(CC) $(CFLAGS) -o genrhenv genrhenv.o holo.o holofile.o -lrayt -lm
+
+ genrhgrid: genrhgrid.o holo.o
+- $(CC) $(CFLAGS) -o genrhgrid genrhgrid.o holo.o -lrt -lm
++ $(CC) $(CFLAGS) -o genrhgrid genrhgrid.o holo.o -lrayt -lm
+
+-$(DEVDIR)/x11h.hdi: $(DEVDIR)/x11.hdi
+- rm -f $(DEVDIR)/x11h.hdi
+- ln $(DEVDIR)/x11.hdi $(DEVDIR)/x11h.hdi
++x11h.hdi: x11.hdi
++ rm -f x11h.hdi
++ ln x11.hdi x11h.hdi
+
+-$(DEVDIR)/x11.hdi: rhdisp.o rhdisp2.o viewbeams.o rhd_x11.o rhd_qtree.o \
++x11.hdi: rhdisp.o rhdisp2.o viewbeams.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 viewbeams.o \
+-rhd_x11.o rhd_qtree.o rhd_qtree2r.o rhd_ctab.o holo.o dircode.o -lrt -lX11 -lm
++ $(CC) $(CFLAGS) -o x11.hdi rhdisp.o rhdisp2.o viewbeams.o \
++rhd_x11.o rhd_qtree.o rhd_qtree2r.o rhd_ctab.o holo.o dircode.o -lrayt -lX11 -lm -L/usr/X11R6/lib
+
+-$(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
+-
+-$(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
++glx1h.hdi: glx1.hdi
++ rm -f glx1h.hdi
++ ln glx1.hdi glx1h.hdi
++
++glxh.hdi: glx.hdi
++ rm -f glxh.hdi
++ ln glx.hdi glxh.hdi
++
++glxoh.hdi: glxo.hdi
++ rm -f glxoh.hdi
++ ln glxo.hdi glxoh.hdi
++
++glxsh.hdi: glxs.hdi
++ rm -f glxsh.hdi
++ ln glxs.hdi glxsh.hdi
++
++glxsoh.hdi: glxso.hdi
++ rm -f glxsoh.hdi
++ ln glxso.hdi glxsoh.hdi
++
++oglh.hdi: ogl.hdi
++ rm -f oglh.hdi
++ ln ogl.hdi oglh.hdi
++
++ogloh.hdi: oglo.hdi
++ rm -f ogloh.hdi
++ ln oglo.hdi ogloh.hdi
++
++oglsh.hdi: ogls.hdi
++ rm -f oglsh.hdi
++ ln ogls.hdi oglsh.hdi
++
++oglsoh.hdi: oglso.hdi
++ rm -f oglsoh.hdi
++ ln oglso.hdi oglsoh.hdi
+
+-$(DEVDIR)/glx1.hdi: rhd_glx1.o rhdisp.o rhdisp2.o viewbeams.o \
++glx1.hdi: rhd_glx1.o rhdisp.o rhdisp2.o viewbeams.o \
+ rhd_qtree.o rhd_qtree2c.o dircode.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 malloc.o rhd_qtree.o rhd_qtree2c.o dircode.o -lrt -lGLU -lGL -lX11 -lm
++ rm -f glx1.hdi
++ $(CC) $(CFLAGS) -o glx1.hdi rhd_glx1.o rhdisp.o rhdisp2.o \
++viewbeams.o holo.o malloc.o rhd_qtree.o rhd_qtree2c.o dircode.o -lrayt -lGLU -lGL -lX11 -lm
+
+-$(DEVDIR)/glx.hdi: rhd_glx0.o rhdisp.o rhdisp2.o viewbeams.o \
++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 \
++ rm -f glx.hdi
++ $(CC) $(CFLAGS) -o 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
++sm_ogl.o sm.o sm_usets.o dircode.o -lrayt -lGLU -lGL -lX11 -lm
+
+-$(DEVDIR)/glxo.hdi: rhd_glxo.o rhdisp.o rhdisp2.o viewbeams.o \
++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 \
++ rm -f glxo.hdi
++ $(CC) $(CFLAGS) -o 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
++sm_ogl.o sm_usets.o sm.o dircode.o rhdobj.o -lrgl -lrayt -lGLU -lGL -lX11 -lm
+
+-$(DEVDIR)/glxs.hdi: rhd_glxs.o rhdisp.o rhdisp2.o viewbeams.o \
++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 \
++ rm -f glxs.hdi
++ $(CC) $(CFLAGS) -o 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
++sm_ogl.o sm_usets.o sm.o dircode.o -lrayt -lGLU -lGL -lX11 -lXext -lm
+
+-$(DEVDIR)/glxso.hdi: rhd_glxso.o rhdisp.o rhdisp2.o viewbeams.o \
++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 \
++ rm -f glxso.hdi
++ $(CC) $(CFLAGS) -o 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
++-lrgl -lrayt -lGLU -lGL -lX11 -lXext -lm
+
+-$(DEVDIR)/ogl.hdi: rhd_ogl0.o rhdisp.o rhdisp2.o viewbeams.o \
++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
++ $(CC) $(CFLAGS) -o ogl.hdi rhd_ogl0.o rhdisp.o rhdisp2.o \
++viewbeams.o holo.o rhd_odraw.o rhd_geom.o -lrgl -lrayt -lGLU -lGL -lX11 -lm
+
+-$(DEVDIR)/oglo.hdi: rhd_oglo.o rhdisp.o rhdisp2.o viewbeams.o \
++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 \
++ $(CC) $(CFLAGS) -o 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 -lrayt -lGLU -lGL -lX11 -lm
+
+-$(DEVDIR)/ogls.hdi: rhd_ogls.o rhdisp.o rhdisp2.o viewbeams.o \
++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 \
++ $(CC) $(CFLAGS) -o 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 -lrayt -lGLU -lGL -lX11 -lXext -lm
+
+-$(DEVDIR)/oglso.hdi: rhd_oglso.o rhdisp.o rhdisp2.o viewbeams.o \
++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 \
++ $(CC) $(CFLAGS) -o 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 -lrayt -lGLU -lGL -lX11 -lXext -lm
+
+ rhd_glx0.o: rhd_glx.c
+ $(CC) $(CFLAGS) -c rhd_glx.c
diff -ur ray.orig/src/meta/Rmakefile ray/src/meta/Rmakefile
---- ray.orig/src/meta/Rmakefile Fri Dec 10 02:24:07 1993
-+++ ray/src/meta/Rmakefile Sun Jun 17 17:16:16 2001
-@@ -24,160 +24,121 @@
+--- ray.orig/src/meta/Rmakefile Sat Jul 6 18:20:18 2002
++++ ray/src/meta/Rmakefile Sat Jul 6 22:31:06 2002
+@@ -24,127 +24,98 @@
common = $(io) syscalls.o misc.o savestr.o wputs.o eputs.o quit.o $(COMPAT)
-install: general
+PROGS = mx80 meta2tga t4014 pexpand psort cv psmeta plotin imagew impress x11meta \
+ bgraph igraph dgraph igraph dgraph gcomp aed5 plot4
-+
+PROGS2 = mt160l mt160 mtext plotout xmeta okimate tbar
+
-+all: $(common) ../lib/libmeta.a $(PROGS)
++all: $(common) ../lib/libmeta.a $(PROGS)
+
+install: $(PROGS)
+ install $(PROGS) $(DESTDIR)$(INSTDIR)
-
-$(EXEC2)/mt160l: mt160l.o mplot.o plot.o palloc.o
- $(CC) $(CFLAGS) -o $(EXEC2)/mt160l mt160l.o mplot.o plot.o \
--$(common) palloc.o
--
--$(EXEC2)/okimate: okimate.o mplot.o plot.o palloc.o
-- $(CC) $(CFLAGS) -o $(EXEC2)/okimate okimate.o mplot.o plot.o \
--$(common) palloc.o
+mt160l: mt160l.o mplot.o plot.o palloc.o
+ $(CC) $(CFLAGS) -o mt160l mt160l.o mplot.o plot.o \
-+ $(common) palloc.o
-+
+ $(common) palloc.o
+
+-$(EXEC2)/okimate: okimate.o mplot.o plot.o palloc.o
+- $(CC) $(CFLAGS) -o $(EXEC2)/okimate okimate.o mplot.o plot.o \
+okimate: okimate.o mplot.o plot.o palloc.o
+ $(CC) $(CFLAGS) -o okimate okimate.o mplot.o plot.o \
-+ $(common) palloc.o
+ $(common) palloc.o
-$(INSTDIR)/imagew: imagew.o mplot.o plot.o palloc.o
+imagew: imagew.o mplot.o plot.o palloc.o
$(CC) $(CFLAGS) imagew.o mplot.o plot.o $(common) \
-palloc.o $(MLIB)
- cp a.out $(INSTDIR)/imagew
-+ palloc.o $(MLIB) -o imagew
++palloc.o $(MLIB) -o imagew
-$(EXEC2)/mt160: mt160.o mplot.o plot.o palloc.o
- $(CC) $(CFLAGS) -o $(EXEC2)/mt160 mt160.o mplot.o plot.o $(common) \
--palloc.o
+mt160: mt160.o mplot.o plot.o palloc.o
-+ $(CC) $(CFLAGS) -o mt160 mt160.o mplot.o plot.o $(common) palloc.o
++ $(CC) $(CFLAGS) -o mt160 mt160.o mplot.o plot.o $(common) \
+ palloc.o
-$(INSTDIR)/meta2tga: meta2tga.o rplot.o plot.o palloc.o
+meta2tga: meta2tga.o rplot.o plot.o palloc.o
$(CC) $(CFLAGS) meta2tga.o rplot.o plot.o $(common) \
-palloc.o $(MLIB)
- cp a.out $(INSTDIR)/meta2tga
-+ palloc.o $(MLIB) -o meta2tga
++palloc.o $(MLIB) -o meta2tga
-$(INSTDIR)/mx80: mx80.o mplot.o plot.o palloc.o
+mx80: mx80.o mplot.o plot.o palloc.o
$(CC) $(CFLAGS) mx80.o mplot.o plot.o $(common) \
-palloc.o $(MLIB)
- cp a.out $(INSTDIR)/mx80
-+ palloc.o $(MLIB) -o mx80
++palloc.o $(MLIB) -o mx80
-$(INSTDIR)/t4014: plotout.c ../lib/lib4014.a
+t4014: plotout.c ../lib/lib4014.a
$(CC) -DFORTEK $(CFLAGS) plotout.c $(common) \
-../lib/lib4014.a $(MLIB)
- cp a.out $(INSTDIR)/t4014
-+ ../lib/lib4014.a $(MLIB) -o t4014
++../lib/lib4014.a $(MLIB) -o t4014
rm -f plotout.o
-$(INSTDIR)/impress: impress.o implot.o imPfuncs.o plot.o
$(CC) $(CFLAGS) impress.o implot.o imPfuncs.o \
-plot.o $(common) $(MLIB)
- cp a.out $(INSTDIR)/impress
-+ plot.o $(common) $(MLIB) -o impress
++plot.o $(common) $(MLIB) -o impress
+
+aed5: aed5.o
+ $(CC) $(CFLAGS) aed5.o $(common) $(MLIB) -o aed5
$(CC) $(CFLAGS) pexpand.o expand.o segment.o \
-$(common) palloc.o $(MLIB)
- cp a.out $(INSTDIR)/pexpand
-+ $(common) palloc.o $(MLIB) -o pexpand
++$(common) palloc.o $(MLIB) -o pexpand
-$(INSTDIR)/psort: psort.o sort.o palloc.o
- $(CC) $(CFLAGS) psort.o sort.o $(common) palloc.o $(MLIB)
+ $(CC) $(CFLAGS) psort.o sort.o $(common) palloc.o $(MLIB) -o psort
-$(INSTDIR)/cv: cv.o mfio.o cvhfio.o syscalls.o misc.o savestr.o \
--wputs.o eputs.o quit.o $(COMPAT)
-+cv: cv.o mfio.o cvhfio.o syscalls.o misc.o savestr.o wputs.o eputs.o quit.o $(COMPAT)
++cv: cv.o mfio.o cvhfio.o syscalls.o misc.o savestr.o \
+ wputs.o eputs.o quit.o $(COMPAT)
$(CC) $(CFLAGS) cv.o mfio.o cvhfio.o syscalls.o misc.o \
-savestr.o wputs.o eputs.o quit.o $(COMPAT) $(MLIB)
- cp a.out $(INSTDIR)/cv
-+ savestr.o wputs.o eputs.o quit.o $(COMPAT) $(MLIB) -o cv
++savestr.o wputs.o eputs.o quit.o $(COMPAT) $(MLIB) -o cv
-$(INSTDIR)/plot4: plot4.o primout.o
- $(CC) $(CFLAGS) plot4.o primout.o $(common) $(MLIB)
$(CC) $(CFLAGS) tcurve.o tgraph.o primout.o \
-$(common) $(MLIB)
- cp a.out $(INSTDIR)/tcurve
-+ $(common) $(MLIB) -o tcurve
++$(common) $(MLIB) -o tcurve
-$(INSTDIR)/tscat: tscat.o tgraph.o primout.o
+tscat: tscat.o tgraph.o primout.o
$(CC) $(CFLAGS) tscat.o tgraph.o primout.o \
-$(common) $(MLIB)
- cp a.out $(INSTDIR)/tscat
-+ $(common) $(MLIB) -o tscat
++$(common) $(MLIB) -o tscat
+
+tbar: tbar.o tgraph.o primout.o
+ $(CC) $(CFLAGS) tbar.o tgraph.o primout.o $(common) $(MLIB) -o tbar
+ $(CC) $(CFLAGS) mtext.o primout.o $(common) -o mtext
../lib/libmeta.a: metacalls.o primout.o progname.o
-- ar rc ../lib/libmeta.a metacalls.o primout.o \
--$(common) progname.o
-+ ar rc ../lib/libmeta.a metacalls.o primout.o $(common) progname.o
- -ranlib ../lib/libmeta.a
-
+ ar rc ../lib/libmeta.a metacalls.o primout.o \
+@@ -154,30 +125,26 @@
../lib/lib4014.a:
- cd lib4014; make INSTDIR=../../lib install clean
+ cd lib4014; make INSTDIR=../../lib "CFLAGS=$(OPT)" install clean
-$(INSTDIR)/bgraph: bgraph.o mgvars.o mgraph.o ../lib/libmeta.a \
--calexpr.o caldefn.o calfunc.o ealloc.o
-+bgraph: bgraph.o mgvars.o mgraph.o ../lib/libmeta.a calexpr.o caldefn.o calfunc.o ealloc.o
++bgraph: bgraph.o mgvars.o mgraph.o ../lib/libmeta.a \
+ calexpr.o caldefn.o calfunc.o ealloc.o
$(CC) $(CFLAGS) bgraph.o mgvars.o mgraph.o \
-calexpr.o caldefn.o calfunc.o ealloc.o ../lib/libmeta.a $(MLIB)
- cp a.out $(INSTDIR)/bgraph
-+ calexpr.o caldefn.o calfunc.o ealloc.o ../lib/libmeta.a $(MLIB) -o bgraph
++calexpr.o caldefn.o calfunc.o ealloc.o ../lib/libmeta.a $(MLIB) -o bgraph
-$(INSTDIR)/igraph: igraph.o mgvars.o mgraph.o ../lib/libmeta.a \
--calexpr.o caldefn.o calfunc.o cgraph.o ealloc.o gcalc.o
-+igraph: igraph.o mgvars.o mgraph.o ../lib/libmeta.a calexpr.o caldefn.o calfunc.o cgraph.o ealloc.o gcalc.o
++igraph: igraph.o mgvars.o mgraph.o ../lib/libmeta.a \
+ calexpr.o caldefn.o calfunc.o cgraph.o ealloc.o gcalc.o
$(CC) $(CFLAGS) igraph.o mgvars.o mgraph.o \
--calexpr.o caldefn.o calfunc.o cgraph.o ealloc.o gcalc.o \
+ calexpr.o caldefn.o calfunc.o cgraph.o ealloc.o gcalc.o \
-../lib/libmeta.a $(MLIB)
- cp a.out $(INSTDIR)/igraph
-+ calexpr.o caldefn.o calfunc.o cgraph.o ealloc.o gcalc.o \
-+ ../lib/libmeta.a $(MLIB) -o igraph
++../lib/libmeta.a $(MLIB) -o igraph
-$(INSTDIR)/dgraph: dgraph.o cgraph.o mgvars.o ealloc.o calfunc.o \
--calexpr.o caldefn.o savestr.o wputs.o $(COMPAT)
-+dgraph: dgraph.o cgraph.o mgvars.o ealloc.o calfunc.o calexpr.o caldefn.o savestr.o wputs.o $(COMPAT)
++dgraph: dgraph.o cgraph.o mgvars.o ealloc.o calfunc.o \
+ calexpr.o caldefn.o savestr.o wputs.o $(COMPAT)
$(CC) $(CFLAGS) dgraph.o cgraph.o mgvars.o \
-calfunc.o calexpr.o caldefn.o ealloc.o savestr.o wputs.o $(COMPAT) $(MLIB)
- cp a.out $(INSTDIR)/dgraph
-+ calfunc.o calexpr.o caldefn.o ealloc.o savestr.o wputs.o $(COMPAT) $(MLIB) -o dgraph
++calfunc.o calexpr.o caldefn.o ealloc.o savestr.o wputs.o $(COMPAT) $(MLIB) -o dgraph
-$(INSTDIR)/gcomp: gcomp.o gcalc.o mgvars.o ealloc.o calfunc.o \
--calexpr.o caldefn.o wputs.o savestr.o $(COMPAT)
-+gcomp: gcomp.o gcalc.o mgvars.o ealloc.o calfunc.o calexpr.o caldefn.o wputs.o savestr.o $(COMPAT)
++gcomp: gcomp.o gcalc.o mgvars.o ealloc.o calfunc.o \
+ calexpr.o caldefn.o wputs.o savestr.o $(COMPAT)
$(CC) $(CFLAGS) gcomp.o gcalc.o mgvars.o \
-calfunc.o calexpr.o caldefn.o ealloc.o wputs.o savestr.o $(COMPAT) $(MLIB)
- cp a.out $(INSTDIR)/gcomp
-+ calfunc.o calexpr.o caldefn.o ealloc.o wputs.o savestr.o $(COMPAT) $(MLIB) -o gcomp
++calfunc.o calexpr.o caldefn.o ealloc.o wputs.o savestr.o $(COMPAT) $(MLIB) -o gcomp
calexpr.o: calexpr.c calcomp.h
$(CC) $(CFLAGS) -c -DVARIABLE -DFUNCTION -DRCONST calexpr.c
diff -ur ray.orig/src/meta/igraph.c ray/src/meta/igraph.c
---- ray.orig/src/meta/igraph.c Thu Aug 29 13:36:42 1991
-+++ ray/src/meta/igraph.c Sun Jun 17 17:30:58 2001
+--- ray.orig/src/meta/igraph.c Sat Jul 6 18:20:18 2002
++++ ray/src/meta/igraph.c Sat Jul 6 22:31:06 2002
@@ -14,6 +14,8 @@
#include "mgvars.h"
char *descrip; /* description */
char *value; /* value */
diff -ur ray.orig/src/meta/meta.h ray/src/meta/meta.h
---- ray.orig/src/meta/meta.h Fri Dec 4 19:51:46 1992
-+++ ray/src/meta/meta.h Sun Jun 17 17:23:33 2001
+--- ray.orig/src/meta/meta.h Sat Jul 6 18:20:18 2002
++++ ray/src/meta/meta.h Sat Jul 6 22:31:06 2002
@@ -90,6 +90,7 @@
#define YMN 1 /* index in xy array for ymin */
#define XMX 2 /* index in xy array for xmax */
/*
diff -ur ray.orig/src/meta/meta2tga.c ray/src/meta/meta2tga.c
---- ray.orig/src/meta/meta2tga.c Sat Oct 31 18:35:16 1992
-+++ ray/src/meta/meta2tga.c Sun Jun 17 17:21:55 2001
-@@ -38,7 +38,7 @@
- static char outname[64];
- static char *outtack = NULL;
-
--static FILE *fout = stdout;
-+static FILE *fout;// = stdout;
-
- static int lineno = 0;
-
-@@ -66,6 +66,8 @@
- FILE *popen();
+--- ray.orig/src/meta/meta2tga.c Sat Jul 6 18:20:18 2002
++++ ray/src/meta/meta2tga.c Sat Jul 6 22:31:06 2002
+@@ -67,6 +67,8 @@
#endif
char comargs[200], command[300];
-+
-+ fout=stdout;
++ fout=stdout;
++
#ifdef CPM
fixargs("meta2tga", &argc, &argv);
-diff -ur ray.orig/src/meta/primout.c ray/src/meta/primout.c
---- ray.orig/src/meta/primout.c Tue Feb 25 23:19:05 1986
-+++ ray/src/meta/primout.c Sun Jun 17 17:23:05 2001
-@@ -8,7 +8,7 @@
- #include "meta.h"
-
-
--FILE *pout = stdout; /* the primitive output stream */
-+// FILE *pout;// = stdout; /* the primitive output stream */
-
-
- plseg(a0, xstart, ystart, xend, yend) /* plot line segment */
+ #endif
diff -ur ray.orig/src/ot/Rmakefile ray/src/ot/Rmakefile
---- ray.orig/src/ot/Rmakefile Tue Apr 4 01:46:49 1995
-+++ ray/src/ot/Rmakefile Sun Jun 17 17:16:16 2001
+--- ray.orig/src/ot/Rmakefile Sat Jul 6 18:20:18 2002
++++ ray/src/ot/Rmakefile Sat Jul 6 22:31:06 2002
@@ -24,14 +24,14 @@
o_cone.o o_instance.o bbox.o initotypes.o readfargs.o malloc.o
$(CC) $(CFLAGS) -o oconv oconv.o writeoct.o sphere.o o_face.o \
clean:
set nonomatch; rm -f oconv getbbox *.o core
diff -ur ray.orig/src/px/Rmakefile ray/src/px/Rmakefile
---- ray.orig/src/px/Rmakefile Wed Apr 16 01:56:32 1997
-+++ ray/src/px/Rmakefile Sun Jun 17 17:16:16 2001
+--- ray.orig/src/px/Rmakefile Sat Jul 6 18:20:18 2002
++++ ray/src/px/Rmakefile Sat Jul 6 22:31:06 2002
@@ -5,7 +5,7 @@
ARCH = sun
OPT = -O
MACH = -DBSD
--SPECIAL = aed tiff
-+# SPECIAL = aed tiff
- CFLAGS = $(OPT) $(MACH) -I../common -L../lib
+-SPECIAL = aed
++# SPECIAL = aed
+ CFLAGS = -I../common -L../lib $(OPT) $(MACH)
CC = cc
MLIB = -lm
-@@ -40,145 +40,145 @@
+@@ -25,13 +25,13 @@
+ all: $(PROGS) $(SPECIAL)
+
+ x10: x10image
+- cp x10image $(INSTDIR)
++ cp x10image $(DESTDIR)$(INSTDIR)
+
+ aed: aedimage
+- cp aedimage $(INSTDIR)
++ cp aedimage $(DESTDIR)$(INSTDIR)
+
+ sgi: glimage
+- cp glimage $(INSTDIR)
++ cp glimage $(DESTDIR)$(INSTDIR)
+
+ ogl:
+
+@@ -39,15 +39,15 @@
install: $(PROGS) $(SPECIAL) normpat.csh falsecolor.csh \
pdfblur.csh pmblur.csh xyzimage.csh
- cp pdfblur.csh $(INSTDIR)/pdfblur
- cp pmblur.csh $(INSTDIR)/pmblur
- cp xyzimage.csh $(INSTDIR)/xyzimage
+- cp phisto.csh $(INSTDIR)/phisto
- chmod 755 $(INSTDIR)/normpat $(INSTDIR)/falsecolor \
--$(INSTDIR)/pdfblur $(INSTDIR)/pmblur $(INSTDIR)/xyzimage
+-$(INSTDIR)/pdfblur $(INSTDIR)/pmblur $(INSTDIR)/xyzimage $(INSTDIR)/phisto
+ install $(PROGS) $(DESTDIR)$(INSTDIR)
+ install normpat.csh $(DESTDIR)$(INSTDIR)/normpat
+ install falsecolor.csh $(DESTDIR)$(INSTDIR)/falsecolor
+ install pdfblur.csh $(DESTDIR)$(INSTDIR)/pdfblur
+ install pmblur.csh $(DESTDIR)$(INSTDIR)/pmblur
+ install xyzimage.csh $(DESTDIR)$(INSTDIR)/xyzimage
++ install phisto.csh $(DESTDIR)$(INSTDIR)/phisto
+ chmod 755 $(DESTDIR)$(INSTDIR)/normpat $(DESTDIR)$(INSTDIR)/falsecolor \
-+$(DESTDIR)$(INSTDIR)/pdfblur $(DESTDIR)$(INSTDIR)/pmblur $(DESTDIR)$(INSTDIR)/xyzimage
++$(DESTDIR)$(INSTDIR)/pdfblur $(DESTDIR)$(INSTDIR)/pmblur $(DESTDIR)$(INSTDIR)/xyzimage $(DESTDIR)$(INSTDIR)/phisto
clean:
- set nonomatch; rm -f x10image aedimage glimage ra_tiff \
- $(PROGS) *.o core
+ set nonomatch; rm -f x10image aedimage glimage \
+@@ -55,140 +55,140 @@
+ cd tiff; make distclean
pfilt: pfilt.o pf2.o pf3.o
- $(CC) $(CFLAGS) -o pfilt pfilt.o pf2.o pf3.o -lrt $(MLIB)
+ $(CC) $(CFLAGS) -o greyscale greyscale.o -lrayt $(MLIB)
colorscale: colorscale.o
-- $(CC) $(CFLAGS) -o colorscale colorscale.o -lrt
-+ $(CC) $(CFLAGS) -o colorscale colorscale.o -lrayt
+- $(CC) $(CFLAGS) -o colorscale colorscale.o -lrt $(MLIB)
++ $(CC) $(CFLAGS) -o colorscale colorscale.o -lrayt $(MLIB)
pvalue: pvalue.o
- $(CC) $(CFLAGS) -o pvalue pvalue.o -lrt $(MLIB)
+ $(CC) $(CFLAGS) -o psum psum.o -lrayt
pcompos: pcompos.o
-- $(CC) $(CFLAGS) -o pcompos pcompos.o -lrt
-+ $(CC) $(CFLAGS) -o pcompos pcompos.o -lrayt
+- $(CC) $(CFLAGS) -o pcompos pcompos.o -lrt $(MLIB)
++ $(CC) $(CFLAGS) -o pcompos pcompos.o -lrayt $(MLIB)
psign: psign.o
-- $(CC) $(CFLAGS) -o psign psign.o -lrt
-+ $(CC) $(CFLAGS) -o psign psign.o -lrayt
+- $(CC) $(CFLAGS) -o psign psign.o -lrt $(MLIB)
++ $(CC) $(CFLAGS) -o psign psign.o -lrayt $(MLIB)
d48c: d48c.o
- $(CC) $(CFLAGS) -o d48c d48c.o -lrt
- $(CC) $(CFLAGS) -o ra_pict ra_pict.o -lrt $(MLIB)
+ $(CC) $(CFLAGS) -o ra_pict ra_pict.o -lrayt $(MLIB)
+ ra_hexbit: ra_hexbit.o
+- $(CC) $(CFLAGS) -o ra_hexbit ra_hexbit.o -lrt
++ $(CC) $(CFLAGS) -o ra_hexbit ra_hexbit.o -lrayt
x10image: ximage.o ciq.o cut.o closest.o xraster.o biq.o
$(CC) $(CFLAGS) -o x10image ximage.o xraster.o \
ximage: x11image.o x11raster.o clrtab.o
$(CC) $(CFLAGS) -o ximage x11image.o x11raster.o \
--clrtab.o -lX11 -lrt $(MLIB)
-+clrtab.o -lX11 -lrayt $(MLIB)
+-clrtab.o -lrt -lX11 $(MLIB)
++clrtab.o -lrayt -lX11 $(MLIB)
protate: protate.o
-- $(CC) $(CFLAGS) -o protate protate.o -lrt
-+ $(CC) $(CFLAGS) -o protate protate.o -lrayt
+- $(CC) $(CFLAGS) -o protate protate.o -lrt $(MLIB)
++ $(CC) $(CFLAGS) -o protate protate.o -lrayt $(MLIB)
pextrem: pextrem.o
-- $(CC) $(CFLAGS) -o pextrem pextrem.o -lrt
-+ $(CC) $(CFLAGS) -o pextrem pextrem.o -lrayt
+- $(CC) $(CFLAGS) -o pextrem pextrem.o -lrt $(MLIB)
++ $(CC) $(CFLAGS) -o pextrem pextrem.o -lrayt $(MLIB)
pflip: pflip.o
-- $(CC) $(CFLAGS) -o pflip pflip.o -lrt
-+ $(CC) $(CFLAGS) -o pflip pflip.o -lrayt
+- $(CC) $(CFLAGS) -o pflip pflip.o -lrt $(MLIB)
++ $(CC) $(CFLAGS) -o pflip pflip.o -lrayt $(MLIB)
panim: panim.o client/libclient.a
$(CC) $(CFLAGS) -o panim panim.o \
- $(CC) $(CFLAGS) -o ra_tiff ra_tiff.o -lrt -ltiff $(MLIB)
+ $(CC) $(CFLAGS) -o ra_tiff ra_tiff.o -lrayt -ltiff $(MLIB)
- ra_tiff.o: ra_tiff.c
- $(CC) $(CFLAGS) -Ilibtiff -c ra_tiff.c
-@@ -188,7 +188,7 @@
- mv libtiff.a ../../lib ; make clean
+ ../common/tiff.h ../common/tiffio.h: ../lib/libtiff.a
+ @chmod u+w ../common/tiff.h ../common/tiffio.h
+ @touch ../common/tiff.h ../common/tiffio.h
+
+ normtiff: normtiff.o ../lib/libtiff.a
+- $(CC) $(CFLAGS) -o normtiff normtiff.o -lrt -ltiff $(MLIB)
++ $(CC) $(CFLAGS) -o normtiff normtiff.o -lrayt -ltiff $(MLIB)
+
+ ../lib/libtiff.a: tiff/config.local
+ cd tiff ; ./configure -quiet -noninteractive -with-CC=$(CC) \
+@@ -196,7 +196,7 @@
+ cd libtiff ; make install
ra_pixar: ra_pixar.o ra_pixar.c
- $(CC) $(CFLAGS) $(PIXAR_INCLUDE) -o $@ ra_pixar.o -lrt \
$(PIXAR_LIB)
ra_pixar.o: ra_pixar.c
-@@ -196,11 +196,11 @@
+@@ -204,11 +204,11 @@
xshowtrace: xshowtrace.o x11findwind.o
$(CC) $(CFLAGS) -o xshowtrace xshowtrace.o \
--x11findwind.o -lrt $(MLIB) -lX11
-+x11findwind.o -lrayt $(MLIB) -lX11
+-x11findwind.o -lrt -lX11 $(MLIB)
++x11findwind.o -lrayt -lX11 $(MLIB)
macbethcal: macbethcal.o pmapgen.o mx3.o warp3d.o
$(CC) $(CFLAGS) -o macbethcal macbethcal.o pmapgen.o mx3.o warp3d.o \
macbethcal.o: pmap.h ../common/color.h ../common/resolu.h
diff -ur ray.orig/src/px/pcwarp.c ray/src/px/pcwarp.c
---- ray.orig/src/px/pcwarp.c Thu Feb 6 02:29:26 1997
-+++ ray/src/px/pcwarp.c Sun Jun 17 17:25:54 2001
-@@ -14,7 +14,7 @@
-
- char *progname; /* global argv[0] */
-
--FILE *infp = stdin; /* input stream */
-+FILE *infp; // = stdin; /* input stream */
- int xres, yres; /* input picture resolution */
-
- WARP3D *cwarp; /* our warp map */
+--- ray.orig/src/px/pcwarp.c Sat Jul 6 18:20:18 2002
++++ ray/src/px/pcwarp.c Sat Jul 6 22:31:06 2002
@@ -30,6 +30,7 @@
int cwflags = 0;
int rval;
+ infp=stdin;
progname = argv[0];
- /* get options */
+ infp = stdin;
diff -ur ray.orig/src/px/x11image.c ray/src/px/x11image.c
---- ray.orig/src/px/x11image.c Wed Jan 28 01:59:42 1998
-+++ ray/src/px/x11image.c Sun Jun 17 17:25:18 2001
-@@ -94,7 +94,7 @@
- int xmax, ymax; /* picture dimensions */
- int width, height; /* window size */
- char *fname = NULL; /* input file name */
--FILE *fin = stdin; /* input file */
-+FILE *fin; // = stdin; /* input file */
- long *scanpos = NULL; /* scan line positions in file */
- int cury = 0; /* current scan location */
-
-@@ -144,6 +144,7 @@
+--- ray.orig/src/px/x11image.c Sat Jul 6 18:20:18 2002
++++ ray/src/px/x11image.c Sat Jul 6 22:31:06 2002
+@@ -141,6 +141,7 @@
int headline();
int i;
int pid;
+ fin=stdin;
progname = argv[0];
-
+ fin = stdin;
diff -ur ray.orig/src/rt/Rmakefile ray/src/rt/Rmakefile
---- ray.orig/src/rt/Rmakefile Thu Jul 4 02:19:57 1996
-+++ ray/src/rt/Rmakefile Sun Jun 17 17:16:16 2001
+--- ray.orig/src/rt/Rmakefile Sat Jul 6 18:20:18 2002
++++ ray/src/rt/Rmakefile Sat Jul 6 22:31:06 2002
@@ -5,8 +5,8 @@
OPT = -O
MACH = -DBSD
--CFLAGS = $(MACH) $(OPT) -I../common -L../lib
+-CFLAGS = -I../common -L../lib $(OPT) $(MACH)
-SPECIAL = aed
-+CFLAGS = $(MACH) $(OPT) -I../common -L../lib -I/usr/include/ncurses
-+# SPECIAL = aed
++CFLAGS = -I../common -L../lib $(OPT) $(MACH) -I/usr/include/ncurses
++#SPECIAL = aed
CC = cc
MLIB = -lm
LINT = lint
+@@ -18,7 +18,7 @@
+ #
+ DESTDIR = .
+ INSTDIR = /usr/local/bin
+-INSTALL = cp
++INSTALL = install
+
+ #
+ # The following paths must exist and be relative to root:
@@ -29,7 +29,7 @@
#
# Library routines:
#
# Device drivers for rview (see also devtable.c):
-@@ -87,14 +87,14 @@
+@@ -85,14 +85,14 @@
# What this makefile produces:
#
-PROGS = $(DESTDIR)/rtrace $(DESTDIR)/rpict $(DESTDIR)/rview $(DESTDIR)/lookamb
+PROGS = rtrace rpict rview lookamb
- all: $(PROGS) $(SPECIAL)
+ all: $(PROGS)
install: $(PROGS) $(SPECIAL) rayinit.cal
- $(INSTALL) $(PROGS) $(INSTDIR)
- cp rayinit.cal $(LIBDIR)
+ $(INSTALL) $(PROGS) $(DESTDIR)$(INSTDIR)
+ rm -f $(DESTDIR)$(LIBDIR)/rayinit.cal
-+ install rayinit.cal $(DESTDIR)$(LIBDIR)
++ $(INSTALL) rayinit.cal $(DESTDIR)$(LIBDIR)
sun: $(DEVDIR)/sun $(DEVDIR)/sun.com
-@@ -116,19 +116,19 @@
+@@ -114,17 +114,17 @@
# Links:
#
+ $(CC) $(CFLAGS) -o rpict $(RPOBJS) $(LIBS)
-$(DESTDIR)/rview: $(RVOBJS)
-- $(CC) $(CFLAGS) -o $(DESTDIR)/rview $(RVOBJS) $(DLIBS) $(LIBS)
+- $(CC) $(CFLAGS) -o $(DESTDIR)/rview $(RVOBJS) $(LIBS) $(DLIBS)
+rview: $(RVOBJS)
-+ $(CC) $(CFLAGS) -o rview $(RVOBJS) $(DLIBS) $(LIBS)
++ $(CC) $(CFLAGS) -o rview $(RVOBJS) $(LIBS) $(DLIBS)
-$(DESTDIR)/lookamb: lookamb.o ambio.o
-- $(CC) $(CFLAGS) -o $(DESTDIR)/lookamb lookamb.o ambio.o -lrt
+- $(CC) $(CFLAGS) -o $(DESTDIR)/lookamb lookamb.o ambio.o $(LIBS)
+lookamb: lookamb.o ambio.o
-+ $(CC) $(CFLAGS) -o lookamb lookamb.o ambio.o -lrayt
++ $(CC) $(CFLAGS) -o lookamb lookamb.o ambio.o $(LIBS)
--$(DEVDIR)/sun: sundev.o devmain.o colortab.o editline.o
-+(DEVDIR)/sun: sundev.o devmain.o colortab.o editline.o
+ $(DEVDIR)/sun: sundev.o devmain.o colortab.o editline.o
$(CC) $(CFLAGS) -s -o $(DEVDIR)/sun devmain.o sundev.o colortab.o \
- editline.o -lsuntool -lsunwindow -lpixrect $(LIBS)
-
diff -ur ray.orig/src/util/Rmakefile ray/src/util/Rmakefile
---- ray.orig/src/util/Rmakefile Wed Mar 19 00:59:42 1997
-+++ ray/src/util/Rmakefile Sun Jun 17 17:16:16 2001
-@@ -21,19 +21,19 @@
+--- ray.orig/src/util/Rmakefile Sat Jul 6 18:20:18 2002
++++ ray/src/util/Rmakefile Sat Jul 6 22:31:06 2002
+@@ -24,27 +24,27 @@
- install: all objview.csh objpict.csh glare.csh dayfact.csh rlux.csh \
- raddepend.csh trad.wsh objline.csh
+ install: all $(SPECIAL) objview.csh objpict.csh glare.csh dayfact.csh \
+ rlux.csh raddepend.csh trad.wsh objline.csh compamb.csh
- cp $(PROGS) $(INSTDIR)
- cp objview.csh $(INSTDIR)/objview
- cp objline.csh $(INSTDIR)/objline
- cp debugcal.csh $(INSTDIR)/debugcal
- cp rlux.csh $(INSTDIR)/rlux
- cp raddepend.csh $(INSTDIR)/raddepend
+- cp compamb.csh $(INSTDIR)/compamb
- chmod 755 $(INSTDIR)/objview $(INSTDIR)/objpict \
- $(INSTDIR)/glare $(INSTDIR)/dayfact $(INSTDIR)/debugcal \
-- $(INSTDIR)/rlux $(INSTDIR)/raddepend $(INSTDIR)/objline
+- $(INSTDIR)/rlux $(INSTDIR)/raddepend $(INSTDIR)/objline \
+- $(INSTDIR)/compamb
- csh -f tradinstall.csh $(INSTDIR) $(LIBDIR)/tcl
-+ install $(PROGS) $(DESTDIR)$(INSTDIR)
-+ install objview.csh $(DESTDIR)$(INSTDIR)/objview
-+ install objline.csh $(DESTDIR)$(INSTDIR)/objline
-+ install objpict.csh $(DESTDIR)$(INSTDIR)/objpict
-+ install glare.csh $(DESTDIR)$(INSTDIR)/glare
-+ install dayfact.csh $(DESTDIR)$(INSTDIR)/dayfact
-+ install debugcal.csh $(DESTDIR)$(INSTDIR)/debugcal
-+ install rlux.csh $(DESTDIR)$(INSTDIR)/rlux
-+ install raddepend.csh $(DESTDIR)$(INSTDIR)/raddepend
++ cp $(PROGS) $(DESTDIR)$(INSTDIR)
++ cp objview.csh $(DESTDIR)$(INSTDIR)/objview
++ cp objline.csh $(DESTDIR)$(INSTDIR)/objline
++ cp objpict.csh $(DESTDIR)$(INSTDIR)/objpict
++ cp glare.csh $(DESTDIR)$(INSTDIR)/glare
++ cp dayfact.csh $(DESTDIR)$(INSTDIR)/dayfact
++ cp debugcal.csh $(DESTDIR)$(INSTDIR)/debugcal
++ cp rlux.csh $(DESTDIR)$(INSTDIR)/rlux
++ cp raddepend.csh $(DESTDIR)$(INSTDIR)/raddepend
++ cp compamb.csh $(DESTDIR)$(INSTDIR)/compamb
+ chmod 755 $(DESTDIR)$(INSTDIR)/objview $(DESTDIR)$(INSTDIR)/objpict \
+ $(DESTDIR)$(INSTDIR)/glare $(DESTDIR)$(INSTDIR)/dayfact $(DESTDIR)$(INSTDIR)/debugcal \
-+ $(DESTDIR)$(INSTDIR)/rlux $(DESTDIR)$(INSTDIR)/raddepend $(DESTDIR)$(INSTDIR)/objline
++ $(DESTDIR)$(INSTDIR)/rlux $(DESTDIR)$(INSTDIR)/raddepend $(DESTDIR)$(INSTDIR)/objline \
++ $(DESTDIR)$(INSTDIR)/compamb
+ csh -f tradinstall.csh $(DESTDIR)$(INSTDIR) $(DESTDIR)$(LIBDIR)/tcl
clean:
set nonomatch; rm -f *.o $(PROGS) core
-@@ -42,33 +42,33 @@
+
+ ogl: glrad
+- cp glrad $(INSTDIR)
++ cp glrad $(DESTDIR)$(INSTDIR)
+
+ x10:
+
+@@ -58,39 +58,39 @@
$(CC) $(CFLAGS) -o scanner scanner.o -lm
makedist: makedist.o setscan.o
- $(CC) $(CFLAGS) -o vwright vwright.o -lrt -lm
+ $(CC) $(CFLAGS) -o vwright vwright.o -lrayt -lm
+ vwrays: vwrays.o
+- $(CC) $(CFLAGS) -o vwrays vwrays.o -lrt -lm
++ $(CC) $(CFLAGS) -o vwrays vwrays.o -lrayt -lm
+
getinfo: getinfo.o
- $(CC) $(CFLAGS) -o getinfo getinfo.o -lrt
+ $(CC) $(CFLAGS) -o getinfo getinfo.o -lrayt
+ glrad: glrad.o
+- $(CC) $(CFLAGS) -o glrad glrad.o -lrgl -lrt -lGLU -lGL \
++ $(CC) $(CFLAGS) -o glrad glrad.o -lrgl -lrayt -lGLU -lGL \
+ -lX11 -lXext -lm
+
contour: contour.o
- $(CC) $(CFLAGS) -o contour contour.o -lm
projects / packages / Radiance.git / commitdiff