--- ray/src/px/Rmakefile	1997/08/29 15:35:28	2.36
+++ ray/src/px/Rmakefile	1998/06/09 16:46:57	2.39
@@ -18,7 +18,7 @@ PIXAR_INCLUDE=	-I/usr/pixar/include
 PIXAR_LIB=	-L/usr/pixar/host/lib -lpirl -lpicio -lchad -lpixar $(MLIB)
 
 PROGS = pfilt ttyimage oki20c oki20 paintjet mt160r psign \
-pvalue pcompos protate ra_pr ra_pr24 ra_avs \
+pvalue pcompos protate ra_pr ra_pr24 ra_avs ra_tiff \
 ra_t8 ra_bn ra_t16 pcomb pinterp ximage xshowtrace pflip ra_ppm \
 ra_rgbe ra_pict ra_ps pextrem ra_gif ra_xyze macbethcal pcond pcwarp
 
@@ -33,6 +33,8 @@ aed:	aedimage
 sgi:	glimage
 	cp glimage $(INSTDIR)
 
+ogl:
+
 sun:
 
 install:	$(PROGS) $(SPECIAL) normpat.csh falsecolor.csh \
@@ -43,12 +45,14 @@ pdfblur.csh pmblur.csh xyzimage.csh
 	cp pdfblur.csh $(INSTDIR)/pdfblur
 	cp pmblur.csh $(INSTDIR)/pmblur
 	cp xyzimage.csh $(INSTDIR)/xyzimage
+	cp phisto.csh $(INSTDIR)/phisto
 	chmod 755 $(INSTDIR)/normpat $(INSTDIR)/falsecolor \
-$(INSTDIR)/pdfblur $(INSTDIR)/pmblur $(INSTDIR)/xyzimage
+$(INSTDIR)/pdfblur $(INSTDIR)/pmblur $(INSTDIR)/xyzimage $(INSTDIR)/phisto
 
 clean:
-	set nonomatch; rm -f x10image aedimage glimage ra_tiff \
+	set nonomatch; rm -f x10image aedimage glimage \
 $(PROGS) *.o core
+	cd tiff; make distclean
 
 pfilt:	pfilt.o pf2.o pf3.o
 	$(CC) $(CFLAGS) -o pfilt pfilt.o pf2.o pf3.o -lrt $(MLIB)
@@ -180,9 +184,8 @@ ra_tiff:	ra_tiff.o ../lib/libtiff.a
 ../common/tiff.h:	../lib/libtiff.a
 
 ../lib/libtiff.a:	tiff/config.local
-	cd tiff ; ./configure -quiet -noninteractive ; \
-	cd libtiff ; make install ;
-#	cd .. ; make distclean
+	cd tiff ; ./configure -quiet -noninteractive -with-CC=$(CC) ; \
+	cd libtiff ; make install
 
 ra_pixar:	ra_pixar.o ra_pixar.c
 	$(CC) $(CFLAGS) $(PIXAR_INCLUDE) -o $@ ra_pixar.o -lrt \