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.54 by greg, Tue Jul 16 15:56:40 1991 UTC vs.
Revision 1.61 by greg, Tue Oct 8 15:32:43 1991 UTC

# Line 1 | Line 1
1 – # SCCSid "$SunId$ LBL"
2 –
1   #
2 + # SCCSid "$SunId$ LBL"
3   #  Compiles for ray tracing programs.
4   #
5  
6   OPT = -O -pipe
7   MACH = -DSTRUCTASSIGN -DBSD -DIEEE -f68881 /usr/lib/libm.il
8 < CFLAGS = $(MACH) $(OPT) -I../common
8 > CFLAGS = $(MACH) $(OPT) -I../common -L../lib
9   CC = cc
10   LINT = lint
11   LINTFLAGS = -DSTRUCTASSIGN -DBSD -DIEEE -DVARIABLE -DFUNCTION \
# Line 28 | Line 27 | LIBDIR = /usr/local/lib/ray
27   #
28   # Library routines:
29   #
30 < LIBS = ../common/librt.a -lm
30 > LIBS = -lrt -lm
31  
32   #
33   # Device drivers for rview (see also devtable.c):
# Line 73 | Line 72 | MATSRC = normal.c dielectric.c m_clip.c glass.c m_brdf
72   MODOBJS = p_func.o t_func.o p_data.o t_data.o text.o mx_func.o mx_data.o
73   MODSRC = p_func.c t_func.c p_data.c t_data.c text.c mx_func.c mx_data.c
74  
75 < SUPPOBJS = zeroes.o calexpr.o caldefn.o func.o noise3.o data.o
76 < SUPPSRC = zeroes.c calexpr.c caldefn.c func.c noise3.c data.c
75 > SUPPOBJS = zeroes.o calexpr.o caldefn.o func.o noise3.o data.o readfargs.o \
76 >        malloc.o
77 > SUPPSRC = zeroes.c calexpr.c caldefn.c func.c noise3.c data.c readfargs.c \
78 >        malloc.c
79  
80   #
81   # What this makefile produces:
# Line 84 | Line 85 | PROGS = $(DESTDIR)/rtrace $(DESTDIR)/rpict $(DESTDIR)/
85  
86   all:    $(PROGS)
87  
88 < install:        $(PROGS)
88 > install:        $(PROGS) rayinit.cal
89          $(INSTALL) $(PROGS) $(INSTDIR)
90 +        rm -f $(LIBDIR)/rayinit.cal
91 +        cp rayinit.cal $(LIBDIR)
92  
93   sun:    $(DEVDIR)/sun $(DEVDIR)/sun.com
94  
# Line 93 | Line 96 | x10:   $(DEVDIR)/x10
96  
97   aed:    $(DEVDIR)/aed
98  
99 + tiff:  
100 +
101   clean:
102          set nonomatch; rm -f $(PROGS) *.o core
103  
# Line 112 | Line 117 | $(DESTDIR)/rpict:      $(RPOBJS)
117   $(DESTDIR)/rview:       $(RVOBJS)
118          $(CC) $(CFLAGS) -o $(DESTDIR)/rview $(RVOBJS) $(DLIBS) $(LIBS)
119  
115 – $(DESTDIR)/rtrace $(DESTDIR)/rpict $(DESTDIR)/rview:    ../common/librt.a
116 –
120   $(DESTDIR)/lookamb:     lookamb.o
121          $(CC) $(CFLAGS) -o $(DESTDIR)/lookamb lookamb.o
122  
# Line 148 | Line 151 | rvmain.o:      rmain.c
151          $(CC) $(CFLAGS) -DRVIEW -DDEFPATH=\":$(LIBDIR)\" -c rmain.c
152          mv rmain.o rvmain.o
153  
154 + readfargs.o:    readfargs.c ../common/object.h
155 +        $(CC) $(CFLAGS) -DMEMHOG -c readfargs.c
156 +
157 + malloc.o:       malloc.c
158 +        $(CC) $(CFLAGS) -DMCOMP -c malloc.c
159 +
160   #
161   # Uncomment the following to model dispersion:
162   #
163 < #dielectric.o:  dielectric.c source.h
164 < #       $(CC) $(CFLAGS) -DDISPERSE -c dielectric.c
165 < #
163 > dielectric.o:   dielectric.c source.h
164 >        $(CC) $(CFLAGS) -DDISPERSE -c dielectric.c
165 >
166   # end of dispersion compiles.
167  
168   devcomm.o:      devcomm.c

Diff Legend

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