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.57 by greg, Fri Aug 16 12:54:48 1991 UTC vs.
Revision 1.61 by greg, Tue Oct 8 15:32:43 1991 UTC

# Line 5 | Line 5
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 27 | 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 72 | 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 readfargs.o
76 < SUPPSRC = zeroes.c calexpr.c caldefn.c func.c noise3.c data.c readfargs.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 83 | 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 104 | Line 108 | lint:  $(RVSRC)
108   # Links:
109   #
110  
111 < $(DESTDIR)/rtrace:      $(RTOBJS) ../common/librt.a
111 > $(DESTDIR)/rtrace:      $(RTOBJS)
112          $(CC) $(CFLAGS) -o $(DESTDIR)/rtrace $(RTOBJS) $(LIBS)
113  
114 < $(DESTDIR)/rpict:       $(RPOBJS) ../common/librt.a
114 > $(DESTDIR)/rpict:       $(RPOBJS)
115          $(CC) $(CFLAGS) -o $(DESTDIR)/rpict $(RPOBJS) $(LIBS)
116  
117 < $(DESTDIR)/rview:       $(RVOBJS) ../common/librt.a
117 > $(DESTDIR)/rview:       $(RVOBJS)
118          $(CC) $(CFLAGS) -o $(DESTDIR)/rview $(RVOBJS) $(DLIBS) $(LIBS)
119  
120   $(DESTDIR)/lookamb:     lookamb.o
# Line 149 | Line 153 | rvmain.o:      rmain.c
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:

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines