--- ray/src/px/Rmakefile	1990/10/19 16:33:30	1.20
+++ ray/src/px/Rmakefile	2004/10/27 23:23:47	2.53
@@ -1,172 +1,289 @@
-# SCCSid "$SunId$ LBL"
-
+# RCSid: $Id: Rmakefile,v 2.53 2004/10/27 23:23:47 greg Exp $
 #
-#  Compiles for pixel file plotters.
+# Compiles for image processing and display programs
 #
 
+ARCH = sun
 OPT = -O
-MACH = -DBSD -DSTRUCTASSIGN -f68881 /usr/lib/f68881.il -DIEEE
-CFLAGS = $(OPT) $(MACH)
+MACH = -DBSD
+SPECIAL = aed
+CFLAGS = -I../common -L../lib $(OPT) $(MACH)
+CC = cc
+MLIB = -lm
 
-INSTDIR = /usr/local/ray
+INSTDIR = /usr/local/bin
 
-CALDEFS = -DFUNCTION -DVARIABLE -DRCONST -DBIGLIB
+LIBDIR = /usr/local/lib/ray
 
 PIXAR_INCLUDE=	-I/usr/pixar/include
-PIXAR_LIB=	-L/usr/pixar/host/lib -lpirl -lpicio -lchad -lpixar -lm
+PIXAR_LIB=	-L/usr/pixar/host/lib -lpirl -lpicio -lchad -lpixar $(MLIB)
 
-PROGS = pfilt ttyimage aedimage oki20c paintjet mt160r getinfo psign \
-greyscale pvalue pcompos colorscale ra_pr ra_pr24 ximage prot \
-ra_t8 ra_bn ra_t16 pcomb pinterp x11image xshowtrace
+PROGS = pfilt ttyimage oki20c oki20 psign ra_tiff normtiff \
+pvalue pcompos protate ra_pr ra_pr24 ra_avs ra_hexbit ra_bmp \
+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)
+all:	$(PROGS) $(SPECIAL)
 
-install:	$(PROGS)
+x10:	x10image
+	cp x10image $(INSTDIR)
+
+aed:	aedimage
+	cp aedimage $(INSTDIR)
+
+sgi:	glimage
+	cp glimage $(INSTDIR)
+
+ogl:
+
+sun:
+
+install:	$(PROGS) $(SPECIAL) normpat.csh falsecolor.csh \
+pdfblur.csh pmblur.csh xyzimage.csh pgblur.csh
 	cp $(PROGS) $(INSTDIR)
+	cp normpat.csh $(INSTDIR)/normpat
+	cp falsecolor.csh $(INSTDIR)/falsecolor
+	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
+	cp pgblur.csh $(INSTDIR)/pgblur
+	cd $(INSTDIR) ; chmod 755 normpat falsecolor pdfblur \
+		pmblur xyzimage phisto pdelta pgblur
 
-pfilt:	pfilt.o pf2.o pf3.o resolu.o color.o header.o
-	cc $(CFLAGS) -o pfilt pfilt.o pf2.o pf3.o resolu.o color.o header.o -lm
+clean:
+	set nonomatch; rm -f x10image aedimage glimage \
+$(PROGS) $(SPECIAL) *.o core
+	-cd tiff; make distclean
 
-ttyimage:	ttyimage.o resolu.o color.o header.o
-	cc $(CFLAGS) -o ttyimage ttyimage.o resolu.o color.o header.o
+pfilt:	pfilt.o pf2.o pf3.o
+	$(CC) $(CFLAGS) -o pfilt pfilt.o pf2.o pf3.o -lrt $(MLIB)
 
-t4027:	t4027.o color.o resolu.o
-	cc $(CFLAGS) -o t4027 t4027.o color.o resolu.o
+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)
 
-glimage:	glimage.o color.o resolu.o header.o
-	cc $(CFLAGS) -o glimage glimage.o color.o resolu.o header.o -lgl_s
+pcwarp:	pcwarp.o warp3d.o
+	$(CC) $(CFLAGS) -o pcwarp pcwarp.o warp3d.o -lrt $(MLIB)
 
-aedimage:	aedimage.o color.o resolu.o ciq.o cut.o closest.o ealloc.o biq.o header.o
-	cc $(CFLAGS) -o aedimage aedimage.o color.o resolu.o ciq.o cut.o \
-closest.o ealloc.o biq.o header.o -lm
+ttyimage:	ttyimage.o
+	$(CC) $(CFLAGS) -o ttyimage ttyimage.o -lrt $(MLIB)
 
-oki20c:	oki20c.o color.o resolu.o header.o
-	cc $(CFLAGS) -o oki20c oki20c.o color.o resolu.o header.o
+t4027:	t4027.o
+	$(CC) $(CFLAGS) -o t4027 t4027.o -lrt
 
-paintjet:	paintjet.o color.o resolu.o header.o
-	cc $(CFLAGS) -o paintjet paintjet.o color.o resolu.o header.o
+glimage:	glimage.o
+	$(CC) $(CFLAGS) -o glimage glimage.o -lrt -lgl_s $(MLIB)
 
-mt160r:	mt160r.o color.o resolu.o header.o
-	cc $(CFLAGS) -o mt160r mt160r.o color.o resolu.o header.o
+aedimage:	aedimage.o ciq.o cut.o closest.o biq.o
+	$(CC) $(CFLAGS) -o aedimage aedimage.o ciq.o cut.o closest.o \
+biq.o -lrt $(MLIB)
 
-getinfo:	getinfo.o header.o
-	cc $(CFLAGS) -n -o getinfo getinfo.o header.o
+oki20c:	oki20c.o
+	$(CC) $(CFLAGS) -o oki20c oki20c.o -lrt $(MLIB)
 
-greyscale:	greyscale.o color.o resolu.o
-	cc $(CFLAGS) -o greyscale greyscale.o color.o resolu.o -lm
+oki20:	oki20.o
+	$(CC) $(CFLAGS) -o oki20 oki20.o -lrt $(MLIB)
 
-colorscale:	colorscale.o color.o resolu.o
-	cc $(CFLAGS) -o colorscale colorscale.o color.o resolu.o
+paintjet:	paintjet.o
+	$(CC) $(CFLAGS) -o paintjet paintjet.o -lrt $(MLIB)
 
-pvalue:	pvalue.o color.o resolu.o header.o
-	cc $(CFLAGS) -o pvalue pvalue.o color.o resolu.o header.o
+mt160r:	mt160r.o
+	$(CC) $(CFLAGS) -o mt160r mt160r.o -lrt $(MLIB)
 
-psum:	psum.o color.o resolu.o header.o
-	cc $(CFLAGS) -o psum psum.o color.o resolu.o header.o
+greyscale:	greyscale.o
+	$(CC) $(CFLAGS) -o greyscale greyscale.o -lrt $(MLIB)
 
-pcompos:	pcompos.o color.o resolu.o header.o
-	cc $(CFLAGS) -o pcompos pcompos.o color.o resolu.o header.o
+colorscale:	colorscale.o
+	$(CC) $(CFLAGS) -o colorscale colorscale.o -lrt $(MLIB)
 
-psign:	psign.o color.o resolu.o
-	cc $(CFLAGS) -o psign psign.o color.o resolu.o
+pvalue:	pvalue.o
+	$(CC) $(CFLAGS) -o pvalue pvalue.o -lrt $(MLIB)
 
-d48c:	d48c.o color.o resolu.o
-	cc $(CFLAGS) -o d48c d48c.o color.o resolu.o
+psum:	psum.o
+	$(CC) $(CFLAGS) -o psum psum.o -lrt
 
-ra_pr: ra_pr.o ciq.o cut.o closest.o color.o resolu.o ealloc.o header.o biq.o
-	cc $(CFLAGS) -o ra_pr ra_pr.o ciq.o cut.o closest.o \
-color.o resolu.o ealloc.o header.o biq.o -lm
+pcompos:	pcompos.o
+	$(CC) $(CFLAGS) -o pcompos pcompos.o -lrt $(MLIB)
 
-ra_pr24: ra_pr24.o color.o colrops.o resolu.o header.o
-	cc $(CFLAGS) -o ra_pr24 ra_pr24.o color.o colrops.o resolu.o \
-header.o -lm
+psign:	psign.o
+	$(CC) $(CFLAGS) -o psign psign.o -lrt $(MLIB)
 
-ra_t8: ra_t8.o ciq.o cut.o closest.o color.o resolu.o ealloc.o header.o biq.o
-	cc $(CFLAGS) -o ra_t8 ra_t8.o ciq.o cut.o closest.o \
-color.o resolu.o ealloc.o header.o biq.o -lm
+d48c:	d48c.o
+	$(CC) $(CFLAGS) -o d48c d48c.o -lrt
 
-ra_t16: ra_t16.o color.o resolu.o ealloc.o header.o
-	cc $(CFLAGS) -o ra_t16 ra_t16.o color.o resolu.o ealloc.o header.o -lm
+ra_gif:	ra_gif.o clrtab.o neuclrtab.o
+	$(CC) $(CFLAGS) -o ra_gif ra_gif.o clrtab.o neuclrtab.o -lrt $(MLIB)
 
+ra_pr:	ra_pr.o ciq.o cut.o closest.o biq.o
+	$(CC) $(CFLAGS) -o ra_pr ra_pr.o ciq.o cut.o closest.o \
+biq.o -lrt $(MLIB)
+
+ra_pr24:	ra_pr24.o
+	$(CC) $(CFLAGS) -o ra_pr24 ra_pr24.o -lrt $(MLIB)
+
+ra_avs:	ra_avs.o
+	$(CC) $(CFLAGS) -o ra_avs ra_avs.o -lrt $(MLIB)
+
+ra_ps:	ra_ps.o
+	$(CC) $(CFLAGS) -o ra_ps ra_ps.o -lrt $(MLIB)
+
+ra_ppm:		ra_ppm.o
+	$(CC) $(CFLAGS) -o ra_ppm ra_ppm.o -lrt $(MLIB)
+
+ra_bmp:		ra_bmp.o
+	$(CC) $(CFLAGS) -o ra_bmp ra_bmp.o -lrt $(MLIB)
+
+ra_t8:	ra_t8.o clrtab.o neuclrtab.o
+	$(CC) $(CFLAGS) -o ra_t8 ra_t8.o clrtab.o neuclrtab.o -lrt $(MLIB)
+
+ra_t16: ra_t16.o
+	$(CC) $(CFLAGS) -o ra_t16 ra_t16.o -lrt $(MLIB)
+
 ra_im: ra_im.o
-	cc $(CFLAGS) -n -o ra_im ra_im.o
+	$(CC) $(CFLAGS) -o ra_im ra_im.o
 
-ra_bn: ra_bn.o color.o resolu.o header.o
-	cc $(CFLAGS) -o ra_bn ra_bn.o color.o resolu.o header.o -lm
+ra_bn: ra_bn.o
+	$(CC) $(CFLAGS) -o ra_bn ra_bn.o -lrt $(MLIB)
 
-ximage:	ximage.o color.o resolu.o ciq.o cut.o closest.o ealloc.o \
-xraster.o header.o biq.o image.o fvect.o
-	cc $(CFLAGS) -o ximage ximage.o color.o resolu.o xraster.o \
-header.o ciq.o cut.o closest.o ealloc.o biq.o image.o fvect.o -lX -lm
+ra_rgbe:	ra_rgbe.o
+	$(CC) $(CFLAGS) -o ra_rgbe ra_rgbe.o -lrt $(MLIB)
 
-x11image:	x11image.o color.o resolu.o ciq.o cut.o closest.o ealloc.o \
-x11raster.o header.o biq.o image.o fvect.o
-	cc $(CFLAGS) -o x11image x11image.o color.o resolu.o x11raster.o \
-header.o ciq.o cut.o closest.o ealloc.o biq.o image.o fvect.o -lX11 -lm
+ra_pict:    ra_pict.o
+	$(CC) $(CFLAGS) -o ra_pict ra_pict.o -lrt $(MLIB)
 
-prot:		prot.o color.o resolu.o header.o
-	cc $(CFLAGS) -o prot prot.o color.o resolu.o header.o
+ra_hexbit:	ra_hexbit.o
+	$(CC) $(CFLAGS) -o ra_hexbit ra_hexbit.o -lrt $(MLIB)
 
-panim:	panim.o color.o resolu.o header.o client/libclient.a
-	cc $(CFLAGS) -o panim panim.o color.o resolu.o header.o \
-client/libclient.a -lrpcsvc -lm
+x10image:	ximage.o ciq.o cut.o closest.o xraster.o biq.o
+	$(CC) $(CFLAGS) -o x10image ximage.o xraster.o \
+ciq.o cut.o closest.o biq.o -lX -lrt $(MLIB)
 
-pcomb:	pcomb.o calexpr.o calfunc.o caldefn.o color.o resolu.o \
-header.o ealloc.o savestr.o
-	cc $(CFLAGS) -o pcomb pcomb.o calexpr.o calfunc.o caldefn.o \
-color.o resolu.o header.o ealloc.o savestr.o -lm
+ximage:	x11image.o x11raster.o clrtab.o
+	$(CC) $(CFLAGS) -o ximage x11image.o x11raster.o \
+clrtab.o -lrt -lX11 $(MLIB)
 
-pinterp:	pinterp.o image.o header.o color.o resolu.o fvect.o mat4.o
-	cc $(CFLAGS) -o pinterp pinterp.o image.o header.o mat4.o \
-fvect.o color.o resolu.o -lm
+protate:		protate.o
+	$(CC) $(CFLAGS) -o protate protate.o -lrt $(MLIB)
 
-ra_pixar:	ra_pixar.o ra_pixar.c color.o resolu.o header.o
-	cc $(CFLAGS) $(PIXAR_INCLUDE) -o $@ ra_pixar.o color.o resolu.o header.o \
-$(PIXAR_LIB)
+pextrem:	pextrem.o
+	$(CC) $(CFLAGS) -o pextrem pextrem.o -lrt $(MLIB)
 
-calexpr.o:	calexpr.c
-	cc $(CFLAGS) $(CALDEFS) -c calexpr.c
+pflip:		pflip.o
+	$(CC) $(CFLAGS) -o pflip pflip.o -lrt $(MLIB)
 
-calfunc.o:	calfunc.c
-	cc $(CFLAGS) $(CALDEFS) -c calfunc.c
+panim:	panim.o client/libclient.a
+	$(CC) $(CFLAGS) -o panim panim.o \
+-lrt client/libclient.a -lrpcsvc $(MLIB)
 
-caldefn.o:	caldefn.c
-	cc $(CFLAGS) $(CALDEFS) -c caldefn.c
+pcomb:	pcomb.o
+	$(CC) $(CFLAGS) -o pcomb pcomb.o -lrt $(MLIB)
 
+pinterp:	pinterp.o
+	$(CC) $(CFLAGS) -o pinterp pinterp.o -lrt $(MLIB)
+
+ra_xyze:	ra_xyze.o
+	$(CC) $(CFLAGS) -o ra_xyze ra_xyze.o -lrt $(MLIB)
+
+ra_tiff:	ra_tiff.o ../lib/libtiff.a
+	$(CC) $(CFLAGS) -o ra_tiff ra_tiff.o -lrt -ltiff $(MLIB)
+
+../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
+
+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)
+
 ra_pixar.o:	ra_pixar.c
-	cc $(CFLAGS) $(PIXAR_INCLUDE) -c ra_pixar.c
+	$(CC) $(CFLAGS) $(PIXAR_INCLUDE) -c ra_pixar.c
 
-xshowtrace:	xshowtrace.o image.o resolu.o header.o fvect.o
-	cc $(CFLAGS) -o xshowtrace xshowtrace.o image.o resolu.o header.o \
-fvect.o -lm -lX11
+xshowtrace:	xshowtrace.o x11findwind.o
+	$(CC) $(CFLAGS) -o xshowtrace xshowtrace.o \
+x11findwind.o -lrt -lX11 $(MLIB)
 
-xshowtrace.o:	view.h standard.h fvect.h
+macbethcal:	macbethcal.o pmapgen.o mx3.o warp3d.o
+	$(CC) $(CFLAGS) -o macbethcal macbethcal.o pmapgen.o mx3.o warp3d.o \
+-lrt $(MLIB)
 
-pcomb.o calexpr.o calfunc.o caldefn.o:	calcomp.h
 
-panim.o:	client/scan.h color.h random.h
+macbethcal.o:	pmap.h ../common/color.h ../common/resolu.h
 
-pf2.o bnoise.o:	random.h
+macbethcal.o pcond2.o pcwarp.o warp3d.o:	warp3d.h ../common/lookup.h
 
-ra_t16.o:	random.h
+pmapgen.o:	mx3.h pmap.h
 
-pfilt.o pf2.o ttyimage.o t4027.o mt160r.o psum.o psign.o prot.o ra_pr24.o \
-d48c.o aedimage.o pcompos.o color.o resolu.o colrops.o \
-greyscale.o ra_t8.o glimage.o \
-ra_bn.o ra_t16.o ra_pr.o pvalue.o pcomb.o pinterp.o ximage.o:	color.h
+nclrtab.o:	neuclrtab.o
+	ln neuclrtab.c nclrtab.c
+	$(CC) $(CFLAGS) -DCOMPAT_MODE -c nclrtab.c
+	rm -f nclrtab.c
 
-pinterp.o ximage.o image.o:	standard.h fvect.h
+pcomb.o:	../common/calcomp.h
 
-ximage.o x11raster.o:	xraster.h
+panim.o:	client/scan.h ../common/color.h ../common/random.h
 
+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 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/rtmisc.h ../common/rtio.h \
+../common/rtmath.h ../common/mat4.h ../common/fvect.h \
+../common/rterror.h ../common/tifftypes.h
+
+ximage.o xraster.o:	xraster.h
+
 x11image.o x11raster.o:	x11raster.h
 
-ra_t8.o:	targa.h
+x11image.o:	../common/tonemap.h ../common/color.h
 
-fvect.o:	fvect.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 image.o:	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 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:	../common/resolu.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/rtmisc.h ../common/rtio.h \
+../common/rtmath.h ../common/mat4.h ../common/fvect.h \
+../common/rterror.h ../common/tifftypes.h \
+../common/color.h ../common/view.h ../common/resolu.h
+
+normtiff.o:	../common/color.h ../common/tonemap.h ../common/resolu.h
+
+ra_bmp.o:	../common/bmpfile.h ../common/color.h \
+../common/tonemap.h ../common/resolu.h
+
+x11findwind.c:	../common/x11findwind.c
+	cp ../common/x11findwind.c .