--- ray/src/rt/Rmakefile	1991/10/09 12:27:50	1.63
+++ ray/src/rt/Rmakefile	1991/11/11 14:02:39	1.70
@@ -3,19 +3,20 @@
 #  Compiles for ray tracing programs.
 #
 
-OPT = -O -pipe
-MACH = -DSTRUCTASSIGN -DBSD -DIEEE -f68881 /usr/lib/libm.il
+OPT = -O
+MACH = -DBSD
 CFLAGS = $(MACH) $(OPT) -I../common -L../lib
+SPECIAL = aed
 CC = cc
 LINT = lint
-LINTFLAGS = -DSTRUCTASSIGN -DBSD -DIEEE -DVARIABLE -DFUNCTION \
--DINCHAN -DRCONST -DREDEFW -DBIGLIB
+LINTFLAGS = -DBSD -DVARIABLE -DFUNCTION \
+-DINCHAN -DRCONST -DREDEFW
 
 #
 # The following are user-definable:
 #
 DESTDIR = .
-INSTDIR = /lumen/lumen/ray/bin.sun3
+INSTDIR = /usr/local/bin
 INSTALL = cp
 
 #
@@ -59,10 +60,10 @@ RSRC = $(RAYSRC) $(SURFSRC) $(MATSRC) \
 RAYOBJS = initotypes.o raytrace.o ambient.o ambcomp.o
 RAYSRC = initotypes.c raytrace.c ambient.c ambcomp.c
 
-SURFOBJS = source.o sphere.o srcsupp.o virtuals.o o_face.o o_cone.o \
-	o_instance.o
+SURFOBJS = source.o sphere.o srcsupp.o srcsamp.o virtuals.o o_face.o \
+	o_cone.o o_instance.o
 SURFSRC = sphere.c source.c srcsupp.c virtuals.c o_face.c \
-		o_cone.c o_instance.c
+		srcsamp.c o_cone.c o_instance.c
 
 MATOBJS = normal.o dielectric.o m_clip.o glass.o m_brdf.o m_mirror.o \
 	m_direct.o
@@ -85,9 +86,9 @@ HEADERS = ambient.h ray.h data.h otspecial.h source.h
 
 PROGS = $(DESTDIR)/rtrace $(DESTDIR)/rpict $(DESTDIR)/rview $(DESTDIR)/lookamb
 
-all:	$(PROGS)
+all:	$(PROGS) $(SPECIAL)
 
-install:	$(PROGS) rayinit.cal
+install:	$(PROGS) $(SPECIAL) rayinit.cal
 	$(INSTALL) $(PROGS) $(INSTDIR)
 	rm -f $(LIBDIR)/rayinit.cal
 	cp rayinit.cal $(LIBDIR)
@@ -98,6 +99,8 @@ x10:	$(DEVDIR)/x10
 
 aed:	$(DEVDIR)/aed
 
+sgi:	$(DEVDIR)/news
+
 tiff:	
 
 clean:
@@ -137,6 +140,10 @@ $(DEVDIR)/aed:	aed.o colortab.o tty.o devmain.o editli
 	$(CC) $(CFLAGS) -s -o $(DEVDIR)/aed aed.o colortab.o \
 devmain.o tty.o editline.o $(LIBS)
 
+$(DEVDIR)/news: nwsdev.o devmain.o editline.o
+	$(CC) $(CFLAGS) -s -o $(DEVDIR)/news nwsdev.o devmain.o editline.o \
+-lcps $(LIBS)
+
 #
 # Special compiles:
 #
@@ -189,7 +196,7 @@ caldefn.o:	caldefn.c ../common/calcomp.h
 	$(CC) $(CFLAGS) -DFUNCTION -DREDEFW -c caldefn.c
 
 nwsdev.o:	nwsdev.c nwsdev.h newsconstants.h
-	$(CC) $(CFLAGS) -c nwsdev.c
+	$(CC) $(CFLAGS) -Dnws_init=dinit -c nwsdev.c
 
 nwsdev.h:	nwsdev.cps newsconstants.h
 	cps nwsdev.cps
@@ -227,18 +234,19 @@ ambient.o dielectric.o func.o initotypes.o m_brdf.o \
 normal.o o_cone.o text.o raytrace.o rtrace.o \
 rv2.o source.o srcsupp.o virtuals.o sphere.o:	../common/otypes.h
 
-ambient.o ambcomp.o rpict.o rv3.o source.o:	../common/random.h
+ambient.o ambcomp.o rpict.o rv3.o srcsamp.o:	../common/random.h
 
 ambient.o ambcomp.o dielectric.o func.o glass.o m_clip.o m_mirror.o \
 m_brdf.o mx_data.o mx_func.o normal.o o_cone.o o_face.o o_instance.o \
 p_data.o p_func.o text.o raytrace.o rpmain.o rtmain.o rvmain.o rpict.o \
-rtrace.o rview.o rv2.o rv3.o source.o srcsupp.o virtuals.o sphere.o \
-t_data.o t_func.o:	ray.h ../common/standard.h ../common/mat4.h \
-../common/fvect.h ../common/object.h ../common/color.h
+rtrace.o rview.o rv2.o rv3.o source.o srcsamp.o srcsupp.o virtuals.o \
+sphere.o t_data.o t_func.o:	ray.h ../common/standard.h \
+../common/mat4.h ../common/fvect.h ../common/object.h ../common/color.h
 
 rv2.o rv3.o rview.o:	rpaint.h driver.h ../common/view.h
 
-mirror.o source.o srcsupp.o virtuals.o:	source.h
+m_direct.o m_mirror.o \
+source.o srcsamp.o srcsupp.o virtuals.o:	source.h
 
 cone.o data.o devcomm.o initotypes.o \
 octree.o:	../common/standard.h ../common/mat4.h ../common/fvect.h
@@ -256,3 +264,5 @@ x11.o x11twind.o: x11twind.h
 x11.o:	x11icon.h
 
 ambient.o ambcomp.o lookamb.o:	ambient.h
+
+data.o rmain.o rpict.o rv2.o:	../common/resolu.h