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

Comparing ray/src/util/Rmakefile (file contents):
Revision 2.40 by greg, Wed May 25 04:44:26 2005 UTC vs.
Revision 2.52 by greg, Tue Jun 16 04:54:08 2009 UTC

# Line 9 | Line 9 | OPT = -O
9  
10   CFLAGS = -I../common -I../rt -L../lib $(OPT) $(MACH)
11  
12 + MLIB = -lm
13 +
14   CC = cc
15  
16   SPECIAL =
# Line 18 | Line 20 | INSTDIR = /usr/local/bin
20   LIBDIR = /usr/local/lib/ray
21  
22   PROGS = findglare glarendx rpiece rad ranimate ranimove vwright getinfo \
23 <                vwrays xglaresrc rtcontrib
23 >                vwrays xglaresrc rtcontrib rsensor
24  
25   all:    $(PROGS)
26  
27   install:        all $(SPECIAL) objview.csh objpict.csh glare.csh dayfact.csh \
28 < rlux.csh raddepend.csh trad.wsh objline.csh compamb.csh
28 > rlux.csh raddepend.csh trad.wsh objline.csh compamb.csh vinfo.csh \
29 > genambpos.csh fieldcomb.csh genklemsamp.pl gentregvec.pl tregsamp.dat
30          cp $(PROGS) $(INSTDIR)
31          cp objview.csh $(INSTDIR)/objview
32          cp objline.csh $(INSTDIR)/objline
# Line 36 | Line 39 | rlux.csh raddepend.csh trad.wsh objline.csh compamb.cs
39          cp compamb.csh $(INSTDIR)/compamb
40          cp vinfo.csh $(INSTDIR)/vinfo
41          cp genambpos.csh $(INSTDIR)/genambpos
42 <        chmod 755 $(INSTDIR)/objview $(INSTDIR)/objpict \
43 <                $(INSTDIR)/glare $(INSTDIR)/dayfact $(INSTDIR)/debugcal \
44 <                $(INSTDIR)/rlux $(INSTDIR)/raddepend $(INSTDIR)/objline \
45 <                $(INSTDIR)/compamb $(INSTDIR)/vinfo $(INSTDIR)/genambpos
42 >        cp fieldcomb.csh $(INSTDIR)/fieldcomb
43 >        cp genklemsamp.pl $(INSTDIR)/genklemsamp
44 >        cp gentregvec.pl $(INSTDIR)/gentregvec
45 >        cd $(INSTDIR) ; chmod 755 objview objpict \
46 >                glare dayfact debugcal rlux raddepend objline \
47 >                compamb vinfo genambpos fieldcomb genklemsamp gentregvec
48 >        cp tregsamp.dat $(LIBDIR)
49          csh -f tradinstall.csh $(INSTDIR) $(LIBDIR)/tcl
50  
51   clean:
52 <        set nonomatch; rm -f *.o $(PROGS) glrad core
52 >        set nonomatch; rm -f *.o $(PROGS) glrad core Version.c x11findwind.c
53  
54   ogl:    glrad
55          cp glrad $(INSTDIR)
# Line 54 | Line 60 | sun:
60  
61   findglare:      findglare.o glareval.o glaresrc.o setscan.o
62          $(CC) $(CFLAGS) -o findglare findglare.o glareval.o glaresrc.o \
63 < setscan.o -lrt -lm
63 > setscan.o -lrtrad $(MLIB)
64  
65   glarendx:       glarendx.o
66 <        $(CC) $(CFLAGS) -o glarendx glarendx.o -lrt -lm
66 >        $(CC) $(CFLAGS) -o glarendx glarendx.o -lrtrad $(MLIB)
67  
68   xglaresrc:      xglaresrc.o x11findwind.o
69          $(CC) $(CFLAGS) -o xglaresrc xglaresrc.o \
70 < x11findwind.o -lrt -lX11 -lm
70 > x11findwind.o -lrtrad -lX11 $(MLIB)
71  
72   rad:    rad.o
73 <        $(CC) $(CFLAGS) -o rad rad.o -lrt -lm
73 >        $(CC) $(CFLAGS) -o rad rad.o -lrtrad $(MLIB)
74  
75   ranimate:       ranimate.o netproc.o
76 <        $(CC) $(CFLAGS) -o ranimate ranimate.o netproc.o -lrt -lm
76 >        $(CC) $(CFLAGS) -o ranimate ranimate.o netproc.o -lrtrad $(MLIB)
77  
78   ranimove:       ranimove.o ranimove1.o ranimove2.o
79          $(CC) $(CFLAGS) -o ranimove ranimove.o ranimove1.o ranimove2.o \
80 < -lraycalls -lradiance -lrt -lm
80 > -lraycalls -lradiance -lrtrad $(MLIB)
81  
82 + rsensor:        rsensor.o
83 +        $(CC) $(CFLAGS) -o rsensor rsensor.o \
84 + -lraycalls -lradiance -lrtrad $(MLIB)
85 +
86   rpiece: rpiece.o Version.o
87 <        $(CC) $(CFLAGS) -o rpiece rpiece.o Version.o -lrt -lm
87 >        $(CC) $(CFLAGS) -o rpiece rpiece.o Version.o -lrtrad $(MLIB)
88  
89   rtcontrib:      rtcontrib.o Version.o
90 <        $(CC) $(CFLAGS) -o rtcontrib rtcontrib.o Version.o -lrt -lm
90 >        $(CC) $(CFLAGS) -o rtcontrib rtcontrib.o Version.o -lrtrad $(MLIB)
91  
92   vwright:        vwright.o
93 <        $(CC) $(CFLAGS) -o vwright vwright.o -lrt -lm
93 >        $(CC) $(CFLAGS) -o vwright vwright.o -lrtrad $(MLIB)
94  
95   vwrays:         vwrays.o
96 <        $(CC) $(CFLAGS) -o vwrays vwrays.o -lrt -lm
96 >        $(CC) $(CFLAGS) -o vwrays vwrays.o -lrtrad $(MLIB)
97  
98   getinfo:        getinfo.o
99 <        $(CC) $(CFLAGS) -o getinfo getinfo.o -lrt
99 >        $(CC) $(CFLAGS) -o getinfo getinfo.o -lrtrad
100  
101   glrad:  glrad.o
102 <        $(CC) $(CFLAGS) -o glrad glrad.o -lrgl -lrt -lGLU -lGL \
103 < -lX11 -lXext -lm
102 >        $(CC) $(CFLAGS) -o glrad glrad.o -lrgl -lrtrad -lGLU -lGL \
103 > -lX11 -lXext $(MLIB)
104  
105   setscan.o:      setscan.h
106  
# Line 98 | Line 108 | findglare.o glareval.o \
108   glaresrc.o:     glare.h ../common/standard.h \
109   ../common/rtmisc.h ../common/rtio.h \
110   ../common/rtmath.h ../common/mat4.h ../common/fvect.h \
111 < ../common/rterror.h ../common/tifftypes.h \
102 < ../common/view.h ../common/color.h setscan.h
111 > ../common/rterror.h ../common/view.h ../common/color.h setscan.h
112  
113   glaresrc.o:     ../common/linregr.h
114  
115   rpiece.o:       ../common/color.h ../common/view.h ../common/resolu.h
116  
117 < rtcontrib.o:    ../common/rtio.h ../common/platform.h ../common/rtprocess.h \
118 < ../common/color.h ../common/resolu.h ../common/lookup.h ../common/calcomp.h \
119 < ../common/rterror.h ../common/selcall.h
117 > rtcontrib.o:    ../common/platform.h ../common/rtprocess.h \
118 > ../common/color.h ../common/resolu.h ../common/lookup.h \
119 > ../common/calcomp.h ../common/selcall.h
120  
121 < rad.o ranimate.o rpiece.o xglaresrc.o:  ../common/standard.h \
121 > rad.o ranimate.o rpiece.o rtcontrib.o xglaresrc.o:      ../common/standard.h \
122   ../common/rtmisc.h ../common/rtio.h \
123   ../common/rtmath.h ../common/mat4.h ../common/fvect.h \
124 < ../common/rterror.h ../common/tifftypes.h
124 > ../common/rterror.h
125  
126   xglaresrc.o:    ../common/view.h
127  
# Line 120 | Line 129 | glareval.o xglaresrc.o:        ../common/resolu.h
129  
130   rad.o ranimate.o:       ../common/vars.h
131  
132 < ranimove1.o ranimove2.o:        ../common/random.h
132 > ranimove1.o ranimove2.o vwrays.o:       ../common/random.h
133  
134   rad.o:  ../common/paths.h
135  
# Line 134 | Line 143 | rad.o ranimate.o ranimove.o:   ../common/view.h ../commo
143  
144   glrad.o:        ../common/radogl.h \
145   ../common/standard.h ../common/rtmisc.h ../common/rtio.h \
146 < ../common/rtmath.h ../common/mat4.h ../common/fvect.h \
138 < ../common/rterror.h ../common/tifftypes.h \
146 > ../common/rtmath.h ../common/mat4.h ../common/fvect.h ../common/rterror.h \
147   ../common/color.h ../common/object.h ../common/otypes.h ../common/lookup.h
148  
149   glrad.o:        glradicon.h ../common/view.h ../common/paths.h
# Line 146 | Line 154 | ranimove.o ranimove1.o ranimove2.o:    ranimove.h \
154   ../common/object.h ../common/color.h \
155   ../common/standard.h ../common/rtmisc.h ../common/rtio.h \
156   ../common/rtmath.h ../common/mat4.h ../common/fvect.h \
157 < ../common/rterror.h ../common/tifftypes.h
157 > ../common/rterror.h
158 >
159 > rsensor.o:      ../rt/ray.h ../common/octree.h \
160 > ../common/object.h ../common/color.h \
161 > ../common/standard.h ../common/rtmisc.h ../common/rtio.h \
162 > ../common/rtmath.h ../common/mat4.h ../common/fvect.h \
163 > ../common/rterror.h
164 >
165 > rsensor.o:      ../common/view.h ../common/resolu.h ../rt/source.h
166  
167   Version.c:      ../rt/Version.c
168          cp ../rt/Version.c .

Diff Legend

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