--- ray/src/px/Rmakefile	1997/04/15 16:56:28	2.33
+++ ray/src/px/Rmakefile	1998/09/03 10:48:57	2.41
@@ -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,11 +18,11 @@ 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_hexbit \
 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 pcwarp
 
-all:	$(PROGS) $(SPECIAL)
+all:	$(PROGS)
 
 x10:	x10image
 	cp x10image $(INSTDIR)
@@ -33,8 +33,7 @@ aed:	aedimage
 sgi:	glimage
 	cp glimage $(INSTDIR)
 
-tiff:	ra_tiff
-	cp ra_tiff $(INSTDIR)
+ogl:
 
 sun:
 
@@ -46,12 +45,14 @@ 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)
@@ -92,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)
@@ -104,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
@@ -146,6 +147,8 @@ ra_rgbe:	ra_rgbe.o
 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
 
 x10image:	ximage.o ciq.o cut.o closest.o xraster.o biq.o
 	$(CC) $(CFLAGS) -o x10image ximage.o xraster.o \
@@ -156,13 +159,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 \
@@ -180,12 +183,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 \
@@ -221,7 +223,7 @@ 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 \
+psum.o psign.o protate.o ra_hexbit.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
@@ -238,6 +240,8 @@ 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
 
 ciq.o cut.o closest.o biq.o:	pic.h ciq.h
@@ -247,7 +251,7 @@ pinterp.o ximage.o x11showtrace.o image.o:	../common/v
 ra_pict.o:	pict.h
 
 mt160r.o oki20c.o paintjet.o pcomb.o pcompos.o pfilt.o pflip.o \
-pinterp.o protate.o pvalue.o ra_bn.o ra_pict.o ra_pixar.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 ximage.o x11image.o:	../common/resolu.h