--- ray/src/px/Rmakefile	1991/08/23 17:37:26	1.49
+++ ray/src/px/Rmakefile	1991/11/07 16:36:21	1.54
@@ -1,14 +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
+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
 
@@ -18,9 +18,9 @@ PIXAR_LIB=	-L/usr/pixar/host/lib -lpirl -lpicio -lchad
 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 ra_ppm \
-ra_rgbe
+ra_rgbe ra_pict
 
-all:	$(PROGS)
+all:	$(PROGS) $(SPECIAL)
 
 x10:	x10image
 	cp x10image $(INSTDIR)
@@ -28,19 +28,23 @@ 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 -lrt -lm
@@ -117,6 +121,10 @@ ra_bn: ra_bn.o
 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 -lrt -lm
@@ -173,7 +181,7 @@ 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 \
+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 \
@@ -190,3 +198,5 @@ 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