--- ray/src/util/Rmakefile 2007/11/21 17:52:05 2.45 +++ ray/src/util/Rmakefile 2008/02/21 01:22:06 2.48 @@ -1,4 +1,4 @@ -# RCSid: $Id: Rmakefile,v 2.45 2007/11/21 17:52:05 greg Exp $ +# RCSid: $Id: Rmakefile,v 2.48 2008/02/21 01:22:06 greg Exp $ # # Radiance makefile for utility programs # @@ -9,6 +9,8 @@ OPT = -O CFLAGS = -I../common -I../rt -L../lib $(OPT) $(MACH) +MLIB = -lm + CC = cc SPECIAL = @@ -18,7 +20,7 @@ INSTDIR = /usr/local/bin LIBDIR = /usr/local/lib/ray PROGS = findglare glarendx rpiece rad ranimate ranimove vwright getinfo \ - vwrays xglaresrc rtcontrib + vwrays xglaresrc rtcontrib rsensor all: $(PROGS) @@ -57,43 +59,47 @@ sun: findglare: findglare.o glareval.o glaresrc.o setscan.o $(CC) $(CFLAGS) -o findglare findglare.o glareval.o glaresrc.o \ -setscan.o -lrtrad -lm +setscan.o -lrtrad $(MLIB) glarendx: glarendx.o - $(CC) $(CFLAGS) -o glarendx glarendx.o -lrtrad -lm + $(CC) $(CFLAGS) -o glarendx glarendx.o -lrtrad $(MLIB) xglaresrc: xglaresrc.o x11findwind.o $(CC) $(CFLAGS) -o xglaresrc xglaresrc.o \ -x11findwind.o -lrtrad -lX11 -lm +x11findwind.o -lrtrad -lX11 $(MLIB) rad: rad.o - $(CC) $(CFLAGS) -o rad rad.o -lrtrad -lm + $(CC) $(CFLAGS) -o rad rad.o -lrtrad $(MLIB) ranimate: ranimate.o netproc.o - $(CC) $(CFLAGS) -o ranimate ranimate.o netproc.o -lrtrad -lm + $(CC) $(CFLAGS) -o ranimate ranimate.o netproc.o -lrtrad $(MLIB) ranimove: ranimove.o ranimove1.o ranimove2.o $(CC) $(CFLAGS) -o ranimove ranimove.o ranimove1.o ranimove2.o \ --lraycalls -lradiance -lrtrad -lm +-lraycalls -lradiance -lrtrad $(MLIB) +rsensor: rsensor.o + $(CC) $(CFLAGS) -o rsensor rsensor.o \ +-lraycalls -lradiance -lrtrad $(MLIB) + rpiece: rpiece.o Version.o - $(CC) $(CFLAGS) -o rpiece rpiece.o Version.o -lrtrad -lm + $(CC) $(CFLAGS) -o rpiece rpiece.o Version.o -lrtrad $(MLIB) rtcontrib: rtcontrib.o Version.o - $(CC) $(CFLAGS) -o rtcontrib rtcontrib.o Version.o -lrtrad -lm + $(CC) $(CFLAGS) -o rtcontrib rtcontrib.o Version.o -lrtrad $(MLIB) vwright: vwright.o - $(CC) $(CFLAGS) -o vwright vwright.o -lrtrad -lm + $(CC) $(CFLAGS) -o vwright vwright.o -lrtrad $(MLIB) vwrays: vwrays.o - $(CC) $(CFLAGS) -o vwrays vwrays.o -lrtrad -lm + $(CC) $(CFLAGS) -o vwrays vwrays.o -lrtrad $(MLIB) getinfo: getinfo.o $(CC) $(CFLAGS) -o getinfo getinfo.o -lrtrad glrad: glrad.o $(CC) $(CFLAGS) -o glrad glrad.o -lrgl -lrtrad -lGLU -lGL \ --lX11 -lXext -lm +-lX11 -lXext setscan.o: setscan.h @@ -150,6 +156,14 @@ ranimove.o ranimove1.o ranimove2.o: ranimove.h \ ../common/standard.h ../common/rtmisc.h ../common/rtio.h \ ../common/rtmath.h ../common/mat4.h ../common/fvect.h \ ../common/rterror.h ../common/tifftypes.h + +rsensor.o: ../rt/ray.h ../common/octree.h \ +../common/object.h ../common/color.h \ +../common/standard.h ../common/rtmisc.h ../common/rtio.h \ +../common/rtmath.h ../common/mat4.h ../common/fvect.h \ +../common/rterror.h ../common/tifftypes.h + +rsensor.o: ../common/view.h ../common/resolu.h ../rt/source.h Version.c: ../rt/Version.c cp ../rt/Version.c .