1 diff -ur ray.orig/src/cal/calc/Makefile ray/src/cal/calc/Makefile
2 --- ray.orig/src/cal/calc/Makefile Fri Dec 10 02:24:21 1993
3 +++ ray/src/cal/calc/Makefile Sun Jun 17 17:16:16 2001
5 caldefn.o calfunc.o calprnt.o ealloc.o savestr.o $(COMPAT) $(MLIB)
9 + install calc $(DESTDIR)$(INSTDIR)
12 set nonomatch; rm -f *.o calc
13 diff -ur ray.orig/src/cal/calc/Rmakefile ray/src/cal/calc/Rmakefile
14 --- ray.orig/src/cal/calc/Rmakefile Fri Dec 10 02:24:21 1993
15 +++ ray/src/cal/calc/Rmakefile Sun Jun 17 17:16:16 2001
17 caldefn.o calfunc.o calprnt.o ealloc.o savestr.o $(COMPAT) $(MLIB)
21 + install calc $(DESTDIR)$(INSTDIR)
24 set nonomatch; rm -f *.o calc
25 diff -ur ray.orig/src/cal/ev/Makefile ray/src/cal/ev/Makefile
26 --- ray.orig/src/cal/ev/Makefile Fri Dec 10 02:24:58 1993
27 +++ ray/src/cal/ev/Makefile Sun Jun 17 17:16:16 2001
29 calfunc.o ealloc.o savestr.o $(MLIB)
33 + install ev $(DESTDIR)$(INSTDIR)
36 set nonomatch; rm -f *.o ev
37 diff -ur ray.orig/src/cal/ev/Rmakefile ray/src/cal/ev/Rmakefile
38 --- ray.orig/src/cal/ev/Rmakefile Fri Dec 10 02:24:58 1993
39 +++ ray/src/cal/ev/Rmakefile Sun Jun 17 17:16:16 2001
41 calfunc.o ealloc.o savestr.o $(MLIB)
45 + install ev $(DESTDIR)$(INSTDIR)
48 set nonomatch; rm -f *.o ev
49 diff -ur ray.orig/src/cal/rcalc/Makefile ray/src/cal/rcalc/Makefile
50 --- ray.orig/src/cal/rcalc/Makefile Fri Dec 10 02:24:36 1993
51 +++ ray/src/cal/rcalc/Makefile Sun Jun 17 17:16:16 2001
53 caldefn.o calfunc.o ealloc.o savestr.o $(COMPAT) $(MLIB)
57 + install rcalc $(DESTDIR)$(INSTDIR)
60 set nonomatch; rm -f *.o rcalc
61 diff -ur ray.orig/src/cal/rcalc/Rmakefile ray/src/cal/rcalc/Rmakefile
62 --- ray.orig/src/cal/rcalc/Rmakefile Fri Dec 10 02:24:36 1993
63 +++ ray/src/cal/rcalc/Rmakefile Sun Jun 17 17:16:16 2001
65 caldefn.o calfunc.o ealloc.o savestr.o $(COMPAT) $(MLIB)
69 + install rcalc $(DESTDIR)$(INSTDIR)
72 set nonomatch; rm -f *.o rcalc
73 diff -ur ray.orig/src/cal/util/Makefile ray/src/cal/util/Makefile
74 --- ray.orig/src/cal/util/Makefile Fri Sep 6 05:47:47 1996
75 +++ ray/src/cal/util/Makefile Sun Jun 17 17:16:16 2001
80 - cp $(PROGS) $(INSTDIR)
81 + install $(PROGS) $(DESTDIR)$(INSTDIR)
84 set nonomatch; rm -f *.o $(PROGS)
85 diff -ur ray.orig/src/cal/util/Rmakefile ray/src/cal/util/Rmakefile
86 --- ray.orig/src/cal/util/Rmakefile Wed Jan 28 01:59:42 1998
87 +++ ray/src/cal/util/Rmakefile Sun Jun 17 17:16:16 2001
92 - cp $(PROGS) $(INSTDIR)
93 + install $(PROGS) $(DESTDIR)$(INSTDIR)
96 set nonomatch; rm -f *.o $(PROGS)
97 diff -ur ray.orig/src/common/Rmakefile ray/src/common/Rmakefile
98 --- ray.orig/src/common/Rmakefile Wed Apr 16 01:53:33 1997
99 +++ ray/src/common/Rmakefile Sun Jun 17 17:16:16 2001
101 librt.a: $(RTOBJ) $(PICOBJ) $(STDOBJ) $(SYSOBJ)
102 ar rc librt.a $(RTOBJ) $(PICOBJ) $(STDOBJ) $(SYSOBJ)
104 + cp librt.a ../lib/librayt.a
107 - mv librt.a ../lib/librt.a
108 + mv librt.a ../lib/librayt.a
112 diff -ur ray.orig/src/common/error.c ray/src/common/error.c
113 --- ray.orig/src/common/error.c Sat Apr 6 01:48:19 1996
114 +++ ray/src/common/error.c Sun Jun 17 17:16:16 2001
117 #include "standard.h"
120 extern char *sys_errlist[]; /* system error list */
122 extern int sys_nerr; /* number of system errors */
124 char errmsg[512]; /* global error message buffer */
125 diff -ur ray.orig/src/common/lookup.h ray/src/common/lookup.h
126 --- ray.orig/src/common/lookup.h Wed Jan 28 01:59:42 1998
127 +++ ray/src/common/lookup.h Sun Jun 17 17:16:16 2001
130 * Header file for general associative table lookup routines
135 char *key; /* key name */
137 extern void lu_done();
138 extern long lu_shash();
140 -extern int strcmp();
141 diff -ur ray.orig/src/cv/Rmakefile ray/src/cv/Rmakefile
142 --- ray.orig/src/cv/Rmakefile Fri Jan 19 18:47:36 1996
143 +++ ray/src/cv/Rmakefile Sun Jun 17 17:16:16 2001
146 LIBFILES = source.cal tilt.cal lamp.tab tmesh.cal
148 +MGF_LIB = ../lib/libmgf.a
152 install: $(PROGS) $(LIBFILES)
153 - cp $(PROGS) $(INSTDIR)
154 - cd $(LIBDIR) ; rm -f $(LIBFILES)
155 - cp $(LIBFILES) $(LIBDIR)
156 + install $(PROGS) $(DESTDIR)$(INSTDIR)
157 + cd $(DESTDIR)$(LIBDIR) ; rm -f $(LIBFILES)
158 + install $(LIBFILES) $(DESTDIR)$(LIBDIR)
161 set nonomatch; rm -f $(PROGS) *.o core
163 $(CC) $(CFLAGS) -o thf2rad thf2rad.o
166 - $(CC) $(CFLAGS) -o ies2rad ies2rad.o -lrt -lm
167 + $(CC) $(CFLAGS) -o ies2rad ies2rad.o -lrayt -lm
169 arch2rad: arch2rad.o trans.o
170 - $(CC) $(CFLAGS) -o arch2rad arch2rad.o trans.o -lrt
171 + $(CC) $(CFLAGS) -o arch2rad arch2rad.o trans.o -lrayt
174 $(CC) $(CFLAGS) -o nff2rad nff2rad.o
176 lampcolor: lampcolor.o
177 - $(CC) $(CFLAGS) -o lampcolor lampcolor.o -lrt
178 + $(CC) $(CFLAGS) -o lampcolor lampcolor.o -lrayt
180 tmesh2rad: tmesh2rad.o tmesh.o
181 - $(CC) $(CFLAGS) -o tmesh2rad tmesh2rad.o tmesh.o -lrt $(MLIB)
182 + $(CC) $(CFLAGS) -o tmesh2rad tmesh2rad.o tmesh.o -lrayt $(MLIB)
184 obj2rad: obj2rad.o trans.o tmesh.o
185 - $(CC) $(CFLAGS) -o obj2rad obj2rad.o trans.o tmesh.o -lrt $(MLIB)
186 + $(CC) $(CFLAGS) -o obj2rad obj2rad.o trans.o tmesh.o -lrayt $(MLIB)
188 -mgf2rad: MGF_LIB mgf2rad.o tmesh.o
189 - $(CC) $(CFLAGS) -o mgf2rad mgf2rad.o tmesh.o -lmgf -lrt $(MLIB)
190 +mgf2rad: $(MGF_LIB) mgf2rad.o tmesh.o
191 + $(CC) $(CFLAGS) -o mgf2rad mgf2rad.o tmesh.o -lmgf -lrayt $(MLIB)
194 - $(CC) $(CFLAGS) -o rad2mgf rad2mgf.o -lrt $(MLIB)
195 + $(CC) $(CFLAGS) -o rad2mgf rad2mgf.o -lrayt $(MLIB)
197 -mgf2meta: MGF_LIB mgf2meta.o
198 - $(CC) $(CFLAGS) -o mgf2meta mgf2meta.o -lmgf -lmeta -lrt $(MLIB)
199 +mgf2meta: $(MGF_LIB) mgf2meta.o
200 + $(CC) $(CFLAGS) -o mgf2meta mgf2meta.o -lmgf -lmeta -lrayt $(MLIB)
203 cd mgflib ; rm -f mgfilt ; \
205 CFLAGS="$(OPT) $(MACH) '-DMEM_PTR=char *' -DNOPROTO" ; \
210 cd mgflib ; rm -f libmgf.a ; \
211 make libmgf.a CC=$(CC) \
212 CFLAGS="$(OPT) $(MACH) '-DMEM_PTR=char *' -DNOPROTO" ; \
213 diff -ur ray.orig/src/cv/mgf2rad.c ray/src/cv/mgf2rad.c
214 --- ray.orig/src/cv/mgf2rad.c Wed Jul 24 22:07:53 1996
215 +++ ray/src/cv/mgf2rad.c Sun Jun 17 17:20:06 2001
218 double emult = 1.; /* emitter multiplier */
220 -FILE *matfp = stdout; /* material output file */
221 +FILE *matfp;// = stdout; /* material output file */
223 int r_comment(), r_cone(), r_cyl(), r_face(), r_ies(), r_ring(), r_sph();
224 char *material(), *object(), *addarg();
231 /* print out parser version */
232 printf("## Translated from MGF Version %d.%d\n", MG_VMAJOR, MG_VMINOR);
233 /* initialize dispatch table */
234 diff -ur ray.orig/src/gen/Rmakefile ray/src/gen/Rmakefile
235 --- ray.orig/src/gen/Rmakefile Tue Mar 19 21:37:46 1996
236 +++ ray/src/gen/Rmakefile Sun Jun 17 17:16:16 2001
240 install: $(PROGS) $(LIBFILES)
241 - cp $(PROGS) $(INSTDIR)
242 - cd $(LIBDIR) ; rm -f $(LIBFILES)
243 - cp $(LIBFILES) $(LIBDIR)
244 + install $(PROGS) $(DESTDIR)$(INSTDIR)
245 + cd $(DESTDIR)$(LIBDIR) ; rm -f $(LIBFILES)
246 + install $(LIBFILES) $(DESTDIR)$(LIBDIR)
249 set nonomatch; rm -f $(PROGS) *.o core
251 $(CC) $(CFLAGS) -o genprism genprism.o $(MLIB)
254 - $(CC) $(CFLAGS) -o xform xform.o -lrt $(MLIB)
255 + $(CC) $(CFLAGS) -o xform xform.o -lrayt $(MLIB)
257 replmarks: replmarks.o
258 - $(CC) $(CFLAGS) -o replmarks replmarks.o -lrt $(MLIB)
259 + $(CC) $(CFLAGS) -o replmarks replmarks.o -lrayt $(MLIB)
261 mkillum: mkillum.o mkillum2.o mkillum3.o
262 - $(CC) $(CFLAGS) -o mkillum mkillum.o mkillum2.o mkillum3.o -lrt $(MLIB)
263 + $(CC) $(CFLAGS) -o mkillum mkillum.o mkillum2.o mkillum3.o -lrayt $(MLIB)
266 - $(CC) $(CFLAGS) -o genrev genrev.o -lrt $(MLIB)
267 + $(CC) $(CFLAGS) -o genrev genrev.o -lrayt $(MLIB)
270 - $(CC) $(CFLAGS) -o genworm genworm.o -lrt $(MLIB)
271 + $(CC) $(CFLAGS) -o genworm genworm.o -lrayt $(MLIB)
274 - $(CC) $(CFLAGS) -o gensurf gensurf.o -lrt $(MLIB)
275 + $(CC) $(CFLAGS) -o gensurf gensurf.o -lrayt $(MLIB)
278 $(CC) $(CFLAGS) -o genclock genclock.o $(MLIB)
279 diff -ur ray.orig/src/meta/Rmakefile ray/src/meta/Rmakefile
280 --- ray.orig/src/meta/Rmakefile Fri Dec 10 02:24:07 1993
281 +++ ray/src/meta/Rmakefile Sun Jun 17 17:16:16 2001
282 @@ -24,160 +24,121 @@
284 common = $(io) syscalls.o misc.o savestr.o wputs.o eputs.o quit.o $(COMPAT)
287 +PROGS = mx80 meta2tga t4014 pexpand psort cv psmeta plotin imagew impress x11meta \
288 + bgraph igraph dgraph igraph dgraph gcomp aed5 plot4
290 +PROGS2 = mt160l mt160 mtext plotout xmeta okimate tbar
292 +all: $(common) ../lib/libmeta.a $(PROGS)
295 + install $(PROGS) $(DESTDIR)$(INSTDIR)
298 set nonomatch; rm -f *.o a.out core
300 -general: $(INSTDIR)/mx80 $(INSTDIR)/meta2tga \
301 -$(INSTDIR)/t4014 $(INSTDIR)/pexpand $(INSTDIR)/psort \
302 -$(INSTDIR)/cv $(INSTDIR)/psmeta $(EXEC2)/plotin \
303 -$(INSTDIR)/imagew $(INSTDIR)/impress $(INSTDIR)/x11meta \
304 -../lib/libmeta.a $(INSTDIR)/bgraph $(INSTDIR)/igraph \
305 -$(INSTDIR)/dgraph $(INSTDIR)/gcomp $(INSTDIR)/aed5 $(INSTDIR)/plot4
307 -special: $(EXEC2)/mt160l $(EXEC2)/mt160 $(EXEC2)/mtext \
308 -$(EXEC2)/plotout $(EXEC2)/xmeta $(EXEC2)/okimate $(EXEC2)/tbar
310 -$(INSTDIR)/meta2tga $(EXEC2)/okimate $(INSTDIR)/impress \
311 -$(INSTDIR)/mx80 $(INSTDIR)/t4014 $(INSTDIR)/plotout $(INSTDIR)/x11meta \
312 -$(EXEC2)/mt160l $(EXEC2)/mt160 $(INSTDIR)/pexpand $(INSTDIR)/plot4 \
313 -$(INSTDIR)/psort $(INSTDIR)/imagew $(INSTDIR)/tcurve $(EXEC2)/mtext \
314 -$(INSTDIR)/tscat $(INSTDIR)/plotin $(INSTDIR)/tbar $(INSTDIR)/xmeta \
315 -../lib/libmeta.a $(INSTDIR)/aed5 $(INSTDIR)/psmeta: $(common)
317 -$(EXEC2)/mt160l: mt160l.o mplot.o plot.o palloc.o
318 - $(CC) $(CFLAGS) -o $(EXEC2)/mt160l mt160l.o mplot.o plot.o \
321 -$(EXEC2)/okimate: okimate.o mplot.o plot.o palloc.o
322 - $(CC) $(CFLAGS) -o $(EXEC2)/okimate okimate.o mplot.o plot.o \
324 +mt160l: mt160l.o mplot.o plot.o palloc.o
325 + $(CC) $(CFLAGS) -o mt160l mt160l.o mplot.o plot.o \
328 +okimate: okimate.o mplot.o plot.o palloc.o
329 + $(CC) $(CFLAGS) -o okimate okimate.o mplot.o plot.o \
332 -$(INSTDIR)/imagew: imagew.o mplot.o plot.o palloc.o
333 +imagew: imagew.o mplot.o plot.o palloc.o
334 $(CC) $(CFLAGS) imagew.o mplot.o plot.o $(common) \
336 - cp a.out $(INSTDIR)/imagew
337 + palloc.o $(MLIB) -o imagew
339 -$(EXEC2)/mt160: mt160.o mplot.o plot.o palloc.o
340 - $(CC) $(CFLAGS) -o $(EXEC2)/mt160 mt160.o mplot.o plot.o $(common) \
342 +mt160: mt160.o mplot.o plot.o palloc.o
343 + $(CC) $(CFLAGS) -o mt160 mt160.o mplot.o plot.o $(common) palloc.o
345 -$(INSTDIR)/meta2tga: meta2tga.o rplot.o plot.o palloc.o
346 +meta2tga: meta2tga.o rplot.o plot.o palloc.o
347 $(CC) $(CFLAGS) meta2tga.o rplot.o plot.o $(common) \
349 - cp a.out $(INSTDIR)/meta2tga
350 + palloc.o $(MLIB) -o meta2tga
352 -$(INSTDIR)/mx80: mx80.o mplot.o plot.o palloc.o
353 +mx80: mx80.o mplot.o plot.o palloc.o
354 $(CC) $(CFLAGS) mx80.o mplot.o plot.o $(common) \
356 - cp a.out $(INSTDIR)/mx80
357 + palloc.o $(MLIB) -o mx80
359 -$(INSTDIR)/t4014: plotout.c ../lib/lib4014.a
360 +t4014: plotout.c ../lib/lib4014.a
361 $(CC) -DFORTEK $(CFLAGS) plotout.c $(common) \
362 -../lib/lib4014.a $(MLIB)
363 - cp a.out $(INSTDIR)/t4014
364 + ../lib/lib4014.a $(MLIB) -o t4014
367 -$(INSTDIR)/impress: impress.o implot.o imPfuncs.o plot.o
368 +impress: impress.o implot.o imPfuncs.o plot.o
369 $(CC) $(CFLAGS) impress.o implot.o imPfuncs.o \
370 -plot.o $(common) $(MLIB)
371 - cp a.out $(INSTDIR)/impress
372 + plot.o $(common) $(MLIB) -o impress
375 + $(CC) $(CFLAGS) aed5.o $(common) $(MLIB) -o aed5
377 -$(INSTDIR)/aed5: aed5.o
378 - $(CC) $(CFLAGS) aed5.o $(common) $(MLIB)
379 - cp a.out $(INSTDIR)/aed5
381 -$(INSTDIR)/xmeta: xmeta.o xplot.o plot.o palloc.o
382 - $(CC) $(CFLAGS) xmeta.o xplot.o plot.o palloc.o $(common) -lX11 $(MLIB)
383 - cp a.out $(INSTDIR)/xmeta
385 -$(INSTDIR)/x11meta: xmeta.o x11plot.o plot.o palloc.o
386 - $(CC) $(CFLAGS) xmeta.o x11plot.o plot.o palloc.o $(common) -lX11 $(MLIB)
387 - cp a.out $(INSTDIR)/x11meta
389 -$(INSTDIR)/psmeta: psmeta.o psplot.o
390 - $(CC) $(CFLAGS) psmeta.o psplot.o $(common) $(MLIB)
391 - cp a.out $(INSTDIR)/psmeta
393 -$(INSTDIR)/plotout: plotout.c
394 - $(CC) $(CFLAGS) plotout.c $(common) -lplot $(MLIB)
395 - cp a.out $(INSTDIR)/plotout
396 +xmeta: xmeta.o xplot.o plot.o palloc.o
397 + $(CC) $(CFLAGS) xmeta.o xplot.o plot.o palloc.o $(common) -lX11 $(MLIB) -o xmeta
399 +x11meta: xmeta.o x11plot.o plot.o palloc.o
400 + $(CC) $(CFLAGS) xmeta.o x11plot.o plot.o palloc.o $(common) -lX11 $(MLIB) -o x11meta
402 +psmeta: psmeta.o psplot.o
403 + $(CC) $(CFLAGS) psmeta.o psplot.o $(common) $(MLIB) -o psmeta
406 + $(CC) $(CFLAGS) plotout.c $(common) -lplot $(MLIB) -o plotout
409 -$(INSTDIR)/plotin: plotin.o primout.o
410 - $(CC) $(CFLAGS) plotin.o primout.o $(common) $(MLIB)
411 - cp a.out $(INSTDIR)/plotin
412 +plotin: plotin.o primout.o
413 + $(CC) $(CFLAGS) plotin.o primout.o $(common) $(MLIB) -o plotin
415 -$(INSTDIR)/pexpand: pexpand.o expand.o segment.o palloc.o
416 +pexpand: pexpand.o expand.o segment.o palloc.o
417 $(CC) $(CFLAGS) pexpand.o expand.o segment.o \
418 -$(common) palloc.o $(MLIB)
419 - cp a.out $(INSTDIR)/pexpand
420 + $(common) palloc.o $(MLIB) -o pexpand
422 -$(INSTDIR)/psort: psort.o sort.o palloc.o
423 - $(CC) $(CFLAGS) psort.o sort.o $(common) palloc.o $(MLIB)
424 - cp a.out $(INSTDIR)/psort
425 +psort: psort.o sort.o palloc.o
426 + $(CC) $(CFLAGS) psort.o sort.o $(common) palloc.o $(MLIB) -o psort
428 -$(INSTDIR)/cv: cv.o mfio.o cvhfio.o syscalls.o misc.o savestr.o \
429 -wputs.o eputs.o quit.o $(COMPAT)
430 +cv: cv.o mfio.o cvhfio.o syscalls.o misc.o savestr.o wputs.o eputs.o quit.o $(COMPAT)
431 $(CC) $(CFLAGS) cv.o mfio.o cvhfio.o syscalls.o misc.o \
432 -savestr.o wputs.o eputs.o quit.o $(COMPAT) $(MLIB)
433 - cp a.out $(INSTDIR)/cv
434 + savestr.o wputs.o eputs.o quit.o $(COMPAT) $(MLIB) -o cv
436 -$(INSTDIR)/plot4: plot4.o primout.o
437 - $(CC) $(CFLAGS) plot4.o primout.o $(common) $(MLIB)
438 - cp a.out $(INSTDIR)/plot4
439 +plot4: plot4.o primout.o
440 + $(CC) $(CFLAGS) plot4.o primout.o $(common) $(MLIB) -o plot4
442 -$(INSTDIR)/tcurve: tcurve.o tgraph.o primout.o
443 +tcurve: tcurve.o tgraph.o primout.o
444 $(CC) $(CFLAGS) tcurve.o tgraph.o primout.o \
446 - cp a.out $(INSTDIR)/tcurve
447 + $(common) $(MLIB) -o tcurve
449 -$(INSTDIR)/tscat: tscat.o tgraph.o primout.o
450 +tscat: tscat.o tgraph.o primout.o
451 $(CC) $(CFLAGS) tscat.o tgraph.o primout.o \
453 - cp a.out $(INSTDIR)/tscat
454 + $(common) $(MLIB) -o tscat
456 +tbar: tbar.o tgraph.o primout.o
457 + $(CC) $(CFLAGS) tbar.o tgraph.o primout.o $(common) $(MLIB) -o tbar
459 -$(INSTDIR)/tbar: tbar.o tgraph.o primout.o
460 - $(CC) $(CFLAGS) tbar.o tgraph.o primout.o $(common) $(MLIB)
461 - cp a.out $(INSTDIR)/tbar
463 -$(EXEC2)/mtext: mtext.o primout.o
464 - $(CC) $(CFLAGS) mtext.o primout.o $(common)
465 - cp a.out $(EXEC2)/mtext
466 +mtext: mtext.o primout.o
467 + $(CC) $(CFLAGS) mtext.o primout.o $(common) -o mtext
469 ../lib/libmeta.a: metacalls.o primout.o progname.o
470 - ar rc ../lib/libmeta.a metacalls.o primout.o \
471 -$(common) progname.o
472 + ar rc ../lib/libmeta.a metacalls.o primout.o $(common) progname.o
473 -ranlib ../lib/libmeta.a
476 cd lib4014; make INSTDIR=../../lib install clean
478 -$(INSTDIR)/bgraph: bgraph.o mgvars.o mgraph.o ../lib/libmeta.a \
479 -calexpr.o caldefn.o calfunc.o ealloc.o
480 +bgraph: bgraph.o mgvars.o mgraph.o ../lib/libmeta.a calexpr.o caldefn.o calfunc.o ealloc.o
481 $(CC) $(CFLAGS) bgraph.o mgvars.o mgraph.o \
482 -calexpr.o caldefn.o calfunc.o ealloc.o ../lib/libmeta.a $(MLIB)
483 - cp a.out $(INSTDIR)/bgraph
484 + calexpr.o caldefn.o calfunc.o ealloc.o ../lib/libmeta.a $(MLIB) -o bgraph
486 -$(INSTDIR)/igraph: igraph.o mgvars.o mgraph.o ../lib/libmeta.a \
487 -calexpr.o caldefn.o calfunc.o cgraph.o ealloc.o gcalc.o
488 +igraph: igraph.o mgvars.o mgraph.o ../lib/libmeta.a calexpr.o caldefn.o calfunc.o cgraph.o ealloc.o gcalc.o
489 $(CC) $(CFLAGS) igraph.o mgvars.o mgraph.o \
490 -calexpr.o caldefn.o calfunc.o cgraph.o ealloc.o gcalc.o \
491 -../lib/libmeta.a $(MLIB)
492 - cp a.out $(INSTDIR)/igraph
493 + calexpr.o caldefn.o calfunc.o cgraph.o ealloc.o gcalc.o \
494 + ../lib/libmeta.a $(MLIB) -o igraph
496 -$(INSTDIR)/dgraph: dgraph.o cgraph.o mgvars.o ealloc.o calfunc.o \
497 -calexpr.o caldefn.o savestr.o wputs.o $(COMPAT)
498 +dgraph: dgraph.o cgraph.o mgvars.o ealloc.o calfunc.o calexpr.o caldefn.o savestr.o wputs.o $(COMPAT)
499 $(CC) $(CFLAGS) dgraph.o cgraph.o mgvars.o \
500 -calfunc.o calexpr.o caldefn.o ealloc.o savestr.o wputs.o $(COMPAT) $(MLIB)
501 - cp a.out $(INSTDIR)/dgraph
502 + calfunc.o calexpr.o caldefn.o ealloc.o savestr.o wputs.o $(COMPAT) $(MLIB) -o dgraph
504 -$(INSTDIR)/gcomp: gcomp.o gcalc.o mgvars.o ealloc.o calfunc.o \
505 -calexpr.o caldefn.o wputs.o savestr.o $(COMPAT)
506 +gcomp: gcomp.o gcalc.o mgvars.o ealloc.o calfunc.o calexpr.o caldefn.o wputs.o savestr.o $(COMPAT)
507 $(CC) $(CFLAGS) gcomp.o gcalc.o mgvars.o \
508 -calfunc.o calexpr.o caldefn.o ealloc.o wputs.o savestr.o $(COMPAT) $(MLIB)
509 - cp a.out $(INSTDIR)/gcomp
510 + calfunc.o calexpr.o caldefn.o ealloc.o wputs.o savestr.o $(COMPAT) $(MLIB) -o gcomp
512 calexpr.o: calexpr.c calcomp.h
513 $(CC) $(CFLAGS) -c -DVARIABLE -DFUNCTION -DRCONST calexpr.c
514 diff -ur ray.orig/src/meta/igraph.c ray/src/meta/igraph.c
515 --- ray.orig/src/meta/igraph.c Thu Aug 29 13:36:42 1991
516 +++ ray/src/meta/igraph.c Sun Jun 17 17:30:58 2001
524 char *descrip; /* description */
525 char *value; /* value */
526 diff -ur ray.orig/src/meta/meta.h ray/src/meta/meta.h
527 --- ray.orig/src/meta/meta.h Fri Dec 4 19:51:46 1992
528 +++ ray/src/meta/meta.h Sun Jun 17 17:23:33 2001
530 #define YMN 1 /* index in xy array for ymin */
531 #define XMX 2 /* index in xy array for xmax */
532 #define YMX 3 /* index in xy array for ymax */
537 diff -ur ray.orig/src/meta/meta2tga.c ray/src/meta/meta2tga.c
538 --- ray.orig/src/meta/meta2tga.c Sat Oct 31 18:35:16 1992
539 +++ ray/src/meta/meta2tga.c Sun Jun 17 17:21:55 2001
541 static char outname[64];
542 static char *outtack = NULL;
544 -static FILE *fout = stdout;
545 +static FILE *fout;// = stdout;
547 static int lineno = 0;
552 char comargs[200], command[300];
557 fixargs("meta2tga", &argc, &argv);
558 diff -ur ray.orig/src/meta/primout.c ray/src/meta/primout.c
559 --- ray.orig/src/meta/primout.c Tue Feb 25 23:19:05 1986
560 +++ ray/src/meta/primout.c Sun Jun 17 17:23:05 2001
565 -FILE *pout = stdout; /* the primitive output stream */
566 +// FILE *pout;// = stdout; /* the primitive output stream */
569 plseg(a0, xstart, ystart, xend, yend) /* plot line segment */
570 diff -ur ray.orig/src/ot/Rmakefile ray/src/ot/Rmakefile
571 --- ray.orig/src/ot/Rmakefile Tue Apr 4 01:46:49 1995
572 +++ ray/src/ot/Rmakefile Sun Jun 17 17:16:16 2001
574 o_cone.o o_instance.o bbox.o initotypes.o readfargs.o malloc.o
575 $(CC) $(CFLAGS) -o oconv oconv.o writeoct.o sphere.o o_face.o \
576 o_cone.o o_instance.o bbox.o readfargs.o \
577 -initotypes.o malloc.o -lrt $(MLIB)
578 +initotypes.o malloc.o -lrayt $(MLIB)
580 getbbox: getbbox.o readobj2.o bbox.o init2otypes.o
581 $(CC) $(CFLAGS) -o getbbox getbbox.o readobj2.o \
582 -bbox.o init2otypes.o -lrt $(MLIB)
583 +bbox.o init2otypes.o -lrayt $(MLIB)
585 install: oconv getbbox
586 - cp oconv getbbox $(INSTDIR)
587 + install oconv getbbox $(DESTDIR)$(INSTDIR)
590 set nonomatch; rm -f oconv getbbox *.o core
591 diff -ur ray.orig/src/px/Rmakefile ray/src/px/Rmakefile
592 --- ray.orig/src/px/Rmakefile Wed Apr 16 01:56:32 1997
593 +++ ray/src/px/Rmakefile Sun Jun 17 17:16:16 2001
599 +# SPECIAL = aed tiff
600 CFLAGS = $(OPT) $(MACH) -I../common -L../lib
603 @@ -40,145 +40,145 @@
605 install: $(PROGS) $(SPECIAL) normpat.csh falsecolor.csh \
606 pdfblur.csh pmblur.csh xyzimage.csh
607 - cp $(PROGS) $(INSTDIR)
608 - cp normpat.csh $(INSTDIR)/normpat
609 - cp falsecolor.csh $(INSTDIR)/falsecolor
610 - cp pdfblur.csh $(INSTDIR)/pdfblur
611 - cp pmblur.csh $(INSTDIR)/pmblur
612 - cp xyzimage.csh $(INSTDIR)/xyzimage
613 - chmod 755 $(INSTDIR)/normpat $(INSTDIR)/falsecolor \
614 -$(INSTDIR)/pdfblur $(INSTDIR)/pmblur $(INSTDIR)/xyzimage
615 + install $(PROGS) $(DESTDIR)$(INSTDIR)
616 + install normpat.csh $(DESTDIR)$(INSTDIR)/normpat
617 + install falsecolor.csh $(DESTDIR)$(INSTDIR)/falsecolor
618 + install pdfblur.csh $(DESTDIR)$(INSTDIR)/pdfblur
619 + install pmblur.csh $(DESTDIR)$(INSTDIR)/pmblur
620 + install xyzimage.csh $(DESTDIR)$(INSTDIR)/xyzimage
621 + chmod 755 $(DESTDIR)$(INSTDIR)/normpat $(DESTDIR)$(INSTDIR)/falsecolor \
622 +$(DESTDIR)$(INSTDIR)/pdfblur $(DESTDIR)$(INSTDIR)/pmblur $(DESTDIR)$(INSTDIR)/xyzimage
625 set nonomatch; rm -f x10image aedimage glimage ra_tiff \
628 pfilt: pfilt.o pf2.o pf3.o
629 - $(CC) $(CFLAGS) -o pfilt pfilt.o pf2.o pf3.o -lrt $(MLIB)
630 + $(CC) $(CFLAGS) -o pfilt pfilt.o pf2.o pf3.o -lrayt $(MLIB)
632 pcond: pcond.o pcond2.o pcond3.o pcond4.o warp3d.o
633 $(CC) $(CFLAGS) -o pcond pcond.o pcond2.o pcond3.o pcond4.o warp3d.o \
637 pcwarp: pcwarp.o warp3d.o
638 - $(CC) $(CFLAGS) -o pcwarp pcwarp.o warp3d.o -lrt $(MLIB)
639 + $(CC) $(CFLAGS) -o pcwarp pcwarp.o warp3d.o -lrayt $(MLIB)
642 - $(CC) $(CFLAGS) -o ttyimage ttyimage.o -lrt $(MLIB)
643 + $(CC) $(CFLAGS) -o ttyimage ttyimage.o -lrayt $(MLIB)
646 - $(CC) $(CFLAGS) -o t4027 t4027.o -lrt
647 + $(CC) $(CFLAGS) -o t4027 t4027.o -lrayt
650 - $(CC) $(CFLAGS) -o glimage glimage.o -lrt -lgl_s $(MLIB)
651 + $(CC) $(CFLAGS) -o glimage glimage.o -lrayt -lgl_s $(MLIB)
653 aedimage: aedimage.o ciq.o cut.o closest.o biq.o
654 $(CC) $(CFLAGS) -o aedimage aedimage.o ciq.o cut.o closest.o \
656 +biq.o -lrayt $(MLIB)
659 - $(CC) $(CFLAGS) -o oki20c oki20c.o -lrt $(MLIB)
660 + $(CC) $(CFLAGS) -o oki20c oki20c.o -lrayt $(MLIB)
663 - $(CC) $(CFLAGS) -o oki20 oki20.o -lrt $(MLIB)
664 + $(CC) $(CFLAGS) -o oki20 oki20.o -lrayt $(MLIB)
667 - $(CC) $(CFLAGS) -o paintjet paintjet.o -lrt $(MLIB)
668 + $(CC) $(CFLAGS) -o paintjet paintjet.o -lrayt $(MLIB)
671 - $(CC) $(CFLAGS) -o mt160r mt160r.o -lrt $(MLIB)
672 + $(CC) $(CFLAGS) -o mt160r mt160r.o -lrayt $(MLIB)
674 greyscale: greyscale.o
675 - $(CC) $(CFLAGS) -o greyscale greyscale.o -lrt $(MLIB)
676 + $(CC) $(CFLAGS) -o greyscale greyscale.o -lrayt $(MLIB)
678 colorscale: colorscale.o
679 - $(CC) $(CFLAGS) -o colorscale colorscale.o -lrt
680 + $(CC) $(CFLAGS) -o colorscale colorscale.o -lrayt
683 - $(CC) $(CFLAGS) -o pvalue pvalue.o -lrt $(MLIB)
684 + $(CC) $(CFLAGS) -o pvalue pvalue.o -lrayt $(MLIB)
687 - $(CC) $(CFLAGS) -o psum psum.o -lrt
688 + $(CC) $(CFLAGS) -o psum psum.o -lrayt
691 - $(CC) $(CFLAGS) -o pcompos pcompos.o -lrt
692 + $(CC) $(CFLAGS) -o pcompos pcompos.o -lrayt
695 - $(CC) $(CFLAGS) -o psign psign.o -lrt
696 + $(CC) $(CFLAGS) -o psign psign.o -lrayt
699 - $(CC) $(CFLAGS) -o d48c d48c.o -lrt
700 + $(CC) $(CFLAGS) -o d48c d48c.o -lrayt
702 ra_gif: ra_gif.o clrtab.o neuclrtab.o
703 - $(CC) $(CFLAGS) -o ra_gif ra_gif.o clrtab.o neuclrtab.o -lrt $(MLIB)
704 + $(CC) $(CFLAGS) -o ra_gif ra_gif.o clrtab.o neuclrtab.o -lrayt $(MLIB)
706 ra_pr: ra_pr.o ciq.o cut.o closest.o biq.o
707 $(CC) $(CFLAGS) -o ra_pr ra_pr.o ciq.o cut.o closest.o \
709 +biq.o -lrayt $(MLIB)
712 - $(CC) $(CFLAGS) -o ra_pr24 ra_pr24.o -lrt $(MLIB)
713 + $(CC) $(CFLAGS) -o ra_pr24 ra_pr24.o -lrayt $(MLIB)
716 - $(CC) $(CFLAGS) -o ra_avs ra_avs.o -lrt $(MLIB)
717 + $(CC) $(CFLAGS) -o ra_avs ra_avs.o -lrayt $(MLIB)
720 - $(CC) $(CFLAGS) -o ra_ps ra_ps.o -lrt $(MLIB)
721 + $(CC) $(CFLAGS) -o ra_ps ra_ps.o -lrayt $(MLIB)
724 - $(CC) $(CFLAGS) -o ra_ppm ra_ppm.o -lrt $(MLIB)
725 + $(CC) $(CFLAGS) -o ra_ppm ra_ppm.o -lrayt $(MLIB)
727 ra_t8: ra_t8.o clrtab.o neuclrtab.o
728 - $(CC) $(CFLAGS) -o ra_t8 ra_t8.o clrtab.o neuclrtab.o -lrt $(MLIB)
729 + $(CC) $(CFLAGS) -o ra_t8 ra_t8.o clrtab.o neuclrtab.o -lrayt $(MLIB)
732 - $(CC) $(CFLAGS) -o ra_t16 ra_t16.o -lrt $(MLIB)
733 + $(CC) $(CFLAGS) -o ra_t16 ra_t16.o -lrayt $(MLIB)
736 $(CC) $(CFLAGS) -o ra_im ra_im.o
739 - $(CC) $(CFLAGS) -o ra_bn ra_bn.o -lrt $(MLIB)
740 + $(CC) $(CFLAGS) -o ra_bn ra_bn.o -lrayt $(MLIB)
743 - $(CC) $(CFLAGS) -o ra_rgbe ra_rgbe.o -lrt $(MLIB)
744 + $(CC) $(CFLAGS) -o ra_rgbe ra_rgbe.o -lrayt $(MLIB)
747 - $(CC) $(CFLAGS) -o ra_pict ra_pict.o -lrt $(MLIB)
748 + $(CC) $(CFLAGS) -o ra_pict ra_pict.o -lrayt $(MLIB)
751 x10image: ximage.o ciq.o cut.o closest.o xraster.o biq.o
752 $(CC) $(CFLAGS) -o x10image ximage.o xraster.o \
753 -ciq.o cut.o closest.o biq.o -lX -lrt $(MLIB)
754 +ciq.o cut.o closest.o biq.o -lX -lrayt $(MLIB)
756 ximage: x11image.o x11raster.o clrtab.o
757 $(CC) $(CFLAGS) -o ximage x11image.o x11raster.o \
758 -clrtab.o -lX11 -lrt $(MLIB)
759 +clrtab.o -lX11 -lrayt $(MLIB)
762 - $(CC) $(CFLAGS) -o protate protate.o -lrt
763 + $(CC) $(CFLAGS) -o protate protate.o -lrayt
766 - $(CC) $(CFLAGS) -o pextrem pextrem.o -lrt
767 + $(CC) $(CFLAGS) -o pextrem pextrem.o -lrayt
770 - $(CC) $(CFLAGS) -o pflip pflip.o -lrt
771 + $(CC) $(CFLAGS) -o pflip pflip.o -lrayt
773 panim: panim.o client/libclient.a
774 $(CC) $(CFLAGS) -o panim panim.o \
775 --lrt client/libclient.a -lrpcsvc $(MLIB)
776 +-lrayt client/libclient.a -lrpcsvc $(MLIB)
779 - $(CC) $(CFLAGS) -o pcomb pcomb.o -lrt $(MLIB)
780 + $(CC) $(CFLAGS) -o pcomb pcomb.o -lrayt $(MLIB)
783 - $(CC) $(CFLAGS) -o pinterp pinterp.o -lrt $(MLIB)
784 + $(CC) $(CFLAGS) -o pinterp pinterp.o -lrayt $(MLIB)
787 - $(CC) $(CFLAGS) -o ra_xyze ra_xyze.o -lrt $(MLIB)
788 + $(CC) $(CFLAGS) -o ra_xyze ra_xyze.o -lrayt $(MLIB)
790 ra_tiff: ra_tiff.o ../lib/libtiff.a
791 - $(CC) $(CFLAGS) -o ra_tiff ra_tiff.o -lrt -ltiff $(MLIB)
792 + $(CC) $(CFLAGS) -o ra_tiff ra_tiff.o -lrayt -ltiff $(MLIB)
795 $(CC) $(CFLAGS) -Ilibtiff -c ra_tiff.c
797 mv libtiff.a ../../lib ; make clean
799 ra_pixar: ra_pixar.o ra_pixar.c
800 - $(CC) $(CFLAGS) $(PIXAR_INCLUDE) -o $@ ra_pixar.o -lrt \
801 + $(CC) $(CFLAGS) $(PIXAR_INCLUDE) -o $@ ra_pixar.o -lrayt \
804 ra_pixar.o: ra_pixar.c
805 @@ -196,11 +196,11 @@
807 xshowtrace: xshowtrace.o x11findwind.o
808 $(CC) $(CFLAGS) -o xshowtrace xshowtrace.o \
809 -x11findwind.o -lrt $(MLIB) -lX11
810 +x11findwind.o -lrayt $(MLIB) -lX11
812 macbethcal: macbethcal.o pmapgen.o mx3.o warp3d.o
813 $(CC) $(CFLAGS) -o macbethcal macbethcal.o pmapgen.o mx3.o warp3d.o \
818 macbethcal.o: pmap.h ../common/color.h ../common/resolu.h
819 diff -ur ray.orig/src/px/pcwarp.c ray/src/px/pcwarp.c
820 --- ray.orig/src/px/pcwarp.c Thu Feb 6 02:29:26 1997
821 +++ ray/src/px/pcwarp.c Sun Jun 17 17:25:54 2001
824 char *progname; /* global argv[0] */
826 -FILE *infp = stdin; /* input stream */
827 +FILE *infp; // = stdin; /* input stream */
828 int xres, yres; /* input picture resolution */
830 WARP3D *cwarp; /* our warp map */
839 diff -ur ray.orig/src/px/x11image.c ray/src/px/x11image.c
840 --- ray.orig/src/px/x11image.c Wed Jan 28 01:59:42 1998
841 +++ ray/src/px/x11image.c Sun Jun 17 17:25:18 2001
843 int xmax, ymax; /* picture dimensions */
844 int width, height; /* window size */
845 char *fname = NULL; /* input file name */
846 -FILE *fin = stdin; /* input file */
847 +FILE *fin; // = stdin; /* input file */
848 long *scanpos = NULL; /* scan line positions in file */
849 int cury = 0; /* current scan location */
859 diff -ur ray.orig/src/rt/Rmakefile ray/src/rt/Rmakefile
860 --- ray.orig/src/rt/Rmakefile Thu Jul 4 02:19:57 1996
861 +++ ray/src/rt/Rmakefile Sun Jun 17 17:16:16 2001
866 -CFLAGS = $(MACH) $(OPT) -I../common -L../lib
868 +CFLAGS = $(MACH) $(OPT) -I../common -L../lib -I/usr/include/ncurses
878 +LIBS = -lrayt $(MLIB)
881 # Device drivers for rview (see also devtable.c):
883 # What this makefile produces:
886 -PROGS = $(DESTDIR)/rtrace $(DESTDIR)/rpict $(DESTDIR)/rview $(DESTDIR)/lookamb
887 +PROGS = rtrace rpict rview lookamb
889 all: $(PROGS) $(SPECIAL)
891 install: $(PROGS) $(SPECIAL) rayinit.cal
892 - $(INSTALL) $(PROGS) $(INSTDIR)
893 - rm -f $(LIBDIR)/rayinit.cal
894 - cp rayinit.cal $(LIBDIR)
895 + $(INSTALL) $(PROGS) $(DESTDIR)$(INSTDIR)
896 + rm -f $(DESTDIR)$(LIBDIR)/rayinit.cal
897 + install rayinit.cal $(DESTDIR)$(LIBDIR)
899 sun: $(DEVDIR)/sun $(DEVDIR)/sun.com
901 @@ -116,19 +116,19 @@
905 -$(DESTDIR)/rtrace: $(RTOBJS)
906 - $(CC) $(CFLAGS) -o $(DESTDIR)/rtrace $(RTOBJS) $(LIBS)
908 + $(CC) $(CFLAGS) -o rtrace $(RTOBJS) $(LIBS)
910 -$(DESTDIR)/rpict: $(RPOBJS)
911 - $(CC) $(CFLAGS) -o $(DESTDIR)/rpict $(RPOBJS) $(LIBS)
913 + $(CC) $(CFLAGS) -o rpict $(RPOBJS) $(LIBS)
915 -$(DESTDIR)/rview: $(RVOBJS)
916 - $(CC) $(CFLAGS) -o $(DESTDIR)/rview $(RVOBJS) $(DLIBS) $(LIBS)
918 + $(CC) $(CFLAGS) -o rview $(RVOBJS) $(DLIBS) $(LIBS)
920 -$(DESTDIR)/lookamb: lookamb.o ambio.o
921 - $(CC) $(CFLAGS) -o $(DESTDIR)/lookamb lookamb.o ambio.o -lrt
922 +lookamb: lookamb.o ambio.o
923 + $(CC) $(CFLAGS) -o lookamb lookamb.o ambio.o -lrayt
925 -$(DEVDIR)/sun: sundev.o devmain.o colortab.o editline.o
926 +(DEVDIR)/sun: sundev.o devmain.o colortab.o editline.o
927 $(CC) $(CFLAGS) -s -o $(DEVDIR)/sun devmain.o sundev.o colortab.o \
928 editline.o -lsuntool -lsunwindow -lpixrect $(LIBS)
930 diff -ur ray.orig/src/util/Rmakefile ray/src/util/Rmakefile
931 --- ray.orig/src/util/Rmakefile Wed Mar 19 00:59:42 1997
932 +++ ray/src/util/Rmakefile Sun Jun 17 17:16:16 2001
935 install: all objview.csh objpict.csh glare.csh dayfact.csh rlux.csh \
936 raddepend.csh trad.wsh objline.csh
937 - cp $(PROGS) $(INSTDIR)
938 - cp objview.csh $(INSTDIR)/objview
939 - cp objline.csh $(INSTDIR)/objline
940 - cp objpict.csh $(INSTDIR)/objpict
941 - cp glare.csh $(INSTDIR)/glare
942 - cp dayfact.csh $(INSTDIR)/dayfact
943 - cp debugcal.csh $(INSTDIR)/debugcal
944 - cp rlux.csh $(INSTDIR)/rlux
945 - cp raddepend.csh $(INSTDIR)/raddepend
946 - chmod 755 $(INSTDIR)/objview $(INSTDIR)/objpict \
947 - $(INSTDIR)/glare $(INSTDIR)/dayfact $(INSTDIR)/debugcal \
948 - $(INSTDIR)/rlux $(INSTDIR)/raddepend $(INSTDIR)/objline
949 - csh -f tradinstall.csh $(INSTDIR) $(LIBDIR)/tcl
950 + install $(PROGS) $(DESTDIR)$(INSTDIR)
951 + install objview.csh $(DESTDIR)$(INSTDIR)/objview
952 + install objline.csh $(DESTDIR)$(INSTDIR)/objline
953 + install objpict.csh $(DESTDIR)$(INSTDIR)/objpict
954 + install glare.csh $(DESTDIR)$(INSTDIR)/glare
955 + install dayfact.csh $(DESTDIR)$(INSTDIR)/dayfact
956 + install debugcal.csh $(DESTDIR)$(INSTDIR)/debugcal
957 + install rlux.csh $(DESTDIR)$(INSTDIR)/rlux
958 + install raddepend.csh $(DESTDIR)$(INSTDIR)/raddepend
959 + chmod 755 $(DESTDIR)$(INSTDIR)/objview $(DESTDIR)$(INSTDIR)/objpict \
960 + $(DESTDIR)$(INSTDIR)/glare $(DESTDIR)$(INSTDIR)/dayfact $(DESTDIR)$(INSTDIR)/debugcal \
961 + $(DESTDIR)$(INSTDIR)/rlux $(DESTDIR)$(INSTDIR)/raddepend $(DESTDIR)$(INSTDIR)/objline
962 + csh -f tradinstall.csh $(DESTDIR)$(INSTDIR) $(DESTDIR)$(LIBDIR)/tcl
965 set nonomatch; rm -f *.o $(PROGS) core
967 $(CC) $(CFLAGS) -o scanner scanner.o -lm
969 makedist: makedist.o setscan.o
970 - $(CC) $(CFLAGS) -o makedist makedist.o setscan.o -lrt -lm
971 + $(CC) $(CFLAGS) -o makedist makedist.o setscan.o -lrayt -lm
973 findglare: findglare.o glareval.o glaresrc.o setscan.o
974 $(CC) $(CFLAGS) -o findglare findglare.o glareval.o glaresrc.o \
976 +setscan.o -lrayt -lm
979 - $(CC) $(CFLAGS) -o glarendx glarendx.o -lrt -lm
980 + $(CC) $(CFLAGS) -o glarendx glarendx.o -lrayt -lm
982 xglaresrc: xglaresrc.o x11findwind.o
983 $(CC) $(CFLAGS) -o xglaresrc xglaresrc.o \
984 -x11findwind.o -lrt -lX11 -lm
985 +x11findwind.o -lrayt -lX11 -lm
988 - $(CC) $(CFLAGS) -o rad rad.o -lrt -lm
989 + $(CC) $(CFLAGS) -o rad rad.o -lrayt -lm
991 ranimate: ranimate.o netproc.o
992 - $(CC) $(CFLAGS) -o ranimate ranimate.o netproc.o -lrt -lm
993 + $(CC) $(CFLAGS) -o ranimate ranimate.o netproc.o -lrayt -lm
995 rpiece: rpiece.o Version.o
996 - $(CC) $(CFLAGS) -o rpiece rpiece.o Version.o -lrt -lm
997 + $(CC) $(CFLAGS) -o rpiece rpiece.o Version.o -lrayt -lm
1000 - $(CC) $(CFLAGS) -o vwright vwright.o -lrt -lm
1001 + $(CC) $(CFLAGS) -o vwright vwright.o -lrayt -lm
1004 - $(CC) $(CFLAGS) -o getinfo getinfo.o -lrt
1005 + $(CC) $(CFLAGS) -o getinfo getinfo.o -lrayt
1008 $(CC) $(CFLAGS) -o contour contour.o -lm