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.19 by greg, Thu Feb 22 11:35:45 1990 UTC

# Line 4 | Line 4
4   #  Compiles for ray tracing programs.
5   #
6  
7 < CFLAGS = -DBSD -O -DIEEE -f68881 /usr/lib/f68881.il
7 > OPT = -O
8 > MACH = -DSTRUCTASSIGN -DBSD -DIEEE -f68881 /usr/lib/f68881.il
9 > CFLAGS = $(MACH) $(OPT)
10  
11   #
12   # The following are user-definable:
# Line 16 | Line 18 | INSTALL = cp
18   #
19   # The following paths must exist and be relative to root:
20   #
21 < DEVDIR = $(LIBDIR)/lib
21 > DEVDIR = $(INSTDIR)
22   LIBDIR = /usr/local/lib/ray
23  
24   #
25 < # Broken library routines:
25 > # Library routines:
26   #
27 + LIBS = -lm
28   COMPAT = malloc.o
29  
30   #
31   # Device drivers for rview (see also devtable.c):
32   #
33 < DOBJS = devtable.o devcomm.o aed.o tty.o editline.o sun.o x10.o xtwind.o
33 > DOBJS = devtable.o devcomm.o aed.o tty.o editline.o x10.o xtwind.o \
34 >        colortab.o
35   DLIBS = -lX
36 < DRIVERS = $(DEVDIR)/sun.dev $(DEVDIR)/sun.com
36 > DRIVERS = $(DEVDIR)/sundev $(DEVDIR)/sun.com # $(DEVDIR)/X11dev
37  
38   #
39   # Standard object files:
# Line 53 | Line 57 | SURFOBJS = face.o sphere.o source.o o_face.o cone.o \
57  
58   MATOBJS = normal.o dielectric.o m_clip.o glass.o
59  
60 < MODOBJS = p_func.o t_func.o p_data.o text.o mx_func.o mx_data.o
60 > MODOBJS = p_func.o t_func.o p_data.o t_data.o text.o mx_func.o mx_data.o
61  
62   SUPPOBJS = zeroes.o calexpr.o caldefn.o calfunc.o func.o noise3.o data.o
63  
64 < MISCOBJS = misc.o color.o header.o mat4.o xf.o fvect.o savestr.o ealloc.o
64 > MISCOBJS = misc.o color.o header.o mat4.o xf.o fvect.o savestr.o \
65 >                fgetline.o ealloc.o
66  
67   #
68   # What this makefile produces:
# Line 68 | Line 73 | PROGS = $(DESTDIR)/rtrace $(DESTDIR)/rpict $(DESTDIR)/
73   all:    $(PROGS) $(DRIVERS)
74  
75   install:        all
71 –        sccs check
76          $(INSTALL) $(PROGS) $(INSTDIR)
77  
78   clean:
# Line 79 | Line 83 | clean:
83   #
84  
85   $(DESTDIR)/rtrace:      $(RTOBJS)
86 <        cc $(CFLAGS) -o $(DESTDIR)/rtrace $(RTOBJS) -lm
86 >        cc $(CFLAGS) -o $(DESTDIR)/rtrace $(RTOBJS) $(LIBS)
87  
88   $(DESTDIR)/rpict:       $(RPOBJS)
89 <        cc $(CFLAGS) -o $(DESTDIR)/rpict $(RPOBJS) -lm
89 >        cc $(CFLAGS) -o $(DESTDIR)/rpict $(RPOBJS) $(LIBS)
90  
91   $(DESTDIR)/rview:       $(RVOBJS)
92 <        cc $(CFLAGS) -o $(DESTDIR)/rview $(RVOBJS) $(DLIBS) -lm
92 >        cc $(CFLAGS) -o $(DESTDIR)/rview $(RVOBJS) $(DLIBS) $(LIBS)
93  
94   $(DESTDIR)/lookamb:     lookamb.o
95          cc $(CFLAGS) -o $(DESTDIR)/lookamb lookamb.o
96  
97 < $(DEVDIR)/sun.dev:      sundev.o
98 <        cc $(CFLAGS) -o $(DEVDIR)/sun.dev sundev.o \
99 < -lsuntool -lsunwindow -lpixrect -lm
97 > $(DEVDIR)/sundev:       sundev.o devmain.o colortab.o
98 >        cc $(CFLAGS) -o $(DEVDIR)/sundev devmain.o sundev.o colortab.o \
99 > -lsuntool -lsunwindow -lpixrect $(LIBS)
100  
101   $(DEVDIR)/sun.com:      suncom.o editline.o
102          cc $(CFLAGS) -o $(DEVDIR)/sun.com suncom.o editline.o
103  
104 + $(DEVDIR)/X11dev:       x11.o x11twind.o colortab.o
105 +        cc $(CFLAGS) -o $(DEVDIR)/x11dev devmain.o sundev.o colortab.o \
106 + -lX11 $(LIBS)
107 +
108   #
109   # Special compiles:
110   #
# Line 125 | Line 133 | rvmain.o:      rmain.c
133   # end of dispersion compiles.
134  
135   sundev.o:       sundev.c
136 <        cc $(CFLAGS) -DTTYPROG=\"$(DEVDIR)/sun.com\" -c sundev.c
136 >        cc $(CFLAGS) -c sundev.c
137  
138   devcomm.o:      devcomm.c
139 <        cc $(CFLAGS) -DDEVPATH=\"$(DEVDIR)\" -c devcomm.c
139 >        cc $(CFLAGS) -c devcomm.c
140  
141   ambient.o:      ambient.c
142          cc $(CFLAGS) -DAMBFLUSH=16 -c ambient.c
# Line 151 | Line 159 | xf.o:  xf.c
159  
160   caldefn.o calexpr.o calfunc.o:  calcomp.h
161  
162 < aed.o color.o data.o devcomm.o lookamb.o rview.o sundev.o x10.o:        color.h
162 > aed.o color.o colortab.o data.o devcomm.o \
163 > devmain.o lookamb.o rview.o sundev.o x10.o:     color.h
164  
165   cone.o o_cone.o source.o:       cone.h
166  
167 < data.o mx_data.o p_data.o:      data.h
167 > data.o mx_data.o p_data.o t_data.o:     data.h
168  
169 < aed.o devcomm.o devtable.o sun.o sundev.o tty.o x10.o:  driver.h
169 > aed.o devcomm.o devmain.o devtable.o \
170 > editline.o sundev.o tty.o x10.o:        driver.h
171  
172   face.o o_face.o source.o:       face.h
173  
# Line 165 | Line 175 | fvect.o:       fvect.h
175  
176   cone.o face.o objset.o otypes.o readobj.o readoct.o:    object.h
177  
178 < ambient.o objset.o octree.o raytrace.o readoct.o rmain.o rv2.o: octree.h
178 > ambient.o objset.o octree.o raytrace.o \
179 > readoct.o rmain.o rv2.o rv3.o source.o: octree.h
180  
181   o_instance.o instance.o:        instance.h octree.h
182  
183 < cone.o dielectric.o func.o normal.o o_cone.o otypes.o \
183 > ambient.o cone.o dielectric.o func.o normal.o o_cone.o otypes.o \
184   text.o raytrace.o readobj.o readoct.o rtrace.o \
185   rv2.o source.o sphere.o:        otypes.h
186  
187   ambient.o rpict.o rv3.o source.o:       random.h
188  
189 < ambient.o dielectric.o func.o glass.o image.o m_clip.o \
189 > ambient.o dielectric.o func.o glass.o m_clip.o \
190   mx_data.o mx_func.o normal.o o_cone.o o_face.o o_instance.o \
191   p_data.o p_func.o text.o raytrace.o rmain.o rpict.o \
192   rtrace.o rv2.o rv3.o source.o \
193 < sphere.o t_func.o:      ray.h standard.h fvect.h object.h color.h
193 > sphere.o t_data.o t_func.o:     ray.h standard.h fvect.h object.h color.h
194  
195   rv2.o rv3.o rview.o:    rpaint.h driver.h view.h
196  
197 < dielectric.o normal.o source.o: source.h
197 > source.o:       source.h
198  
199 < cone.o data.o face.o misc.o objset.o octree.o otypes.o \
199 > cone.o data.o devcomm.o face.o image.o misc.o objset.o octree.o otypes.o \
200   readobj.o readoct.o rview.o:    standard.h fvect.h
201  
202   sundev.o:       suntools.icon
# Line 193 | Line 204 | sundev.o:      suntools.icon
204   image.o rmain.o rpict.o:        view.h
205  
206   x10.o xtwind.o: xtwind.h
207 +
208 + x11.o x11twind.o: x11twind.h

Diff Legend

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