--- ray/src/rt/Rmakefile 1989/06/09 15:35:18 1.8 +++ ray/src/rt/Rmakefile 1989/10/12 11:35:23 1.11 @@ -4,7 +4,9 @@ # Compiles for ray tracing programs. # -CFLAGS = -DBSD -O -DIEEE -f68881 /usr/lib/f68881.il +OPT = -O +MACH = -DBSD -DIEEE -f68881 /usr/lib/f68881.il +CFLAGS = $(MACH) $(OPT) # # The following are user-definable: @@ -28,7 +30,8 @@ COMPAT = malloc.o # # Device drivers for rview (see also devtable.c): # -DOBJS = devtable.o devcomm.o aed.o tty.o editline.o sun.o x10.o xtwind.o +DOBJS = devtable.o devcomm.o aed.o tty.o editline.o sun.o x10.o xtwind.o \ + colortab.o DLIBS = -lX DRIVERS = $(DEVDIR)/sun.dev $(DEVDIR)/sun.com @@ -58,7 +61,8 @@ MODOBJS = p_func.o t_func.o p_data.o t_data.o text.o m SUPPOBJS = zeroes.o calexpr.o caldefn.o calfunc.o func.o noise3.o data.o -MISCOBJS = misc.o color.o header.o mat4.o xf.o fvect.o savestr.o ealloc.o +MISCOBJS = misc.o color.o header.o mat4.o xf.o fvect.o savestr.o \ + fgetline.o ealloc.o # # What this makefile produces: @@ -90,8 +94,8 @@ $(DESTDIR)/rview: $(RVOBJS) $(DESTDIR)/lookamb: lookamb.o cc $(CFLAGS) -o $(DESTDIR)/lookamb lookamb.o -$(DEVDIR)/sun.dev: sundev.o - cc $(CFLAGS) -o $(DEVDIR)/sun.dev sundev.o \ +$(DEVDIR)/sun.dev: sundev.o colortab.o + cc $(CFLAGS) -o $(DEVDIR)/sun.dev sundev.o colortab.o \ -lsuntool -lsunwindow -lpixrect $(LIBS) $(DEVDIR)/sun.com: suncom.o editline.o @@ -151,7 +155,8 @@ xf.o: xf.c caldefn.o calexpr.o calfunc.o: calcomp.h -aed.o color.o data.o devcomm.o lookamb.o rview.o sundev.o x10.o: color.h +aed.o color.o colortab.o data.o devcomm.o \ +lookamb.o rview.o sundev.o x10.o: color.h cone.o o_cone.o source.o: cone.h