--- ray/src/px/Rmakefile	1991/08/15 14:32:51	1.45
+++ ray/src/px/Rmakefile	1991/11/13 11:08:32	2.1
@@ -1,13 +1,14 @@
-#
-# SCCSid "$SunId$ LBL"
 #  Compiles for image processing and display programs
+# SCCSid "$SunId$ LBL"
 #
 
+ARCH = sun
 OPT = -O
-MACH = -DSTRUCTASSIGN -f68881 /usr/lib/libm.il -DIEEE -DBSD
-CFLAGS = $(OPT) $(MACH) -I../common
+MACH = -DBSD
+SPECIAL = aed tiff
+CFLAGS = $(OPT) $(MACH) -I../common -L../lib
 
-INSTDIR = /lumen/lumen/ray/bin.sun3
+INSTDIR = /usr/local/bin
 
 LIBDIR = /usr/local/lib/ray
 
@@ -15,10 +16,11 @@ PIXAR_INCLUDE=	-I/usr/pixar/include
 PIXAR_LIB=	-L/usr/pixar/host/lib -lpirl -lpicio -lchad -lpixar -lm
 
 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
+greyscale pvalue pcompos colorscale protate ra_pr ra_pr24 \
+ra_t8 ra_bn ra_t16 pcomb pinterp ximage xshowtrace pflip ra_ppm \
+ra_rgbe ra_pict
 
-all:	$(PROGS)
+all:	$(PROGS) $(SPECIAL)
 
 x10:	x10image
 	cp x10image $(INSTDIR)
@@ -26,122 +28,139 @@ x10:	x10image
 aed:	aedimage
 	cp aedimage $(INSTDIR)
 
+sgi:	glimage
+	cp glimage $(INSTDIR)
+
+tiff:	ra_tiff
+	cp ra_tiff $(INSTDIR)
+
 sun:
 
-install:	$(PROGS) normpat.csh falsecolor.csh
+install:	$(PROGS) $(SPECIAL) normpat.csh falsecolor.csh
 	cp $(PROGS) $(INSTDIR)
 	cp normpat.csh $(INSTDIR)/normpat
 	cp falsecolor.csh $(INSTDIR)/falsecolor
 	chmod 755 $(INSTDIR)/normpat $(INSTDIR)/falsecolor
 
 clean:
-	set nonomatch; rm -f $(PROGS) *.o core
+	set nonomatch; rm -f x10image aedimage glimage ra_tiff \
+$(PROGS) *.o core
 
 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 -lrt -lm
 
 ttyimage:	ttyimage.o
-	cc $(CFLAGS) -o ttyimage ttyimage.o ../common/librt.a -lm
+	cc $(CFLAGS) -o ttyimage ttyimage.o -lrt -lm
 
 t4027:	t4027.o
-	cc $(CFLAGS) -o t4027 t4027.o ../common/librt.a
+	cc $(CFLAGS) -o t4027 t4027.o -lrt
 
 glimage:	glimage.o
-	cc $(CFLAGS) -o glimage glimage.o ../common/librt.a -lgl_s -lm
+	cc $(CFLAGS) -o glimage glimage.o -lrt -lgl_s -lm
 
 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
+biq.o -lrt -lm
 
 oki20c:	oki20c.o
-	cc $(CFLAGS) -o oki20c oki20c.o ../common/librt.a -lm
+	cc $(CFLAGS) -o oki20c oki20c.o -lrt -lm
 
 paintjet:	paintjet.o
-	cc $(CFLAGS) -o paintjet paintjet.o ../common/librt.a -lm
+	cc $(CFLAGS) -o paintjet paintjet.o -lrt -lm
 
 mt160r:	mt160r.o
-	cc $(CFLAGS) -o mt160r mt160r.o ../common/librt.a -lm
+	cc $(CFLAGS) -o mt160r mt160r.o -lrt -lm
 
 getinfo:	getinfo.o
-	cc $(CFLAGS) -n -o getinfo getinfo.o ../common/librt.a
+	cc $(CFLAGS) -n -o getinfo getinfo.o -lrt
 
 greyscale:	greyscale.o
-	cc $(CFLAGS) -o greyscale greyscale.o ../common/librt.a -lm
+	cc $(CFLAGS) -o greyscale greyscale.o -lrt -lm
 
 colorscale:	colorscale.o
-	cc $(CFLAGS) -o colorscale colorscale.o ../common/librt.a
+	cc $(CFLAGS) -o colorscale colorscale.o -lrt
 
 pvalue:	pvalue.o
-	cc $(CFLAGS) -o pvalue pvalue.o ../common/librt.a -lm
+	cc $(CFLAGS) -o pvalue pvalue.o -lrt -lm
 
 psum:	psum.o
-	cc $(CFLAGS) -o psum psum.o ../common/librt.a
+	cc $(CFLAGS) -o psum psum.o -lrt
 
 pcompos:	pcompos.o
-	cc $(CFLAGS) -o pcompos pcompos.o ../common/librt.a
+	cc $(CFLAGS) -o pcompos pcompos.o -lrt
 
 psign:	psign.o
-	cc $(CFLAGS) -o psign psign.o ../common/librt.a
+	cc $(CFLAGS) -o psign psign.o -lrt
 
 d48c:	d48c.o
-	cc $(CFLAGS) -o d48c d48c.o ../common/librt.a
+	cc $(CFLAGS) -o d48c d48c.o -lrt
 
 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
+biq.o -lrt -lm
 
 ra_pr24:	ra_pr24.o
-	cc $(CFLAGS) -o ra_pr24 ra_pr24.o ../common/librt.a -lm
+	cc $(CFLAGS) -o ra_pr24 ra_pr24.o -lrt -lm
 
+ra_ppm:		ra_ppm.o
+	cc $(CFLAGS) -o ra_ppm ra_ppm.o -lrt -lm
+
 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
+biq.o -lrt -lm
 
 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 -lrt -lm
 
 ra_im: ra_im.o
 	cc $(CFLAGS) -n -o ra_im ra_im.o
 
 ra_bn: ra_bn.o
-	cc $(CFLAGS) -o ra_bn ra_bn.o ../common/librt.a -lm
+	cc $(CFLAGS) -o ra_bn ra_bn.o -lrt -lm
 
+ra_rgbe:	ra_rgbe.o
+	cc $(CFLAGS) -o ra_rgbe ra_rgbe.o -lrt -lm
+
+ra_pict:    ra_pict.o
+	cc $(CFLAGS) -o ra_pict ra_pict.o -lrt -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 ../common/librt.a -lm
+ciq.o cut.o closest.o biq.o -lX -lrt -lm
 
 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
+ciq.o cut.o closest.o biq.o -lX11 -lrt -lm
 
-prot:		prot.o
-	cc $(CFLAGS) -o prot prot.o ../common/librt.a
+protate:		protate.o
+	cc $(CFLAGS) -o protate protate.o -lrt
 
 pflip:		pflip.o
-	cc $(CFLAGS) -o pflip pflip.o ../common/librt.a
+	cc $(CFLAGS) -o pflip pflip.o -lrt
 
 panim:	panim.o client/libclient.a
 	cc $(CFLAGS) -o panim panim.o \
-../common/librt.a client/libclient.a -lrpcsvc -lm
+-lrt client/libclient.a -lrpcsvc -lm
 
 pcomb:	pcomb.o
-	cc $(CFLAGS) -o pcomb pcomb.o ../common/librt.a -lm
+	cc $(CFLAGS) -o pcomb pcomb.o -lrt -lm
 
 pinterp:	pinterp.o
-	cc $(CFLAGS) -o pinterp pinterp.o ../common/librt.a -lm
+	cc $(CFLAGS) -o pinterp pinterp.o -lrt -lm
 
-ra_tiff:	ra_tiff.o libtiff/libtiff.a
-	cc $(CFLAGS) -o ra_tiff ra_tiff.o ../common/librt.a \
-libtiff/libtiff.a -lm
+ra_tiff:	ra_tiff.o ../lib/libtiff.a
+	cc $(CFLAGS) -o ra_tiff ra_tiff.o -lrt -ltiff -lm
 
-ra_tiff.o:	ra_tiff.c libtiff/tiffio.h libtiff/tiff.h
+ra_tiff.o:	ra_tiff.c
 	cc $(CFLAGS) -Ilibtiff -c ra_tiff.c
 
-libtiff/libtiff.a:
-	maketiff
+../lib/libtiff.a:
+	cd libtiff ; make -f Makefile.$(ARCH) ; \
+	mv libtiff.a ../../lib ; make clean
 
 ra_pixar:	ra_pixar.o ra_pixar.c
-	cc $(CFLAGS) $(PIXAR_INCLUDE) -o $@ ra_pixar.o ../common/librt.a \
+	cc $(CFLAGS) $(PIXAR_INCLUDE) -o $@ ra_pixar.o -lrt \
 $(PIXAR_LIB)
 
 ra_pixar.o:	ra_pixar.c
@@ -149,7 +168,7 @@ ra_pixar.o:	ra_pixar.c
 
 xshowtrace:	xshowtrace.o x11findwind.o
 	cc $(CFLAGS) -o xshowtrace xshowtrace.o \
-x11findwind.o ../common/librt.a -lm -lX11
+x11findwind.o -lrt -lm -lX11
 
 xshowtrace.o:	../common/view.h ../common/standard.h \
 ../common/mat4.h ../common/fvect.h
@@ -160,12 +179,12 @@ panim.o:	client/scan.h ../common/color.h ../common/ran
 
 pf2.o bnoise.o ra_t16.o:	../common/random.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 \
+pfilt.o pf2.o ttyimage.o t4027.o mt160r.o psum.o psign.o protate.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_pr.o pvalue.o pcomb.o pinterp.o ximage.o:	../common/color.h
 
-prot.o biq.o ciq.o pinterp.o ximage.o \
+pvalue.o protate.o biq.o ciq.o pinterp.o ximage.o \
 image.o:	../common/standard.h ../common/mat4.h ../common/fvect.h
 
 ximage.o xraster.o:	xraster.h
@@ -179,3 +198,10 @@ 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:	../common/view.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 \
+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