--- ray/src/px/Rmakefile	2004/11/05 03:31:38	2.54
+++ ray/src/px/Rmakefile	2005/07/26 15:33:13	2.60
@@ -1,4 +1,4 @@
-# RCSid: $Id: Rmakefile,v 2.54 2004/11/05 03:31:38 greg Exp $
+# RCSid: $Id: Rmakefile,v 2.60 2005/07/26 15:33:13 greg Exp $
 #
 # Compiles for image processing and display programs
 #
@@ -15,9 +15,6 @@ INSTDIR = /usr/local/bin
 
 LIBDIR = /usr/local/lib/ray
 
-PIXAR_INCLUDE=	-I/usr/pixar/include
-PIXAR_LIB=	-L/usr/pixar/host/lib -lpirl -lpicio -lchad -lpixar $(MLIB)
-
 PROGS = pfilt ttyimage psign ra_tiff normtiff \
 pvalue pcompos protate ra_hexbit ra_bmp \
 ra_t8 ra_t16 pcomb pinterp pflip ra_ppm ximage xshowtrace \
@@ -30,22 +27,24 @@ ogl:
 sun:
 
 install:	$(PROGS) $(SPECIAL) normpat.csh falsecolor.csh \
-pdfblur.csh pmblur.csh xyzimage.csh pgblur.csh
+pdfblur.csh pmblur.csh pmdblur.csh xyzimage.csh pgblur.csh
 	cp $(PROGS) $(INSTDIR)
 	cp normpat.csh $(INSTDIR)/normpat
 	cp falsecolor.csh $(INSTDIR)/falsecolor
 	cp pdfblur.csh $(INSTDIR)/pdfblur
 	cp pmblur.csh $(INSTDIR)/pmblur
+	cp pmdblur.csh $(INSTDIR)/pmdblur
 	cp xyzimage.csh $(INSTDIR)/xyzimage
 	cp phisto.csh $(INSTDIR)/phisto
 	cp pdelta.csh $(INSTDIR)/pdelta
 	cp pgblur.csh $(INSTDIR)/pgblur
+	cp ra_pfm.csh $(INSTDIR)/ra_pfm
 	cd $(INSTDIR) ; chmod 755 normpat falsecolor pdfblur \
-		pmblur xyzimage phisto pdelta pgblur
+		pmblur pmdblur xyzimage phisto pdelta pgblur ra_pfm
 
 clean:
-	set nonomatch; rm -f $(PROGS) $(SPECIAL) *.o core
-	-cd tiff; make distclean
+	rm -f $(PROGS) $(SPECIAL) *.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)
@@ -128,10 +127,15 @@ ra_tiff:	ra_tiff.o ../lib/libtiff.a
 normtiff:	normtiff.o ../lib/libtiff.a
 	$(CC) $(CFLAGS) -o normtiff normtiff.o -lrt -ltiff $(MLIB)
 
-../lib/libtiff.a:	tiff/config.local
-	cd tiff ; sh configure -quiet -noninteractive -with-CC=$(CC) \
+../lib/libtiff.a:
+	cd tiff ; ./configure -C -quiet -with-CC=$(CC) \
+		"--libdir=`pwd`/../../lib" "--includedir=`pwd`/../../common" \
+		--enable-static --disable-shared --disable-cxx \
+		--enable-logluv --disable-jpeg \
+		--disable-zlib --disable-pixarlog \
 		"-with-ENVOPTS=$(OPT)" ; \
-	cd libtiff ; make install
+	cd port ; make all ; \
+	cd ../libtiff ; make install
 
 xshowtrace:	xshowtrace.o x11findwind.o
 	$(CC) $(CFLAGS) -o xshowtrace xshowtrace.o \
@@ -162,7 +166,7 @@ psign.o protate.o ra_hexbit.o pextrem.o pcompos.o \
 pflip.o ra_t8.o ra_t16.o ra_tiff.o ra_pict.o \
 ra_ps.o pvalue.o pcomb.o pinterp.o:	../common/color.h
 
-neuclrtab.o pvalue.o protate.o biq.o ciq.o pinterp.o psign.o \
+neuclrtab.o pvalue.o protate.o pinterp.o psign.o \
 xshowtrace.o clrtab.o pcomb.o pfilt.o pf3.o image.o:	../common/standard.h \
 ../common/rtmisc.h ../common/rtio.h \
 ../common/rtmath.h ../common/mat4.h ../common/fvect.h \
@@ -177,8 +181,6 @@ ra_t8.o:	../common/targa.h
 ra_tiff.o normtiff.o:	../common/tiff.h ../common/tiffio.h
 
 ra_t8.o:	pic.h
-
-ciq.o cut.o closest.o biq.o:	pic.h ciq.h
 
 pcomb.o pfilt.o pinterp.o x11image.o x11showtrace.o \
 image.o:	../common/view.h ../common/resolu.h