--- ray/src/px/Rmakefile	1994/04/14 04:53:51	2.18
+++ ray/src/px/Rmakefile	1995/10/16 11:43:30	2.23
@@ -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,12 @@ tiff:	ra_tiff
 
 sun:
 
-install:	$(PROGS) $(SPECIAL) normpat.csh falsecolor.csh
+install:	$(PROGS) $(SPECIAL) normpat.csh falsecolor.csh pdfblur.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
+	chmod 755 $(INSTDIR)/normpat $(INSTDIR)/falsecolor $(INSTDIR)/pdfblur
 
 clean:
 	set nonomatch; rm -f x10image aedimage glimage ra_tiff \
@@ -100,8 +101,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 +120,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,6 +166,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)
 
@@ -186,19 +190,33 @@ 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
+	$(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