--- ray/src/cv/Rmakefile 2007/11/04 17:01:34 2.29 +++ ray/src/cv/Rmakefile 2008/06/24 02:01:19 2.33 @@ -1,4 +1,4 @@ -# RCSid $Id: Rmakefile,v 2.29 2007/11/04 17:01:34 greg Exp $ +# RCSid $Id: Rmakefile,v 2.33 2008/06/24 02:01:19 greg Exp $ # # Makefile for conversion programs # @@ -39,7 +39,7 @@ clean: cd mgflib ; make clean ies2rad: ies2rad.o - $(CC) $(CFLAGS) -o ies2rad ies2rad.o -lrtrad -lm + $(CC) $(CFLAGS) -o ies2rad ies2rad.o -lrtrad $(MLIB) arch2rad: arch2rad.o trans.o $(CC) $(CFLAGS) -o arch2rad arch2rad.o trans.o -lrtrad @@ -67,25 +67,25 @@ mgf2meta: $(MGF_LIB) mgf2meta.o mgfilt: cd mgflib ; rm -f mgfilt ; \ - make mgfilt CC=$(CC) \ + make mgfilt CC="$(CC)" \ CFLAGS="$(OPT) $(MACH)" ; \ mv mgfilt .. mgf2inv: cd mgflib ; rm -f mgf2inv ; \ - make mgf2inv CC=$(CC) \ + make mgf2inv CC="$(CC)" \ CFLAGS="$(OPT) $(MACH)" ; \ mv mgf2inv .. 3ds2mgf: cd mgflib ; rm -f 3ds2mgf ; \ - make 3ds2mgf CC=$(CC) \ + make 3ds2mgf CC="$(CC)" \ CFLAGS="$(OPT) $(MACH)" ; \ mv 3ds2mgf .. $(MGF_LIB): cd mgflib ; rm -f libmgf.a ; \ - make libmgf.a CC=$(CC) \ + make libmgf.a CC="$(CC)" \ CFLAGS="$(OPT) $(MACH)" ; \ mv libmgf.a ../../lib @@ -104,7 +104,7 @@ ies2rad.o: ../common/paths.h obj2rad.o tmesh2rad.o: ../common/tmesh.h \ ../common/standard.h ../common/rtmisc.h ../common/rtio.h \ ../common/rtmath.h ../common/rterror.h ../common/mat4.h \ -../common/fvect.h ../common/tifftypes.h +../common/fvect.h obj2rad.o: trans.h