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

Comparing ray/src/rt/Rmakefile (file contents):
Revision 2.47 by greg, Tue Oct 26 19:04:32 2004 UTC vs.
Revision 2.61 by greg, Sun Sep 26 15:51:15 2010 UTC

# Line 6 | Line 6
6   OPT = -O
7   MACH = -DBSD
8   CFLAGS = -I../common -L../lib $(OPT) $(MACH)
9 < SPECIAL = aed
9 > SPECIAL =
10   CC = cc
11   MLIB = -lm
12   LINT = lint
# Line 30 | Line 30 | LIBDIR = /usr/local/lib/ray
30   #
31   RLIB = ../lib/libradiance.a
32   RCLIB = ../lib/libraycalls.a
33 < LIBS = -lrt $(MLIB)
33 > LIBS = -lrtrad $(MLIB)
34  
35   #
36   # Device drivers for rvu (see also devtable.c):
# Line 54 | Line 54 | RPSRC = rpmain.c rpict.c srcdraw.c duphead.c persist.c
54   RVOBJS = rvmain.o rview.o rv2.o rv3.o $(DOBJS)
55   RVSRC = rvmain.c rview.c rv2.c rv3.c $(DSRC)
56  
57 < RLOBJS = raycalls.o raypcalls.o
58 < RLSRC = raycalls.c raypcalls.c
57 > RLOBJS = raycalls.o raypcalls.o rayfifo.o
58 > RLSRC = raycalls.c raypcalls.c rayfifo.c
59  
60   ROBJS = $(RAYOBJS) $(SURFOBJS) $(MATOBJS) \
61          $(MODOBJS) $(SUPPOBJS)
# Line 99 | Line 99 | install:       all rayinit.cal
99          rm -f $(LIBDIR)/rayinit.cal
100          cp rayinit.cal $(LIBDIR)
101  
102 – aed:    $(DEVDIR)/aed
103 –
102   ogl:    
103  
104   clean:
# Line 113 | Line 111 | lint:  $(RVSRC)
111   # Links:
112   #
113  
114 < $(DESTDIR)/rtrace:      $(RTOBJS) $(RLIB)
115 <        $(CC) $(CFLAGS) -o $(DESTDIR)/rtrace $(RTOBJS) $(RLIB) $(LIBS)
114 > $(DESTDIR)/rtrace:      $(RTOBJS) $(RCLIB) $(RLIB)
115 >        $(CC) $(CFLAGS) -o $(DESTDIR)/rtrace $(RTOBJS) $(RCLIB) $(RLIB) $(LIBS)
116  
117   $(DESTDIR)/rpict:       $(RPOBJS) $(RLIB)
118          $(CC) $(CFLAGS) -o $(DESTDIR)/rpict $(RPOBJS) $(RLIB) $(LIBS)
119  
120 < $(DESTDIR)/rvu: $(RVOBJS) $(RLIB)
121 <        $(CC) $(CFLAGS) -o $(DESTDIR)/rvu $(RVOBJS) $(RLIB) $(LIBS) $(DLIBS)
120 > $(DESTDIR)/rvu: $(RVOBJS) $(RCLIB) $(RLIB)
121 >        $(CC) $(CFLAGS) -o $(DESTDIR)/rvu $(RVOBJS) $(RCLIB) \
122 > $(RLIB) $(LIBS) $(DLIBS)
123  
124   $(DESTDIR)/lookamb:     lookamb.o ambio.o
125          $(CC) $(CFLAGS) -o $(DESTDIR)/lookamb lookamb.o ambio.o $(LIBS)
126  
128 – $(DEVDIR)/aed:  aed.o colortab.o tty.o devmain.o editline.o
129 –        $(CC) $(CFLAGS) -s -o $(DEVDIR)/aed aed.o colortab.o \
130 – devmain.o tty.o editline.o $(LIBS)
131 –
127   $(RLIB):        $(ROBJS) Version.o
128 +        rm -f $(RLIB)
129          ar rc $(RLIB) $(ROBJS) Version.o
130          -ranlib $(RLIB)
131  
132   $(RCLIB):       $(RLOBJS)
133 +        rm -f $(RCLIB)
134          ar rc $(RCLIB) $(RLOBJS)
135          -ranlib $(RCLIB)
136  
137   #
141 – # Special compiles:
142 – #
143 –
144 – rtmain.o:       rtmain.c
145 –        $(CC) $(CFLAGS) -DNICE=4 -c rtmain.c
146 –
147 – rpmain.o:       rpmain.c
148 –        $(CC) $(CFLAGS) -DNICE=6 -c rpmain.c
149 –
150 – rvmain.o:       rvmain.c
151 –        $(CC) $(CFLAGS) -c rvmain.c
152 –
153 – #
138   # Uncomment the following to model dispersion:
139   #
140   dielectric.o:   dielectric.c source.h
# Line 161 | Line 145 | dielectric.o:  dielectric.c source.h
145   devcomm.o:      devcomm.c
146          $(CC) $(CFLAGS) -DDEVPATH=\"$(DEVDIR)\" -c devcomm.c
147  
164 – aed.o:  aed.c
165 –        $(CC) $(CFLAGS) -Daed_init=dinit -c aed.c
166 –
148   #
149   # Version module:
150   #
# Line 176 | Line 157 | Version.c:     VERSION $(RSRC) $(HEADERS)
157   # Include dependencies:
158   #
159  
160 < aed.o ambio.o colortab.o data.o devcomm.o \
160 > ambio.o colortab.o data.o devcomm.o \
161   devmain.o lookamb.o rview.o x11.o:      ../common/color.h
162  
163   freeobjmem.o o_cone.o srcsupp.o:        ../common/cone.h
# Line 184 | Line 165 | freeobjmem.o o_cone.o srcsupp.o:       ../common/cone.h
165   data.o freeobjmem.o m_brdf.o mx_data.o \
166   p_data.o raycalls.o t_data.o:   data.h
167  
168 < aed.o devcomm.o devmain.o devtable.o \
169 < editline.o tty.o x11.o: driver.h
168 > devcomm.o devmain.o devtable.o \
169 > editline.o x11.o:       driver.h
170  
171   freeobjmem.o o_face.o srcsupp.o:        ../common/face.h
172  
# Line 199 | Line 180 | m_brdf.o m_direct.o m_mirror.o normal.o o_cone.o prelo
180   raycalls.o raytrace.o rtrace.o rv2.o source.o sphere.o srcsupp.o text.o \
181   srcdraw.o srcobstr.o virtuals.o:        ../common/otypes.h
182  
183 < ambient.o ambcomp.o aniso.o normal.o raycalls.o rpict.o rvmain.o \
184 < rtmain.o rpmain.o persist.o source.o rv3.o \
183 > ambient.o ambcomp.o aniso.o normal.o raycalls.o raytrace.o rpict.o \
184 > rvmain.o rtmain.o rpmain.o persist.o source.o rv3.o \
185   srcsamp.o virtuals.o:   ../common/random.h
186  
187   ambcomp.o ambient.o aniso.o dielectric.o freeobjmem.o func.o glass.o \
188   m_brdf.o m_clip.o m_direct.o m_mirror.o m_mist.o mx_data.o o_mesh.o \
189   mx_func.o normal.o o_cone.o o_face.o o_instance.o p_data.o p_func.o \
190 < raycalls.o raypcalls.o raytrace.o rpict.o rtrace.o rv2.o rv3.o rview.o \
190 > raycalls.o raypcalls.o rayfifo.o raytrace.o rpict.o rtrace.o rv2.o rv3.o rview.o \
191   source.o sphere.o srcdraw.o srcobstr.o srcsamp.o srcsupp.o t_data.o t_func.o \
192   text.o rpmain.o rtmain.o rvmain.o virtuals.o m_alias.o: ray.h \
193   ../common/standard.h ../common/rtmisc.h ../common/rtio.h ../common/rtmath.h \
# Line 216 | Line 197 | text.o rpmain.o rtmain.o rvmain.o virtuals.o m_alias.o
197   rv2.o rv3.o rview.o:    rpaint.h driver.h ../common/view.h ../common/resolu.h
198  
199   m_direct.o m_mirror.o m_mist.o dielectric.o raycalls.o \
200 < rpict.o rpmain.o rtmain.o rvmain.o source.o srcdraw.o \
200 > rpict.o rpmain.o rtmain.o rvmain.o rv2.o source.o srcdraw.o \
201   srcobstr.o srcsamp.o srcsupp.o virtuals.o:      source.h
202  
203   cone.o data.o devcomm.o initotypes.o fprism.o preload.o \
# Line 256 | Line 237 | raypcalls.o:   ../common/selcall.h
237   o_mesh.o:       ../common/mesh.h
238  
239   noise3.o:       ../common/calcomp.h
240 +
241 + aniso.o dielectric.o freeobjmem.o glass.o initotypes.o \
242 + m_alias.o m_brdf.o m_clip.o m_direct.o m_mirror.o m_mist.o \
243 + mx_data.o mx_func.o normal.o o_cone.o o_face.o o_instance.o \
244 + o_mesh.o p_data.o p_func.o source.o sphere.o t_data.o t_func.o \
245 + srcobstr.o text.o:              rtotypes.h

Diff Legend

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