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.27 by schorsch, Fri Mar 10 19:40:12 2006 UTC vs.
Revision 2.30 by greg, Wed Nov 21 17:52:04 2007 UTC

# Line 21 | Line 21 | LIBDIR = /usr/local/lib/ray
21   MGF_LIB = ../lib/libmgf.a
22  
23   PROGS = ies2rad arch2rad nff2rad lampcolor tmesh2rad obj2rad \
24 < mgf2rad rad2mgf mgf2meta mgfilt mgf2inv
24 > mgf2rad rad2mgf mgf2meta mgfilt mgf2inv 3ds2mgf
25  
26 < LIBFILES = source.cal tilt.cal lamp.tab
26 > LIBFILES = source.cal tilt.cal lamp.tab window.cal
27  
28   all:    $(PROGS)
29  
30 < install:        $(PROGS) $(LIBFILES)
30 > install:        $(PROGS) $(LIBFILES) optics2rad.csh
31          cp $(PROGS) $(INSTDIR)
32 +        cp optics2rad.csh $(INSTDIR)/optics2rad
33 +        chmod 755 $(INSTDIR)/optics2rad
34          cd $(LIBDIR) && rm -f $(LIBFILES)
35          cp $(LIBFILES) $(LIBDIR)
36  
# Line 65 | Line 67 | mgf2meta:      $(MGF_LIB) mgf2meta.o
67  
68   mgfilt:
69          cd mgflib ; rm -f mgfilt ; \
70 <        make mgfilt CC=$(CC) \
70 >        make mgfilt CC="$(CC)" \
71                  CFLAGS="$(OPT) $(MACH)" ; \
72          mv mgfilt ..
73  
74   mgf2inv:
75          cd mgflib ; rm -f mgf2inv ; \
76 <        make mgf2inv CC=$(CC) \
76 >        make mgf2inv CC="$(CC)" \
77                  CFLAGS="$(OPT) $(MACH)" ; \
78          mv mgf2inv ..
79  
80 + 3ds2mgf:
81 +        cd mgflib ; rm -f 3ds2mgf ; \
82 +        make 3ds2mgf CC=$(CC) \
83 +                CFLAGS="$(OPT) $(MACH)" ; \
84 +        mv 3ds2mgf ..
85 +
86   $(MGF_LIB):
87          cd mgflib ; rm -f libmgf.a ; \
88 <        make libmgf.a CC=$(CC) \
88 >        make libmgf.a CC="$(CC)" \
89                  CFLAGS="$(OPT) $(MACH)" ; \
90          mv libmgf.a ../../lib
91  

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines