diff options
| author | Ian Jauslin <ian.jauslin@roma1.infn.it> | 2015-10-07 12:51:41 +0000 |
|---|---|---|
| committer | Ian Jauslin <ian.jauslin@roma1.infn.it> | 2015-10-07 13:00:23 +0000 |
| commit | 469bdc80712dbf9c12562059dc4594620b59a076 (patch) | |
| tree | c6da40a884899110d102d82a7a778f2b3afae702 /Makefile | |
| parent | e7aa6859f08565d58684fa4b9c40fed716f0ba17 (diff) | |
Support MPFR floats in numkondov1.4
Remove '-D' option (error tolerance) in numkondo
Diffstat (limited to 'Makefile')
| -rw-r--r-- | Makefile | 20 |
1 files changed, 10 insertions, 10 deletions
@@ -18,7 +18,7 @@ # if static=1 then link libkondo statically but other libraries dynamically STATIC=1 -VERSION=1.3.1 +VERSION=1.4 # products of the compilation PROJECT_BINS= meankondo numkondo meantools kondo_preprocess meantools-convert @@ -62,9 +62,9 @@ SRCDIR=./src OBJDIR=./objs # objects -LIBKONDO_OBJS = $(addprefix $(OBJDIR)/,array.o cli_parser.o coefficient.o fields.o grouped_polynomial.o idtable.o istring.o number.o parse_file.o polynomial.o rational_float.o rational_int.o rcc.o tools.o) +LIBKONDO_OBJS = $(addprefix $(OBJDIR)/,array.o cli_parser.o coefficient.o fields.o grouped_polynomial.o idtable.o istring.o number.o parse_file.o polynomial.o rational_float.o rational_int.o rcc.o rcc_mpfr.o tools.o) MEANKONDO_OBJS = $(addprefix $(OBJDIR)/,meankondo.o mean.o) -NUMKONDO_OBJS = $(addprefix $(OBJDIR)/,numkondo.o flow.o) +NUMKONDO_OBJS = $(addprefix $(OBJDIR)/,numkondo.o flow.o flow_mpfr.o) MEANTOOLS_OBJS = $(addprefix $(OBJDIR)/,meantools.o meantools_exp.o meantools_deriv.o meantools_eval.o) KONDO_PP_OBJS = $(addprefix $(OBJDIR)/,kondo_preprocess.o kondo.o) @@ -78,8 +78,8 @@ XTRA_LIBS= ifeq ($(STATIC),1) # compile libkondo.a PREREQ=static - # libkondo is linked against libm - XTRA_LIBS=-lm + # libkondo is linked against libm, libmpfr and libgmp + XTRA_LIBS=-lm -lmpfr -lgmp # link binaries using the static library LIBKONDO_FLAG=-l:libkondo.a # install static lib @@ -87,8 +87,8 @@ ifeq ($(STATIC),1) else ifeq ($(STATIC),2) # compile libkondo.a PREREQ=static - # libkondo is linked against libm - XTRA_LIBS=-lm + # libkondo is linked against libm, libmpfr and libgmp + XTRA_LIBS=-lm -lmpfr -lgmp # link binaries statically override LDFLAGS += -static INSTALLLIB=install-static @@ -119,17 +119,17 @@ libkondo.a: $(LIBKONDO_OBJS) $(AR) -rc $(BUILDDIR)/lib/$@ $^ libkondo.so.$(VERSION): $(LIBKONDO_OBJS) - $(LD) -shared -lm $(LDFLAGS) -o $(BUILDDIR)/lib/$@ $^ + $(LD) -shared -lm -lmpfr -lgmp $(LDFLAGS) -o $(BUILDDIR)/lib/$@ $^ ln -fs ./libkondo.so.$(VERSION) $(BUILDDIR)/lib/libkondo.so meankondo: $(MEANKONDO_OBJS) $(LD) -L$(BUILDDIR)/lib $(LDFLAGS) -o $(BUILDDIR)/bin/$@ $^ $(LIBKONDO_FLAG) -lpthread $(XTRA_LIBS) numkondo: $(NUMKONDO_OBJS) - $(LD) -L$(BUILDDIR)/lib $(LDFLAGS) -o $(BUILDDIR)/bin/$@ $^ $(LIBKONDO_FLAG) -lm $(XTRA_LIBS) + $(LD) -L$(BUILDDIR)/lib $(LDFLAGS) -o $(BUILDDIR)/bin/$@ $^ $(LIBKONDO_FLAG) -lm -lmpfr -lgmp $(XTRA_LIBS) meantools: $(MEANTOOLS_OBJS) - $(LD) -L$(BUILDDIR)/lib $(LDFLAGS) -o $(BUILDDIR)/bin/$@ $^ $(LIBKONDO_FLAG) $(XTRA_LIBS) + $(LD) -L$(BUILDDIR)/lib $(LDFLAGS) -o $(BUILDDIR)/bin/$@ $^ $(LIBKONDO_FLAG) -lmpfr -lgmp $(XTRA_LIBS) meantools-convert: cp scripts/meantools-convert $(BUILDDIR)/bin/ |