--- ray/src/px/Rmakefile	1991/07/15 12:33:16	1.40
+++ ray/src/px/Rmakefile	1991/08/16 13:40:12	1.47
@@ -1,25 +1,23 @@
-# SCCSid "$SunId$ LBL"
-
 #
+# SCCSid "$SunId$ LBL"
 #  Compiles for image processing and display programs
 #
 
+ARCH = sun
 OPT = -O
 MACH = -DSTRUCTASSIGN -f68881 /usr/lib/libm.il -DIEEE -DBSD
 CFLAGS = $(OPT) $(MACH) -I../common
 
 INSTDIR = /lumen/lumen/ray/bin.sun3
 
-LIBDIR = /lumen/lumen/ray/lib
+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 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_t8 ra_bn ra_t16 pcomb pinterp ximage xshowtrace pflip ra_ppm
 
 all:	$(PROGS)
 
@@ -29,6 +27,9 @@ x10:	x10image
 aed:	aedimage
 	cp aedimage $(INSTDIR)
 
+tiff:	ra_tiff
+	cp ra_tiff $(INSTDIR)
+
 sun:
 
 install:	$(PROGS) normpat.csh falsecolor.csh
@@ -96,6 +97,9 @@ biq.o ../common/librt.a -lm
 ra_pr24:	ra_pr24.o
 	cc $(CFLAGS) -o ra_pr24 ra_pr24.o ../common/librt.a -lm
 
+ra_ppm:		ra_ppm.o
+	cc $(CFLAGS) -o ra_ppm ra_ppm.o ../common/librt.a -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
@@ -127,26 +131,26 @@ panim:	panim.o client/libclient.a
 	cc $(CFLAGS) -o panim panim.o \
 ../common/librt.a client/libclient.a -lrpcsvc -lm
 
-pcomb:	pcomb.o calexpr.o calfunc.o caldefn.o
-	cc $(CFLAGS) -o pcomb pcomb.o calexpr.o calfunc.o caldefn.o \
-../common/librt.a -lm
+pcomb:	pcomb.o
+	cc $(CFLAGS) -o pcomb pcomb.o ../common/librt.a -lm
 
 pinterp:	pinterp.o
 	cc $(CFLAGS) -o pinterp pinterp.o ../common/librt.a -lm
 
+ra_tiff:	ra_tiff.o libtiff.a
+	cc $(CFLAGS) -o ra_tiff ra_tiff.o ../common/librt.a \
+libtiff.a -lm
+
+ra_tiff.o:	ra_tiff.c
+	cc $(CFLAGS) -Ilibtiff -c ra_tiff.c
+
+libtiff.a:
+	cd libtiff ; make -f Makefile.$(ARCH) ; mv libtiff.a .. ; make clean
+
 ra_pixar:	ra_pixar.o ra_pixar.c
 	cc $(CFLAGS) $(PIXAR_INCLUDE) -o $@ ra_pixar.o ../common/librt.a \
 $(PIXAR_LIB)
 
-calexpr.o:	calexpr.c
-	cc $(CFLAGS) $(CALDEFS) -c calexpr.c
-
-calfunc.o:	calfunc.c
-	cc $(CFLAGS) $(CALDEFS) -c calfunc.c
-
-caldefn.o:	caldefn.c
-	cc $(CFLAGS) $(CALDEFS) -c caldefn.c
-
 ra_pixar.o:	ra_pixar.c
 	cc $(CFLAGS) $(PIXAR_INCLUDE) -c ra_pixar.c
 
@@ -157,7 +161,7 @@ x11findwind.o ../common/librt.a -lm -lX11
 xshowtrace.o:	../common/view.h ../common/standard.h \
 ../common/mat4.h ../common/fvect.h
 
-pcomb.o calexpr.o calfunc.o caldefn.o:	../common/calcomp.h
+pcomb.o:	../common/calcomp.h
 
 panim.o:	client/scan.h ../common/color.h ../common/random.h
 
@@ -171,7 +175,7 @@ ra_pr.o pvalue.o pcomb.o pinterp.o ximage.o:	../common
 prot.o biq.o ciq.o pinterp.o ximage.o \
 image.o:	../common/standard.h ../common/mat4.h ../common/fvect.h
 
-ximage.o x11raster.o:	xraster.h
+ximage.o xraster.o:	xraster.h
 
 x11image.o x11raster.o:	x11raster.h