--- ray/src/px/Rmakefile	1998/05/26 09:04:55	2.38
+++ ray/src/px/Rmakefile	1998/11/12 09:44:07	2.44
@@ -18,7 +18,7 @@ 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 \
-pvalue pcompos protate ra_pr ra_pr24 ra_avs ra_tiff \
+pvalue pcompos protate ra_pr ra_pr24 ra_avs ra_tiff normtiff 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
 
@@ -33,6 +33,8 @@ aed:	aedimage
 sgi:	glimage
 	cp glimage $(INSTDIR)
 
+ogl:
+
 sun:
 
 install:	$(PROGS) $(SPECIAL) normpat.csh falsecolor.csh \
@@ -48,8 +50,9 @@ pdfblur.csh pmblur.csh xyzimage.csh
 $(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)
@@ -90,7 +93,7 @@ greyscale:	greyscale.o
 	$(CC) $(CFLAGS) -o greyscale greyscale.o -lrt $(MLIB)
 
 colorscale:	colorscale.o
-	$(CC) $(CFLAGS) -o colorscale colorscale.o -lrt -lm
+	$(CC) $(CFLAGS) -o colorscale colorscale.o -lrt $(MLIB)
 
 pvalue:	pvalue.o
 	$(CC) $(CFLAGS) -o pvalue pvalue.o -lrt $(MLIB)
@@ -99,10 +102,10 @@ psum:	psum.o
 	$(CC) $(CFLAGS) -o psum psum.o -lrt
 
 pcompos:	pcompos.o
-	$(CC) $(CFLAGS) -o pcompos pcompos.o -lrt
+	$(CC) $(CFLAGS) -o pcompos pcompos.o -lrt $(MLIB)
 
 psign:	psign.o
-	$(CC) $(CFLAGS) -o psign psign.o -lrt -lm
+	$(CC) $(CFLAGS) -o psign psign.o -lrt $(MLIB)
 
 d48c:	d48c.o
 	$(CC) $(CFLAGS) -o d48c d48c.o -lrt
@@ -144,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 \
@@ -154,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 -lm
+	$(CC) $(CFLAGS) -o protate protate.o -lrt $(MLIB)
 
 pextrem:	pextrem.o
-	$(CC) $(CFLAGS) -o pextrem pextrem.o -lrt -lm
+	$(CC) $(CFLAGS) -o pextrem pextrem.o -lrt $(MLIB)
 
 pflip:		pflip.o
-	$(CC) $(CFLAGS) -o pflip pflip.o -lrt -lm
+	$(CC) $(CFLAGS) -o pflip pflip.o -lrt $(MLIB)
 
 panim:	panim.o client/libclient.a
 	$(CC) $(CFLAGS) -o panim panim.o \
@@ -178,12 +183,16 @@ ra_xyze:	ra_xyze.o
 ra_tiff:	ra_tiff.o ../lib/libtiff.a
 	$(CC) $(CFLAGS) -o ra_tiff ra_tiff.o -lrt -ltiff $(MLIB)
 
-../common/tiff.h:	../lib/libtiff.a
+../common/tiff.h ../common/tiffio.h:	../lib/libtiff.a
+	@touch ../common/tiff.h ../common/tiffio.h
 
+normtiff:	normtiff.o tmaptiff.o ../lib/libtiff.a
+	$(CC) $(CFLAGS) -o normtiff normtiff.o tmaptiff.o -lrt -ltiff $(MLIB)
+
 ../lib/libtiff.a:	tiff/config.local
-	cd tiff ; ./configure -quiet -noninteractive ; \
-	cd libtiff ; make install ;
-#	cd .. ; make distclean
+	cd tiff ; ./configure -quiet -noninteractive -with-CC=$(CC) \
+		"-with-ENVOPTS=$(OPT)" ; \
+	cd libtiff ; make install
 
 ra_pixar:	ra_pixar.o ra_pixar.c
 	$(CC) $(CFLAGS) $(PIXAR_INCLUDE) -o $@ ra_pixar.o -lrt \
@@ -219,7 +228,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
@@ -236,7 +245,7 @@ x11image.o:	../common/tonemap.h ../common/color.h
 
 ra_t8.o:	../common/targa.h
 
-ra_tiff.o:	../common/tiff.h
+ra_tiff.o normtiff.o tmaptiff.o:	../common/tiff.h ../common/tiffio.h
 
 aedimage.o ximage.o ra_t8.o ra_pr.o:	pic.h
 
@@ -247,7 +256,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
 
@@ -258,3 +267,7 @@ 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/color.h ../common/view.h ../common/resolu.h
+
+normtiff.o:	../common/color.h ../common/tonemap.h ../common/resolu.h
+
+tmaptiff.o:	../common/tmprivat.h ../common/color.h ../common/tonemap.h