--- ray/src/px/Rmakefile	2003/04/29 19:09:43	2.46
+++ ray/src/px/Rmakefile	2004/03/26 03:11:50	2.51
@@ -1,4 +1,4 @@
-# RCSid: $Id: Rmakefile,v 2.46 2003/04/29 19:09:43 greg Exp $
+# RCSid: $Id: Rmakefile,v 2.51 2004/03/26 03:11:50 greg Exp $
 #
 # Compiles for image processing and display programs
 #
@@ -19,7 +19,7 @@ PIXAR_INCLUDE=	-I/usr/pixar/include
 PIXAR_LIB=	-L/usr/pixar/host/lib -lpirl -lpicio -lchad -lpixar $(MLIB)
 
 PROGS = pfilt ttyimage oki20c oki20 psign ra_tiff normtiff \
-pvalue pcompos protate ra_pr ra_pr24 ra_avs ra_hexbit \
+pvalue pcompos protate ra_pr ra_pr24 ra_avs ra_hexbit ra_bmp \
 ra_t8 ra_bn ra_t16 pcomb pinterp pflip ra_ppm ximage xshowtrace \
 ra_rgbe ra_pict ra_ps pextrem ra_gif ra_xyze macbethcal pcond pcwarp
 
@@ -39,7 +39,7 @@ ogl:
 sun:
 
 install:	$(PROGS) $(SPECIAL) normpat.csh falsecolor.csh \
-pdfblur.csh pmblur.csh xyzimage.csh
+pdfblur.csh pmblur.csh xyzimage.csh pgblur.csh
 	cp $(PROGS) $(INSTDIR)
 	cp normpat.csh $(INSTDIR)/normpat
 	cp falsecolor.csh $(INSTDIR)/falsecolor
@@ -48,9 +48,9 @@ pdfblur.csh pmblur.csh xyzimage.csh
 	cp xyzimage.csh $(INSTDIR)/xyzimage
 	cp phisto.csh $(INSTDIR)/phisto
 	cp pdelta.csh $(INSTDIR)/pdelta
-	chmod 755 $(INSTDIR)/normpat $(INSTDIR)/falsecolor \
-$(INSTDIR)/pdfblur $(INSTDIR)/pmblur $(INSTDIR)/xyzimage \
-$(INSTDIR)/phisto $(INSTDIR)/pdelta
+	cp pgblur.csh $(INSTDIR)/pgblur
+	cd $(INSTDIR) ; chmod 755 normpat falsecolor pdfblur \
+		pmblur xyzimage phisto pdelta pgblur
 
 clean:
 	set nonomatch; rm -f x10image aedimage glimage \
@@ -132,6 +132,9 @@ ra_ps:	ra_ps.o
 ra_ppm:		ra_ppm.o
 	$(CC) $(CFLAGS) -o ra_ppm ra_ppm.o -lrt $(MLIB)
 
+ra_bmp:		ra_bmp.o
+	$(CC) $(CFLAGS) -o ra_bmp ra_bmp.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)
 
@@ -151,7 +154,7 @@ ra_pict:    ra_pict.o
 	$(CC) $(CFLAGS) -o ra_pict ra_pict.o -lrt $(MLIB)
 
 ra_hexbit:	ra_hexbit.o
-	$(CC) $(CFLAGS) -o ra_hexbit ra_hexbit.o -lrt
+	$(CC) $(CFLAGS) -o ra_hexbit ra_hexbit.o -lrt $(MLIB)
 
 x10image:	ximage.o ciq.o cut.o closest.o xraster.o biq.o
 	$(CC) $(CFLAGS) -o x10image ximage.o xraster.o \
@@ -232,14 +235,16 @@ panim.o:	client/scan.h ../common/color.h ../common/ran
 pf2.o bnoise.o ra_ps.o ra_t16.o:	../common/random.h
 
 neuclrtab.o clrtab.o pfilt.o pf2.o pf3.o ttyimage.o t4027.o mt160r.o \
-psum.o psign.o protate.o ra_hexbit.o \
+psum.o psign.o protate.o ra_hexbit.o ra_bmp.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
 
 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
+../common/rtmisc.h ../common/rtio.h \
+../common/rtmath.h ../common/mat4.h ../common/fvect.h \
+../common/rterror.h
 
 ximage.o xraster.o:	xraster.h
 
@@ -260,7 +265,7 @@ image.o:	../common/view.h ../common/resolu.h
 
 ra_pict.o:	pict.h
 
-mt160r.o oki20c.o paintjet.o pcompos.o pfilt.o pflip.o \
+mt160r.o oki20c.o paintjet.o pcompos.o pfilt.o pflip.o ra_bmp.o \
 pinterp.o protate.o pvalue.o ra_bn.o ra_pict.o ra_pixar.o ra_hexbit.o \
 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:	../common/resolu.h
@@ -270,10 +275,14 @@ pfilt.o:	../common/paths.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/rtmisc.h ../common/rtio.h \
+../common/rtmath.h ../common/mat4.h ../common/fvect.h \
+../common/rterror.h \
 ../common/color.h ../common/view.h ../common/resolu.h
 
 normtiff.o:	../common/color.h ../common/tonemap.h ../common/resolu.h
+
+ra_bmp.o:	../common/bmpfile.h
 
 x11findwind.c:	../common/x11findwind.c
 	cp ../common/x11findwind.c .