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

Comparing ray/src/rt/Rmakefile (file contents):
Revision 1.1 by greg, Thu Feb 2 10:41:12 1989 UTC vs.
Revision 1.9 by greg, Mon Oct 2 17:12: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   #
23 < # Broken library routines:
23 > # Library routines:
24   #
25 + LIBS = -lm
26   COMPAT = malloc.o
27  
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 53 | Line 55 | SURFOBJS = face.o sphere.o source.o o_face.o cone.o \
55  
56   MATOBJS = normal.o dielectric.o m_clip.o glass.o
57  
58 < MODOBJS = p_func.o t_func.o p_data.o text.o mx_func.o mx_data.o
58 > MODOBJS = p_func.o t_func.o p_data.o t_data.o text.o mx_func.o mx_data.o
59  
60   SUPPOBJS = zeroes.o calexpr.o caldefn.o calfunc.o func.o noise3.o data.o
61  
# Line 68 | Line 70 | PROGS = $(DESTDIR)/rtrace $(DESTDIR)/rpict $(DESTDIR)/
70   all:    $(PROGS) $(DRIVERS)
71  
72   install:        all
71 –        sccs check
73          $(INSTALL) $(PROGS) $(INSTDIR)
74  
75   clean:
# Line 79 | Line 80 | clean:
80   #
81  
82   $(DESTDIR)/rtrace:      $(RTOBJS)
83 <        cc $(CFLAGS) -o $(DESTDIR)/rtrace $(RTOBJS) -lm
83 >        cc $(CFLAGS) -o $(DESTDIR)/rtrace $(RTOBJS) $(LIBS)
84  
85   $(DESTDIR)/rpict:       $(RPOBJS)
86 <        cc $(CFLAGS) -o $(DESTDIR)/rpict $(RPOBJS) -lm
86 >        cc $(CFLAGS) -o $(DESTDIR)/rpict $(RPOBJS) $(LIBS)
87  
88   $(DESTDIR)/rview:       $(RVOBJS)
89 <        cc $(CFLAGS) -o $(DESTDIR)/rview $(RVOBJS) $(DLIBS) -lm
89 >        cc $(CFLAGS) -o $(DESTDIR)/rview $(RVOBJS) $(DLIBS) $(LIBS)
90  
91   $(DESTDIR)/lookamb:     lookamb.o
92          cc $(CFLAGS) -o $(DESTDIR)/lookamb lookamb.o
93  
94 < $(DEVDIR)/sun.dev:      sundev.o
95 <        cc $(CFLAGS) -o $(DEVDIR)/sun.dev sundev.o \
96 < -lsuntool -lsunwindow -lpixrect -lm
94 > $(DEVDIR)/sun.dev:      sundev.o colortab.o
95 >        cc $(CFLAGS) -o $(DEVDIR)/sun.dev sundev.o colortab.o \
96 > -lsuntool -lsunwindow -lpixrect $(LIBS)
97  
98   $(DEVDIR)/sun.com:      suncom.o editline.o
99          cc $(CFLAGS) -o $(DEVDIR)/sun.com suncom.o editline.o
# Line 125 | Line 126 | rvmain.o:      rmain.c
126   # end of dispersion compiles.
127  
128   sundev.o:       sundev.c
129 <        cc $(CFLAGS) -DTTYPROG=\"$(DEVDIR)/sun.com\" -c sundev.c
129 >        cc $(CFLAGS) -c sundev.c
130  
131   devcomm.o:      devcomm.c
132 <        cc $(CFLAGS) -DDEVPATH=\"$(DEVDIR)\" -c devcomm.c
132 >        cc $(CFLAGS) -c devcomm.c
133  
134   ambient.o:      ambient.c
135          cc $(CFLAGS) -DAMBFLUSH=16 -c ambient.c
# Line 151 | Line 152 | xf.o:  xf.c
152  
153   caldefn.o calexpr.o calfunc.o:  calcomp.h
154  
155 < aed.o color.o data.o devcomm.o lookamb.o rview.o sundev.o x10.o:        color.h
155 > aed.o color.o colortab.o data.o devcomm.o \
156 > lookamb.o rview.o sundev.o x10.o:       color.h
157  
158   cone.o o_cone.o source.o:       cone.h
159  
160 < data.o mx_data.o p_data.o:      data.h
160 > data.o mx_data.o p_data.o t_data.o:     data.h
161  
162   aed.o devcomm.o devtable.o sun.o sundev.o tty.o x10.o:  driver.h
163  
# Line 165 | Line 167 | fvect.o:       fvect.h
167  
168   cone.o face.o objset.o otypes.o readobj.o readoct.o:    object.h
169  
170 < ambient.o objset.o octree.o raytrace.o readoct.o rmain.o rv2.o: octree.h
170 > ambient.o objset.o octree.o raytrace.o \
171 > readoct.o rmain.o rv2.o source.o:       octree.h
172  
173   o_instance.o instance.o:        instance.h octree.h
174  
# Line 179 | Line 182 | ambient.o dielectric.o func.o glass.o image.o m_clip.o
182   mx_data.o mx_func.o normal.o o_cone.o o_face.o o_instance.o \
183   p_data.o p_func.o text.o raytrace.o rmain.o rpict.o \
184   rtrace.o rv2.o rv3.o source.o \
185 < sphere.o t_func.o:      ray.h standard.h fvect.h object.h color.h
185 > sphere.o t_data.o t_func.o:     ray.h standard.h fvect.h object.h color.h
186  
187   rv2.o rv3.o rview.o:    rpaint.h driver.h view.h
188  
189 < dielectric.o normal.o source.o: source.h
189 > source.o:       source.h
190  
191   cone.o data.o face.o misc.o objset.o octree.o otypes.o \
192   readobj.o readoct.o rview.o:    standard.h fvect.h

Diff Legend

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