--- ray/src/px/Rmakefile	1997/01/09 13:56:37	2.30
+++ ray/src/px/Rmakefile	1997/07/24 11:47:42	2.34
@@ -1,5 +1,5 @@
-#  Compiles for image processing and display programs
-# SCCSid "$SunId$ LBL"
+# Compiles for image processing and display programs
+# SCCSid "$SunId$ SGI"
 #
 
 ARCH = sun
@@ -20,7 +20,7 @@ PIXAR_LIB=	-L/usr/pixar/host/lib -lpirl -lpicio -lchad
 PROGS = pfilt ttyimage oki20c oki20 paintjet mt160r psign \
 greyscale pvalue pcompos colorscale protate ra_pr ra_pr24 ra_avs \
 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
+ra_rgbe ra_pict ra_ps pextrem ra_gif ra_xyze macbethcal pcond pcwarp
 
 all:	$(PROGS) $(SPECIAL)
 
@@ -33,9 +33,6 @@ aed:	aedimage
 sgi:	glimage
 	cp glimage $(INSTDIR)
 
-tiff:	ra_tiff
-	cp ra_tiff $(INSTDIR)
-
 sun:
 
 install:	$(PROGS) $(SPECIAL) normpat.csh falsecolor.csh \
@@ -43,15 +40,11 @@ pdfblur.csh pmblur.csh xyzimage.csh
 	cp $(PROGS) $(INSTDIR)
 	cp normpat.csh $(INSTDIR)/normpat
 	cp falsecolor.csh $(INSTDIR)/falsecolor
-	cp pacuity.csh $(INSTDIR)/pacuity
 	cp pdfblur.csh $(INSTDIR)/pdfblur
 	cp pmblur.csh $(INSTDIR)/pmblur
-	cp psquish.csh $(INSTDIR)/psquish
-	cp pveil.csh $(INSTDIR)/pveil
 	cp xyzimage.csh $(INSTDIR)/xyzimage
 	chmod 755 $(INSTDIR)/normpat $(INSTDIR)/falsecolor \
-$(INSTDIR)/pdfblur $(INSTDIR)/pmblur $(INSTDIR)/xyzimage \
-$(INSTDIR)/pacuity $(INSTDIR)/psquish $(INSTDIR)/pveil
+$(INSTDIR)/pdfblur $(INSTDIR)/pmblur $(INSTDIR)/xyzimage
 
 clean:
 	set nonomatch; rm -f x10image aedimage glimage ra_tiff \
@@ -60,9 +53,13 @@ $(PROGS) *.o core
 pfilt:	pfilt.o pf2.o pf3.o
 	$(CC) $(CFLAGS) -o pfilt pfilt.o pf2.o pf3.o -lrt $(MLIB)
 
-pcond:	pcond.o pcond2.o pcond3.o pcond4.o
-	$(CC) $(CFLAGS) -o pcond pcond.o pcond2.o pcond3.o pcond4.o -lrt $(MLIB)
+pcond:	pcond.o pcond2.o pcond3.o pcond4.o warp3d.o
+	$(CC) $(CFLAGS) -o pcond pcond.o pcond2.o pcond3.o pcond4.o warp3d.o \
+-lrt $(MLIB)
 
+pcwarp:	pcwarp.o warp3d.o
+	$(CC) $(CFLAGS) -o pcwarp pcwarp.o warp3d.o -lrt $(MLIB)
+
 ttyimage:	ttyimage.o
 	$(CC) $(CFLAGS) -o ttyimage ttyimage.o -lrt $(MLIB)
 
@@ -180,13 +177,11 @@ ra_xyze:	ra_xyze.o
 ra_tiff:	ra_tiff.o ../lib/libtiff.a
 	$(CC) $(CFLAGS) -o ra_tiff ra_tiff.o -lrt -ltiff $(MLIB)
 
-ra_tiff.o:	ra_tiff.c
-	$(CC) $(CFLAGS) -Ilibtiff -c ra_tiff.c
+../common/tiff.h ../lib/libtiff.a:	tiff/config.local
+	cd tiff ; ./configure -quiet -noninteractive ; \
+	cd libtiff ; make install ;
+#	cd .. ; make distclean
 
-../lib/libtiff.a:
-	cd libtiff ; make -f Makefile.$(ARCH) ; \
-	mv libtiff.a ../../lib ; make clean
-
 ra_pixar:	ra_pixar.o ra_pixar.c
 	$(CC) $(CFLAGS) $(PIXAR_INCLUDE) -o $@ ra_pixar.o -lrt \
 $(PIXAR_LIB)
@@ -198,12 +193,15 @@ xshowtrace:	xshowtrace.o x11findwind.o
 	$(CC) $(CFLAGS) -o xshowtrace xshowtrace.o \
 x11findwind.o -lrt $(MLIB) -lX11
 
-macbethcal:	macbethcal.o pmapgen.o mx3.o
-	$(CC) $(CFLAGS) -o macbethcal macbethcal.o pmapgen.o mx3.o -lrt $(MLIB)
+macbethcal:	macbethcal.o pmapgen.o mx3.o warp3d.o
+	$(CC) $(CFLAGS) -o macbethcal macbethcal.o pmapgen.o mx3.o warp3d.o \
+-lrt $(MLIB)
 
 
 macbethcal.o:	pmap.h ../common/color.h ../common/resolu.h
 
+macbethcal.o pcond2.o pcwarp.o warp3d.o:	warp3d.h ../common/lookup.h
+
 pmapgen.o:	mx3.h pmap.h
 
 nclrtab.o:	neuclrtab.o
@@ -231,7 +229,11 @@ ximage.o xraster.o:	xraster.h
 
 x11image.o x11raster.o:	x11raster.h
 
+x11image.o:	../common/tonemap.h ../common/color.h
+
 ra_t8.o:	../common/targa.h
+
+ra_tiff.o:	../common/tiff.h
 
 aedimage.o ximage.o ra_t8.o ra_pr.o:	pic.h