]> git.pld-linux.org Git - packages/Radiance.git/blame - Radiance-PLD.patch
projects / packages / Radiance.git / blame
? search:
summary | shortlog | log | commit | commitdiff | tree
blob | blame (incremental) | history | HEAD
- move datafiles do _datadir, they are architecture independent
[packages/Radiance.git] / Radiance-PLD.patch
CommitLineData
196b4671 1diff -ur ray.orig/src/cal/calc/Makefile ray/src/cal/calc/Makefile
c46822c7 2--- ray.orig/src/cal/calc/Makefile Sat Jul 6 18:20:18 2002
3+++ ray/src/cal/calc/Makefile Sat Jul 6 22:31:06 2002
196b4671 4@@ -24,7 +24,7 @@
5 caldefn.o calfunc.o calprnt.o ealloc.o savestr.o $(COMPAT) $(MLIB)
6
7 install: calc
8- cp calc $(INSTDIR)
754b842b 9+ install calc $(DESTDIR)$(INSTDIR)
196b4671 10
11 clean:
12 set nonomatch; rm -f *.o calc
13diff -ur ray.orig/src/cal/calc/Rmakefile ray/src/cal/calc/Rmakefile
c46822c7 14--- ray.orig/src/cal/calc/Rmakefile Sat Jul 6 18:20:18 2002
15+++ ray/src/cal/calc/Rmakefile Sat Jul 6 22:31:06 2002
196b4671 16@@ -24,7 +24,7 @@
17 caldefn.o calfunc.o calprnt.o ealloc.o savestr.o $(COMPAT) $(MLIB)
18
19 install: calc
20- cp calc $(INSTDIR)
754b842b 21+ install calc $(DESTDIR)$(INSTDIR)
196b4671 22
23 clean:
24 set nonomatch; rm -f *.o calc
25diff -ur ray.orig/src/cal/ev/Makefile ray/src/cal/ev/Makefile
c46822c7 26--- ray.orig/src/cal/ev/Makefile Sat Jul 6 18:20:18 2002
27+++ ray/src/cal/ev/Makefile Sat Jul 6 22:31:06 2002
196b4671 28@@ -21,7 +21,7 @@
29 calfunc.o ealloc.o savestr.o $(MLIB)
30
31 install: ev
32- cp ev $(INSTDIR)
754b842b 33+ install ev $(DESTDIR)$(INSTDIR)
196b4671 34
35 clean:
36 set nonomatch; rm -f *.o ev
37diff -ur ray.orig/src/cal/ev/Rmakefile ray/src/cal/ev/Rmakefile
c46822c7 38--- ray.orig/src/cal/ev/Rmakefile Sat Jul 6 18:20:18 2002
39+++ ray/src/cal/ev/Rmakefile Sat Jul 6 22:31:06 2002
196b4671 40@@ -21,7 +21,7 @@
41 calfunc.o ealloc.o savestr.o $(MLIB)
42
43 install: ev
44- cp ev $(INSTDIR)
754b842b 45+ install ev $(DESTDIR)$(INSTDIR)
196b4671 46
47 clean:
48 set nonomatch; rm -f *.o ev
49diff -ur ray.orig/src/cal/rcalc/Makefile ray/src/cal/rcalc/Makefile
c46822c7 50--- ray.orig/src/cal/rcalc/Makefile Sat Jul 6 18:20:18 2002
51+++ ray/src/cal/rcalc/Makefile Sat Jul 6 22:31:06 2002
196b4671 52@@ -24,7 +24,7 @@
53 caldefn.o calfunc.o ealloc.o savestr.o $(COMPAT) $(MLIB)
54
55 install: rcalc
56- cp rcalc $(INSTDIR)
754b842b 57+ install rcalc $(DESTDIR)$(INSTDIR)
196b4671 58
59 clean:
60 set nonomatch; rm -f *.o rcalc
61diff -ur ray.orig/src/cal/rcalc/Rmakefile ray/src/cal/rcalc/Rmakefile
c46822c7 62--- ray.orig/src/cal/rcalc/Rmakefile Sat Jul 6 18:20:18 2002
63+++ ray/src/cal/rcalc/Rmakefile Sat Jul 6 22:31:06 2002
196b4671 64@@ -24,7 +24,7 @@
65 caldefn.o calfunc.o ealloc.o savestr.o $(COMPAT) $(MLIB)
66
67 install: rcalc
68- cp rcalc $(INSTDIR)
754b842b 69+ install rcalc $(DESTDIR)$(INSTDIR)
196b4671 70
71 clean:
72 set nonomatch; rm -f *.o rcalc
73diff -ur ray.orig/src/cal/util/Makefile ray/src/cal/util/Makefile
c46822c7 74--- ray.orig/src/cal/util/Makefile Sat Jul 6 18:20:18 2002
75+++ ray/src/cal/util/Makefile Sat Jul 6 22:31:06 2002
76@@ -19,7 +19,7 @@
196b4671 77 all: $(PROGS)
78
79 install: $(PROGS)
80- cp $(PROGS) $(INSTDIR)
754b842b 81+ install $(PROGS) $(DESTDIR)$(INSTDIR)
196b4671 82
83 clean:
84 set nonomatch; rm -f *.o $(PROGS)
85diff -ur ray.orig/src/cal/util/Rmakefile ray/src/cal/util/Rmakefile
c46822c7 86--- ray.orig/src/cal/util/Rmakefile Sat Jul 6 18:20:18 2002
87+++ ray/src/cal/util/Rmakefile Sat Jul 6 22:31:06 2002
196b4671 88@@ -19,7 +19,7 @@
89 all: $(PROGS)
90
91 install: $(PROGS)
92- cp $(PROGS) $(INSTDIR)
754b842b 93+ install $(PROGS) $(DESTDIR)$(INSTDIR)
196b4671 94
95 clean:
96 set nonomatch; rm -f *.o $(PROGS)
97diff -ur ray.orig/src/common/Rmakefile ray/src/common/Rmakefile
c46822c7 98--- ray.orig/src/common/Rmakefile Sat Jul 6 18:20:18 2002
99+++ ray/src/common/Rmakefile Sat Jul 6 22:31:06 2002
100@@ -31,17 +31,18 @@
196b4671 101
c46822c7 102 OGLOBJ = rglfile.o rglmat.o rgldomat.o rglsurf.o rglinst.o rglsrc.o
196b4671 103
c46822c7 104-all: librt.a $(SPECIAL)
105+all: librayt.a $(SPECIAL)
196b4671 106
c46822c7 107-librt.a: $(RTOBJ) $(PICOBJ) $(STDOBJ) $(SYSOBJ)
108- ar rc librt.a $(RTOBJ) $(PICOBJ) $(STDOBJ) $(SYSOBJ)
109- -ranlib librt.a
110+librayt.a: $(RTOBJ) $(PICOBJ) $(STDOBJ) $(SYSOBJ)
111+ ar rc librayt.a $(RTOBJ) $(PICOBJ) $(STDOBJ) $(SYSOBJ)
112+ -ranlib librayt.a
113+ cp librayt.a ../lib/librayt.a
196b4671 114
c46822c7 115 install: all
116- mv librt.a ../lib/librt.a
117+ mv librayt.a ../lib/librayt.a
118
119 clean:
120- rm -f *.o librt.a
121+ rm -f *.o librayt.a
122
123 ogl: $(OGLOBJ)
124 ar rc librgl.a $(OGLOBJ)
196b4671 125diff -ur ray.orig/src/common/lookup.h ray/src/common/lookup.h
c46822c7 126--- ray.orig/src/common/lookup.h Sat Jul 6 18:20:18 2002
127+++ ray/src/common/lookup.h Sat Jul 6 22:31:06 2002
196b4671 128@@ -5,6 +5,7 @@
129 /*
130 * Header file for general associative table lookup routines
131 */
132+#include <string.h>
133
134 typedef struct {
c46822c7 135 char *key; /* key name */
136@@ -80,4 +81,3 @@
196b4671 137 extern void lu_done();
c46822c7 138 extern unsigned long lu_shash();
196b4671 139
140-extern int strcmp();
196b4671 141diff -ur ray.orig/src/cv/Rmakefile ray/src/cv/Rmakefile
c46822c7 142--- ray.orig/src/cv/Rmakefile Sat Jul 6 18:20:18 2002
143+++ ray/src/cv/Rmakefile Sat Jul 6 22:31:06 2002
754b842b
JB		 144@@ -22,12 +22,14 @@
145
146 LIBFILES = source.cal tilt.cal lamp.tab tmesh.cal
147
148+MGF_LIB = ../lib/libmgf.a
149+
196b4671 150 all: $(PROGS)
151
152 install: $(PROGS) $(LIBFILES)
153- cp $(PROGS) $(INSTDIR)
154- cd $(LIBDIR) ; rm -f $(LIBFILES)
155- cp $(LIBFILES) $(LIBDIR)
754b842b 156+ install $(PROGS) $(DESTDIR)$(INSTDIR)
196b4671 157+ cd $(DESTDIR)$(LIBDIR) ; rm -f $(LIBFILES)
754b842b 158+ install $(LIBFILES) $(DESTDIR)$(LIBDIR)
196b4671 159
160 clean:
161 set nonomatch; rm -f $(PROGS) *.o core
754b842b 162@@ -37,31 +39,31 @@
196b4671 163 $(CC) $(CFLAGS) -o thf2rad thf2rad.o
164
165 ies2rad: ies2rad.o
166- $(CC) $(CFLAGS) -o ies2rad ies2rad.o -lrt -lm
167+ $(CC) $(CFLAGS) -o ies2rad ies2rad.o -lrayt -lm
168
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
172
173 nff2rad: nff2rad.o
174 $(CC) $(CFLAGS) -o nff2rad nff2rad.o
175
176 lampcolor: lampcolor.o
177- $(CC) $(CFLAGS) -o lampcolor lampcolor.o -lrt
178+ $(CC) $(CFLAGS) -o lampcolor lampcolor.o -lrayt
179
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)
183
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)
187
754b842b 188-mgf2rad: MGF_LIB mgf2rad.o tmesh.o
196b4671 189- $(CC) $(CFLAGS) -o mgf2rad mgf2rad.o tmesh.o -lmgf -lrt $(MLIB)
754b842b 190+mgf2rad: $(MGF_LIB) mgf2rad.o tmesh.o
196b4671 191+ $(CC) $(CFLAGS) -o mgf2rad mgf2rad.o tmesh.o -lmgf -lrayt $(MLIB)
192
193 rad2mgf: rad2mgf.o
194- $(CC) $(CFLAGS) -o rad2mgf rad2mgf.o -lrt $(MLIB)
195+ $(CC) $(CFLAGS) -o rad2mgf rad2mgf.o -lrayt $(MLIB)
196
754b842b 197-mgf2meta: MGF_LIB mgf2meta.o
196b4671 198- $(CC) $(CFLAGS) -o mgf2meta mgf2meta.o -lmgf -lmeta -lrt $(MLIB)
754b842b 199+mgf2meta: $(MGF_LIB) mgf2meta.o
196b4671 200+ $(CC) $(CFLAGS) -o mgf2meta mgf2meta.o -lmgf -lmeta -lrayt $(MLIB)
201
202 mgfilt:
203 cd mgflib ; rm -f mgfilt ; \
754b842b 204@@ -75,7 +77,7 @@
c46822c7 205 CFLAGS="$(OPT) $(MACH) -DNOPROTO" ; \
754b842b
JB		 206 mv mgf2inv ..
207
208-MGF_LIB:
209+$(MGF_LIB):
210 cd mgflib ; rm -f libmgf.a ; \
211 make libmgf.a CC=$(CC) \
c46822c7 212 CFLAGS="$(OPT) $(MACH) -DNOPROTO" ; \
196b4671 213diff -ur ray.orig/src/gen/Rmakefile ray/src/gen/Rmakefile
c46822c7 214--- ray.orig/src/gen/Rmakefile Sat Jul 6 18:20:18 2002
215+++ ray/src/gen/Rmakefile Sat Jul 6 22:31:06 2002
196b4671 216@@ -22,9 +22,9 @@
217 all: $(PROGS)
218
219 install: $(PROGS) $(LIBFILES)
220- cp $(PROGS) $(INSTDIR)
221- cd $(LIBDIR) ; rm -f $(LIBFILES)
222- cp $(LIBFILES) $(LIBDIR)
754b842b 223+ install $(PROGS) $(DESTDIR)$(INSTDIR)
196b4671 224+ cd $(DESTDIR)$(LIBDIR) ; rm -f $(LIBFILES)
754b842b 225+ install $(LIBFILES) $(DESTDIR)$(LIBDIR)
196b4671 226
227 clean:
228 set nonomatch; rm -f $(PROGS) *.o core
229@@ -48,22 +48,22 @@
230 $(CC) $(CFLAGS) -o genprism genprism.o $(MLIB)
231
232 xform: xform.o
233- $(CC) $(CFLAGS) -o xform xform.o -lrt $(MLIB)
234+ $(CC) $(CFLAGS) -o xform xform.o -lrayt $(MLIB)
235
236 replmarks: replmarks.o
237- $(CC) $(CFLAGS) -o replmarks replmarks.o -lrt $(MLIB)
238+ $(CC) $(CFLAGS) -o replmarks replmarks.o -lrayt $(MLIB)
239
240 mkillum: mkillum.o mkillum2.o mkillum3.o
241- $(CC) $(CFLAGS) -o mkillum mkillum.o mkillum2.o mkillum3.o -lrt $(MLIB)
242+ $(CC) $(CFLAGS) -o mkillum mkillum.o mkillum2.o mkillum3.o -lrayt $(MLIB)
243
244 genrev: genrev.o
245- $(CC) $(CFLAGS) -o genrev genrev.o -lrt $(MLIB)
246+ $(CC) $(CFLAGS) -o genrev genrev.o -lrayt $(MLIB)
247
248 genworm: genworm.o
249- $(CC) $(CFLAGS) -o genworm genworm.o -lrt $(MLIB)
250+ $(CC) $(CFLAGS) -o genworm genworm.o -lrayt $(MLIB)
251
252 gensurf: gensurf.o
253- $(CC) $(CFLAGS) -o gensurf gensurf.o -lrt $(MLIB)
254+ $(CC) $(CFLAGS) -o gensurf gensurf.o -lrayt $(MLIB)
255
256 genclock: genclock.o
257 $(CC) $(CFLAGS) -o genclock genclock.o $(MLIB)
c46822c7 258diff -ur ray.orig/src/hd/Rmakefile ray/src/hd/Rmakefile
259--- ray.orig/src/hd/Rmakefile Sat Jul 6 18:20:18 2002
260+++ ray/src/hd/Rmakefile Sat Jul 6 22:46:00 2002
261@@ -14,31 +14,30 @@
262 SPECIAL =
263
264 INSTDIR = /usr/local/bin
265-DEVDIR = $(INSTDIR)/dev
266
267 LIBDIR = /usr/local/lib/ray
268
269 PROGS = rholo rhpict rhcopy genrhgrid rhoptimize rhinfo
270
271-DEVS = $(DEVDIR)/x11.hdi $(DEVDIR)/x11h.hdi
272+DEVS = x11.hdi x11h.hdi
273
274 all: $(PROGS)
275
276 install: all $(DEVS) $(SPECIAL)
277- cp $(PROGS) $(INSTDIR)
278+ install $(PROGS) $(DESTDIR)$(INSTDIR)
279
280 clean:
281 set nonomatch; rm -f *.o $(PROGS) core
282
283-ogl: $(DEVDIR)/glx.hdi $(DEVDIR)/glxh.hdi \
284- $(DEVDIR)/glxo.hdi $(DEVDIR)/glxoh.hdi \
285- $(DEVDIR)/glxs.hdi $(DEVDIR)/glxsh.hdi \
286- $(DEVDIR)/glxso.hdi $(DEVDIR)/glxsoh.hdi \
287- $(DEVDIR)/glx1.hdi $(DEVDIR)/glx1h.hdi \
288- $(DEVDIR)/ogl.hdi $(DEVDIR)/oglh.hdi \
289- $(DEVDIR)/oglo.hdi $(DEVDIR)/ogloh.hdi \
290- $(DEVDIR)/ogls.hdi $(DEVDIR)/oglsh.hdi \
291- $(DEVDIR)/oglso.hdi $(DEVDIR)/oglsoh.hdi
292+ogl: glx.hdi glxh.hdi \
293+ glxo.hdi glxoh.hdi \
294+ glxs.hdi glxsh.hdi \
295+ glxso.hdi glxsoh.hdi \
296+ glx1.hdi glx1h.hdi \
297+ ogl.hdi oglh.hdi \
298+ oglo.hdi ogloh.hdi \
299+ ogls.hdi oglsh.hdi \
300+ oglso.hdi oglsoh.hdi
301
302 x10:
303
304@@ -51,135 +50,135 @@
305 rholo: rholo.o rholo2.o rholo2l.o rholo3.o rholo4.o holo.o holofile.o \
306 viewbeams.o malloc.o Version.o
307 $(CC) $(CFLAGS) -o rholo rholo.o rholo2.o rholo2l.o rholo3.o rholo4.o \
308-holo.o holofile.o viewbeams.o malloc.o Version.o -lrt -lm
309+holo.o holofile.o viewbeams.o malloc.o Version.o -lrayt -lm
310
311 rhpict: rhpict.o rhpict2.o holo.o holofile.o viewbeams.o malloc.o Version.o
312 $(CC) $(CFLAGS) -o rhpict rhpict.o rhpict2.o holo.o holofile.o \
313-viewbeams.o malloc.o Version.o -lrt -lm
314+viewbeams.o malloc.o Version.o -lrayt -lm
315
316 rhcopy: rhcopy.o clumpbeams.o holo.o holofile.o
317 $(CC) $(CFLAGS) -o rhcopy rhcopy.o clumpbeams.o \
318-holo.o holofile.o -lrt -lm
319+holo.o holofile.o -lrayt -lm
320
321 rhoptimize: rhoptimize.o clumpbeams.o holo.o holofile.o
322 $(CC) $(CFLAGS) -o rhoptimize rhoptimize.o clumpbeams.o \
323-holo.o holofile.o -lrt -lm
324+holo.o holofile.o -lrayt -lm
325
326 rhinfo: rhinfo.o holo.o holofile.o
327- $(CC) $(CFLAGS) -o rhinfo rhinfo.o holo.o holofile.o -lrt -lm
328+ $(CC) $(CFLAGS) -o rhinfo rhinfo.o holo.o holofile.o -lrayt -lm
329
330 genrhenv: genrhenv.o holo.o holofile.o
331- $(CC) $(CFLAGS) -o genrhenv genrhenv.o holo.o holofile.o -lrt -lm
332+ $(CC) $(CFLAGS) -o genrhenv genrhenv.o holo.o holofile.o -lrayt -lm
333
334 genrhgrid: genrhgrid.o holo.o
335- $(CC) $(CFLAGS) -o genrhgrid genrhgrid.o holo.o -lrt -lm
336+ $(CC) $(CFLAGS) -o genrhgrid genrhgrid.o holo.o -lrayt -lm
337
338-$(DEVDIR)/x11h.hdi: $(DEVDIR)/x11.hdi
339- rm -f $(DEVDIR)/x11h.hdi
340- ln $(DEVDIR)/x11.hdi $(DEVDIR)/x11h.hdi
341+x11h.hdi: x11.hdi
342+ rm -f x11h.hdi
343+ ln x11.hdi x11h.hdi
344
345-$(DEVDIR)/x11.hdi: rhdisp.o rhdisp2.o viewbeams.o rhd_x11.o rhd_qtree.o \
346+x11.hdi: rhdisp.o rhdisp2.o viewbeams.o rhd_x11.o rhd_qtree.o \
347 rhd_qtree2r.o rhd_ctab.o dircode.o holo.o
348- $(CC) $(CFLAGS) -o $(DEVDIR)/x11.hdi rhdisp.o rhdisp2.o viewbeams.o \
349-rhd_x11.o rhd_qtree.o rhd_qtree2r.o rhd_ctab.o holo.o dircode.o -lrt -lX11 -lm
350+ $(CC) $(CFLAGS) -o x11.hdi rhdisp.o rhdisp2.o viewbeams.o \
351+rhd_x11.o rhd_qtree.o rhd_qtree2r.o rhd_ctab.o holo.o dircode.o -lrayt -lX11 -lm -L/usr/X11R6/lib
352
353-$(DEVDIR)/glx1h.hdi: $(DEVDIR)/glx1.hdi
354- rm -f $(DEVDIR)/glx1h.hdi
355- ln $(DEVDIR)/glx1.hdi $(DEVDIR)/glx1h.hdi
356-
357-$(DEVDIR)/glxh.hdi: $(DEVDIR)/glx.hdi
358- rm -f $(DEVDIR)/glxh.hdi
359- ln $(DEVDIR)/glx.hdi $(DEVDIR)/glxh.hdi
360-
361-$(DEVDIR)/glxoh.hdi: $(DEVDIR)/glxo.hdi
362- rm -f $(DEVDIR)/glxoh.hdi
363- ln $(DEVDIR)/glxo.hdi $(DEVDIR)/glxoh.hdi
364-
365-$(DEVDIR)/glxsh.hdi: $(DEVDIR)/glxs.hdi
366- rm -f $(DEVDIR)/glxsh.hdi
367- ln $(DEVDIR)/glxs.hdi $(DEVDIR)/glxsh.hdi
368-
369-$(DEVDIR)/glxsoh.hdi: $(DEVDIR)/glxso.hdi
370- rm -f $(DEVDIR)/glxsoh.hdi
371- ln $(DEVDIR)/glxso.hdi $(DEVDIR)/glxsoh.hdi
372-
373-$(DEVDIR)/oglh.hdi: $(DEVDIR)/ogl.hdi
374- rm -f $(DEVDIR)/oglh.hdi
375- ln $(DEVDIR)/ogl.hdi $(DEVDIR)/oglh.hdi
376-
377-$(DEVDIR)/ogloh.hdi: $(DEVDIR)/oglo.hdi
378- rm -f $(DEVDIR)/ogloh.hdi
379- ln $(DEVDIR)/oglo.hdi $(DEVDIR)/ogloh.hdi
380-
381-$(DEVDIR)/oglsh.hdi: $(DEVDIR)/ogls.hdi
382- rm -f $(DEVDIR)/oglsh.hdi
383- ln $(DEVDIR)/ogls.hdi $(DEVDIR)/oglsh.hdi
384-
385-$(DEVDIR)/oglsoh.hdi: $(DEVDIR)/oglso.hdi
386- rm -f $(DEVDIR)/oglsoh.hdi
387- ln $(DEVDIR)/oglso.hdi $(DEVDIR)/oglsoh.hdi
388+glx1h.hdi: glx1.hdi
389+ rm -f glx1h.hdi
390+ ln glx1.hdi glx1h.hdi
391+
392+glxh.hdi: glx.hdi
393+ rm -f glxh.hdi
394+ ln glx.hdi glxh.hdi
395+
396+glxoh.hdi: glxo.hdi
397+ rm -f glxoh.hdi
398+ ln glxo.hdi glxoh.hdi
399+
400+glxsh.hdi: glxs.hdi
401+ rm -f glxsh.hdi
402+ ln glxs.hdi glxsh.hdi
403+
404+glxsoh.hdi: glxso.hdi
405+ rm -f glxsoh.hdi
406+ ln glxso.hdi glxsoh.hdi
407+
408+oglh.hdi: ogl.hdi
409+ rm -f oglh.hdi
410+ ln ogl.hdi oglh.hdi
411+
412+ogloh.hdi: oglo.hdi
413+ rm -f ogloh.hdi
414+ ln oglo.hdi ogloh.hdi
415+
416+oglsh.hdi: ogls.hdi
417+ rm -f oglsh.hdi
418+ ln ogls.hdi oglsh.hdi
419+
420+oglsoh.hdi: oglso.hdi
421+ rm -f oglsoh.hdi
422+ ln oglso.hdi oglsoh.hdi
423
424-$(DEVDIR)/glx1.hdi: rhd_glx1.o rhdisp.o rhdisp2.o viewbeams.o \
425+glx1.hdi: rhd_glx1.o rhdisp.o rhdisp2.o viewbeams.o \
426 rhd_qtree.o rhd_qtree2c.o dircode.o holo.o
427- rm -f $(DEVDIR)/glx1.hdi
428- $(CC) $(CFLAGS) -o $(DEVDIR)/glx1.hdi rhd_glx1.o rhdisp.o rhdisp2.o \
429-viewbeams.o holo.o malloc.o rhd_qtree.o rhd_qtree2c.o dircode.o -lrt -lGLU -lGL -lX11 -lm
430+ rm -f glx1.hdi
431+ $(CC) $(CFLAGS) -o glx1.hdi rhd_glx1.o rhdisp.o rhdisp2.o \
432+viewbeams.o holo.o malloc.o rhd_qtree.o rhd_qtree2c.o dircode.o -lrayt -lGLU -lGL -lX11 -lm
433
434-$(DEVDIR)/glx.hdi: rhd_glx0.o rhdisp.o rhdisp2.o viewbeams.o \
435+glx.hdi: rhd_glx0.o rhdisp.o rhdisp2.o viewbeams.o \
436 sm_samp.o sm_qtree.o sm_stree.o sm_geom.o sm_list.o sm_del.o \
437 sm_ogl.o sm.o sm_usets.o dircode.o holo.o
438- rm -f $(DEVDIR)/glx.hdi
439- $(CC) $(CFLAGS) -o $(DEVDIR)/glx.hdi rhd_glx0.o rhdisp.o rhdisp2.o \
440+ rm -f glx.hdi
441+ $(CC) $(CFLAGS) -o glx.hdi rhd_glx0.o rhdisp.o rhdisp2.o \
442 viewbeams.o holo.o sm_samp.o sm_qtree.o sm_stree.o sm_geom.o sm_list.o sm_del.o \
443-sm_ogl.o sm.o sm_usets.o dircode.o -lrt -lGLU -lGL -lX11 -lm
444+sm_ogl.o sm.o sm_usets.o dircode.o -lrayt -lGLU -lGL -lX11 -lm
445
446-$(DEVDIR)/glxo.hdi: rhd_glxo.o rhdisp.o rhdisp2.o viewbeams.o \
447+glxo.hdi: rhd_glxo.o rhdisp.o rhdisp2.o viewbeams.o \
448 sm_samp.o sm_qtree.o sm_stree.o sm_geom.o sm_list.o sm_del.o \
449 sm_ogl.o sm_usets.o sm.o dircode.o holo.o rhdobj.o
450- rm -f $(DEVDIR)/glxo.hdi
451- $(CC) $(CFLAGS) -o $(DEVDIR)/glxo.hdi rhd_glxo.o rhdisp.o rhdisp2.o \
452+ rm -f glxo.hdi
453+ $(CC) $(CFLAGS) -o glxo.hdi rhd_glxo.o rhdisp.o rhdisp2.o \
454 viewbeams.o holo.o sm_samp.o sm_qtree.o sm_stree.o sm_geom.o sm_list.o sm_del.o \
455-sm_ogl.o sm_usets.o sm.o dircode.o rhdobj.o -lrgl -lrt -lGLU -lGL -lX11 -lm
456+sm_ogl.o sm_usets.o sm.o dircode.o rhdobj.o -lrgl -lrayt -lGLU -lGL -lX11 -lm
457
458-$(DEVDIR)/glxs.hdi: rhd_glxs.o rhdisp.o rhdisp2.o viewbeams.o \
459+glxs.hdi: rhd_glxs.o rhdisp.o rhdisp2.o viewbeams.o \
460 sm_samp.o sm_qtree.o sm_stree.o sm_geom.o sm_list.o sm_del.o \
461 sm_ogl.o sm_usets.o sm.o dircode.o holo.o
462- rm -f $(DEVDIR)/glxs.hdi
463- $(CC) $(CFLAGS) -o $(DEVDIR)/glxs.hdi rhd_glxs.o rhdisp.o rhdisp2.o \
464+ rm -f glxs.hdi
465+ $(CC) $(CFLAGS) -o glxs.hdi rhd_glxs.o rhdisp.o rhdisp2.o \
466 viewbeams.o holo.o sm_samp.o sm_qtree.o sm_stree.o sm_geom.o sm_list.o sm_del.o \
467-sm_ogl.o sm_usets.o sm.o dircode.o -lrt -lGLU -lGL -lX11 -lXext -lm
468+sm_ogl.o sm_usets.o sm.o dircode.o -lrayt -lGLU -lGL -lX11 -lXext -lm
469
470-$(DEVDIR)/glxso.hdi: rhd_glxso.o rhdisp.o rhdisp2.o viewbeams.o \
471+glxso.hdi: rhd_glxso.o rhdisp.o rhdisp2.o viewbeams.o \
472 sm_samp.o sm_qtree.o sm_stree.o sm_geom.o sm_list.o sm_del.o \
473 sm_ogl.o sm_usets.o sm.o dircode.o holo.o rhdobj.o
474- rm -f $(DEVDIR)/glxso.hdi
475- $(CC) $(CFLAGS) -o $(DEVDIR)/glxso.hdi rhd_glxso.o rhdisp.o rhdisp2.o \
476+ rm -f glxso.hdi
477+ $(CC) $(CFLAGS) -o glxso.hdi rhd_glxso.o rhdisp.o rhdisp2.o \
478 viewbeams.o holo.o sm_samp.o sm_qtree.o sm_stree.o sm_geom.o sm_list.o sm_del.o \
479 sm_ogl.o sm_usets.o sm.o dircode.o rhdobj.o \
480--lrgl -lrt -lGLU -lGL -lX11 -lXext -lm
481+-lrgl -lrayt -lGLU -lGL -lX11 -lXext -lm
482
483-$(DEVDIR)/ogl.hdi: rhd_ogl0.o rhdisp.o rhdisp2.o viewbeams.o \
484+ogl.hdi: rhd_ogl0.o rhdisp.o rhdisp2.o viewbeams.o \
485 rhd_odraw.o rhd_geom.o holo.o
486- $(CC) $(CFLAGS) -o $(DEVDIR)/ogl.hdi rhd_ogl0.o rhdisp.o rhdisp2.o \
487-viewbeams.o holo.o rhd_odraw.o rhd_geom.o -lrgl -lrt -lGLU -lGL -lX11 -lm
488+ $(CC) $(CFLAGS) -o ogl.hdi rhd_ogl0.o rhdisp.o rhdisp2.o \
489+viewbeams.o holo.o rhd_odraw.o rhd_geom.o -lrgl -lrayt -lGLU -lGL -lX11 -lm
490
491-$(DEVDIR)/oglo.hdi: rhd_oglo.o rhdisp.o rhdisp2.o viewbeams.o \
492+oglo.hdi: rhd_oglo.o rhdisp.o rhdisp2.o viewbeams.o \
493 rhd_odraw.o rhd_geom.o holo.o rhdobj.o
494- $(CC) $(CFLAGS) -o $(DEVDIR)/oglo.hdi rhd_oglo.o rhdisp.o \
495+ $(CC) $(CFLAGS) -o oglo.hdi rhd_oglo.o rhdisp.o \
496 rhdisp2.o viewbeams.o holo.o rhd_odraw.o rhd_geom.o rhdobj.o \
497--lrgl -lrt -lGLU -lGL -lX11 -lm
498+-lrgl -lrayt -lGLU -lGL -lX11 -lm
499
500-$(DEVDIR)/ogls.hdi: rhd_ogls.o rhdisp.o rhdisp2.o viewbeams.o \
501+ogls.hdi: rhd_ogls.o rhdisp.o rhdisp2.o viewbeams.o \
502 rhd_odraw.o rhd_geom.o holo.o
503- $(CC) $(CFLAGS) -o $(DEVDIR)/ogls.hdi rhd_ogls.o rhdisp.o rhdisp2.o \
504+ $(CC) $(CFLAGS) -o ogls.hdi rhd_ogls.o rhdisp.o rhdisp2.o \
505 viewbeams.o holo.o rhd_odraw.o rhd_geom.o \
506--lrgl -lrt -lGLU -lGL -lX11 -lXext -lm
507+-lrgl -lrayt -lGLU -lGL -lX11 -lXext -lm
508
509-$(DEVDIR)/oglso.hdi: rhd_oglso.o rhdisp.o rhdisp2.o viewbeams.o \
510+oglso.hdi: rhd_oglso.o rhdisp.o rhdisp2.o viewbeams.o \
511 rhd_odraw.o rhd_geom.o holo.o rhdobj.o
512- $(CC) $(CFLAGS) -o $(DEVDIR)/oglso.hdi rhd_oglso.o rhdisp.o rhdisp2.o \
513+ $(CC) $(CFLAGS) -o oglso.hdi rhd_oglso.o rhdisp.o rhdisp2.o \
514 viewbeams.o holo.o rhd_odraw.o rhd_geom.o rhdobj.o \
515--lrgl -lrt -lGLU -lGL -lX11 -lXext -lm
516+-lrgl -lrayt -lGLU -lGL -lX11 -lXext -lm
517
518 rhd_glx0.o: rhd_glx.c
519 $(CC) $(CFLAGS) -c rhd_glx.c
196b4671 520diff -ur ray.orig/src/meta/Rmakefile ray/src/meta/Rmakefile
c46822c7 521--- ray.orig/src/meta/Rmakefile Sat Jul 6 18:20:18 2002
522+++ ray/src/meta/Rmakefile Sat Jul 6 22:31:06 2002
523@@ -24,127 +24,98 @@
754b842b
JB		 524
525 common = $(io) syscalls.o misc.o savestr.o wputs.o eputs.o quit.o $(COMPAT)
526
527-install: general
528+PROGS = mx80 meta2tga t4014 pexpand psort cv psmeta plotin imagew impress x11meta \
d6295d4e 529+ bgraph igraph dgraph gcomp aed5 plot4
754b842b
JB		 530+PROGS2 = mt160l mt160 mtext plotout xmeta okimate tbar
531+
c46822c7 532+all: $(common) ../lib/libmeta.a $(PROGS)
754b842b
JB		 533+
534+install: $(PROGS)
535+ install $(PROGS) $(DESTDIR)$(INSTDIR)
536
196b4671 537 clean:
538 set nonomatch; rm -f *.o a.out core
539
540-general: $(INSTDIR)/mx80 $(INSTDIR)/meta2tga \
541-$(INSTDIR)/t4014 $(INSTDIR)/pexpand $(INSTDIR)/psort \
542-$(INSTDIR)/cv $(INSTDIR)/psmeta $(EXEC2)/plotin \
543-$(INSTDIR)/imagew $(INSTDIR)/impress $(INSTDIR)/x11meta \
544-../lib/libmeta.a $(INSTDIR)/bgraph $(INSTDIR)/igraph \
545-$(INSTDIR)/dgraph $(INSTDIR)/gcomp $(INSTDIR)/aed5 $(INSTDIR)/plot4
754b842b
JB		 546-
547-special: $(EXEC2)/mt160l $(EXEC2)/mt160 $(EXEC2)/mtext \
548-$(EXEC2)/plotout $(EXEC2)/xmeta $(EXEC2)/okimate $(EXEC2)/tbar
549-
196b4671 550-$(INSTDIR)/meta2tga $(EXEC2)/okimate $(INSTDIR)/impress \
551-$(INSTDIR)/mx80 $(INSTDIR)/t4014 $(INSTDIR)/plotout $(INSTDIR)/x11meta \
552-$(EXEC2)/mt160l $(EXEC2)/mt160 $(INSTDIR)/pexpand $(INSTDIR)/plot4 \
553-$(INSTDIR)/psort $(INSTDIR)/imagew $(INSTDIR)/tcurve $(EXEC2)/mtext \
554-$(INSTDIR)/tscat $(INSTDIR)/plotin $(INSTDIR)/tbar $(INSTDIR)/xmeta \
555-../lib/libmeta.a $(INSTDIR)/aed5 $(INSTDIR)/psmeta: $(common)
754b842b 556-
196b4671 557-$(EXEC2)/mt160l: mt160l.o mplot.o plot.o palloc.o
558- $(CC) $(CFLAGS) -o $(EXEC2)/mt160l mt160l.o mplot.o plot.o \
754b842b
JB		 559+mt160l: mt160l.o mplot.o plot.o palloc.o
560+ $(CC) $(CFLAGS) -o mt160l mt160l.o mplot.o plot.o \
c46822c7 561 $(common) palloc.o
562
563-$(EXEC2)/okimate: okimate.o mplot.o plot.o palloc.o
564- $(CC) $(CFLAGS) -o $(EXEC2)/okimate okimate.o mplot.o plot.o \
754b842b
JB		 565+okimate: okimate.o mplot.o plot.o palloc.o
566+ $(CC) $(CFLAGS) -o okimate okimate.o mplot.o plot.o \
c46822c7 567 $(common) palloc.o
196b4671 568
569-$(INSTDIR)/imagew: imagew.o mplot.o plot.o palloc.o
754b842b 570+imagew: imagew.o mplot.o plot.o palloc.o
196b4671 571 $(CC) $(CFLAGS) imagew.o mplot.o plot.o $(common) \
572-palloc.o $(MLIB)
573- cp a.out $(INSTDIR)/imagew
c46822c7 574+palloc.o $(MLIB) -o imagew
196b4671 575
576-$(EXEC2)/mt160: mt160.o mplot.o plot.o palloc.o
577- $(CC) $(CFLAGS) -o $(EXEC2)/mt160 mt160.o mplot.o plot.o $(common) \
754b842b 578+mt160: mt160.o mplot.o plot.o palloc.o
c46822c7 579+ $(CC) $(CFLAGS) -o mt160 mt160.o mplot.o plot.o $(common) \
580 palloc.o
196b4671 581
582-$(INSTDIR)/meta2tga: meta2tga.o rplot.o plot.o palloc.o
754b842b 583+meta2tga: meta2tga.o rplot.o plot.o palloc.o
196b4671 584 $(CC) $(CFLAGS) meta2tga.o rplot.o plot.o $(common) \
585-palloc.o $(MLIB)
586- cp a.out $(INSTDIR)/meta2tga
c46822c7 587+palloc.o $(MLIB) -o meta2tga
196b4671 588
589-$(INSTDIR)/mx80: mx80.o mplot.o plot.o palloc.o
754b842b 590+mx80: mx80.o mplot.o plot.o palloc.o
196b4671 591 $(CC) $(CFLAGS) mx80.o mplot.o plot.o $(common) \
592-palloc.o $(MLIB)
593- cp a.out $(INSTDIR)/mx80
c46822c7 594+palloc.o $(MLIB) -o mx80
196b4671 595
596-$(INSTDIR)/t4014: plotout.c ../lib/lib4014.a
754b842b 597+t4014: plotout.c ../lib/lib4014.a
196b4671 598 $(CC) -DFORTEK $(CFLAGS) plotout.c $(common) \
599-../lib/lib4014.a $(MLIB)
600- cp a.out $(INSTDIR)/t4014
c46822c7 601+../lib/lib4014.a $(MLIB) -o t4014
196b4671 602 rm -f plotout.o
603
604-$(INSTDIR)/impress: impress.o implot.o imPfuncs.o plot.o
754b842b 605+impress: impress.o implot.o imPfuncs.o plot.o
196b4671 606 $(CC) $(CFLAGS) impress.o implot.o imPfuncs.o \
607-plot.o $(common) $(MLIB)
608- cp a.out $(INSTDIR)/impress
c46822c7 609+plot.o $(common) $(MLIB) -o impress
754b842b
JB		 610+
611+aed5: aed5.o
612+ $(CC) $(CFLAGS) aed5.o $(common) $(MLIB) -o aed5
196b4671 613
614-$(INSTDIR)/aed5: aed5.o
615- $(CC) $(CFLAGS) aed5.o $(common) $(MLIB)
616- cp a.out $(INSTDIR)/aed5
617-
618-$(INSTDIR)/xmeta: xmeta.o xplot.o plot.o palloc.o
619- $(CC) $(CFLAGS) xmeta.o xplot.o plot.o palloc.o $(common) -lX11 $(MLIB)
620- cp a.out $(INSTDIR)/xmeta
621-
622-$(INSTDIR)/x11meta: xmeta.o x11plot.o plot.o palloc.o
623- $(CC) $(CFLAGS) xmeta.o x11plot.o plot.o palloc.o $(common) -lX11 $(MLIB)
624- cp a.out $(INSTDIR)/x11meta
625-
626-$(INSTDIR)/psmeta: psmeta.o psplot.o
627- $(CC) $(CFLAGS) psmeta.o psplot.o $(common) $(MLIB)
628- cp a.out $(INSTDIR)/psmeta
629-
630-$(INSTDIR)/plotout: plotout.c
631- $(CC) $(CFLAGS) plotout.c $(common) -lplot $(MLIB)
632- cp a.out $(INSTDIR)/plotout
754b842b
JB		 633+xmeta: xmeta.o xplot.o plot.o palloc.o
634+ $(CC) $(CFLAGS) xmeta.o xplot.o plot.o palloc.o $(common) -lX11 $(MLIB) -o xmeta
196b4671 635+
754b842b
JB		 636+x11meta: xmeta.o x11plot.o plot.o palloc.o
637+ $(CC) $(CFLAGS) xmeta.o x11plot.o plot.o palloc.o $(common) -lX11 $(MLIB) -o x11meta
196b4671 638+
754b842b
JB		 639+psmeta: psmeta.o psplot.o
640+ $(CC) $(CFLAGS) psmeta.o psplot.o $(common) $(MLIB) -o psmeta
196b4671 641+
754b842b
JB		 642+plotout: plotout.c
643+ $(CC) $(CFLAGS) plotout.c $(common) -lplot $(MLIB) -o plotout
196b4671 644 rm -f plotout.o
645
646-$(INSTDIR)/plotin: plotin.o primout.o
647- $(CC) $(CFLAGS) plotin.o primout.o $(common) $(MLIB)
648- cp a.out $(INSTDIR)/plotin
754b842b
JB		 649+plotin: plotin.o primout.o
650+ $(CC) $(CFLAGS) plotin.o primout.o $(common) $(MLIB) -o plotin
196b4671 651
652-$(INSTDIR)/pexpand: pexpand.o expand.o segment.o palloc.o
754b842b 653+pexpand: pexpand.o expand.o segment.o palloc.o
196b4671 654 $(CC) $(CFLAGS) pexpand.o expand.o segment.o \
655-$(common) palloc.o $(MLIB)
656- cp a.out $(INSTDIR)/pexpand
c46822c7 657+$(common) palloc.o $(MLIB) -o pexpand
196b4671 658
659-$(INSTDIR)/psort: psort.o sort.o palloc.o
660- $(CC) $(CFLAGS) psort.o sort.o $(common) palloc.o $(MLIB)
661- cp a.out $(INSTDIR)/psort
754b842b
JB		 662+psort: psort.o sort.o palloc.o
663+ $(CC) $(CFLAGS) psort.o sort.o $(common) palloc.o $(MLIB) -o psort
196b4671 664
665-$(INSTDIR)/cv: cv.o mfio.o cvhfio.o syscalls.o misc.o savestr.o \
c46822c7 666+cv: cv.o mfio.o cvhfio.o syscalls.o misc.o savestr.o \
667 wputs.o eputs.o quit.o $(COMPAT)
196b4671 668 $(CC) $(CFLAGS) cv.o mfio.o cvhfio.o syscalls.o misc.o \
669-savestr.o wputs.o eputs.o quit.o $(COMPAT) $(MLIB)
670- cp a.out $(INSTDIR)/cv
c46822c7 671+savestr.o wputs.o eputs.o quit.o $(COMPAT) $(MLIB) -o cv
196b4671 672
673-$(INSTDIR)/plot4: plot4.o primout.o
674- $(CC) $(CFLAGS) plot4.o primout.o $(common) $(MLIB)
675- cp a.out $(INSTDIR)/plot4
754b842b
JB		 676+plot4: plot4.o primout.o
677+ $(CC) $(CFLAGS) plot4.o primout.o $(common) $(MLIB) -o plot4
196b4671 678
679-$(INSTDIR)/tcurve: tcurve.o tgraph.o primout.o
754b842b 680+tcurve: tcurve.o tgraph.o primout.o
196b4671 681 $(CC) $(CFLAGS) tcurve.o tgraph.o primout.o \
682-$(common) $(MLIB)
683- cp a.out $(INSTDIR)/tcurve
c46822c7 684+$(common) $(MLIB) -o tcurve
196b4671 685
686-$(INSTDIR)/tscat: tscat.o tgraph.o primout.o
754b842b 687+tscat: tscat.o tgraph.o primout.o
196b4671 688 $(CC) $(CFLAGS) tscat.o tgraph.o primout.o \
689-$(common) $(MLIB)
690- cp a.out $(INSTDIR)/tscat
c46822c7 691+$(common) $(MLIB) -o tscat
196b4671 692+
754b842b
JB		 693+tbar: tbar.o tgraph.o primout.o
694+ $(CC) $(CFLAGS) tbar.o tgraph.o primout.o $(common) $(MLIB) -o tbar
196b4671 695
696-$(INSTDIR)/tbar: tbar.o tgraph.o primout.o
697- $(CC) $(CFLAGS) tbar.o tgraph.o primout.o $(common) $(MLIB)
698- cp a.out $(INSTDIR)/tbar
699-
700-$(EXEC2)/mtext: mtext.o primout.o
701- $(CC) $(CFLAGS) mtext.o primout.o $(common)
702- cp a.out $(EXEC2)/mtext
754b842b
JB		 703+mtext: mtext.o primout.o
704+ $(CC) $(CFLAGS) mtext.o primout.o $(common) -o mtext
196b4671 705
706 ../lib/libmeta.a: metacalls.o primout.o progname.o
c46822c7 707 ar rc ../lib/libmeta.a metacalls.o primout.o \
708@@ -154,30 +125,26 @@
196b4671 709 ../lib/lib4014.a:
c46822c7 710 cd lib4014; make INSTDIR=../../lib "CFLAGS=$(OPT)" install clean
196b4671 711
712-$(INSTDIR)/bgraph: bgraph.o mgvars.o mgraph.o ../lib/libmeta.a \
c46822c7 713+bgraph: bgraph.o mgvars.o mgraph.o ../lib/libmeta.a \
714 calexpr.o caldefn.o calfunc.o ealloc.o
196b4671 715 $(CC) $(CFLAGS) bgraph.o mgvars.o mgraph.o \
716-calexpr.o caldefn.o calfunc.o ealloc.o ../lib/libmeta.a $(MLIB)
717- cp a.out $(INSTDIR)/bgraph
c46822c7 718+calexpr.o caldefn.o calfunc.o ealloc.o ../lib/libmeta.a $(MLIB) -o bgraph
196b4671 719
720-$(INSTDIR)/igraph: igraph.o mgvars.o mgraph.o ../lib/libmeta.a \
c46822c7 721+igraph: igraph.o mgvars.o mgraph.o ../lib/libmeta.a \
722 calexpr.o caldefn.o calfunc.o cgraph.o ealloc.o gcalc.o
196b4671 723 $(CC) $(CFLAGS) igraph.o mgvars.o mgraph.o \
c46822c7 724 calexpr.o caldefn.o calfunc.o cgraph.o ealloc.o gcalc.o \
196b4671 725-../lib/libmeta.a $(MLIB)
726- cp a.out $(INSTDIR)/igraph
c46822c7 727+../lib/libmeta.a $(MLIB) -o igraph
196b4671 728
729-$(INSTDIR)/dgraph: dgraph.o cgraph.o mgvars.o ealloc.o calfunc.o \
c46822c7 730+dgraph: dgraph.o cgraph.o mgvars.o ealloc.o calfunc.o \
731 calexpr.o caldefn.o savestr.o wputs.o $(COMPAT)
196b4671 732 $(CC) $(CFLAGS) dgraph.o cgraph.o mgvars.o \
733-calfunc.o calexpr.o caldefn.o ealloc.o savestr.o wputs.o $(COMPAT) $(MLIB)
734- cp a.out $(INSTDIR)/dgraph
c46822c7 735+calfunc.o calexpr.o caldefn.o ealloc.o savestr.o wputs.o $(COMPAT) $(MLIB) -o dgraph
196b4671 736
737-$(INSTDIR)/gcomp: gcomp.o gcalc.o mgvars.o ealloc.o calfunc.o \
c46822c7 738+gcomp: gcomp.o gcalc.o mgvars.o ealloc.o calfunc.o \
739 calexpr.o caldefn.o wputs.o savestr.o $(COMPAT)
196b4671 740 $(CC) $(CFLAGS) gcomp.o gcalc.o mgvars.o \
741-calfunc.o calexpr.o caldefn.o ealloc.o wputs.o savestr.o $(COMPAT) $(MLIB)
742- cp a.out $(INSTDIR)/gcomp
c46822c7 743+calfunc.o calexpr.o caldefn.o ealloc.o wputs.o savestr.o $(COMPAT) $(MLIB) -o gcomp
196b4671 744
745 calexpr.o: calexpr.c calcomp.h
746 $(CC) $(CFLAGS) -c -DVARIABLE -DFUNCTION -DRCONST calexpr.c
747diff -ur ray.orig/src/meta/igraph.c ray/src/meta/igraph.c
c46822c7 748--- ray.orig/src/meta/igraph.c Sat Jul 6 18:20:18 2002
749+++ ray/src/meta/igraph.c Sat Jul 6 22:31:06 2002
196b4671 750@@ -14,6 +14,8 @@
751
752 #include "mgvars.h"
753
754+#include "meta.h"
755+
756 typedef struct {
757 char *descrip; /* description */
758 char *value; /* value */
759diff -ur ray.orig/src/meta/meta.h ray/src/meta/meta.h
c46822c7 760--- ray.orig/src/meta/meta.h Sat Jul 6 18:20:18 2002
761+++ ray/src/meta/meta.h Sat Jul 6 22:31:06 2002
196b4671 762@@ -90,6 +90,7 @@
763 #define YMN 1 /* index in xy array for ymin */
764 #define XMX 2 /* index in xy array for xmax */
765 #define YMX 3 /* index in xy array for ymax */
766+#define pout stdout
767
768
769 /*
770diff -ur ray.orig/src/meta/meta2tga.c ray/src/meta/meta2tga.c
c46822c7 771--- ray.orig/src/meta/meta2tga.c Sat Jul 6 18:20:18 2002
772+++ ray/src/meta/meta2tga.c Sat Jul 6 22:31:06 2002
773@@ -67,6 +67,8 @@
196b4671 774 #endif
775 char comargs[200], command[300];
196b4671 776
c46822c7 777+ fout=stdout;
778+
196b4671 779 #ifdef CPM
780 fixargs("meta2tga", &argc, &argv);
c46822c7 781 #endif
196b4671 782diff -ur ray.orig/src/ot/Rmakefile ray/src/ot/Rmakefile
c46822c7 783--- ray.orig/src/ot/Rmakefile Sat Jul 6 18:20:18 2002
784+++ ray/src/ot/Rmakefile Sat Jul 6 22:31:06 2002
196b4671 785@@ -24,14 +24,14 @@
786 o_cone.o o_instance.o bbox.o initotypes.o readfargs.o malloc.o
787 $(CC) $(CFLAGS) -o oconv oconv.o writeoct.o sphere.o o_face.o \
788 o_cone.o o_instance.o bbox.o readfargs.o \
789-initotypes.o malloc.o -lrt $(MLIB)
790+initotypes.o malloc.o -lrayt $(MLIB)
791
792 getbbox: getbbox.o readobj2.o bbox.o init2otypes.o
793 $(CC) $(CFLAGS) -o getbbox getbbox.o readobj2.o \
794-bbox.o init2otypes.o -lrt $(MLIB)
795+bbox.o init2otypes.o -lrayt $(MLIB)
796
797 install: oconv getbbox
798- cp oconv getbbox $(INSTDIR)
754b842b 799+ install oconv getbbox $(DESTDIR)$(INSTDIR)
196b4671 800
801 clean:
802 set nonomatch; rm -f oconv getbbox *.o core
803diff -ur ray.orig/src/px/Rmakefile ray/src/px/Rmakefile
c46822c7 804--- ray.orig/src/px/Rmakefile Sat Jul 6 18:20:18 2002
805+++ ray/src/px/Rmakefile Sat Jul 6 22:31:06 2002
196b4671 806@@ -5,7 +5,7 @@
807 ARCH = sun
808 OPT = -O
809 MACH = -DBSD
c46822c7 810-SPECIAL = aed
811+# SPECIAL = aed
812 CFLAGS = -I../common -L../lib $(OPT) $(MACH)
196b4671 813 CC = cc
814 MLIB = -lm
c46822c7 815@@ -25,13 +25,13 @@
816 all: $(PROGS) $(SPECIAL)
817
818 x10: x10image
819- cp x10image $(INSTDIR)
820+ cp x10image $(DESTDIR)$(INSTDIR)
821
822 aed: aedimage
823- cp aedimage $(INSTDIR)
824+ cp aedimage $(DESTDIR)$(INSTDIR)
825
826 sgi: glimage
827- cp glimage $(INSTDIR)
828+ cp glimage $(DESTDIR)$(INSTDIR)
829
830 ogl:
831
832@@ -39,15 +39,15 @@
196b4671 833
834 install: $(PROGS) $(SPECIAL) normpat.csh falsecolor.csh \
835 pdfblur.csh pmblur.csh xyzimage.csh
836- cp $(PROGS) $(INSTDIR)
837- cp normpat.csh $(INSTDIR)/normpat
838- cp falsecolor.csh $(INSTDIR)/falsecolor
839- cp pdfblur.csh $(INSTDIR)/pdfblur
840- cp pmblur.csh $(INSTDIR)/pmblur
841- cp xyzimage.csh $(INSTDIR)/xyzimage
c46822c7 842- cp phisto.csh $(INSTDIR)/phisto
196b4671 843- chmod 755 $(INSTDIR)/normpat $(INSTDIR)/falsecolor \
c46822c7 844-$(INSTDIR)/pdfblur $(INSTDIR)/pmblur $(INSTDIR)/xyzimage $(INSTDIR)/phisto
754b842b
JB		 845+ install $(PROGS) $(DESTDIR)$(INSTDIR)
846+ install normpat.csh $(DESTDIR)$(INSTDIR)/normpat
847+ install falsecolor.csh $(DESTDIR)$(INSTDIR)/falsecolor
848+ install pdfblur.csh $(DESTDIR)$(INSTDIR)/pdfblur
849+ install pmblur.csh $(DESTDIR)$(INSTDIR)/pmblur
850+ install xyzimage.csh $(DESTDIR)$(INSTDIR)/xyzimage
c46822c7 851+ install phisto.csh $(DESTDIR)$(INSTDIR)/phisto
196b4671 852+ chmod 755 $(DESTDIR)$(INSTDIR)/normpat $(DESTDIR)$(INSTDIR)/falsecolor \
c46822c7 853+$(DESTDIR)$(INSTDIR)/pdfblur $(DESTDIR)$(INSTDIR)/pmblur $(DESTDIR)$(INSTDIR)/xyzimage $(DESTDIR)$(INSTDIR)/phisto
196b4671 854
855 clean:
c46822c7 856 set nonomatch; rm -f x10image aedimage glimage \
857@@ -55,140 +55,140 @@
858 cd tiff; make distclean
196b4671 859
860 pfilt: pfilt.o pf2.o pf3.o
861- $(CC) $(CFLAGS) -o pfilt pfilt.o pf2.o pf3.o -lrt $(MLIB)
862+ $(CC) $(CFLAGS) -o pfilt pfilt.o pf2.o pf3.o -lrayt $(MLIB)
863
864 pcond: pcond.o pcond2.o pcond3.o pcond4.o warp3d.o
865 $(CC) $(CFLAGS) -o pcond pcond.o pcond2.o pcond3.o pcond4.o warp3d.o \
866--lrt $(MLIB)
867+-lrayt $(MLIB)
868
869 pcwarp: pcwarp.o warp3d.o
870- $(CC) $(CFLAGS) -o pcwarp pcwarp.o warp3d.o -lrt $(MLIB)
871+ $(CC) $(CFLAGS) -o pcwarp pcwarp.o warp3d.o -lrayt $(MLIB)
872
873 ttyimage: ttyimage.o
874- $(CC) $(CFLAGS) -o ttyimage ttyimage.o -lrt $(MLIB)
875+ $(CC) $(CFLAGS) -o ttyimage ttyimage.o -lrayt $(MLIB)
876
877 t4027: t4027.o
878- $(CC) $(CFLAGS) -o t4027 t4027.o -lrt
879+ $(CC) $(CFLAGS) -o t4027 t4027.o -lrayt
880
881 glimage: glimage.o
882- $(CC) $(CFLAGS) -o glimage glimage.o -lrt -lgl_s $(MLIB)
883+ $(CC) $(CFLAGS) -o glimage glimage.o -lrayt -lgl_s $(MLIB)
884
885 aedimage: aedimage.o ciq.o cut.o closest.o biq.o
886 $(CC) $(CFLAGS) -o aedimage aedimage.o ciq.o cut.o closest.o \
887-biq.o -lrt $(MLIB)
888+biq.o -lrayt $(MLIB)
889
890 oki20c: oki20c.o
891- $(CC) $(CFLAGS) -o oki20c oki20c.o -lrt $(MLIB)
892+ $(CC) $(CFLAGS) -o oki20c oki20c.o -lrayt $(MLIB)
893
894 oki20: oki20.o
895- $(CC) $(CFLAGS) -o oki20 oki20.o -lrt $(MLIB)
896+ $(CC) $(CFLAGS) -o oki20 oki20.o -lrayt $(MLIB)
897
898 paintjet: paintjet.o
899- $(CC) $(CFLAGS) -o paintjet paintjet.o -lrt $(MLIB)
900+ $(CC) $(CFLAGS) -o paintjet paintjet.o -lrayt $(MLIB)
901
902 mt160r: mt160r.o
903- $(CC) $(CFLAGS) -o mt160r mt160r.o -lrt $(MLIB)
904+ $(CC) $(CFLAGS) -o mt160r mt160r.o -lrayt $(MLIB)
905
906 greyscale: greyscale.o
907- $(CC) $(CFLAGS) -o greyscale greyscale.o -lrt $(MLIB)
908+ $(CC) $(CFLAGS) -o greyscale greyscale.o -lrayt $(MLIB)
909
910 colorscale: colorscale.o
c46822c7 911- $(CC) $(CFLAGS) -o colorscale colorscale.o -lrt $(MLIB)
912+ $(CC) $(CFLAGS) -o colorscale colorscale.o -lrayt $(MLIB)
196b4671 913
914 pvalue: pvalue.o
915- $(CC) $(CFLAGS) -o pvalue pvalue.o -lrt $(MLIB)
916+ $(CC) $(CFLAGS) -o pvalue pvalue.o -lrayt $(MLIB)
917
918 psum: psum.o
919- $(CC) $(CFLAGS) -o psum psum.o -lrt
920+ $(CC) $(CFLAGS) -o psum psum.o -lrayt
921
922 pcompos: pcompos.o
c46822c7 923- $(CC) $(CFLAGS) -o pcompos pcompos.o -lrt $(MLIB)
924+ $(CC) $(CFLAGS) -o pcompos pcompos.o -lrayt $(MLIB)
196b4671 925
926 psign: psign.o
c46822c7 927- $(CC) $(CFLAGS) -o psign psign.o -lrt $(MLIB)
928+ $(CC) $(CFLAGS) -o psign psign.o -lrayt $(MLIB)
196b4671 929
930 d48c: d48c.o
931- $(CC) $(CFLAGS) -o d48c d48c.o -lrt
932+ $(CC) $(CFLAGS) -o d48c d48c.o -lrayt
933
934 ra_gif: ra_gif.o clrtab.o neuclrtab.o
935- $(CC) $(CFLAGS) -o ra_gif ra_gif.o clrtab.o neuclrtab.o -lrt $(MLIB)
936+ $(CC) $(CFLAGS) -o ra_gif ra_gif.o clrtab.o neuclrtab.o -lrayt $(MLIB)
937
938 ra_pr: ra_pr.o ciq.o cut.o closest.o biq.o
939 $(CC) $(CFLAGS) -o ra_pr ra_pr.o ciq.o cut.o closest.o \
940-biq.o -lrt $(MLIB)
941+biq.o -lrayt $(MLIB)
942
943 ra_pr24: ra_pr24.o
944- $(CC) $(CFLAGS) -o ra_pr24 ra_pr24.o -lrt $(MLIB)
945+ $(CC) $(CFLAGS) -o ra_pr24 ra_pr24.o -lrayt $(MLIB)
946
947 ra_avs: ra_avs.o
948- $(CC) $(CFLAGS) -o ra_avs ra_avs.o -lrt $(MLIB)
949+ $(CC) $(CFLAGS) -o ra_avs ra_avs.o -lrayt $(MLIB)
950
951 ra_ps: ra_ps.o
952- $(CC) $(CFLAGS) -o ra_ps ra_ps.o -lrt $(MLIB)
953+ $(CC) $(CFLAGS) -o ra_ps ra_ps.o -lrayt $(MLIB)
954
955 ra_ppm: ra_ppm.o
956- $(CC) $(CFLAGS) -o ra_ppm ra_ppm.o -lrt $(MLIB)
957+ $(CC) $(CFLAGS) -o ra_ppm ra_ppm.o -lrayt $(MLIB)
958
959 ra_t8: ra_t8.o clrtab.o neuclrtab.o
960- $(CC) $(CFLAGS) -o ra_t8 ra_t8.o clrtab.o neuclrtab.o -lrt $(MLIB)
961+ $(CC) $(CFLAGS) -o ra_t8 ra_t8.o clrtab.o neuclrtab.o -lrayt $(MLIB)
962
963 ra_t16: ra_t16.o
964- $(CC) $(CFLAGS) -o ra_t16 ra_t16.o -lrt $(MLIB)
965+ $(CC) $(CFLAGS) -o ra_t16 ra_t16.o -lrayt $(MLIB)
966
967 ra_im: ra_im.o
968 $(CC) $(CFLAGS) -o ra_im ra_im.o
969
970 ra_bn: ra_bn.o
971- $(CC) $(CFLAGS) -o ra_bn ra_bn.o -lrt $(MLIB)
972+ $(CC) $(CFLAGS) -o ra_bn ra_bn.o -lrayt $(MLIB)
973
974 ra_rgbe: ra_rgbe.o
975- $(CC) $(CFLAGS) -o ra_rgbe ra_rgbe.o -lrt $(MLIB)
976+ $(CC) $(CFLAGS) -o ra_rgbe ra_rgbe.o -lrayt $(MLIB)
977
978 ra_pict: ra_pict.o
979- $(CC) $(CFLAGS) -o ra_pict ra_pict.o -lrt $(MLIB)
980+ $(CC) $(CFLAGS) -o ra_pict ra_pict.o -lrayt $(MLIB)
981
c46822c7 982 ra_hexbit: ra_hexbit.o
983- $(CC) $(CFLAGS) -o ra_hexbit ra_hexbit.o -lrt
984+ $(CC) $(CFLAGS) -o ra_hexbit ra_hexbit.o -lrayt
196b4671 985
986 x10image: ximage.o ciq.o cut.o closest.o xraster.o biq.o
987 $(CC) $(CFLAGS) -o x10image ximage.o xraster.o \
988-ciq.o cut.o closest.o biq.o -lX -lrt $(MLIB)
989+ciq.o cut.o closest.o biq.o -lX -lrayt $(MLIB)
990
991 ximage: x11image.o x11raster.o clrtab.o
992 $(CC) $(CFLAGS) -o ximage x11image.o x11raster.o \
c46822c7 993-clrtab.o -lrt -lX11 $(MLIB)
994+clrtab.o -lrayt -lX11 $(MLIB)
196b4671 995
996 protate: protate.o
c46822c7 997- $(CC) $(CFLAGS) -o protate protate.o -lrt $(MLIB)
998+ $(CC) $(CFLAGS) -o protate protate.o -lrayt $(MLIB)
196b4671 999
1000 pextrem: pextrem.o
c46822c7 1001- $(CC) $(CFLAGS) -o pextrem pextrem.o -lrt $(MLIB)
1002+ $(CC) $(CFLAGS) -o pextrem pextrem.o -lrayt $(MLIB)
196b4671 1003
1004 pflip: pflip.o
c46822c7 1005- $(CC) $(CFLAGS) -o pflip pflip.o -lrt $(MLIB)
1006+ $(CC) $(CFLAGS) -o pflip pflip.o -lrayt $(MLIB)
196b4671 1007
1008 panim: panim.o client/libclient.a
1009 $(CC) $(CFLAGS) -o panim panim.o \
1010--lrt client/libclient.a -lrpcsvc $(MLIB)
1011+-lrayt client/libclient.a -lrpcsvc $(MLIB)
1012
1013 pcomb: pcomb.o
1014- $(CC) $(CFLAGS) -o pcomb pcomb.o -lrt $(MLIB)
1015+ $(CC) $(CFLAGS) -o pcomb pcomb.o -lrayt $(MLIB)
1016
1017 pinterp: pinterp.o
1018- $(CC) $(CFLAGS) -o pinterp pinterp.o -lrt $(MLIB)
1019+ $(CC) $(CFLAGS) -o pinterp pinterp.o -lrayt $(MLIB)
1020
1021 ra_xyze: ra_xyze.o
1022- $(CC) $(CFLAGS) -o ra_xyze ra_xyze.o -lrt $(MLIB)
1023+ $(CC) $(CFLAGS) -o ra_xyze ra_xyze.o -lrayt $(MLIB)
1024
1025 ra_tiff: ra_tiff.o ../lib/libtiff.a
1026- $(CC) $(CFLAGS) -o ra_tiff ra_tiff.o -lrt -ltiff $(MLIB)
1027+ $(CC) $(CFLAGS) -o ra_tiff ra_tiff.o -lrayt -ltiff $(MLIB)
1028
c46822c7 1029 ../common/tiff.h ../common/tiffio.h: ../lib/libtiff.a
1030 @chmod u+w ../common/tiff.h ../common/tiffio.h
1031 @touch ../common/tiff.h ../common/tiffio.h
1032
1033 normtiff: normtiff.o ../lib/libtiff.a
1034- $(CC) $(CFLAGS) -o normtiff normtiff.o -lrt -ltiff $(MLIB)
1035+ $(CC) $(CFLAGS) -o normtiff normtiff.o -lrayt -ltiff $(MLIB)
1036
1037 ../lib/libtiff.a: tiff/config.local
1038 cd tiff ; ./configure -quiet -noninteractive -with-CC=$(CC) \
1039@@ -196,7 +196,7 @@
1040 cd libtiff ; make install
196b4671 1041
1042 ra_pixar: ra_pixar.o ra_pixar.c
1043- $(CC) $(CFLAGS) $(PIXAR_INCLUDE) -o $@ ra_pixar.o -lrt \
1044+ $(CC) $(CFLAGS) $(PIXAR_INCLUDE) -o $@ ra_pixar.o -lrayt \
1045 $(PIXAR_LIB)
1046
1047 ra_pixar.o: ra_pixar.c
c46822c7 1048@@ -204,11 +204,11 @@
196b4671 1049
1050 xshowtrace: xshowtrace.o x11findwind.o
1051 $(CC) $(CFLAGS) -o xshowtrace xshowtrace.o \
c46822c7 1052-x11findwind.o -lrt -lX11 $(MLIB)
1053+x11findwind.o -lrayt -lX11 $(MLIB)
196b4671 1054
1055 macbethcal: macbethcal.o pmapgen.o mx3.o warp3d.o
1056 $(CC) $(CFLAGS) -o macbethcal macbethcal.o pmapgen.o mx3.o warp3d.o \
1057--lrt $(MLIB)
1058+-lrayt $(MLIB)
1059
1060
1061 macbethcal.o: pmap.h ../common/color.h ../common/resolu.h
1062diff -ur ray.orig/src/px/pcwarp.c ray/src/px/pcwarp.c
c46822c7 1063--- ray.orig/src/px/pcwarp.c Sat Jul 6 18:20:18 2002
1064+++ ray/src/px/pcwarp.c Sat Jul 6 22:31:06 2002
196b4671 1065@@ -30,6 +30,7 @@
1066 int cwflags = 0;
1067 int rval;
1068 int i;
1069+ infp=stdin;
1070
1071 progname = argv[0];
c46822c7 1072 infp = stdin;
196b4671 1073diff -ur ray.orig/src/px/x11image.c ray/src/px/x11image.c
c46822c7 1074--- ray.orig/src/px/x11image.c Sat Jul 6 18:20:18 2002
1075+++ ray/src/px/x11image.c Sat Jul 6 22:31:06 2002
1076@@ -141,6 +141,7 @@
196b4671 1077 int headline();
1078 int i;
1079 int pid;
1080+ fin=stdin;
1081
1082 progname = argv[0];
c46822c7 1083 fin = stdin;
196b4671 1084diff -ur ray.orig/src/rt/Rmakefile ray/src/rt/Rmakefile
c46822c7 1085--- ray.orig/src/rt/Rmakefile Sat Jul 6 18:20:18 2002
1086+++ ray/src/rt/Rmakefile Sat Jul 6 22:31:06 2002
196b4671 1087@@ -5,8 +5,8 @@
1088
1089 OPT = -O
1090 MACH = -DBSD
c46822c7 1091-CFLAGS = -I../common -L../lib $(OPT) $(MACH)
196b4671 1092-SPECIAL = aed
c46822c7 1093+CFLAGS = -I../common -L../lib $(OPT) $(MACH) -I/usr/include/ncurses
1094+#SPECIAL = aed
196b4671 1095 CC = cc
1096 MLIB = -lm
1097 LINT = lint
c46822c7 1098@@ -18,7 +18,7 @@
1099 #
1100 DESTDIR = .
1101 INSTDIR = /usr/local/bin
1102-INSTALL = cp
1103+INSTALL = install
1104
1105 #
1106 # The following paths must exist and be relative to root:
196b4671 1107@@ -29,7 +29,7 @@
1108 #
1109 # Library routines:
1110 #
1111-LIBS = -lrt $(MLIB)
1112+LIBS = -lrayt $(MLIB)
1113
1114 #
1115 # Device drivers for rview (see also devtable.c):
c46822c7 1116@@ -85,14 +85,14 @@
754b842b
JB		 1117 # What this makefile produces:
1118 #
1119
1120-PROGS = $(DESTDIR)/rtrace $(DESTDIR)/rpict $(DESTDIR)/rview $(DESTDIR)/lookamb
1121+PROGS = rtrace rpict rview lookamb
1122
c46822c7 1123 all: $(PROGS)
196b4671 1124
1125 install: $(PROGS) $(SPECIAL) rayinit.cal
1126- $(INSTALL) $(PROGS) $(INSTDIR)
1127- rm -f $(LIBDIR)/rayinit.cal
1128- cp rayinit.cal $(LIBDIR)
1129+ $(INSTALL) $(PROGS) $(DESTDIR)$(INSTDIR)
1130+ rm -f $(DESTDIR)$(LIBDIR)/rayinit.cal
c46822c7 1131+ $(INSTALL) rayinit.cal $(DESTDIR)$(LIBDIR)
196b4671 1132
1133 sun: $(DEVDIR)/sun $(DEVDIR)/sun.com
1134
c46822c7 1135@@ -114,17 +114,17 @@
754b842b
JB		 1136 # Links:
1137 #
1138
1139-$(DESTDIR)/rtrace: $(RTOBJS)
1140- $(CC) $(CFLAGS) -o $(DESTDIR)/rtrace $(RTOBJS) $(LIBS)
1141+rtrace: $(RTOBJS)
1142+ $(CC) $(CFLAGS) -o rtrace $(RTOBJS) $(LIBS)
196b4671 1143
754b842b
JB		 1144-$(DESTDIR)/rpict: $(RPOBJS)
1145- $(CC) $(CFLAGS) -o $(DESTDIR)/rpict $(RPOBJS) $(LIBS)
1146+rpict: $(RPOBJS)
1147+ $(CC) $(CFLAGS) -o rpict $(RPOBJS) $(LIBS)
1148
1149-$(DESTDIR)/rview: $(RVOBJS)
c46822c7 1150- $(CC) $(CFLAGS) -o $(DESTDIR)/rview $(RVOBJS) $(LIBS) $(DLIBS)
754b842b 1151+rview: $(RVOBJS)
c46822c7 1152+ $(CC) $(CFLAGS) -o rview $(RVOBJS) $(LIBS) $(DLIBS)
754b842b
JB		 1153
1154-$(DESTDIR)/lookamb: lookamb.o ambio.o
c46822c7 1155- $(CC) $(CFLAGS) -o $(DESTDIR)/lookamb lookamb.o ambio.o $(LIBS)
754b842b 1156+lookamb: lookamb.o ambio.o
c46822c7 1157+ $(CC) $(CFLAGS) -o lookamb lookamb.o ambio.o $(LIBS)
196b4671 1158
c46822c7 1159 $(DEVDIR)/sun: sundev.o devmain.o colortab.o editline.o
196b4671 1160 $(CC) $(CFLAGS) -s -o $(DEVDIR)/sun devmain.o sundev.o colortab.o \
1161diff -ur ray.orig/src/util/Rmakefile ray/src/util/Rmakefile
c46822c7 1162--- ray.orig/src/util/Rmakefile Sat Jul 6 18:20:18 2002
1163+++ ray/src/util/Rmakefile Sat Jul 6 22:31:06 2002
1164@@ -24,27 +24,27 @@
196b4671 1165
c46822c7 1166 install: all $(SPECIAL) objview.csh objpict.csh glare.csh dayfact.csh \
1167 rlux.csh raddepend.csh trad.wsh objline.csh compamb.csh
196b4671 1168- cp $(PROGS) $(INSTDIR)
1169- cp objview.csh $(INSTDIR)/objview
1170- cp objline.csh $(INSTDIR)/objline
1171- cp objpict.csh $(INSTDIR)/objpict
1172- cp glare.csh $(INSTDIR)/glare
1173- cp dayfact.csh $(INSTDIR)/dayfact
1174- cp debugcal.csh $(INSTDIR)/debugcal
1175- cp rlux.csh $(INSTDIR)/rlux
1176- cp raddepend.csh $(INSTDIR)/raddepend
c46822c7 1177- cp compamb.csh $(INSTDIR)/compamb
196b4671 1178- chmod 755 $(INSTDIR)/objview $(INSTDIR)/objpict \
1179- $(INSTDIR)/glare $(INSTDIR)/dayfact $(INSTDIR)/debugcal \
c46822c7 1180- $(INSTDIR)/rlux $(INSTDIR)/raddepend $(INSTDIR)/objline \
1181- $(INSTDIR)/compamb
196b4671 1182- csh -f tradinstall.csh $(INSTDIR) $(LIBDIR)/tcl
c46822c7 1183+ cp $(PROGS) $(DESTDIR)$(INSTDIR)
1184+ cp objview.csh $(DESTDIR)$(INSTDIR)/objview
1185+ cp objline.csh $(DESTDIR)$(INSTDIR)/objline
1186+ cp objpict.csh $(DESTDIR)$(INSTDIR)/objpict
1187+ cp glare.csh $(DESTDIR)$(INSTDIR)/glare
1188+ cp dayfact.csh $(DESTDIR)$(INSTDIR)/dayfact
1189+ cp debugcal.csh $(DESTDIR)$(INSTDIR)/debugcal
1190+ cp rlux.csh $(DESTDIR)$(INSTDIR)/rlux
1191+ cp raddepend.csh $(DESTDIR)$(INSTDIR)/raddepend
1192+ cp compamb.csh $(DESTDIR)$(INSTDIR)/compamb
196b4671 1193+ chmod 755 $(DESTDIR)$(INSTDIR)/objview $(DESTDIR)$(INSTDIR)/objpict \
1194+ $(DESTDIR)$(INSTDIR)/glare $(DESTDIR)$(INSTDIR)/dayfact $(DESTDIR)$(INSTDIR)/debugcal \
c46822c7 1195+ $(DESTDIR)$(INSTDIR)/rlux $(DESTDIR)$(INSTDIR)/raddepend $(DESTDIR)$(INSTDIR)/objline \
1196+ $(DESTDIR)$(INSTDIR)/compamb
196b4671 1197+ csh -f tradinstall.csh $(DESTDIR)$(INSTDIR) $(DESTDIR)$(LIBDIR)/tcl
1198
1199 clean:
1200 set nonomatch; rm -f *.o $(PROGS) core
c46822c7 1201
1202 ogl: glrad
1203- cp glrad $(INSTDIR)
1204+ cp glrad $(DESTDIR)$(INSTDIR)
1205
1206 x10:
1207
1208@@ -58,39 +58,39 @@
196b4671 1209 $(CC) $(CFLAGS) -o scanner scanner.o -lm
1210
1211 makedist: makedist.o setscan.o
1212- $(CC) $(CFLAGS) -o makedist makedist.o setscan.o -lrt -lm
1213+ $(CC) $(CFLAGS) -o makedist makedist.o setscan.o -lrayt -lm
1214
1215 findglare: findglare.o glareval.o glaresrc.o setscan.o
1216 $(CC) $(CFLAGS) -o findglare findglare.o glareval.o glaresrc.o \
1217-setscan.o -lrt -lm
1218+setscan.o -lrayt -lm
1219
1220 glarendx: glarendx.o
1221- $(CC) $(CFLAGS) -o glarendx glarendx.o -lrt -lm
1222+ $(CC) $(CFLAGS) -o glarendx glarendx.o -lrayt -lm
1223
1224 xglaresrc: xglaresrc.o x11findwind.o
1225 $(CC) $(CFLAGS) -o xglaresrc xglaresrc.o \
1226-x11findwind.o -lrt -lX11 -lm
1227+x11findwind.o -lrayt -lX11 -lm
1228
1229 rad: rad.o
1230- $(CC) $(CFLAGS) -o rad rad.o -lrt -lm
1231+ $(CC) $(CFLAGS) -o rad rad.o -lrayt -lm
1232
1233 ranimate: ranimate.o netproc.o
1234- $(CC) $(CFLAGS) -o ranimate ranimate.o netproc.o -lrt -lm
1235+ $(CC) $(CFLAGS) -o ranimate ranimate.o netproc.o -lrayt -lm
1236
1237 rpiece: rpiece.o Version.o
1238- $(CC) $(CFLAGS) -o rpiece rpiece.o Version.o -lrt -lm
1239+ $(CC) $(CFLAGS) -o rpiece rpiece.o Version.o -lrayt -lm
1240
1241 vwright: vwright.o
1242- $(CC) $(CFLAGS) -o vwright vwright.o -lrt -lm
1243+ $(CC) $(CFLAGS) -o vwright vwright.o -lrayt -lm
1244
c46822c7 1245 vwrays: vwrays.o
1246- $(CC) $(CFLAGS) -o vwrays vwrays.o -lrt -lm
1247+ $(CC) $(CFLAGS) -o vwrays vwrays.o -lrayt -lm
1248
196b4671 1249 getinfo: getinfo.o
1250- $(CC) $(CFLAGS) -o getinfo getinfo.o -lrt
1251+ $(CC) $(CFLAGS) -o getinfo getinfo.o -lrayt
1252
c46822c7 1253 glrad: glrad.o
1254- $(CC) $(CFLAGS) -o glrad glrad.o -lrgl -lrt -lGLU -lGL \
1255+ $(CC) $(CFLAGS) -o glrad glrad.o -lrgl -lrayt -lGLU -lGL \
1256 -lX11 -lXext -lm
1257
196b4671 1258 contour: contour.o
Radiance 3D Photo-Realistic Renderer
This page took 0.242047 seconds and 4 git commands to generate.