--- ray/src/px/Rmakefile	1994/03/30 14:25:08	2.17
+++ ray/src/px/Rmakefile	1997/04/15 16:56:28	2.33
@@ -17,10 +17,10 @@ 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 oki20c oki20 paintjet mt160r getinfo psign \
+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_rgbe ra_pict ra_ps pextrem ra_gif ra_xyze macbethcal pcond pcwarp
 
 all:	$(PROGS) $(SPECIAL)
 
@@ -38,11 +38,16 @@ tiff:	ra_tiff
 
 sun:
 
-install:	$(PROGS) $(SPECIAL) normpat.csh falsecolor.csh
+install:	$(PROGS) $(SPECIAL) normpat.csh falsecolor.csh \
+pdfblur.csh pmblur.csh xyzimage.csh
 	cp $(PROGS) $(INSTDIR)
 	cp normpat.csh $(INSTDIR)/normpat
 	cp falsecolor.csh $(INSTDIR)/falsecolor
-	chmod 755 $(INSTDIR)/normpat $(INSTDIR)/falsecolor
+	cp pdfblur.csh $(INSTDIR)/pdfblur
+	cp pmblur.csh $(INSTDIR)/pmblur
+	cp xyzimage.csh $(INSTDIR)/xyzimage
+	chmod 755 $(INSTDIR)/normpat $(INSTDIR)/falsecolor \
+$(INSTDIR)/pdfblur $(INSTDIR)/pmblur $(INSTDIR)/xyzimage
 
 clean:
 	set nonomatch; rm -f x10image aedimage glimage ra_tiff \
@@ -51,6 +56,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 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)
 
@@ -76,9 +88,6 @@ paintjet:	paintjet.o
 mt160r:	mt160r.o
 	$(CC) $(CFLAGS) -o mt160r mt160r.o -lrt $(MLIB)
 
-getinfo:	getinfo.o
-	$(CC) $(CFLAGS) -o getinfo getinfo.o -lrt
-
 greyscale:	greyscale.o
 	$(CC) $(CFLAGS) -o greyscale greyscale.o -lrt $(MLIB)
 
@@ -100,8 +109,8 @@ psign:	psign.o
 d48c:	d48c.o
 	$(CC) $(CFLAGS) -o d48c d48c.o -lrt
 
-ra_gif:	ra_gif.o clrtab.o
-	$(CC) $(CFLAGS) -o ra_gif ra_gif.o clrtab.o -lrt $(MLIB)
+ra_gif:	ra_gif.o clrtab.o neuclrtab.o
+	$(CC) $(CFLAGS) -o ra_gif ra_gif.o clrtab.o neuclrtab.o -lrt $(MLIB)
 
 ra_pr:	ra_pr.o ciq.o cut.o closest.o biq.o
 	$(CC) $(CFLAGS) -o ra_pr ra_pr.o ciq.o cut.o closest.o \
@@ -119,8 +128,8 @@ ra_ps:	ra_ps.o
 ra_ppm:		ra_ppm.o
 	$(CC) $(CFLAGS) -o ra_ppm ra_ppm.o -lrt $(MLIB)
 
-ra_t8:	ra_t8.o clrtab.o
-	$(CC) $(CFLAGS) -o ra_t8 ra_t8.o clrtab.o -lrt $(MLIB)
+ra_t8:	ra_t8.o clrtab.o neuclrtab.o
+	$(CC) $(CFLAGS) -o ra_t8 ra_t8.o clrtab.o neuclrtab.o -lrt $(MLIB)
 
 ra_t16: ra_t16.o
 	$(CC) $(CFLAGS) -o ra_t16 ra_t16.o -lrt $(MLIB)
@@ -165,12 +174,12 @@ pcomb:	pcomb.o
 pinterp:	pinterp.o
 	$(CC) $(CFLAGS) -o pinterp pinterp.o -lrt $(MLIB)
 
+ra_xyze:	ra_xyze.o
+	$(CC) $(CFLAGS) -o ra_xyze ra_xyze.o -lrt $(MLIB)
+
 ra_tiff:	ra_tiff.o ../lib/libtiff.a
 	$(CC) $(CFLAGS) -o ra_tiff ra_tiff.o -lrt -ltiff $(MLIB)
 
-psign.o:	psign.c ../common/font.h
-	$(CC) $(CFLAGS) -DDEFPATH=\":$(LIBDIR)\" -c psign.c
-
 ra_tiff.o:	ra_tiff.c
 	$(CC) $(CFLAGS) -Ilibtiff -c ra_tiff.c
 
@@ -189,25 +198,44 @@ xshowtrace:	xshowtrace.o x11findwind.o
 	$(CC) $(CFLAGS) -o xshowtrace xshowtrace.o \
 x11findwind.o -lrt $(MLIB) -lX11
 
+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
+	ln neuclrtab.c nclrtab.c
+	$(CC) $(CFLAGS) -DCOMPAT_MODE -c nclrtab.c
+	rm -f nclrtab.c
+
 pcomb.o:	../common/calcomp.h
 
 panim.o:	client/scan.h ../common/color.h ../common/random.h
 
 pf2.o bnoise.o ra_ps.o ra_t16.o:	../common/random.h
 
-pfilt.o pf2.o pf3.o ttyimage.o t4027.o mt160r.o psum.o psign.o protate.o \
+neuclrtab.o clrtab.o pfilt.o pf2.o pf3.o ttyimage.o t4027.o mt160r.o \
+psum.o psign.o protate.o \
 pextrem.o ra_pr24.o d48c.o aedimage.o pcompos.o color.o resolu.o colrops.o \
 pflip.o greyscale.o ra_t8.o glimage.o ra_bn.o ra_t16.o ra_tiff.o ra_pict.o \
 ra_ps.o ra_pr.o pvalue.o pcomb.o pinterp.o ximage.o:	../common/color.h
 
-pvalue.o protate.o biq.o ciq.o pinterp.o ximage.o psign.o xshowtrace.o \
-pcomb.o pfilt.o pf3.o image.o:	../common/standard.h \
+neuclrtab.o pvalue.o protate.o biq.o ciq.o pinterp.o ximage.o psign.o \
+xshowtrace.o clrtab.o pcomb.o pfilt.o pf3.o image.o:	../common/standard.h \
 ../common/mat4.h ../common/fvect.h
 
 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
 
 aedimage.o ximage.o ra_t8.o ra_pr.o:	pic.h
@@ -223,4 +251,10 @@ pinterp.o protate.o pvalue.o ra_bn.o ra_pict.o ra_pixa
 ra_ppm.o ra_pr.o ra_pr24.o ra_rgbe.o ra_t16.o ra_t8.o glimage.o \
 ra_tiff.o ttyimage.o ximage.o x11image.o:	../common/resolu.h
 
-pfilt.o psign.o:	../common/paths.h
+pfilt.o:	../common/paths.h ../common/view.h
+
+psign.o:	../common/font.h
+
+pcond.o pcond2.o pcond3.o pcond4.o:	pcond.h ../common/standard.h \
+../common/mat4.h ../common/fvect.h \
+../common/color.h ../common/view.h ../common/resolu.h