--- ray/src/px/Rmakefile	1991/01/09 11:15:26	1.26
+++ ray/src/px/Rmakefile	1991/03/06 15:58:22	1.29
@@ -1,31 +1,44 @@
 # SCCSid "$SunId$ LBL"
 
 #
-#  Compiles for pixel file plotters.
+#  Compiles for image processing and display programs
 #
 
 OPT = -O
-MACH = -DBSD -DSTRUCTASSIGN -f68881 /usr/lib/f68881.il -DIEEE
+MACH = -DSTRUCTASSIGN
 CFLAGS = $(OPT) $(MACH)
 
-INSTDIR = /usr/local/ray
+INSTDIR = ../../bin
 
+LIBDIR = /usr/local/lib/ray
+
 CALDEFS = -DFUNCTION -DVARIABLE -DRCONST -DBIGLIB
 
 PIXAR_INCLUDE=	-I/usr/pixar/include
 PIXAR_LIB=	-L/usr/pixar/host/lib -lpirl -lpicio -lchad -lpixar -lm
 
-PROGS = pfilt ttyimage aedimage oki20c paintjet mt160r getinfo psign \
-greyscale pvalue pcompos colorscale ra_pr ra_pr24 ximage prot \
+PROGS = pfilt ttyimage oki20c paintjet mt160r getinfo psign \
+greyscale pvalue pcompos colorscale prot \
 ra_t8 ra_bn ra_t16 pcomb pinterp x11image xshowtrace pflip
 
 all:	$(PROGS)
 
-install:	$(PROGS)
+x10:	ximage
+	cp ximage $(INSTDIR)
+
+aed:	aedimage
+	cp aedimage $(INSTDIR)
+
+sun:
+
+install:	$(PROGS) normpat.csh
 	cp $(PROGS) $(INSTDIR)
 	cp normpat.csh $(INSTDIR)/normpat
 	chmod 755 $(INSTDIR)/normpat
 
+clean:
+	rm -f $(PROGS) *.o core
+
 pfilt:	pfilt.o pf2.o pf3.o resolu.o color.o header.o lamps.o \
 rexpr.o fropen.o spec_rgb.o
 	cc $(CFLAGS) -o pfilt pfilt.o pf2.o pf3.o resolu.o color.o \
@@ -155,6 +168,9 @@ xshowtrace:	xshowtrace.o image.o resolu.o header.o fve
 	cc $(CFLAGS) -o xshowtrace xshowtrace.o image.o resolu.o header.o \
 fvect.o -lm -lX11
 
+fropen.o:	fropen.c
+	cc $(CFLAGS) -DDEFPATH=\":$(LIBDIR)\" -c fropen.c
+
 xshowtrace.o:	view.h standard.h mat4.h fvect.h
 
 mat4.o:		mat4.h fvect.h
@@ -172,7 +188,7 @@ 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
 
-prot.o pflip.o biq.o ciq.o pinterp.o \
+prot.o biq.o ciq.o pinterp.o \
 ximage.o image.o:	standard.h mat4.h fvect.h
 
 ximage.o x11raster.o:	xraster.h