ViewVC Help
View File | Revision Log | Show Annotations | Download File | Root Listing
root/radiance/ray/src/cv/Rmakefile
(Generate patch)

Comparing ray/src/cv/Rmakefile (file contents):
Revision 2.6 by greg, Wed Apr 13 14:08:53 1994 UTC vs.
Revision 2.9 by greg, Thu Jun 23 10:27:54 1994 UTC

# Line 1 | Line 1
1 – # SCCSid "$SunId$ LBL"
2 –
1   #
2 + # SCCSid "$SunId$ LBL"
3   # Makefile for conversion programs
4   #
5  
# Line 18 | Line 17 | INSTDIR = /usr/local/bin
17  
18   LIBDIR = /usr/local/lib/ray
19  
20 < PROGS = thf2rad ies2rad arch2rad nff2rad lampcolor tmesh2rad obj2rad
20 > PROGS = thf2rad ies2rad arch2rad nff2rad lampcolor tmesh2rad obj2rad mgf2rad
21  
22   LIBFILES = source.cal tilt.cal lamp.tab tmesh.cal
23  
# Line 31 | Line 30 | install:       $(PROGS) $(LIBFILES)
30  
31   clean:
32          set nonomatch; rm -f $(PROGS) *.o core
33 +        cd mgflib ; make clean
34  
35   thf2rad:        thf2rad.o
36          $(CC) $(CFLAGS) -o thf2rad thf2rad.o
# Line 47 | Line 47 | nff2rad:       nff2rad.o
47   lampcolor:      lampcolor.o
48          $(CC) $(CFLAGS) -o lampcolor lampcolor.o -lrt
49  
50 < tmesh2rad:      tmesh2rad.o
51 <        $(CC) $(CFLAGS) -o tmesh2rad tmesh2rad.o -lrt $(MLIB)
50 > tmesh2rad:      tmesh2rad.o tmesh.o
51 >        $(CC) $(CFLAGS) -o tmesh2rad tmesh2rad.o tmesh.o -lrt $(MLIB)
52  
53 < obj2rad:        obj2rad.o trans.o
54 <        $(CC) $(CFLAGS) -o obj2rad obj2rad.o trans.o -lrt $(MLIB)
53 > obj2rad:        obj2rad.o trans.o tmesh.o
54 >        $(CC) $(CFLAGS) -o obj2rad obj2rad.o trans.o tmesh.o -lrt $(MLIB)
55  
56 + mgf2rad:        MGF_LIB mgf2rad.o tmesh.o
57 +        $(CC) $(CFLAGS) -o mgf2rad mgf2rad.o tmesh.o -lmgf -lrt $(MLIB)
58 +
59 + MGF_LIB:
60 +        cd mgflib ; \
61 +        make libmgf.a CFLAGS="$(OPT) $(MACH) '-DMEM_PTR=char *' -DNOPROTO" ; \
62 +        cp libmgf.a ../../lib
63 +
64 + mgf2rad.o:      mgflib/parser.h tmesh.h
65 +        $(CC) $(CFLAGS) '-DMEM_PTR=char *' -DNOPROTO -c mgf2rad.c
66 +
67   arch2rad.o trans.o:     trans.h
68  
69   ies2rad.o lampcolor.o:  ../common/color.h
70  
71   ies2rad.o:      ../common/paths.h
72  
73 < tmesh2rad.o:    ../common/standard.h ../common/mat4.h ../common/fvect.h
73 > obj2rad.o tmesh2rad.o:  tmesh.h \
74 > ../common/standard.h ../common/mat4.h ../common/fvect.h
75 >
76 > obj2rad.o:      trans.h
77 >
78 > tmesh.o:        tmesh.h ../common/fvect.h

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines