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

Comparing ray/src/cv/Rmakefile (file contents):
Revision 2.30 by greg, Wed Nov 21 17:52:04 2007 UTC vs.
Revision 2.34 by greg, Mon Nov 29 17:22:30 2010 UTC

# Line 20 | Line 20 | LIBDIR = /usr/local/lib/ray
20  
21   MGF_LIB = ../lib/libmgf.a
22  
23 < PROGS = ies2rad arch2rad nff2rad lampcolor tmesh2rad obj2rad \
23 > PROGS = ies2rad nff2rad lampcolor tmesh2rad obj2rad \
24   mgf2rad rad2mgf mgf2meta mgfilt mgf2inv 3ds2mgf
25  
26   LIBFILES = source.cal tilt.cal lamp.tab window.cal
# Line 36 | Line 36 | install:       $(PROGS) $(LIBFILES) optics2rad.csh
36  
37   clean:
38          set nonomatch; rm -f $(PROGS) *.o core
39 <        cd mgflib ; make clean
39 >        cd mgflib ; $(MAKE) clean
40  
41   ies2rad:        ies2rad.o
42 <        $(CC) $(CFLAGS) -o ies2rad ies2rad.o -lrtrad -lm
42 >        $(CC) $(CFLAGS) -o ies2rad ies2rad.o -lrtrad $(MLIB)
43  
44   arch2rad:       arch2rad.o trans.o
45          $(CC) $(CFLAGS) -o arch2rad arch2rad.o trans.o -lrtrad
# Line 67 | 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 ..
72 >        cp -p 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 ..
78 >        cp -p mgf2inv ..
79  
80   3ds2mgf:
81          cd mgflib ; rm -f 3ds2mgf ; \
82 <        make 3ds2mgf CC=$(CC) \
82 >        $(MAKE) 3ds2mgf CC="$(CC)" \
83                  CFLAGS="$(OPT) $(MACH)" ; \
84 <        mv 3ds2mgf ..
84 >        cp -p 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
90 >        cp -p libmgf.a ../../lib
91  
92   mgf2rad.o:      mgf2rad.c mgflib/parser.h ../common/tmesh.h ../common/color.h
93          $(CC) $(CFLAGS) -c mgf2rad.c
# Line 104 | Line 104 | ies2rad.o:     ../common/paths.h
104   obj2rad.o tmesh2rad.o:  ../common/tmesh.h \
105   ../common/standard.h ../common/rtmisc.h ../common/rtio.h \
106   ../common/rtmath.h ../common/rterror.h ../common/mat4.h \
107 < ../common/fvect.h ../common/tifftypes.h
107 > ../common/fvect.h
108  
109   obj2rad.o:      trans.h
110  

Diff Legend

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