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

Comparing ray/src/px/Rmakefile (file contents):
Revision 2.41 by gwlarson, Thu Sep 3 10:48:57 1998 UTC vs.
Revision 2.44 by gwlarson, Thu Nov 12 09:44:07 1998 UTC

# Line 18 | Line 18 | PIXAR_INCLUDE= -I/usr/pixar/include
18   PIXAR_LIB=      -L/usr/pixar/host/lib -lpirl -lpicio -lchad -lpixar $(MLIB)
19  
20   PROGS = pfilt ttyimage oki20c oki20 paintjet mt160r psign \
21 < pvalue pcompos protate ra_pr ra_pr24 ra_avs ra_tiff ra_hexbit \
21 > pvalue pcompos protate ra_pr ra_pr24 ra_avs ra_tiff normtiff ra_hexbit \
22   ra_t8 ra_bn ra_t16 pcomb pinterp ximage xshowtrace pflip ra_ppm \
23   ra_rgbe ra_pict ra_ps pextrem ra_gif ra_xyze macbethcal pcond pcwarp
24  
25 < all:    $(PROGS)
25 > all:    $(PROGS) $(SPECIAL)
26  
27   x10:    x10image
28          cp x10image $(INSTDIR)
# Line 93 | Line 93 | greyscale:     greyscale.o
93          $(CC) $(CFLAGS) -o greyscale greyscale.o -lrt $(MLIB)
94  
95   colorscale:     colorscale.o
96 <        $(CC) $(CFLAGS) -o colorscale colorscale.o -lrt -lm
96 >        $(CC) $(CFLAGS) -o colorscale colorscale.o -lrt $(MLIB)
97  
98   pvalue: pvalue.o
99          $(CC) $(CFLAGS) -o pvalue pvalue.o -lrt $(MLIB)
# Line 102 | Line 102 | psum:  psum.o
102          $(CC) $(CFLAGS) -o psum psum.o -lrt
103  
104   pcompos:        pcompos.o
105 <        $(CC) $(CFLAGS) -o pcompos pcompos.o -lrt
105 >        $(CC) $(CFLAGS) -o pcompos pcompos.o -lrt $(MLIB)
106  
107   psign:  psign.o
108 <        $(CC) $(CFLAGS) -o psign psign.o -lrt -lm
108 >        $(CC) $(CFLAGS) -o psign psign.o -lrt $(MLIB)
109  
110   d48c:   d48c.o
111          $(CC) $(CFLAGS) -o d48c d48c.o -lrt
# Line 159 | Line 159 | ximage:        x11image.o x11raster.o clrtab.o
159   clrtab.o -lX11 -lrt $(MLIB)
160  
161   protate:                protate.o
162 <        $(CC) $(CFLAGS) -o protate protate.o -lrt -lm
162 >        $(CC) $(CFLAGS) -o protate protate.o -lrt $(MLIB)
163  
164   pextrem:        pextrem.o
165 <        $(CC) $(CFLAGS) -o pextrem pextrem.o -lrt -lm
165 >        $(CC) $(CFLAGS) -o pextrem pextrem.o -lrt $(MLIB)
166  
167   pflip:          pflip.o
168 <        $(CC) $(CFLAGS) -o pflip pflip.o -lrt -lm
168 >        $(CC) $(CFLAGS) -o pflip pflip.o -lrt $(MLIB)
169  
170   panim:  panim.o client/libclient.a
171          $(CC) $(CFLAGS) -o panim panim.o \
# Line 183 | Line 183 | ra_xyze:       ra_xyze.o
183   ra_tiff:        ra_tiff.o ../lib/libtiff.a
184          $(CC) $(CFLAGS) -o ra_tiff ra_tiff.o -lrt -ltiff $(MLIB)
185  
186 < ../common/tiff.h:       ../lib/libtiff.a
186 > ../common/tiff.h ../common/tiffio.h:    ../lib/libtiff.a
187 >        @touch ../common/tiff.h ../common/tiffio.h
188  
189 + normtiff:       normtiff.o tmaptiff.o ../lib/libtiff.a
190 +        $(CC) $(CFLAGS) -o normtiff normtiff.o tmaptiff.o -lrt -ltiff $(MLIB)
191 +
192   ../lib/libtiff.a:       tiff/config.local
193 <        cd tiff ; ./configure -quiet -noninteractive -with-CC=$(CC) ; \
193 >        cd tiff ; ./configure -quiet -noninteractive -with-CC=$(CC) \
194 >                "-with-ENVOPTS=$(OPT)" ; \
195          cd libtiff ; make install
196  
197   ra_pixar:       ra_pixar.o ra_pixar.c
# Line 240 | Line 245 | x11image.o:    ../common/tonemap.h ../common/color.h
245  
246   ra_t8.o:        ../common/targa.h
247  
248 < ra_tiff.o:      ../common/tiff.h
248 > ra_tiff.o normtiff.o tmaptiff.o:        ../common/tiff.h ../common/tiffio.h
249  
250   aedimage.o ximage.o ra_t8.o ra_pr.o:    pic.h
251  
# Line 262 | Line 267 | psign.o:       ../common/font.h
267   pcond.o pcond2.o pcond3.o pcond4.o:     pcond.h ../common/standard.h \
268   ../common/mat4.h ../common/fvect.h \
269   ../common/color.h ../common/view.h ../common/resolu.h
270 +
271 + normtiff.o:     ../common/color.h ../common/tonemap.h ../common/resolu.h
272 +
273 + tmaptiff.o:     ../common/tmprivat.h ../common/color.h ../common/tonemap.h

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines