--- ray/src/cv/Rmakefile	1991/03/14 13:55:16	1.4
+++ ray/src/cv/Rmakefile	1992/09/08 10:05:15	2.3
@@ -6,44 +6,47 @@
 
 OPT = -O
 
-MACH = -f68881 /usr/lib/libm.il -DBSD
+MACH = -DBSD
 
-CFLAGS = $(OPT) $(MACH)
+CFLAGS = $(OPT) $(MACH) -I../common -L../lib
 
-INSTDIR = /lumen/lumen/ray/bin.sun3
+CC = cc
 
-LIBDIR = /lumen/lumen/ray/lib
+INSTDIR = /usr/local/bin
 
+LIBDIR = /usr/local/lib/ray
+
 PROGS = thf2rad ies2rad arch2rad nff2rad lampcolor
 
+LIBFILES = source.cal tilt.cal lamp.tab
+
 all:	$(PROGS)
 
-install:	$(PROGS)
+install:	$(PROGS) $(LIBFILES)
 	cp $(PROGS) $(INSTDIR)
+	cd $(LIBDIR) ; rm -f $(LIBFILES)
+	cp $(LIBFILES) $(LIBDIR)
 
 clean:
-	rm -f $(PROGS) *.o core
+	set nonomatch; rm -f $(PROGS) *.o core
 
 thf2rad:	thf2rad.o
-	cc $(CFLAGS) -o thf2rad thf2rad.o
+	$(CC) $(CFLAGS) -o thf2rad thf2rad.o
 
-ies2rad:	ies2rad.o lamps.o spec_rgb.o fropen.o rexpr.o
-	cc $(CFLAGS) -o ies2rad ies2rad.o lamps.o \
-spec_rgb.o fropen.o rexpr.o
+ies2rad:	ies2rad.o
+	$(CC) $(CFLAGS) -o ies2rad ies2rad.o -lrt
 
-arch2rad:	arch2rad.o trans.o savestr.o
-	cc $(CFLAGS) -o arch2rad arch2rad.o trans.o savestr.o
+arch2rad:	arch2rad.o trans.o
+	$(CC) $(CFLAGS) -o arch2rad arch2rad.o trans.o -lrt
 
 nff2rad:	nff2rad.o
-	cc $(CFLAGS) -o nff2rad nff2rad.o
+	$(CC) $(CFLAGS) -o nff2rad nff2rad.o
 
-lampcolor:	lampcolor.o lamps.o spec_rgb.o fropen.o rexpr.o
-	cc $(CFLAGS) -o lampcolor lampcolor.o spec_rgb.o \
-lamps.o fropen.o rexpr.o
+lampcolor:	lampcolor.o
+	$(CC) $(CFLAGS) -o lampcolor lampcolor.o -lrt
 
-fropen.o:	fropen.c
-	cc $(CFLAGS) -DDEFPATH=\":$(LIBDIR)\" -c fropen.c
-
 arch2rad.o trans.o:	trans.h
 
-ies2rad.o spec_rgb.o:	color.h
+ies2rad.o lampcolor.o:	../common/color.h
+
+ies2rad.o:	../common/paths.h