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

Comparing ray/src/util/Rmakefile (file contents):
Revision 2.41 by greg, Thu May 26 17:53:28 2005 UTC vs.
Revision 2.47 by greg, Thu Feb 7 23:02:14 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 23 | Line 25 | PROGS = findglare glarendx rpiece rad ranimate ranimov
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
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 +        cp fieldcomb.csh $(INSTDIR)/fieldcomb
43          chmod 755 $(INSTDIR)/objview $(INSTDIR)/objpict \
44                  $(INSTDIR)/glare $(INSTDIR)/dayfact $(INSTDIR)/debugcal \
45                  $(INSTDIR)/rlux $(INSTDIR)/raddepend $(INSTDIR)/objline \
46 <                $(INSTDIR)/compamb $(INSTDIR)/vinfo $(INSTDIR)/genambpos
46 >                $(INSTDIR)/compamb $(INSTDIR)/vinfo $(INSTDIR)/genambpos \
47 >                $(INSTDIR)/fieldcomb
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 54 | 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   rpiece: rpiece.o Version.o
82 <        $(CC) $(CFLAGS) -o rpiece rpiece.o Version.o -lrt -lm
82 >        $(CC) $(CFLAGS) -o rpiece rpiece.o Version.o -lrtrad $(MLIB)
83  
84   rtcontrib:      rtcontrib.o Version.o
85 <        $(CC) $(CFLAGS) -o rtcontrib rtcontrib.o Version.o -lrt -lm
85 >        $(CC) $(CFLAGS) -o rtcontrib rtcontrib.o Version.o -lrtrad $(MLIB)
86  
87   vwright:        vwright.o
88 <        $(CC) $(CFLAGS) -o vwright vwright.o -lrt -lm
88 >        $(CC) $(CFLAGS) -o vwright vwright.o -lrtrad $(MLIB)
89  
90   vwrays:         vwrays.o
91 <        $(CC) $(CFLAGS) -o vwrays vwrays.o -lrt -lm
91 >        $(CC) $(CFLAGS) -o vwrays vwrays.o -lrtrad $(MLIB)
92  
93   getinfo:        getinfo.o
94 <        $(CC) $(CFLAGS) -o getinfo getinfo.o -lrt
94 >        $(CC) $(CFLAGS) -o getinfo getinfo.o -lrtrad
95  
96   glrad:  glrad.o
97 <        $(CC) $(CFLAGS) -o glrad glrad.o -lrgl -lrt -lGLU -lGL \
98 < -lX11 -lXext -lm
97 >        $(CC) $(CFLAGS) -o glrad glrad.o -lrgl -lrtrad -lGLU -lGL \
98 > -lX11 -lXext
99  
100   setscan.o:      setscan.h
101  
# Line 120 | Line 125 | glareval.o xglaresrc.o:        ../common/resolu.h
125  
126   rad.o ranimate.o:       ../common/vars.h
127  
128 < ranimove1.o ranimove2.o:        ../common/random.h
128 > ranimove1.o ranimove2.o vwrays.o:       ../common/random.h
129  
130   rad.o:  ../common/paths.h
131  

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines