--- ray/src/px/Rmakefile	2007/10/22 18:05:43	2.64
+++ ray/src/px/Rmakefile	2017/08/26 16:07:22	2.71
@@ -1,4 +1,4 @@
-# RCSid: $Id: Rmakefile,v 2.64 2007/10/22 18:05:43 greg Exp $
+# RCSid: $Id: Rmakefile,v 2.71 2017/08/26 16:07:22 greg Exp $
 #
 # Compiles for image processing and display programs
 #
@@ -18,7 +18,8 @@ LIBDIR = /usr/local/lib/ray
 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 \
-ra_rgbe ra_pict ra_ps pextrem ra_gif ra_xyze macbethcal pcond pcwarp
+ra_rgbe ra_pict ra_ps pextrem ra_gif ra_xyze macbethcal pcond \
+pcwarp pmblur2 psketch
 
 all:	$(PROGS) $(SPECIAL)
 
@@ -26,12 +27,12 @@ ogl:
 
 sun:
 
-install:	$(PROGS) $(SPECIAL) normpat.csh falsecolor.csh \
+install:	$(PROGS) $(SPECIAL) normpat.csh falsecolor.pl \
 pdfblur.csh pmblur.csh pmdblur.csh xyzimage.csh pgblur.csh ra_pfm.csh \
 pbilat.csh
 	cp $(PROGS) $(INSTDIR)
 	cp normpat.csh $(INSTDIR)/normpat
-	cp falsecolor.csh $(INSTDIR)/falsecolor
+	cp falsecolor.pl $(INSTDIR)/falsecolor
 	cp pdfblur.csh $(INSTDIR)/pdfblur
 	cp pmblur.csh $(INSTDIR)/pmblur
 	cp pmdblur.csh $(INSTDIR)/pmdblur
@@ -46,7 +47,7 @@ pbilat.csh
 	pmdblur xyzimage phisto pdelta pgblur ra_pfm ran2tiff pbilat
 
 clean:
-	rm -f $(PROGS) $(SPECIAL) *.o core
+	rm -f $(PROGS) $(SPECIAL) *.o x11findwind.c
 	cd tiff; make distclean
 
 pfilt:	pfilt.o pf2.o pf3.o
@@ -117,9 +118,15 @@ pcomb:	pcomb.o
 pinterp:	pinterp.o
 	$(CC) $(CFLAGS) -o pinterp pinterp.o -lrtrad $(MLIB)
 
+pmblur2:	pmblur2.o
+	$(CC) $(CFLAGS) -o pmblur2 pmblur2.o -lrtrad $(MLIB)
+
 ra_xyze:	ra_xyze.o
 	$(CC) $(CFLAGS) -o ra_xyze ra_xyze.o -lrtrad $(MLIB)
 
+psketch:	psketch.o
+	$(CC) $(CFLAGS) -o psketch psketch.o -lrtrad $(MLIB)
+
 ra_tiff:	ra_tiff.o ../lib/libtiff.a
 	$(CC) $(CFLAGS) -o ra_tiff ra_tiff.o -lrtrad -ltiff $(MLIB)
 
@@ -162,18 +169,18 @@ nclrtab.o:	neuclrtab.o
 
 pcomb.o:	../common/calcomp.h
 
-pf2.o ra_ps.o ra_t16.o:	../common/random.h
+psketch.o pf2.o ra_ps.o ra_t16.o:	../common/random.h
 
 neuclrtab.o clrtab.o pfilt.o pf2.o pf3.o ttyimage.o \
 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 \
+pflip.o ra_t8.o ra_t16.o ra_tiff.o ra_pict.o pmblur2.o \
 ra_ps.o pvalue.o pcomb.o pinterp.o:	../common/color.h
 
-neuclrtab.o pvalue.o protate.o pinterp.o psign.o \
+neuclrtab.o pvalue.o protate.o pinterp.o psign.o pmblur2.o psketch.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 \
-../common/rterror.h ../common/tifftypes.h
+../common/rterror.h
 
 x11image.o x11raster.o:	x11raster.h
 
@@ -195,6 +202,8 @@ pinterp.o protate.o pvalue.o ra_pict.o ra_hexbit.o \
 ra_ppm.o ra_rgbe.o ra_t16.o ra_t8.o \
 ra_tiff.o ttyimage.o:	../common/resolu.h
 
+psketch.o:	../common/resolu.h ../common/color.h
+
 pfilt.o:	../common/paths.h
 
 psign.o:	../common/font.h
@@ -202,8 +211,7 @@ psign.o:	../common/font.h
 pcond.o pcond2.o pcond3.o pcond4.o:	pcond.h ../common/standard.h \
 ../common/rtmisc.h ../common/rtio.h \
 ../common/rtmath.h ../common/mat4.h ../common/fvect.h \
-../common/rterror.h ../common/tifftypes.h \
-../common/color.h ../common/view.h ../common/resolu.h
+../common/rterror.h ../common/color.h ../common/view.h ../common/resolu.h
 
 normtiff.o:	../common/color.h ../common/tonemap.h ../common/resolu.h
 
@@ -212,3 +220,8 @@ ra_bmp.o:	../common/bmpfile.h ../common/color.h \
 
 x11findwind.c:	../common/x11findwind.c
 	cp ../common/x11findwind.c .
+
+macbethcal.o normtiff.o pcomb.o pcompos.o pcond.o pextrem.o pfilt.o \
+pflip.o psign.o pvalue.o ra_bmp.o ra_gif.o ra_pict.o ra_ppm.o ra_ps.o \
+ra_rgbe.o ra_skel.o ra_t16.o ra_t8.o ra_tiff.o ra_xyze.o pmblur2.o \
+psketch.o ttyimage.o:	../common/platform.h