--- ray/src/px/Rmakefile	2005/09/17 05:14:14	2.62
+++ ray/src/px/Rmakefile	2012/10/05 00:59:38	2.69
@@ -1,4 +1,4 @@
-# RCSid: $Id: Rmakefile,v 2.62 2005/09/17 05:14:14 greg Exp $
+# RCSid: $Id: Rmakefile,v 2.69 2012/10/05 00:59:38 greg Exp $
 #
 # Compiles for image processing and display programs
 #
@@ -18,7 +18,7 @@ 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
 
 all:	$(PROGS) $(SPECIAL)
 
@@ -26,11 +26,12 @@ ogl:
 
 sun:
 
-install:	$(PROGS) $(SPECIAL) normpat.csh falsecolor.csh \
-pdfblur.csh pmblur.csh pmdblur.csh xyzimage.csh pgblur.csh ra_pfm.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
@@ -40,93 +41,97 @@ pdfblur.csh pmblur.csh pmdblur.csh xyzimage.csh pgblur
 	cp pgblur.csh $(INSTDIR)/pgblur
 	cp ra_pfm.csh $(INSTDIR)/ra_pfm
 	cp ran2tiff.csh $(INSTDIR)/ran2tiff
+	cp pbilat.csh $(INSTDIR)/pbilat
 	cd $(INSTDIR) ; chmod 755 normpat falsecolor pdfblur pmblur \
-	pmdblur xyzimage phisto pdelta pgblur ra_pfm ran2tiff
+	pmdblur xyzimage phisto pdelta pgblur ra_pfm ran2tiff pbilat
 
 clean:
-	rm -f $(PROGS) $(SPECIAL) *.o core
+	rm -f $(PROGS) $(SPECIAL) *.o core x11findwind.c
 	cd tiff; make distclean
 
 pfilt:	pfilt.o pf2.o pf3.o
-	$(CC) $(CFLAGS) -o pfilt pfilt.o pf2.o pf3.o -lrt $(MLIB)
+	$(CC) $(CFLAGS) -o pfilt pfilt.o pf2.o pf3.o -lrtrad $(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)
+-lrtrad $(MLIB)
 
 pcwarp:	pcwarp.o warp3d.o
-	$(CC) $(CFLAGS) -o pcwarp pcwarp.o warp3d.o -lrt $(MLIB)
+	$(CC) $(CFLAGS) -o pcwarp pcwarp.o warp3d.o -lrtrad $(MLIB)
 
 ttyimage:	ttyimage.o
-	$(CC) $(CFLAGS) -o ttyimage ttyimage.o -lrt $(MLIB)
+	$(CC) $(CFLAGS) -o ttyimage ttyimage.o -lrtrad $(MLIB)
 
 pvalue:	pvalue.o
-	$(CC) $(CFLAGS) -o pvalue pvalue.o -lrt $(MLIB)
+	$(CC) $(CFLAGS) -o pvalue pvalue.o -lrtrad $(MLIB)
 
 pcompos:	pcompos.o
-	$(CC) $(CFLAGS) -o pcompos pcompos.o -lrt $(MLIB)
+	$(CC) $(CFLAGS) -o pcompos pcompos.o -lrtrad $(MLIB)
 
 psign:	psign.o
-	$(CC) $(CFLAGS) -o psign psign.o -lrt $(MLIB)
+	$(CC) $(CFLAGS) -o psign psign.o -lrtrad $(MLIB)
 
 ra_gif:	ra_gif.o clrtab.o neuclrtab.o
-	$(CC) $(CFLAGS) -o ra_gif ra_gif.o clrtab.o neuclrtab.o -lrt $(MLIB)
+	$(CC) $(CFLAGS) -o ra_gif ra_gif.o clrtab.o neuclrtab.o -lrtrad $(MLIB)
 
 ra_ps:	ra_ps.o
-	$(CC) $(CFLAGS) -o ra_ps ra_ps.o -lrt $(MLIB)
+	$(CC) $(CFLAGS) -o ra_ps ra_ps.o -lrtrad $(MLIB)
 
 ra_ppm:		ra_ppm.o
-	$(CC) $(CFLAGS) -o ra_ppm ra_ppm.o -lrt $(MLIB)
+	$(CC) $(CFLAGS) -o ra_ppm ra_ppm.o -lrtrad $(MLIB)
 
 ra_bmp:		ra_bmp.o
-	$(CC) $(CFLAGS) -o ra_bmp ra_bmp.o -lrt $(MLIB)
+	$(CC) $(CFLAGS) -o ra_bmp ra_bmp.o -lrtrad $(MLIB)
 
 ra_t8:	ra_t8.o clrtab.o neuclrtab.o
-	$(CC) $(CFLAGS) -o ra_t8 ra_t8.o clrtab.o neuclrtab.o -lrt $(MLIB)
+	$(CC) $(CFLAGS) -o ra_t8 ra_t8.o clrtab.o neuclrtab.o -lrtrad $(MLIB)
 
 ra_t16: ra_t16.o
-	$(CC) $(CFLAGS) -o ra_t16 ra_t16.o -lrt $(MLIB)
+	$(CC) $(CFLAGS) -o ra_t16 ra_t16.o -lrtrad $(MLIB)
 
 ra_rgbe:	ra_rgbe.o
-	$(CC) $(CFLAGS) -o ra_rgbe ra_rgbe.o -lrt $(MLIB)
+	$(CC) $(CFLAGS) -o ra_rgbe ra_rgbe.o -lrtrad $(MLIB)
 
 ra_pict:    ra_pict.o
-	$(CC) $(CFLAGS) -o ra_pict ra_pict.o -lrt $(MLIB)
+	$(CC) $(CFLAGS) -o ra_pict ra_pict.o -lrtrad $(MLIB)
 
 ra_hexbit:	ra_hexbit.o
-	$(CC) $(CFLAGS) -o ra_hexbit ra_hexbit.o -lrt $(MLIB)
+	$(CC) $(CFLAGS) -o ra_hexbit ra_hexbit.o -lrtrad $(MLIB)
 
 ximage:	x11image.o x11raster.o clrtab.o
 	$(CC) $(CFLAGS) -o ximage x11image.o x11raster.o \
-clrtab.o -lrt -lX11 $(MLIB)
+clrtab.o -lrtrad -lX11 $(MLIB)
 
 protate:		protate.o
-	$(CC) $(CFLAGS) -o protate protate.o -lrt $(MLIB)
+	$(CC) $(CFLAGS) -o protate protate.o -lrtrad $(MLIB)
 
 pextrem:	pextrem.o
-	$(CC) $(CFLAGS) -o pextrem pextrem.o -lrt $(MLIB)
+	$(CC) $(CFLAGS) -o pextrem pextrem.o -lrtrad $(MLIB)
 
 pflip:		pflip.o
-	$(CC) $(CFLAGS) -o pflip pflip.o -lrt $(MLIB)
+	$(CC) $(CFLAGS) -o pflip pflip.o -lrtrad $(MLIB)
 
 pcomb:	pcomb.o
-	$(CC) $(CFLAGS) -o pcomb pcomb.o -lrt $(MLIB)
+	$(CC) $(CFLAGS) -o pcomb pcomb.o -lrtrad $(MLIB)
 
 pinterp:	pinterp.o
-	$(CC) $(CFLAGS) -o pinterp pinterp.o -lrt $(MLIB)
+	$(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 -lrt $(MLIB)
+	$(CC) $(CFLAGS) -o ra_xyze ra_xyze.o -lrtrad $(MLIB)
 
 ra_tiff:	ra_tiff.o ../lib/libtiff.a
-	$(CC) $(CFLAGS) -o ra_tiff ra_tiff.o -lrt -ltiff $(MLIB)
+	$(CC) $(CFLAGS) -o ra_tiff ra_tiff.o -lrtrad -ltiff $(MLIB)
 
 ../common/tiff.h ../common/tiffio.h:	../lib/libtiff.a
 	@chmod u+w ../common/tiff.h ../common/tiffio.h
 	@touch ../common/tiff.h ../common/tiffio.h
 
 normtiff:	normtiff.o ../lib/libtiff.a
-	$(CC) $(CFLAGS) -o normtiff normtiff.o -lrt -ltiff $(MLIB)
+	$(CC) $(CFLAGS) -o normtiff normtiff.o -lrtrad -ltiff $(MLIB)
 
 ../lib/libtiff.a:
 	cd tiff ; ./configure -C -quiet -with-CC=$(CC) \
@@ -140,11 +145,11 @@ normtiff:	normtiff.o ../lib/libtiff.a
 
 xshowtrace:	xshowtrace.o x11findwind.o
 	$(CC) $(CFLAGS) -o xshowtrace xshowtrace.o \
-x11findwind.o -lrt -lX11 $(MLIB)
+x11findwind.o -lrtrad -lX11 $(MLIB)
 
 macbethcal:	macbethcal.o pmapgen.o mx3.o warp3d.o
 	$(CC) $(CFLAGS) -o macbethcal macbethcal.o pmapgen.o mx3.o warp3d.o \
--lrt $(MLIB)
+-lrtrad $(MLIB)
 
 
 macbethcal.o:	pmap.h ../common/color.h ../common/resolu.h
@@ -164,14 +169,14 @@ 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 \
 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
 
@@ -200,8 +205,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
 
@@ -210,3 +214,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 \
+ttyimage.o:	../common/platform.h