--- ray/src/px/Rmakefile	1991/07/18 11:19:19	1.42
+++ ray/src/px/Rmakefile	1991/08/15 13:35:10	1.44
@@ -1,6 +1,5 @@
-# SCCSid "$SunId$ LBL"
-
 #
+# SCCSid "$SunId$ LBL"
 #  Compiles for image processing and display programs
 #
 
@@ -10,14 +9,14 @@ CFLAGS = $(OPT) $(MACH) -I../common
 
 INSTDIR = /lumen/lumen/ray/bin.sun3
 
-LIBDIR = /lumen/lumen/ray/lib
+LIBDIR = /usr/local/lib/ray
 
 PIXAR_INCLUDE=	-I/usr/pixar/include
 PIXAR_LIB=	-L/usr/pixar/host/lib -lpirl -lpicio -lchad -lpixar -lm
 
 PROGS = pfilt ttyimage oki20c paintjet mt160r getinfo psign \
 greyscale pvalue pcompos colorscale prot ra_pr ra_pr24 \
-ra_t8 ra_bn ra_t16 pcomb pinterp ximage xshowtrace pflip
+ra_t8 ra_bn ra_t16 pcomb pinterp ximage xshowtrace pflip ra_tiff
 
 all:	$(PROGS)
 
@@ -36,7 +35,7 @@ install:	$(PROGS) normpat.csh falsecolor.csh
 	chmod 755 $(INSTDIR)/normpat $(INSTDIR)/falsecolor
 
 clean:
-	set nonomatch; rm -f $(PROGS) aedimage x10image *.o core
+	set nonomatch; rm -f $(PROGS) *.o core
 
 pfilt:	pfilt.o pf2.o pf3.o
 	cc $(CFLAGS) -o pfilt pfilt.o pf2.o pf3.o ../common/librt.a -lm
@@ -131,6 +130,16 @@ pcomb:	pcomb.o
 pinterp:	pinterp.o
 	cc $(CFLAGS) -o pinterp pinterp.o ../common/librt.a -lm
 
+ra_tiff:	ra_tiff.o libtiff/libtiff.a
+	cc $(CFLAGS) -o ra_tiff ra_tiff.o ../common/librt.a \
+libtiff/libtiff.a -lm
+
+ra_tiff.o:	ra_tiff.c libtiff/tiffio.h libtiff/tiff.h
+	cc $(CFLAGS) -Ilibtiff -c ra_tiff.c
+
+libtiff/libtiff.a:
+	maketiff
+
 ra_pixar:	ra_pixar.o ra_pixar.c
 	cc $(CFLAGS) $(PIXAR_INCLUDE) -o $@ ra_pixar.o ../common/librt.a \
 $(PIXAR_LIB)
@@ -159,7 +168,7 @@ ra_pr.o pvalue.o pcomb.o pinterp.o ximage.o:	../common
 prot.o biq.o ciq.o pinterp.o ximage.o \
 image.o:	../common/standard.h ../common/mat4.h ../common/fvect.h
 
-ximage.o x11raster.o:	xraster.h
+ximage.o xraster.o:	xraster.h
 
 x11image.o x11raster.o:	x11raster.h