--- ray/src/px/Rmakefile	1994/06/10 12:51:12	2.19
+++ ray/src/px/Rmakefile	1995/12/13 14:07:08	2.24
@@ -20,7 +20,7 @@ PIXAR_LIB=	-L/usr/pixar/host/lib -lpirl -lpicio -lchad
 PROGS = pfilt ttyimage oki20c oki20 paintjet mt160r getinfo 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
 
 all:	$(PROGS) $(SPECIAL)
 
@@ -38,11 +38,15 @@ tiff:	ra_tiff
 
 sun:
 
-install:	$(PROGS) $(SPECIAL) normpat.csh falsecolor.csh
+install:	$(PROGS) $(SPECIAL) normpat.csh falsecolor.csh \
+pdfblur.csh pmblur.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
+	chmod 755 $(INSTDIR)/normpat $(INSTDIR)/falsecolor \
+$(INSTDIR)/pdfblur $(INSTDIR)/pmblur
 
 clean:
 	set nonomatch; rm -f x10image aedimage glimage ra_tiff \
@@ -165,6 +169,9 @@ 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)
 
@@ -185,6 +192,14 @@ ra_pixar.o:	ra_pixar.c
 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.o:	pmap.h ../common/color.h ../common/resolu.h
+
+pmapgen.o:	mx3.h pmap.h
 
 nclrtab.o:	neuclrtab.o
 	ln neuclrtab.c nclrtab.c