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.34 by greg, Mon Nov 29 17:22:30 2010 UTC vs.
Revision 2.42 by greg, Fri Nov 8 23:32:54 2013 UTC

# Line 18 | Line 18 | INSTDIR = /usr/local/bin
18  
19   LIBDIR = /usr/local/lib/ray
20  
21 MGF_LIB = ../lib/libmgf.a
22
21   PROGS = ies2rad nff2rad lampcolor tmesh2rad obj2rad \
22 < mgf2rad rad2mgf mgf2meta mgfilt mgf2inv 3ds2mgf
22 > mgf2rad rad2mgf mgf2meta mgfilt mgf2inv 3ds2mgf \
23 > pabopto2bsdf bsdf2ttree bsdf2klems pkgBSDF epw2wea
24  
25   LIBFILES = source.cal tilt.cal lamp.tab window.cal
26  
# Line 36 | Line 35 | install:       $(PROGS) $(LIBFILES) optics2rad.csh
35  
36   clean:
37          set nonomatch; rm -f $(PROGS) *.o core
39        cd mgflib ; $(MAKE) clean
38  
39   ies2rad:        ies2rad.o
40          $(CC) $(CFLAGS) -o ies2rad ies2rad.o -lrtrad $(MLIB)
# Line 56 | Line 54 | tmesh2rad:     tmesh2rad.o
54   obj2rad:        obj2rad.o trans.o
55          $(CC) $(CFLAGS) -o obj2rad obj2rad.o trans.o -lrtrad $(MLIB)
56  
57 < mgf2rad:        $(MGF_LIB) mgf2rad.o
57 > mgf2rad:        mgf2rad.o
58          $(CC) $(CFLAGS) -o mgf2rad mgf2rad.o -lmgf -lrtrad $(MLIB)
59  
60   rad2mgf:        rad2mgf.o
61          $(CC) $(CFLAGS) -o rad2mgf rad2mgf.o -lrtrad $(MLIB)
62  
63 < mgf2meta:       $(MGF_LIB) mgf2meta.o
63 > mgf2meta:       mgf2meta.o
64          $(CC) $(CFLAGS) -o mgf2meta mgf2meta.o -lmgf -lmeta -lrtrad $(MLIB)
65  
66 < mgfilt:
67 <        cd mgflib ; rm -f mgfilt ; \
70 <        $(MAKE) mgfilt CC="$(CC)" \
71 <                CFLAGS="$(OPT) $(MACH)" ; \
72 <        cp -p mgfilt ..
66 > mgfilt: mgfilt.o
67 >        $(CC) $(CFLAGS) -o mgfilt mgfilt.o -lmgf -lrtrad $(MLIB)
68  
69 < mgf2inv:
70 <        cd mgflib ; rm -f mgf2inv ; \
76 <        $(MAKE) mgf2inv CC="$(CC)" \
77 <                CFLAGS="$(OPT) $(MACH)" ; \
78 <        cp -p mgf2inv ..
69 > mgf2inv:        mgf2inv.o
70 >        $(CC) $(CFLAGS) -o mgf2inv mgf2inv.o -lmgf -lrtrad $(MLIB)
71  
72 < 3ds2mgf:
73 <        cd mgflib ; rm -f 3ds2mgf ; \
74 <        $(MAKE) 3ds2mgf CC="$(CC)" \
83 <                CFLAGS="$(OPT) $(MACH)" ; \
84 <        cp -p 3ds2mgf ..
72 > 3ds2mgf:        3ds2mgf.o rayopt3ds.o vect3ds.o
73 >        $(CC) $(CFLAGS) -o 3ds2mgf 3ds2mgf.o rayopt3ds.o vect3ds.o \
74 > -lmgf -lrtrad $(MLIB)
75  
76 < $(MGF_LIB):
77 <        cd mgflib ; rm -f libmgf.a ; \
78 <        $(MAKE) libmgf.a CC="$(CC)" \
89 <                CFLAGS="$(OPT) $(MACH)" ; \
90 <        cp -p libmgf.a ../../lib
76 > pabopto2bsdf:   pabopto2bsdf.o bsdfrep.o bsdfrbf.o bsdfmesh.o
77 >        $(CC) $(CFLAGS) -o pabopto2bsdf pabopto2bsdf.o bsdfrep.o \
78 > bsdfrbf.o bsdfmesh.o -lrtrad $(MLIB)
79  
80 < mgf2rad.o:      mgf2rad.c mgflib/parser.h ../common/tmesh.h ../common/color.h
80 > pabopto2rad:    pabopto2rad.o bsdfrep.o bsdfrbf.o bsdfmesh.o
81 >        $(CC) $(CFLAGS) -o pabopto2rad pabopto2rad.o bsdfrep.o \
82 > bsdfrbf.o bsdfmesh.o -lrtrad $(MLIB)
83 >
84 > pabopto2rad.o:  pabopto2bsdf.c bsdfrep.h
85 >        $(CC) $(CFLAGS) -c -DTEST_MAIN -o pabopto2rad.o pabopto2bsdf.c
86 >
87 > bsdf2rad:       bsdf2rad.o bsdfrep.o bsdfinterp.o
88 >        $(CC) $(CFLAGS) -o bsdf2rad bsdf2rad.o bsdfrep.o bsdfinterp.o \
89 > -lrtrad $(MLIB)
90 >
91 > bsdf2ttree:     bsdf2ttree.o bsdfrep.o bsdfinterp.o
92 >        $(CC) $(CFLAGS) -o bsdf2ttree bsdf2ttree.o bsdfrep.o bsdfinterp.o \
93 > -lrtrad $(MLIB)
94 >
95 > bsdf2klems:     bsdf2klems.o bsdfrep.o bsdfinterp.o
96 >        $(CC) $(CFLAGS) -o bsdf2klems bsdf2klems.o bsdfrep.o bsdfinterp.o \
97 > -lrtrad $(MLIB)
98 >
99 > pkgBSDF:        pkgBSDF.o
100 >        $(CC) $(CFLAGS) -o pkgBSDF pkgBSDF.o -lrtrad $(MLIB)
101 >
102 > epw2wea:        epw2wea.o
103 >        $(CC) $(CFLAGS) -o epw2wea epw2wea.o
104 >
105 > mgf2rad.o:      mgf2rad.c ../common/mgf_parser.h ../common/tmesh.h \
106 > ../common/color.h
107          $(CC) $(CFLAGS) -c mgf2rad.c
108  
109 < mgf2meta.o:     mgf2meta.c mgflib/parser.h
109 > mgf2meta.o:     mgf2meta.c ../common/mgf_parser.h
110          $(CC) $(CFLAGS) $(METACFLAGS) -c mgf2meta.c
111  
112   arch2rad.o trans.o:     trans.h
# Line 110 | Line 124 | obj2rad.o:     trans.h
124  
125   rad2mgf.o:      ../common/standard.h ../common/mat4.h ../common/fvect.h \
126   ../common/object.h ../common/color.h ../common/lookup.h
127 +
128 + mgfilt.o:       ../common/mgf_parser.h ../common/ccolor.h
129 +
130 + mgf2inv.o:      ../common/mgf_parser.h ../common/ccolor.h
131 +
132 + 3ds2mgf.o rayopt3ds.o:  rayopt3ds.h
133 +
134 + 3ds2mgf.o rayopt3ds.o vect3ds.o:        vect3ds.h
135 +
136 + pkgBSDF.o:      ../common/bsdf.h ../common/fvect.h ../common/ccolor.h \
137 + ../common/paths.h
138 +
139 + bsdf2ttree.o bsdfinterp.o bsdfmesh.o bsdfrbf.o bsdfrep.o bsdf2rad.o \
140 + pabopto2bsdf.o: bsdfrep.h ../common/bsdf.h ../common/fvect.h ../common/ccolor.h
141 +
142 + bsdf2ttree.o pabopto2bsdf.o:    ../common/platform.h
143 +
144 + bsdfrep.o:      ../common/resolu.h ../common/rtio.h

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines