--- ray/src/px/Rmakefile	1991/03/06 10:14:01	1.28
+++ ray/src/px/Rmakefile	1991/05/03 10:22:05	1.36
@@ -5,31 +5,39 @@
 #
 
 OPT = -O
-MACH = -DBSD -DSTRUCTASSIGN -f68881 /usr/lib/f68881.il -DIEEE
+MACH = -DSTRUCTASSIGN -f68881 /usr/lib/libm.il -DIEEE -DBSD
 CFLAGS = $(OPT) $(MACH)
 
-INSTDIR = ../../bin
+INSTDIR = /lumen/lumen/ray/bin.sun3
 
-LIBDIR = /usr/local/lib/ray
+LIBDIR = /lumen/lumen/ray/lib
 
 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 \
-ra_t8 ra_bn ra_t16 pcomb pinterp x11image xshowtrace pflip
+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)
 
+x10:	x10image
+	cp x10image $(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
+	set nonomatch; 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
@@ -110,14 +118,14 @@ ra_im: ra_im.o
 ra_bn: ra_bn.o color.o colrops.o resolu.o header.o
 	cc $(CFLAGS) -o ra_bn ra_bn.o color.o colrops.o resolu.o header.o -lm
 
-ximage:	ximage.o color.o colrops.o resolu.o ciq.o cut.o closest.o ealloc.o \
-xraster.o header.o biq.o image.o fvect.o
-	cc $(CFLAGS) -o ximage ximage.o color.o colrops.o resolu.o xraster.o \
+x10image:	ximage.o color.o colrops.o resolu.o ciq.o cut.o closest.o  \
+ealloc.o xraster.o header.o biq.o image.o fvect.o
+	cc $(CFLAGS) -o x10image ximage.o color.o colrops.o resolu.o xraster.o \
 header.o ciq.o cut.o closest.o ealloc.o biq.o image.o fvect.o -lX -lm
 
-x11image:	x11image.o color.o colrops.o resolu.o ciq.o cut.o closest.o \
+ximage:	x11image.o color.o colrops.o resolu.o ciq.o cut.o closest.o \
 ealloc.o x11raster.o header.o biq.o image.o fvect.o
-	cc $(CFLAGS) -o x11image x11image.o color.o colrops.o resolu.o \
+	cc $(CFLAGS) -o ximage x11image.o color.o colrops.o resolu.o \
 x11raster.o header.o ciq.o cut.o closest.o ealloc.o biq.o image.o \
 fvect.o -lX11 -lm
 
@@ -156,9 +164,9 @@ caldefn.o:	caldefn.c
 ra_pixar.o:	ra_pixar.c
 	cc $(CFLAGS) $(PIXAR_INCLUDE) -c ra_pixar.c
 
-xshowtrace:	xshowtrace.o image.o resolu.o header.o fvect.o
+xshowtrace:	xshowtrace.o image.o resolu.o header.o fvect.o x11findwind.o
 	cc $(CFLAGS) -o xshowtrace xshowtrace.o image.o resolu.o header.o \
-fvect.o -lm -lX11
+fvect.o x11findwind.o -lm -lX11
 
 fropen.o:	fropen.c
 	cc $(CFLAGS) -DDEFPATH=\":$(LIBDIR)\" -c fropen.c