--- ray/src/cv/Rmakefile	1990/12/11 08:45:45	1.1
+++ ray/src/cv/Rmakefile	1994/04/13 14:08:53	2.6
@@ -4,26 +4,59 @@
 # Makefile for conversion programs
 #
 
-CFLAGS = -O
+OPT = -O
 
-DESTDIR = /usr/local/ray
+MACH = -DBSD
 
-all:	$(DESTDIR)/thf2rad $(DESTDIR)/ies2rad $(DESTDIR)/arch2rad \
-$(DESTDIR)/nff2rad
+CFLAGS = $(OPT) $(MACH) -I../common -L../lib
 
-$(DESTDIR)/thf2rad:	thf2rad.o
-	cc $(CFLAGS) -o $(DESTDIR)/thf2rad thf2rad.o
+CC = cc
 
-$(DESTDIR)/ies2rad:	ies2rad.o lamps.o spec_rgb.o fropen.o rexpr.o
-	cc $(CFLAGS) -o $(DESTDIR)/ies2rad ies2rad.o lamps.o \
-spec_rgb.o fropen.o rexpr.o
+MLIB = -lm
 
-$(DESTDIR)/arch2rad:	arch2rad.o trans.o savestr.o
-	cc $(CFLAGS) -o $(DESTDIR)/arch2rad arch2rad.o trans.o savestr.o
+INSTDIR = /usr/local/bin
 
-$(DESTDIR)/nff2rad:	nff2rad.o
-	cc $(CFLAGS) -o $(DESTDIR)/nff2rad nff2rad.o
+LIBDIR = /usr/local/lib/ray
 
+PROGS = thf2rad ies2rad arch2rad nff2rad lampcolor tmesh2rad obj2rad
+
+LIBFILES = source.cal tilt.cal lamp.tab tmesh.cal
+
+all:	$(PROGS)
+
+install:	$(PROGS) $(LIBFILES)
+	cp $(PROGS) $(INSTDIR)
+	cd $(LIBDIR) ; rm -f $(LIBFILES)
+	cp $(LIBFILES) $(LIBDIR)
+
+clean:
+	set nonomatch; rm -f $(PROGS) *.o core
+
+thf2rad:	thf2rad.o
+	$(CC) $(CFLAGS) -o thf2rad thf2rad.o
+
+ies2rad:	ies2rad.o
+	$(CC) $(CFLAGS) -o ies2rad ies2rad.o -lrt
+
+arch2rad:	arch2rad.o trans.o
+	$(CC) $(CFLAGS) -o arch2rad arch2rad.o trans.o -lrt
+
+nff2rad:	nff2rad.o
+	$(CC) $(CFLAGS) -o nff2rad nff2rad.o
+
+lampcolor:	lampcolor.o
+	$(CC) $(CFLAGS) -o lampcolor lampcolor.o -lrt
+
+tmesh2rad:	tmesh2rad.o
+	$(CC) $(CFLAGS) -o tmesh2rad tmesh2rad.o -lrt $(MLIB)
+
+obj2rad:	obj2rad.o trans.o
+	$(CC) $(CFLAGS) -o obj2rad obj2rad.o trans.o -lrt $(MLIB)
+
 arch2rad.o trans.o:	trans.h
 
-spec_rgb.o:	color.h
+ies2rad.o lampcolor.o:	../common/color.h
+
+ies2rad.o:	../common/paths.h
+
+tmesh2rad.o:	../common/standard.h ../common/mat4.h ../common/fvect.h