--- ray/src/meta/Rmakefile 2014/04/26 15:59:38 1.14 +++ ray/src/meta/Rmakefile 2021/04/07 17:03:13 1.17 @@ -1,4 +1,4 @@ -# RCSid: $Id: Rmakefile,v 1.14 2014/04/26 15:59:38 greg Exp $ +# RCSid: $Id: Rmakefile,v 1.17 2021/04/07 17:03:13 greg Exp $ # # Compiles: # @@ -6,6 +6,7 @@ OPT = -O MACH = CC = cc +AR = ar MLIB = -lm CFLAGS = -DMDIR=\"$(MLIBDIR)/\" $(OPT) $(MACH) -I../common -L../lib @@ -23,11 +24,17 @@ PROGS = $(DESTDIR)/meta2tga $(DESTDIR)/pexpand $(DESTD $(DESTDIR)/dgraph $(DESTDIR)/gcomp $(DESTDIR)/plot4 \ $(DESTDIR)/meta2bmp +LIBS = symbols.met vchars.met boxw.plt curve.plt line.plt scatter.plt \ + cartesian.plt function.plt polar.plt standard.plt + # global targets all: $(PROGS) -install: $(PROGS) +install: $(PROGS) $(LIBS) cp $(PROGS) $(INSTDIR) + cp -f $(LIBS) $(MLIBDIR) + ./cv symbols.met > $(MLIBDIR)/symbols.mta + ./cv vchars.met > $(MLIBDIR)/vchars.mta clean: set nonomatch; rm -f *.o $(PROGS) @@ -81,7 +88,7 @@ $(DESTDIR)/mtext: mtext.o primout.o $(CC) $(CFLAGS) -o mtext mtext.o primout.o $(common) -lrtrad ../lib/libmeta.a: metacalls.o primout.o progname.o - ar rc ../lib/libmeta.a metacalls.o primout.o \ + $(AR) rc ../lib/libmeta.a metacalls.o primout.o \ $(common) progname.o -ranlib ../lib/libmeta.a