--- ray/src/px/Rmakefile	1998/09/03 10:48:57	2.41
+++ ray/src/px/Rmakefile	1998/11/12 09:44:07	2.44
@@ -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 \
-pvalue pcompos protate ra_pr ra_pr24 ra_avs ra_tiff ra_hexbit \
+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
 
-all:	$(PROGS)
+all:	$(PROGS) $(SPECIAL)
 
 x10:	x10image
 	cp x10image $(INSTDIR)
@@ -93,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)
@@ -102,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
@@ -159,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 \
@@ -183,10 +183,15 @@ 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 -with-CC=$(CC) ; \
+	cd tiff ; ./configure -quiet -noninteractive -with-CC=$(CC) \
+		"-with-ENVOPTS=$(OPT)" ; \
 	cd libtiff ; make install
 
 ra_pixar:	ra_pixar.o ra_pixar.c
@@ -240,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
 
@@ -262,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