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.42 by greg, Fri Sep 2 04:15:42 2005 UTC vs.
Revision 2.48 by greg, Thu Feb 21 01:22:06 2008 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  
# Line 46 | Line 48 | genambpos.csh fieldcomb.csh
48          csh -f tradinstall.csh $(INSTDIR) $(LIBDIR)/tcl
49  
50   clean:
51 <        set nonomatch; rm -f *.o $(PROGS) glrad core
51 >        set nonomatch; rm -f *.o $(PROGS) glrad core Version.c x11findwind.c
52  
53   ogl:    glrad
54          cp glrad $(INSTDIR)
# Line 57 | Line 59 | sun:
59  
60   findglare:      findglare.o glareval.o glaresrc.o setscan.o
61          $(CC) $(CFLAGS) -o findglare findglare.o glareval.o glaresrc.o \
62 < setscan.o -lrt -lm
62 > setscan.o -lrtrad $(MLIB)
63  
64   glarendx:       glarendx.o
65 <        $(CC) $(CFLAGS) -o glarendx glarendx.o -lrt -lm
65 >        $(CC) $(CFLAGS) -o glarendx glarendx.o -lrtrad $(MLIB)
66  
67   xglaresrc:      xglaresrc.o x11findwind.o
68          $(CC) $(CFLAGS) -o xglaresrc xglaresrc.o \
69 < x11findwind.o -lrt -lX11 -lm
69 > x11findwind.o -lrtrad -lX11 $(MLIB)
70  
71   rad:    rad.o
72 <        $(CC) $(CFLAGS) -o rad rad.o -lrt -lm
72 >        $(CC) $(CFLAGS) -o rad rad.o -lrtrad $(MLIB)
73  
74   ranimate:       ranimate.o netproc.o
75 <        $(CC) $(CFLAGS) -o ranimate ranimate.o netproc.o -lrt -lm
75 >        $(CC) $(CFLAGS) -o ranimate ranimate.o netproc.o -lrtrad $(MLIB)
76  
77   ranimove:       ranimove.o ranimove1.o ranimove2.o
78          $(CC) $(CFLAGS) -o ranimove ranimove.o ranimove1.o ranimove2.o \
79 < -lraycalls -lradiance -lrt -lm
79 > -lraycalls -lradiance -lrtrad $(MLIB)
80  
81 + rsensor:        rsensor.o
82 +        $(CC) $(CFLAGS) -o rsensor rsensor.o \
83 + -lraycalls -lradiance -lrtrad $(MLIB)
84 +
85   rpiece: rpiece.o Version.o
86 <        $(CC) $(CFLAGS) -o rpiece rpiece.o Version.o -lrt -lm
86 >        $(CC) $(CFLAGS) -o rpiece rpiece.o Version.o -lrtrad $(MLIB)
87  
88   rtcontrib:      rtcontrib.o Version.o
89 <        $(CC) $(CFLAGS) -o rtcontrib rtcontrib.o Version.o -lrt -lm
89 >        $(CC) $(CFLAGS) -o rtcontrib rtcontrib.o Version.o -lrtrad $(MLIB)
90  
91   vwright:        vwright.o
92 <        $(CC) $(CFLAGS) -o vwright vwright.o -lrt -lm
92 >        $(CC) $(CFLAGS) -o vwright vwright.o -lrtrad $(MLIB)
93  
94   vwrays:         vwrays.o
95 <        $(CC) $(CFLAGS) -o vwrays vwrays.o -lrt -lm
95 >        $(CC) $(CFLAGS) -o vwrays vwrays.o -lrtrad $(MLIB)
96  
97   getinfo:        getinfo.o
98 <        $(CC) $(CFLAGS) -o getinfo getinfo.o -lrt
98 >        $(CC) $(CFLAGS) -o getinfo getinfo.o -lrtrad
99  
100   glrad:  glrad.o
101 <        $(CC) $(CFLAGS) -o glrad glrad.o -lrgl -lrt -lGLU -lGL \
102 < -lX11 -lXext -lm
101 >        $(CC) $(CFLAGS) -o glrad glrad.o -lrgl -lrtrad -lGLU -lGL \
102 > -lX11 -lXext
103  
104   setscan.o:      setscan.h
105  
# Line 123 | 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 150 | Line 156 | ranimove.o ranimove1.o ranimove2.o:    ranimove.h \
156   ../common/standard.h ../common/rtmisc.h ../common/rtio.h \
157   ../common/rtmath.h ../common/mat4.h ../common/fvect.h \
158   ../common/rterror.h ../common/tifftypes.h
159 +
160 + rsensor.o:      ../rt/ray.h ../common/octree.h \
161 + ../common/object.h ../common/color.h \
162 + ../common/standard.h ../common/rtmisc.h ../common/rtio.h \
163 + ../common/rtmath.h ../common/mat4.h ../common/fvect.h \
164 + ../common/rterror.h ../common/tifftypes.h
165 +
166 + rsensor.o:      ../common/view.h ../common/resolu.h ../rt/source.h
167  
168   Version.c:      ../rt/Version.c
169          cp ../rt/Version.c .

Diff Legend

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