--- ray/src/cv/Rmakefile 2003/06/27 06:53:22 2.22 +++ ray/src/cv/Rmakefile 2004/10/27 23:36:09 2.25 @@ -1,4 +1,4 @@ -# RCSid $Id: Rmakefile,v 2.22 2003/06/27 06:53:22 greg Exp $ +# RCSid $Id: Rmakefile,v 2.25 2004/10/27 23:36:09 greg Exp $ # # Makefile for conversion programs # @@ -8,6 +8,7 @@ OPT = -O MACH = -DBSD CFLAGS = -I../common -L../lib $(OPT) $(MACH) +METACFLAGS = -I../meta CC = cc @@ -28,7 +29,7 @@ all: $(PROGS) install: $(PROGS) $(LIBFILES) cp $(PROGS) $(INSTDIR) - cd $(LIBDIR) ; rm -f $(LIBFILES) + cd $(LIBDIR) && rm -f $(LIBFILES) cp $(LIBFILES) $(LIBDIR) clean: @@ -87,7 +88,7 @@ mgf2rad.o: mgf2rad.c mgflib/parser.h ../common/tmesh.h $(CC) $(CFLAGS) -c mgf2rad.c mgf2meta.o: mgf2meta.c mgflib/parser.h - $(CC) $(CFLAGS) -c mgf2meta.c + $(CC) $(CFLAGS) $(METACFLAGS) -c mgf2meta.c arch2rad.o trans.o: trans.h @@ -97,7 +98,8 @@ 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/rtmath.h ../common/rterror.h ../common/mat4.h \ +../common/fvect.h ../common/tifftypes.h obj2rad.o: trans.h