--- ray/src/px/Rmakefile	1991/10/23 09:33:13	1.50
+++ ray/src/px/Rmakefile	1991/11/13 11:08:32	2.1
@@ -1,11 +1,11 @@
-#
-# SCCSid "$SunId$ LBL"
 #  Compiles for image processing and display programs
+# SCCSid "$SunId$ LBL"
 #
 
 ARCH = sun
 OPT = -O
-MACH = -DSTRUCTASSIGN -DBSD
+MACH = -DBSD
+SPECIAL = aed tiff
 CFLAGS = $(OPT) $(MACH) -I../common -L../lib
 
 INSTDIR = /usr/local/bin
@@ -16,11 +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 \
+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)
@@ -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
@@ -129,8 +133,8 @@ ximage:	x11image.o ciq.o cut.o closest.o x11raster.o b
 	cc $(CFLAGS) -o ximage x11image.o x11raster.o \
 ciq.o cut.o closest.o biq.o -lX11 -lrt -lm
 
-prot:		prot.o
-	cc $(CFLAGS) -o prot prot.o -lrt
+protate:		protate.o
+	cc $(CFLAGS) -o protate protate.o -lrt
 
 pflip:		pflip.o
 	cc $(CFLAGS) -o pflip pflip.o -lrt
@@ -175,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
@@ -196,3 +200,8 @@ 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