--- ray/src/px/Rmakefile	1997/01/30 19:26:28	2.31
+++ ray/src/px/Rmakefile	1998/06/09 16:46:57	2.39
@@ -1,11 +1,11 @@
-#  Compiles for image processing and display programs
-# SCCSid "$SunId$ LBL"
+# Compiles for image processing and display programs
+# SCCSid "$SunId$ SGI"
 #
 
 ARCH = sun
 OPT = -O
 MACH = -DBSD
-SPECIAL = aed tiff
+SPECIAL = aed
 CFLAGS = $(OPT) $(MACH) -I../common -L../lib
 CC = cc
 MLIB = -lm
@@ -18,9 +18,9 @@ PIXAR_INCLUDE=	-I/usr/pixar/include
 PIXAR_LIB=	-L/usr/pixar/host/lib -lpirl -lpicio -lchad -lpixar $(MLIB)
 
 PROGS = pfilt ttyimage oki20c oki20 paintjet mt160r psign \
-greyscale pvalue pcompos colorscale protate ra_pr ra_pr24 ra_avs \
+pvalue pcompos protate ra_pr ra_pr24 ra_avs ra_tiff \
 ra_t8 ra_bn ra_t16 pcomb pinterp ximage xshowtrace pflip ra_ppm \
-ra_rgbe ra_pict ra_ps pextrem ra_gif ra_xyze macbethcal pcond
+ra_rgbe ra_pict ra_ps pextrem ra_gif ra_xyze macbethcal pcond pcwarp
 
 all:	$(PROGS) $(SPECIAL)
 
@@ -33,8 +33,7 @@ aed:	aedimage
 sgi:	glimage
 	cp glimage $(INSTDIR)
 
-tiff:	ra_tiff
-	cp ra_tiff $(INSTDIR)
+ogl:
 
 sun:
 
@@ -46,19 +45,25 @@ pdfblur.csh pmblur.csh xyzimage.csh
 	cp pdfblur.csh $(INSTDIR)/pdfblur
 	cp pmblur.csh $(INSTDIR)/pmblur
 	cp xyzimage.csh $(INSTDIR)/xyzimage
+	cp phisto.csh $(INSTDIR)/phisto
 	chmod 755 $(INSTDIR)/normpat $(INSTDIR)/falsecolor \
-$(INSTDIR)/pdfblur $(INSTDIR)/pmblur $(INSTDIR)/xyzimage
+$(INSTDIR)/pdfblur $(INSTDIR)/pmblur $(INSTDIR)/xyzimage $(INSTDIR)/phisto
 
 clean:
-	set nonomatch; rm -f x10image aedimage glimage ra_tiff \
+	set nonomatch; rm -f x10image aedimage glimage \
 $(PROGS) *.o core
+	cd tiff; make distclean
 
 pfilt:	pfilt.o pf2.o pf3.o
 	$(CC) $(CFLAGS) -o pfilt pfilt.o pf2.o pf3.o -lrt $(MLIB)
 
-pcond:	pcond.o pcond2.o pcond3.o pcond4.o
-	$(CC) $(CFLAGS) -o pcond pcond.o pcond2.o pcond3.o pcond4.o -lrt $(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)
 
+pcwarp:	pcwarp.o warp3d.o
+	$(CC) $(CFLAGS) -o pcwarp pcwarp.o warp3d.o -lrt $(MLIB)
+
 ttyimage:	ttyimage.o
 	$(CC) $(CFLAGS) -o ttyimage ttyimage.o -lrt $(MLIB)
 
@@ -88,7 +93,7 @@ greyscale:	greyscale.o
 	$(CC) $(CFLAGS) -o greyscale greyscale.o -lrt $(MLIB)
 
 colorscale:	colorscale.o
-	$(CC) $(CFLAGS) -o colorscale colorscale.o -lrt
+	$(CC) $(CFLAGS) -o colorscale colorscale.o -lrt -lm
 
 pvalue:	pvalue.o
 	$(CC) $(CFLAGS) -o pvalue pvalue.o -lrt $(MLIB)
@@ -100,7 +105,7 @@ pcompos:	pcompos.o
 	$(CC) $(CFLAGS) -o pcompos pcompos.o -lrt
 
 psign:	psign.o
-	$(CC) $(CFLAGS) -o psign psign.o -lrt
+	$(CC) $(CFLAGS) -o psign psign.o -lrt -lm
 
 d48c:	d48c.o
 	$(CC) $(CFLAGS) -o d48c d48c.o -lrt
@@ -152,13 +157,13 @@ ximage:	x11image.o x11raster.o clrtab.o
 clrtab.o -lX11 -lrt $(MLIB)
 
 protate:		protate.o
-	$(CC) $(CFLAGS) -o protate protate.o -lrt
+	$(CC) $(CFLAGS) -o protate protate.o -lrt -lm
 
 pextrem:	pextrem.o
-	$(CC) $(CFLAGS) -o pextrem pextrem.o -lrt
+	$(CC) $(CFLAGS) -o pextrem pextrem.o -lrt -lm
 
 pflip:		pflip.o
-	$(CC) $(CFLAGS) -o pflip pflip.o -lrt
+	$(CC) $(CFLAGS) -o pflip pflip.o -lrt -lm
 
 panim:	panim.o client/libclient.a
 	$(CC) $(CFLAGS) -o panim panim.o \
@@ -176,12 +181,11 @@ ra_xyze:	ra_xyze.o
 ra_tiff:	ra_tiff.o ../lib/libtiff.a
 	$(CC) $(CFLAGS) -o ra_tiff ra_tiff.o -lrt -ltiff $(MLIB)
 
-ra_tiff.o:	ra_tiff.c
-	$(CC) $(CFLAGS) -Ilibtiff -c ra_tiff.c
+../common/tiff.h:	../lib/libtiff.a
 
-../lib/libtiff.a:
-	cd libtiff ; make -f Makefile.$(ARCH) ; \
-	mv libtiff.a ../../lib ; make clean
+../lib/libtiff.a:	tiff/config.local
+	cd tiff ; ./configure -quiet -noninteractive -with-CC=$(CC) ; \
+	cd libtiff ; make install
 
 ra_pixar:	ra_pixar.o ra_pixar.c
 	$(CC) $(CFLAGS) $(PIXAR_INCLUDE) -o $@ ra_pixar.o -lrt \
@@ -194,12 +198,15 @@ 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:	macbethcal.o pmapgen.o mx3.o warp3d.o
+	$(CC) $(CFLAGS) -o macbethcal macbethcal.o pmapgen.o mx3.o warp3d.o \
+-lrt $(MLIB)
 
 
 macbethcal.o:	pmap.h ../common/color.h ../common/resolu.h
 
+macbethcal.o pcond2.o pcwarp.o warp3d.o:	warp3d.h ../common/lookup.h
+
 pmapgen.o:	mx3.h pmap.h
 
 nclrtab.o:	neuclrtab.o
@@ -227,7 +234,11 @@ ximage.o xraster.o:	xraster.h
 
 x11image.o x11raster.o:	x11raster.h
 
+x11image.o:	../common/tonemap.h ../common/color.h
+
 ra_t8.o:	../common/targa.h
+
+ra_tiff.o:	../common/tiff.h
 
 aedimage.o ximage.o ra_t8.o ra_pr.o:	pic.h