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.18 by greg, Tue Jan 30 10:51:05 1990 UTC vs.
Revision 1.31 by greg, Sat Sep 22 10:52:19 1990 UTC

# Line 4 | Line 4
4   #  Compiles for ray tracing programs.
5   #
6  
7 < OPT = -O
7 > OPT = -O -pipe
8   MACH = -DSTRUCTASSIGN -DBSD -DIEEE -f68881 /usr/lib/f68881.il
9   CFLAGS = $(MACH) $(OPT)
10 + CC = cc
11  
12   #
13   # The following are user-definable:
# Line 25 | Line 26 | LIBDIR = /usr/local/lib/ray
26   # Library routines:
27   #
28   LIBS = -lm
29 < COMPAT = malloc.o
29 > COMPAT =
30  
31   #
32   # Device drivers for rview (see also devtable.c):
33   #
34   DOBJS = devtable.o devcomm.o aed.o tty.o editline.o x10.o xtwind.o \
35 <        colortab.o
36 < DLIBS = -lX
37 < DRIVERS = $(DEVDIR)/sundev $(DEVDIR)/sun.com # $(DEVDIR)/X11dev
35 >        colortab.o nwsdev.o
36 > DLIBS = -lX -lcps
37 > DRIVERS = $(DEVDIR)/sundev $(DEVDIR)/sun.com $(DEVDIR)/x11dev
38  
39   #
40   # Standard object files:
# Line 61 | Line 62 | MODOBJS = p_func.o t_func.o p_data.o t_data.o text.o m
62  
63   SUPPOBJS = zeroes.o calexpr.o caldefn.o calfunc.o func.o noise3.o data.o
64  
65 < MISCOBJS = misc.o color.o header.o mat4.o xf.o fvect.o savestr.o \
66 <                fgetline.o ealloc.o
65 > MISCOBJS = misc.o header.o mat4.o xf.o fvect.o savestr.o fgetline.o ealloc.o \
66 >                color.o resolu.o
67  
68   #
69   # What this makefile produces:
# Line 83 | Line 84 | clean:
84   #
85  
86   $(DESTDIR)/rtrace:      $(RTOBJS)
87 <        cc $(CFLAGS) -o $(DESTDIR)/rtrace $(RTOBJS) $(LIBS)
87 >        $(CC) $(CFLAGS) -o $(DESTDIR)/rtrace $(RTOBJS) $(LIBS)
88  
89   $(DESTDIR)/rpict:       $(RPOBJS)
90 <        cc $(CFLAGS) -o $(DESTDIR)/rpict $(RPOBJS) $(LIBS)
90 >        $(CC) $(CFLAGS) -o $(DESTDIR)/rpict $(RPOBJS) $(LIBS)
91  
92   $(DESTDIR)/rview:       $(RVOBJS)
93 <        cc $(CFLAGS) -o $(DESTDIR)/rview $(RVOBJS) $(DLIBS) $(LIBS)
93 >        $(CC) $(CFLAGS) -o $(DESTDIR)/rview $(RVOBJS) $(DLIBS) $(LIBS)
94  
95   $(DESTDIR)/lookamb:     lookamb.o
96 <        cc $(CFLAGS) -o $(DESTDIR)/lookamb lookamb.o
96 >        $(CC) $(CFLAGS) -o $(DESTDIR)/lookamb lookamb.o
97  
98 < $(DEVDIR)/sundev:       sundev.o devmain.o colortab.o
99 <        cc $(CFLAGS) -o $(DEVDIR)/sundev devmain.o sundev.o colortab.o \
100 < -lsuntool -lsunwindow -lpixrect $(LIBS)
98 > $(DEVDIR)/sundev:       sundev.o devmain.o colortab.o editline.o
99 >        $(CC) $(CFLAGS) -o $(DEVDIR)/sundev devmain.o sundev.o colortab.o \
100 > editline.o -lsuntool -lsunwindow -lpixrect $(LIBS)
101  
102   $(DEVDIR)/sun.com:      suncom.o editline.o
103 <        cc $(CFLAGS) -o $(DEVDIR)/sun.com suncom.o editline.o
103 >        $(CC) $(CFLAGS) -o $(DEVDIR)/sun.com suncom.o editline.o
104  
105 < $(DEVDIR)/X11dev:       x11.o x11twind.o colortab.o
106 <        cc $(CFLAGS) -o $(DEVDIR)/x11dev devmain.o sundev.o colortab.o \
107 < -lX11 $(LIBS)
105 > $(DEVDIR)/x11dev:       x11.o x11twind.o colortab.o devmain.o editline.o
106 >        $(CC) $(CFLAGS) -o $(DEVDIR)/x11dev x11.o x11twind.o devmain.o \
107 > colortab.o editline.o -lX11 $(LIBS)
108  
109   #
110   # Special compiles:
111   #
112  
113   rtmain.o:       rmain.c
114 <        cc $(CFLAGS) -DRTRACE -DNICE=4 -DDEFPATH=\":$(LIBDIR)\" -c rmain.c
114 >        $(CC) $(CFLAGS) -DRTRACE -DNICE=4 -DDEFPATH=\":$(LIBDIR)\" -c rmain.c
115          mv rmain.o rtmain.o
116  
117   rpmain.o:       rmain.c
118 <        cc $(CFLAGS) -DRPICT -DNICE=6 -DDEFPATH=\":$(LIBDIR)\" -c rmain.c
118 >        $(CC) $(CFLAGS) -DRPICT -DNICE=6 -DDEFPATH=\":$(LIBDIR)\" -c rmain.c
119          mv rmain.o rpmain.o
120  
121   rvmain.o:       rmain.c
122 <        cc $(CFLAGS) -DRVIEW -DDEFPATH=\":$(LIBDIR)\" -c rmain.c
122 >        $(CC) $(CFLAGS) -DRVIEW -DDEFPATH=\":$(LIBDIR)\" -c rmain.c
123          mv rmain.o rvmain.o
124  
125   #
126 < # Uncomment the following to model dispersion:
126 > # Uncomment the following and add spec_rgb.o to MISCOBJS to model dispersion:
127   #
128   #dielectric.o:  dielectric.c source.h
129 < #       cc $(CFLAGS) -DDISPERSE -c dielectric.c
129 > #       $(CC) $(CFLAGS) -DDISPERSE -c dielectric.c
130   #
130 – #color.o:       color.c color.h
131 – #       cc $(CFLAGS) -DSPEC_RGB -c color.c
132 – #
131   # end of dispersion compiles.
132  
133   sundev.o:       sundev.c
134 <        cc $(CFLAGS) -c sundev.c
134 >        $(CC) $(CFLAGS) -Dsun_init=dinit -c sundev.c
135  
136 < devcomm.o:      devcomm.c
137 <        cc $(CFLAGS) -c devcomm.c
136 > x11.o:  x11.c
137 >        $(CC) $(CFLAGS) -Dx11_init=dinit -c x11.c
138  
139   ambient.o:      ambient.c
140 <        cc $(CFLAGS) -DAMBFLUSH=16 -c ambient.c
140 >        $(CC) $(CFLAGS) -DAMBFLUSH=16 -c ambient.c
141  
142   calexpr.o:      calexpr.c calcomp.h
143 <        cc $(CFLAGS) -DVARIABLE -DFUNCTION -DINCHAN -DRCONST -c calexpr.c
143 >        $(CC) $(CFLAGS) -DVARIABLE -DFUNCTION -DINCHAN -DRCONST -c calexpr.c
144  
145   caldefn.o:      caldefn.c calcomp.h
146 <        cc $(CFLAGS) -DFUNCTION -c caldefn.c
146 >        $(CC) $(CFLAGS) -DFUNCTION -DREDEFW -c caldefn.c
147  
148   calfunc.o:      calfunc.c calcomp.h
149 <        cc $(CFLAGS) -DVARIABLE -DBIGLIB -c calfunc.c
149 >        $(CC) $(CFLAGS) -DVARIABLE -DBIGLIB -c calfunc.c
150  
151   xf.o:   xf.c
152 <        cc $(CFLAGS) -DINVXF -c xf.c
152 >        $(CC) $(CFLAGS) -DINVXF -c xf.c
153  
154 + nwsdev.o:       nwsdev.c nwsdev.h newsconstants.h
155 +        $(CC) $(CFLAGS) -c nwsdev.c
156 +
157 + nwsdev.h:       nwsdev.cps newsconstants.h
158 +        cps nwsdev.cps
159 +
160   #
161   # Include dependencies:
162   #
163  
164   caldefn.o calexpr.o calfunc.o:  calcomp.h
165  
166 < aed.o color.o colortab.o data.o devcomm.o \
167 < devmain.o lookamb.o rview.o sundev.o x10.o:     color.h
166 > aed.o color.o colortab.o data.o devcomm.o spec_rgb.o \
167 > devmain.o lookamb.o resolu.o rview.o sundev.o x10.o x11.o:      color.h
168  
169   cone.o o_cone.o source.o:       cone.h
170  
171   data.o mx_data.o p_data.o t_data.o:     data.h
172  
173 < aed.o devcomm.o devmain.o devtable.o sundev.o tty.o x10.o:      driver.h
173 > aed.o devcomm.o devmain.o devtable.o \
174 > editline.o nwsdev.o sundev.o tty.o x10.o x11.o: driver.h
175  
176   face.o o_face.o source.o:       face.h
177  
# Line 174 | Line 179 | fvect.o:       fvect.h
179  
180   cone.o face.o objset.o otypes.o readobj.o readoct.o:    object.h
181  
182 < ambient.o objset.o octree.o raytrace.o \
183 < readoct.o rmain.o rv2.o rv3.o source.o: octree.h
182 > ambient.o objset.o octree.o raytrace.o readoct.o \
183 > rpmain.o rtmain.o rtrace.o rvmain.o rv2.o rv3.o source.o:       octree.h
184  
185   o_instance.o instance.o:        instance.h octree.h
186  
187 < ambient.o cone.o dielectric.o func.o normal.o o_cone.o otypes.o \
188 < text.o raytrace.o readobj.o readoct.o rtrace.o \
187 > ambient.o cone.o dielectric.o func.o normal.o o_cone.o objset.o \
188 > otypes.o text.o raytrace.o readobj.o readoct.o rtrace.o \
189   rv2.o source.o sphere.o:        otypes.h
190  
191   ambient.o rpict.o rv3.o source.o:       random.h
192  
193   ambient.o dielectric.o func.o glass.o m_clip.o \
194   mx_data.o mx_func.o normal.o o_cone.o o_face.o o_instance.o \
195 < p_data.o p_func.o text.o raytrace.o rmain.o rpict.o \
195 > p_data.o p_func.o text.o raytrace.o rpmain.o rtmain.o rvmain.o rpict.o \
196   rtrace.o rv2.o rv3.o source.o \
197   sphere.o t_data.o t_func.o:     ray.h standard.h fvect.h object.h color.h
198  
# Line 200 | Line 205 | readobj.o readoct.o rview.o:   standard.h fvect.h
205  
206   sundev.o:       suntools.icon
207  
208 < image.o rmain.o rpict.o:        view.h
208 > image.o rpmain.o rtmain.o rvmain.o rpict.o:     view.h
209  
210   x10.o xtwind.o: xtwind.h
211  

Diff Legend

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