--- ray/src/px/Rmakefile	1991/07/15 13:09:05	1.41
+++ ray/src/px/Rmakefile	2008/06/24 02:01:20	2.66
@@ -1,172 +1,213 @@
-# SCCSid "$SunId$ LBL"
-
+# RCSid: $Id: Rmakefile,v 2.66 2008/06/24 02:01:20 greg Exp $
 #
-#  Compiles for image processing and display programs
+# Compiles for image processing and display programs
 #
 
+ARCH = sun
 OPT = -O
-MACH = -DSTRUCTASSIGN -f68881 /usr/lib/libm.il -DIEEE -DBSD
-CFLAGS = $(OPT) $(MACH) -I../common
+MACH = -DBSD
+SPECIAL = 
+CFLAGS = -I../common -L../lib $(OPT) $(MACH)
+CC = cc
+MLIB = -lm
 
-INSTDIR = /lumen/lumen/ray/bin.sun3
+INSTDIR = /usr/local/bin
 
-LIBDIR = /lumen/lumen/ray/lib
+LIBDIR = /usr/local/lib/ray
 
-PIXAR_INCLUDE=	-I/usr/pixar/include
-PIXAR_LIB=	-L/usr/pixar/host/lib -lpirl -lpicio -lchad -lpixar -lm
+PROGS = pfilt ttyimage psign ra_tiff normtiff \
+pvalue pcompos protate ra_hexbit ra_bmp \
+ra_t8 ra_t16 pcomb pinterp pflip ra_ppm ximage xshowtrace \
+ra_rgbe ra_pict ra_ps pextrem ra_gif ra_xyze macbethcal pcond pcwarp
 
-PROGS = pfilt ttyimage oki20c paintjet mt160r getinfo psign \
-greyscale pvalue pcompos colorscale prot ra_pr ra_pr24 \
-ra_t8 ra_bn ra_t16 pcomb pinterp ximage xshowtrace pflip
+all:	$(PROGS) $(SPECIAL)
 
-all:	$(PROGS)
+ogl:
 
-x10:	x10image
-	cp x10image $(INSTDIR)
-
-aed:	aedimage
-	cp aedimage $(INSTDIR)
-
 sun:
 
-install:	$(PROGS) normpat.csh falsecolor.csh
+install:	$(PROGS) $(SPECIAL) normpat.csh falsecolor.csh \
+pdfblur.csh pmblur.csh pmdblur.csh xyzimage.csh pgblur.csh ra_pfm.csh \
+pbilat.csh
 	cp $(PROGS) $(INSTDIR)
 	cp normpat.csh $(INSTDIR)/normpat
 	cp falsecolor.csh $(INSTDIR)/falsecolor
-	chmod 755 $(INSTDIR)/normpat $(INSTDIR)/falsecolor
+	cp pdfblur.csh $(INSTDIR)/pdfblur
+	cp pmblur.csh $(INSTDIR)/pmblur
+	cp pmdblur.csh $(INSTDIR)/pmdblur
+	cp xyzimage.csh $(INSTDIR)/xyzimage
+	cp phisto.csh $(INSTDIR)/phisto
+	cp pdelta.csh $(INSTDIR)/pdelta
+	cp pgblur.csh $(INSTDIR)/pgblur
+	cp ra_pfm.csh $(INSTDIR)/ra_pfm
+	cp ran2tiff.csh $(INSTDIR)/ran2tiff
+	cp pbilat.csh $(INSTDIR)/pbilat
+	cd $(INSTDIR) ; chmod 755 normpat falsecolor pdfblur pmblur \
+	pmdblur xyzimage phisto pdelta pgblur ra_pfm ran2tiff pbilat
 
 clean:
-	set nonomatch; rm -f $(PROGS) *.o core
+	rm -f $(PROGS) $(SPECIAL) *.o core x11findwind.c
+	cd tiff; make distclean
 
 pfilt:	pfilt.o pf2.o pf3.o
-	cc $(CFLAGS) -o pfilt pfilt.o pf2.o pf3.o ../common/librt.a -lm
+	$(CC) $(CFLAGS) -o pfilt pfilt.o pf2.o pf3.o -lrtrad $(MLIB)
 
-ttyimage:	ttyimage.o
-	cc $(CFLAGS) -o ttyimage ttyimage.o ../common/librt.a -lm
+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 \
+-lrtrad $(MLIB)
 
-t4027:	t4027.o
-	cc $(CFLAGS) -o t4027 t4027.o ../common/librt.a
+pcwarp:	pcwarp.o warp3d.o
+	$(CC) $(CFLAGS) -o pcwarp pcwarp.o warp3d.o -lrtrad $(MLIB)
 
-glimage:	glimage.o
-	cc $(CFLAGS) -o glimage glimage.o ../common/librt.a -lgl_s -lm
+ttyimage:	ttyimage.o
+	$(CC) $(CFLAGS) -o ttyimage ttyimage.o -lrtrad $(MLIB)
 
-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 ../common/librt.a -lm
-
-oki20c:	oki20c.o
-	cc $(CFLAGS) -o oki20c oki20c.o ../common/librt.a -lm
-
-paintjet:	paintjet.o
-	cc $(CFLAGS) -o paintjet paintjet.o ../common/librt.a -lm
-
-mt160r:	mt160r.o
-	cc $(CFLAGS) -o mt160r mt160r.o ../common/librt.a -lm
-
-getinfo:	getinfo.o
-	cc $(CFLAGS) -n -o getinfo getinfo.o ../common/librt.a
-
-greyscale:	greyscale.o
-	cc $(CFLAGS) -o greyscale greyscale.o ../common/librt.a -lm
-
-colorscale:	colorscale.o
-	cc $(CFLAGS) -o colorscale colorscale.o ../common/librt.a
-
 pvalue:	pvalue.o
-	cc $(CFLAGS) -o pvalue pvalue.o ../common/librt.a -lm
+	$(CC) $(CFLAGS) -o pvalue pvalue.o -lrtrad $(MLIB)
 
-psum:	psum.o
-	cc $(CFLAGS) -o psum psum.o ../common/librt.a
-
 pcompos:	pcompos.o
-	cc $(CFLAGS) -o pcompos pcompos.o ../common/librt.a
+	$(CC) $(CFLAGS) -o pcompos pcompos.o -lrtrad $(MLIB)
 
 psign:	psign.o
-	cc $(CFLAGS) -o psign psign.o ../common/librt.a
+	$(CC) $(CFLAGS) -o psign psign.o -lrtrad $(MLIB)
 
-d48c:	d48c.o
-	cc $(CFLAGS) -o d48c d48c.o ../common/librt.a
+ra_gif:	ra_gif.o clrtab.o neuclrtab.o
+	$(CC) $(CFLAGS) -o ra_gif ra_gif.o clrtab.o neuclrtab.o -lrtrad $(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 ../common/librt.a -lm
+ra_ps:	ra_ps.o
+	$(CC) $(CFLAGS) -o ra_ps ra_ps.o -lrtrad $(MLIB)
 
-ra_pr24:	ra_pr24.o
-	cc $(CFLAGS) -o ra_pr24 ra_pr24.o ../common/librt.a -lm
+ra_ppm:		ra_ppm.o
+	$(CC) $(CFLAGS) -o ra_ppm ra_ppm.o -lrtrad $(MLIB)
 
-ra_t8:	ra_t8.o ciq.o cut.o closest.o biq.o
-	cc $(CFLAGS) -o ra_t8 ra_t8.o ciq.o cut.o closest.o \
-biq.o ../common/librt.a -lm
+ra_bmp:		ra_bmp.o
+	$(CC) $(CFLAGS) -o ra_bmp ra_bmp.o -lrtrad $(MLIB)
 
+ra_t8:	ra_t8.o clrtab.o neuclrtab.o
+	$(CC) $(CFLAGS) -o ra_t8 ra_t8.o clrtab.o neuclrtab.o -lrtrad $(MLIB)
+
 ra_t16: ra_t16.o
-	cc $(CFLAGS) -o ra_t16 ra_t16.o ../common/librt.a -lm
+	$(CC) $(CFLAGS) -o ra_t16 ra_t16.o -lrtrad $(MLIB)
 
-ra_im: ra_im.o
-	cc $(CFLAGS) -n -o ra_im ra_im.o
+ra_rgbe:	ra_rgbe.o
+	$(CC) $(CFLAGS) -o ra_rgbe ra_rgbe.o -lrtrad $(MLIB)
 
-ra_bn: ra_bn.o
-	cc $(CFLAGS) -o ra_bn ra_bn.o ../common/librt.a -lm
+ra_pict:    ra_pict.o
+	$(CC) $(CFLAGS) -o ra_pict ra_pict.o -lrtrad $(MLIB)
 
-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 ../common/librt.a -lm
+ra_hexbit:	ra_hexbit.o
+	$(CC) $(CFLAGS) -o ra_hexbit ra_hexbit.o -lrtrad $(MLIB)
 
-ximage:	x11image.o ciq.o cut.o closest.o x11raster.o biq.o
-	cc $(CFLAGS) -o ximage x11image.o x11raster.o \
-ciq.o cut.o closest.o biq.o -lX11 ../common/librt.a -lm
+ximage:	x11image.o x11raster.o clrtab.o
+	$(CC) $(CFLAGS) -o ximage x11image.o x11raster.o \
+clrtab.o -lrtrad -lX11 $(MLIB)
 
-prot:		prot.o
-	cc $(CFLAGS) -o prot prot.o ../common/librt.a
+protate:		protate.o
+	$(CC) $(CFLAGS) -o protate protate.o -lrtrad $(MLIB)
 
+pextrem:	pextrem.o
+	$(CC) $(CFLAGS) -o pextrem pextrem.o -lrtrad $(MLIB)
+
 pflip:		pflip.o
-	cc $(CFLAGS) -o pflip pflip.o ../common/librt.a
+	$(CC) $(CFLAGS) -o pflip pflip.o -lrtrad $(MLIB)
 
-panim:	panim.o client/libclient.a
-	cc $(CFLAGS) -o panim panim.o \
-../common/librt.a client/libclient.a -lrpcsvc -lm
-
 pcomb:	pcomb.o
-	cc $(CFLAGS) -o pcomb pcomb.o ../common/librt.a -lm
+	$(CC) $(CFLAGS) -o pcomb pcomb.o -lrtrad $(MLIB)
 
 pinterp:	pinterp.o
-	cc $(CFLAGS) -o pinterp pinterp.o ../common/librt.a -lm
+	$(CC) $(CFLAGS) -o pinterp pinterp.o -lrtrad $(MLIB)
 
-ra_pixar:	ra_pixar.o ra_pixar.c
-	cc $(CFLAGS) $(PIXAR_INCLUDE) -o $@ ra_pixar.o ../common/librt.a \
-$(PIXAR_LIB)
+ra_xyze:	ra_xyze.o
+	$(CC) $(CFLAGS) -o ra_xyze ra_xyze.o -lrtrad $(MLIB)
 
-ra_pixar.o:	ra_pixar.c
-	cc $(CFLAGS) $(PIXAR_INCLUDE) -c ra_pixar.c
+ra_tiff:	ra_tiff.o ../lib/libtiff.a
+	$(CC) $(CFLAGS) -o ra_tiff ra_tiff.o -lrtrad -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 -lrtrad -ltiff $(MLIB)
+
+../lib/libtiff.a:
+	cd tiff ; ./configure -C -quiet -with-CC=$(CC) \
+		"--libdir=`pwd`/../../lib" "--includedir=`pwd`/../../common" \
+		--enable-static --disable-shared --disable-cxx \
+		--enable-logluv --disable-jpeg \
+		--disable-zlib --disable-pixarlog \
+		"-with-ENVOPTS=$(OPT)" ; \
+	cd port ; make all ; \
+	cd ../libtiff ; make install
+
 xshowtrace:	xshowtrace.o x11findwind.o
-	cc $(CFLAGS) -o xshowtrace xshowtrace.o \
-x11findwind.o ../common/librt.a -lm -lX11
+	$(CC) $(CFLAGS) -o xshowtrace xshowtrace.o \
+x11findwind.o -lrtrad -lX11 $(MLIB)
 
-xshowtrace.o:	../common/view.h ../common/standard.h \
-../common/mat4.h ../common/fvect.h
+macbethcal:	macbethcal.o pmapgen.o mx3.o warp3d.o
+	$(CC) $(CFLAGS) -o macbethcal macbethcal.o pmapgen.o mx3.o warp3d.o \
+-lrtrad $(MLIB)
 
-pcomb.o:	../common/calcomp.h
 
-panim.o:	client/scan.h ../common/color.h ../common/random.h
+macbethcal.o:	pmap.h ../common/color.h ../common/resolu.h
 
-pf2.o bnoise.o ra_t16.o:	../common/random.h
+macbethcal.o pcond2.o pcwarp.o warp3d.o:	warp3d.h ../common/lookup.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 pflip.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:	../common/color.h
+pmapgen.o:	mx3.h pmap.h
 
-prot.o biq.o ciq.o pinterp.o ximage.o \
-image.o:	../common/standard.h ../common/mat4.h ../common/fvect.h
+nclrtab.o:	neuclrtab.o
+	ln neuclrtab.c nclrtab.c
+	$(CC) $(CFLAGS) -DCOMPAT_MODE -c nclrtab.c
+	rm -f nclrtab.c
 
-ximage.o x11raster.o:	xraster.h
+pcomb.o:	../common/calcomp.h
 
+pf2.o ra_ps.o ra_t16.o:	../common/random.h
+
+neuclrtab.o clrtab.o pfilt.o pf2.o pf3.o ttyimage.o \
+psign.o protate.o ra_hexbit.o pextrem.o pcompos.o \
+pflip.o ra_t8.o ra_t16.o ra_tiff.o ra_pict.o \
+ra_ps.o pvalue.o pcomb.o pinterp.o:	../common/color.h
+
+neuclrtab.o pvalue.o protate.o pinterp.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
+
 x11image.o x11raster.o:	x11raster.h
 
+x11image.o:	../common/tonemap.h ../common/color.h
+
 ra_t8.o:	../common/targa.h
 
-aedimage.o ximage.o ra_t8.o ra_pr.o:	pic.h
+ra_tiff.o normtiff.o:	../common/tiff.h ../common/tiffio.h
 
-ciq.o cut.o closest.o biq.o:	pic.h ciq.h
+ra_t8.o:	pic.h
 
-pinterp.o ximage.o image.o:	../common/view.h
+pcomb.o pfilt.o pinterp.o x11image.o x11showtrace.o \
+image.o:	../common/view.h ../common/resolu.h
+
+ra_pict.o:	pict.h
+
+pcompos.o pfilt.o pflip.o \
+pinterp.o protate.o pvalue.o ra_pict.o ra_hexbit.o \
+ra_ppm.o ra_rgbe.o ra_t16.o ra_t8.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/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 .