--- ray/src/px/Rmakefile	1997/04/15 16:56:28	2.33
+++ ray/src/px/Rmakefile	2003/07/07 17:21:51	2.48
@@ -1,12 +1,13 @@
-#  Compiles for image processing and display programs
-# SCCSid "$SunId$ LBL"
+# RCSid: $Id: Rmakefile,v 2.48 2003/07/07 17:21:51 greg Exp $
 #
+# Compiles for image processing and display programs
+#
 
 ARCH = sun
 OPT = -O
 MACH = -DBSD
-SPECIAL = aed tiff
-CFLAGS = $(OPT) $(MACH) -I../common -L../lib
+SPECIAL = aed
+CFLAGS = -I../common -L../lib $(OPT) $(MACH)
 CC = cc
 MLIB = -lm
 
@@ -17,9 +18,9 @@ LIBDIR = /usr/local/lib/ray
 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 \
-ra_t8 ra_bn ra_t16 pcomb pinterp ximage xshowtrace pflip ra_ppm \
+PROGS = pfilt ttyimage oki20c oki20 psign ra_tiff normtiff \
+pvalue pcompos protate ra_pr ra_pr24 ra_avs ra_hexbit \
+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
 
 all:	$(PROGS) $(SPECIAL)
@@ -33,8 +34,7 @@ aed:	aedimage
 sgi:	glimage
 	cp glimage $(INSTDIR)
 
-tiff:	ra_tiff
-	cp ra_tiff $(INSTDIR)
+ogl:
 
 sun:
 
@@ -46,12 +46,16 @@ 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
+	cp pdelta.csh $(INSTDIR)/pdelta
 	chmod 755 $(INSTDIR)/normpat $(INSTDIR)/falsecolor \
-$(INSTDIR)/pdfblur $(INSTDIR)/pmblur $(INSTDIR)/xyzimage
+$(INSTDIR)/pdfblur $(INSTDIR)/pmblur $(INSTDIR)/xyzimage \
+$(INSTDIR)/phisto $(INSTDIR)/pdelta
 
 clean:
-	set nonomatch; rm -f x10image aedimage glimage ra_tiff \
-$(PROGS) *.o core
+	set nonomatch; rm -f x10image aedimage glimage \
+$(PROGS) $(SPECIAL) *.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 +96,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 $(MLIB)
 
 pvalue:	pvalue.o
 	$(CC) $(CFLAGS) -o pvalue pvalue.o -lrt $(MLIB)
@@ -101,10 +105,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
+	$(CC) $(CFLAGS) -o psign psign.o -lrt $(MLIB)
 
 d48c:	d48c.o
 	$(CC) $(CFLAGS) -o d48c d48c.o -lrt
@@ -146,6 +150,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 $(MLIB)
 
 x10image:	ximage.o ciq.o cut.o closest.o xraster.o biq.o
 	$(CC) $(CFLAGS) -o x10image ximage.o xraster.o \
@@ -153,16 +159,16 @@ ciq.o cut.o closest.o biq.o -lX -lrt $(MLIB)
 
 ximage:	x11image.o x11raster.o clrtab.o
 	$(CC) $(CFLAGS) -o ximage x11image.o x11raster.o \
-clrtab.o -lX11 -lrt $(MLIB)
+clrtab.o -lrt -lX11 $(MLIB)
 
 protate:		protate.o
-	$(CC) $(CFLAGS) -o protate protate.o -lrt
+	$(CC) $(CFLAGS) -o protate protate.o -lrt $(MLIB)
 
 pextrem:	pextrem.o
-	$(CC) $(CFLAGS) -o pextrem pextrem.o -lrt
+	$(CC) $(CFLAGS) -o pextrem pextrem.o -lrt $(MLIB)
 
 pflip:		pflip.o
-	$(CC) $(CFLAGS) -o pflip pflip.o -lrt
+	$(CC) $(CFLAGS) -o pflip pflip.o -lrt $(MLIB)
 
 panim:	panim.o client/libclient.a
 	$(CC) $(CFLAGS) -o panim panim.o \
@@ -180,13 +186,18 @@ 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 ../common/tiffio.h:	../lib/libtiff.a
+	@chmod u+w ../common/tiff.h ../common/tiffio.h
+	@touch ../common/tiff.h ../common/tiffio.h
 
-../lib/libtiff.a:
-	cd libtiff ; make -f Makefile.$(ARCH) ; \
-	mv libtiff.a ../../lib ; make clean
+normtiff:	normtiff.o ../lib/libtiff.a
+	$(CC) $(CFLAGS) -o normtiff normtiff.o -lrt -ltiff $(MLIB)
 
+../lib/libtiff.a:	tiff/config.local
+	cd tiff ; sh 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 \
 $(PIXAR_LIB)
@@ -196,7 +207,7 @@ ra_pixar.o:	ra_pixar.c
 
 xshowtrace:	xshowtrace.o x11findwind.o
 	$(CC) $(CFLAGS) -o xshowtrace xshowtrace.o \
-x11findwind.o -lrt $(MLIB) -lX11
+x11findwind.o -lrt -lX11 $(MLIB)
 
 macbethcal:	macbethcal.o pmapgen.o mx3.o warp3d.o
 	$(CC) $(CFLAGS) -o macbethcal macbethcal.o pmapgen.o mx3.o warp3d.o \
@@ -221,14 +232,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 \
+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
 
 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
 
@@ -238,23 +251,33 @@ x11image.o:	../common/tonemap.h ../common/color.h
 
 ra_t8.o:	../common/targa.h
 
+ra_tiff.o normtiff.o:	../common/tiff.h ../common/tiffio.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
 
-pinterp.o ximage.o x11showtrace.o image.o:	../common/view.h
+pcomb.o pfilt.o pinterp.o ximage.o x11image.o x11showtrace.o \
+image.o:	../common/view.h ../common/resolu.h
 
 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 \
+mt160r.o oki20c.o paintjet.o pcompos.o pfilt.o pflip.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
+ra_tiff.o ttyimage.o:	../common/resolu.h
 
-pfilt.o:	../common/paths.h ../common/view.h
+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
+
+x11findwind.c:	../common/x11findwind.c
+	cp ../common/x11findwind.c .