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 1.6 by greg, Mon Jun 5 11:43:47 1989 UTC vs.
Revision 1.10 by greg, Wed Oct 4 16:07:32 1989 UTC

# Line 16 | Line 16 | INSTALL = cp
16   #
17   # The following paths must exist and be relative to root:
18   #
19 < DEVDIR = $(LIBDIR)/lib
19 > DEVDIR = $(INSTDIR)
20   LIBDIR = /usr/local/lib/ray
21  
22   #
# Line 28 | Line 28 | COMPAT = malloc.o
28   #
29   # Device drivers for rview (see also devtable.c):
30   #
31 < DOBJS = devtable.o devcomm.o aed.o tty.o editline.o sun.o x10.o xtwind.o
31 > DOBJS = devtable.o devcomm.o aed.o tty.o editline.o sun.o x10.o xtwind.o \
32 >        colortab.o
33   DLIBS = -lX
34   DRIVERS = $(DEVDIR)/sun.dev $(DEVDIR)/sun.com
35  
# Line 58 | Line 59 | MODOBJS = p_func.o t_func.o p_data.o t_data.o text.o m
59  
60   SUPPOBJS = zeroes.o calexpr.o caldefn.o calfunc.o func.o noise3.o data.o
61  
62 < MISCOBJS = misc.o color.o header.o mat4.o xf.o fvect.o savestr.o ealloc.o
62 > MISCOBJS = misc.o color.o header.o mat4.o xf.o fvect.o savestr.o \
63 >                fgetline.o ealloc.o
64  
65   #
66   # What this makefile produces:
# Line 90 | Line 92 | $(DESTDIR)/rview:      $(RVOBJS)
92   $(DESTDIR)/lookamb:     lookamb.o
93          cc $(CFLAGS) -o $(DESTDIR)/lookamb lookamb.o
94  
95 < $(DEVDIR)/sun.dev:      sundev.o
96 <        cc $(CFLAGS) -o $(DEVDIR)/sun.dev sundev.o \
95 > $(DEVDIR)/sun.dev:      sundev.o colortab.o
96 >        cc $(CFLAGS) -o $(DEVDIR)/sun.dev sundev.o colortab.o \
97   -lsuntool -lsunwindow -lpixrect $(LIBS)
98  
99   $(DEVDIR)/sun.com:      suncom.o editline.o
# Line 125 | Line 127 | rvmain.o:      rmain.c
127   # end of dispersion compiles.
128  
129   sundev.o:       sundev.c
130 <        cc $(CFLAGS) -DTTYPROG=\"$(DEVDIR)/sun.com\" -c sundev.c
130 >        cc $(CFLAGS) -c sundev.c
131  
132   devcomm.o:      devcomm.c
133 <        cc $(CFLAGS) -DDEVPATH=\"$(DEVDIR)\" -c devcomm.c
133 >        cc $(CFLAGS) -c devcomm.c
134  
135   ambient.o:      ambient.c
136          cc $(CFLAGS) -DAMBFLUSH=16 -c ambient.c
# Line 151 | Line 153 | xf.o:  xf.c
153  
154   caldefn.o calexpr.o calfunc.o:  calcomp.h
155  
156 < aed.o color.o data.o devcomm.o lookamb.o rview.o sundev.o x10.o:        color.h
156 > aed.o color.o colortab.o data.o devcomm.o \
157 > lookamb.o rview.o sundev.o x10.o:       color.h
158  
159   cone.o o_cone.o source.o:       cone.h
160  
# Line 165 | Line 168 | fvect.o:       fvect.h
168  
169   cone.o face.o objset.o otypes.o readobj.o readoct.o:    object.h
170  
171 < ambient.o objset.o octree.o raytrace.o readoct.o rmain.o rv2.o: octree.h
171 > ambient.o objset.o octree.o raytrace.o \
172 > readoct.o rmain.o rv2.o source.o:       octree.h
173  
174   o_instance.o instance.o:        instance.h octree.h
175  
# Line 183 | Line 187 | sphere.o t_data.o t_func.o:    ray.h standard.h fvect.h o
187  
188   rv2.o rv3.o rview.o:    rpaint.h driver.h view.h
189  
190 < normal.o source.o:      source.h
190 > source.o:       source.h
191  
192   cone.o data.o face.o misc.o objset.o octree.o otypes.o \
193   readobj.o readoct.o rview.o:    standard.h fvect.h

Diff Legend

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