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.7 by greg, Wed Jun 22 12:35:56 1994 UTC vs.
Revision 2.10 by greg, Thu Jul 7 17:30:45 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 mgf2rad
20 > PROGS = thf2rad ies2rad arch2rad nff2rad lampcolor tmesh2rad obj2rad \
21 > mgf2rad rad2mgf
22  
23   LIBFILES = source.cal tilt.cal lamp.tab tmesh.cal
24  
# Line 31 | Line 31 | install:       $(PROGS) $(LIBFILES)
31  
32   clean:
33          set nonomatch; rm -f $(PROGS) *.o core
34 +        cd mgflib ; make clean
35  
36   thf2rad:        thf2rad.o
37          $(CC) $(CFLAGS) -o thf2rad thf2rad.o
# Line 53 | Line 54 | tmesh2rad:     tmesh2rad.o tmesh.o
54   obj2rad:        obj2rad.o trans.o tmesh.o
55          $(CC) $(CFLAGS) -o obj2rad obj2rad.o trans.o tmesh.o -lrt $(MLIB)
56  
57 < mgf2rad:        mgf2rad.o ../lib/libmgf.a
57 > mgf2rad:        MGF_LIB mgf2rad.o tmesh.o
58          $(CC) $(CFLAGS) -o mgf2rad mgf2rad.o tmesh.o -lmgf -lrt $(MLIB)
59  
60 < ../lib/libmgf.a:
60 > rad2mgf:        rad2mgf.o
61 >        $(CC) $(CFLAGS) -o rad2mgf rad2mgf.o -lrt $(MLIB)
62 >
63 > MGF_LIB:
64          cd mgflib ; \
65          make libmgf.a CFLAGS="$(OPT) $(MACH) '-DMEM_PTR=char *' -DNOPROTO" ; \
66 <        mv libmgf.a ../../lib
66 >        cp libmgf.a ../../lib
67  
68   mgf2rad.o:      mgflib/parser.h tmesh.h
69 +        $(CC) $(CFLAGS) '-DMEM_PTR=char *' -DNOPROTO -c mgf2rad.c
70  
71   arch2rad.o trans.o:     trans.h
72  
# Line 75 | Line 80 | obj2rad.o tmesh2rad.o: tmesh.h \
80   obj2rad.o:      trans.h
81  
82   tmesh.o:        tmesh.h ../common/fvect.h
83 +
84 + rad2mgf.o:      ../common/fvect.h ../common/object.h ../common/color.h \
85 + ../common/lookup.h

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines