Mercurial > fem-fenics-eugenio
diff inst/private/generate_makefile.m @ 230:1a3674836579
Provide flags for just-in-time compilation
* src/configure.ac: add inst/private/get_vars.m as configured file
* inst/private/get_vars.m.in: a function returning proper compiler
or linker flags
* inst/provate/generate_makefile.m: use flags
* src/Makefile.in: add get_vars.m in the cleanall recipe
| author | Eugenio Gianniti <eugenio.gianniti@mail.polimi.it> |
|---|---|
| date | Fri, 13 Jun 2014 18:45:40 +0200 |
| parents | 8932e9cd8dd1 |
| children | 61830a4f9ab9 |
line wrap: on
line diff
--- a/inst/private/generate_makefile.m Thu Jun 05 19:50:52 2014 +0200 +++ b/inst/private/generate_makefile.m Fri Jun 13 18:45:40 2014 +0200 @@ -21,8 +21,8 @@ STRING ="\n\ DIR = @@PATH@@\n\ -CPPFLAGS+=\n\ -LIBS= -ldolfin\n\ +CPPFLAGS+=@@FF_CPPFLAGS@@ -g\n\ +LIBS+=@@FF_LIBS@@\n\ MKOCTFILE = mkoctfile\n\ FFC = ffc\n\ \n\ @@ -35,16 +35,16 @@ fun : @@UFL_NAME@@_Functional.oct\n\ \n\ @@UFL_NAME@@_FunctionSpace.oct: @@UFL_NAME@@.h @@UFL_NAME@@_FunctionSpace.cc\n\ - $(MKOCTFILE) @@UFL_NAME@@_FunctionSpace.cc -I$(DIR) -I. $(LDFLAGS) $(CPPFLAGS) $(LIBS)\n\ + CPPFLAGS='$(CPPFLAGS)' $(MKOCTFILE) @@UFL_NAME@@_FunctionSpace.cc -I$(DIR) -I. $(LDFLAGS) $(LIBS)\n\ \n\ @@UFL_NAME@@_BilinearForm.oct: @@UFL_NAME@@.h @@UFL_NAME@@_BilinearForm.cc\n\ - $(MKOCTFILE) @@UFL_NAME@@_BilinearForm.cc -I$(DIR) -I. $(LDFLAGS) $(CPPFLAGS) $(LIBS)\n\ + CPPFLAGS='$(CPPFLAGS)' $(MKOCTFILE) @@UFL_NAME@@_BilinearForm.cc -I$(DIR) -I. $(LDFLAGS) $(LIBS)\n\ \n\ @@UFL_NAME@@_LinearForm.oct: @@UFL_NAME@@.h @@UFL_NAME@@_LinearForm.cc\n\ - $(MKOCTFILE) @@UFL_NAME@@_LinearForm.cc -I$(DIR) -I. $(LDFLAGS) $(CPPFLAGS) $(LDFLAGS) $(LIBS)\n\ + CPPFLAGS='$(CPPFLAGS)' $(MKOCTFILE) @@UFL_NAME@@_LinearForm.cc -I$(DIR) -I. $(LDFLAGS) $(LIBS)\n\ \n\ @@UFL_NAME@@_Functional.oct: @@UFL_NAME@@.h @@UFL_NAME@@_Functional.cc\n\ - $(MKOCTFILE) @@UFL_NAME@@_Functional.cc -I$(DIR) -I. $(LDFLAGS) $(CPPFLAGS) $(LDFLAGS) $(LIBS)\n\ + CPPFLAGS='$(CPPFLAGS)' $(MKOCTFILE) @@UFL_NAME@@_Functional.cc -I$(DIR) -I. $(LDFLAGS) $(LIBS)\n\ \n\ @@UFL_NAME@@.h: @@UFL_NAME@@.ufl\n\ $(FFC) -l dolfin @@UFL_NAME@@.ufl\n\ @@ -61,6 +61,8 @@ STRING = strrep (STRING, "@@UFL_NAME@@", ufl_name); STRING = strrep (STRING, "@@PATH@@", path); +STRING = strrep (STRING, "@@FF_CPPFLAGS@@", get_vars ("CPPFLAGS")); +STRING = strrep (STRING, "@@FF_LIBS@@", get_vars ("LIBS")); fid = fopen (sprintf ("Makefile_%s", ufl_name), 'w'); if (fid >= 0)