Mercurial > fem-fenics-eugenio
diff inst/private/generate_mf_makefile.m @ 261:f22588ae37af
Improve template meshfunction implementation
* inst/import_meshfunction_type.m: provide to the auxiliary functions a type name and
a valid identifier
* inst/private/generate_mf_*.m: add space before closing angle bracket to avoid parse
errors
| author | Eugenio Gianniti <eugenio.gianniti@mail.polimi.it> |
|---|---|
| date | Thu, 07 Aug 2014 11:13:54 +0200 |
| parents | 1e2a9be8083a |
| children | 897e312cb440 |
line wrap: on
line diff
--- a/inst/private/generate_mf_makefile.m Wed Aug 06 19:52:03 2014 +0200 +++ b/inst/private/generate_mf_makefile.m Thu Aug 07 11:13:54 2014 +0200 @@ -18,7 +18,7 @@ ## function for internal usage only ## @end deftypefn -function output = generate_mf_makefile (typename, path) +function output = generate_mf_makefile (label, path) STRING ="\n\ DIR = @@PATH@@\n\ @@ -27,36 +27,36 @@ MKOCTFILE = mkoctfile\n\ FFC = ffc\n\ \n\ -OCTFILES = MeshFunction_@@TYPENAME@@.oct save_@@TYPENAME@@.oct\n\ +OCTFILES = MeshFunction_@@LABEL@@.oct save_@@LABEL@@.oct\n\ \n\ all : $(OCTFILES)\n\ \n\ -MeshFunction_@@TYPENAME@@.oct: MeshFunction_@@TYPENAME@@.cc \ - meshfunction_@@TYPENAME@@.h\n\ +MeshFunction_@@LABEL@@.oct: MeshFunction_@@LABEL@@.cc \ + meshfunction_@@LABEL@@.h\n\ CPPFLAGS='$(CPPFLAGS)' $(MKOCTFILE) $< -o $@ -I$(DIR) -I. $(LDFLAGS) $(LIBS)\n\ \n\ -save_@@TYPENAME@@.oct: save_@@TYPENAME@@.cc meshfunction_@@TYPENAME@@.h mkmfdir\n\ - CPPFLAGS='$(CPPFLAGS)' $(MKOCTFILE) $< -o @meshfunction_@@TYPENAME@@/save.oct\ +save_@@LABEL@@.oct: save_@@LABEL@@.cc meshfunction_@@LABEL@@.h mkmfdir\n\ + CPPFLAGS='$(CPPFLAGS)' $(MKOCTFILE) $< -o @meshfunction_@@LABEL@@/save.oct\ -I$(DIR) -I. $(LDFLAGS) $(LIBS)\n\ \n\ mkmfdir:\n\ - mkdir -p @meshfunction_@@TYPENAME@@\n\ + mkdir -p @meshfunction_@@LABEL@@\n\ \n\ .PHONY: clean\n\ \n\ clean:\n\ - $(RM) meshfunction_@@TYPENAME@@.h save_@@TYPENAME@@.o\n\ - $(RM) MeshFunction_@@TYPENAME@@.o MeshFunction_@@TYPENAME@@.cc\n\ - $(RM) save_@@TYPENAME@@.cc\n\ - $(RM) Makefile_@@TYPENAME@@\n\ + $(RM) meshfunction_@@LABEL@@.h save_@@LABEL@@.o\n\ + $(RM) MeshFunction_@@LABEL@@.o MeshFunction_@@LABEL@@.cc\n\ + $(RM) save_@@LABEL@@.cc\n\ + $(RM) Makefile_@@LABEL@@\n\ "; -STRING = strrep (STRING, "@@TYPENAME@@", typename); +STRING = strrep (STRING, "@@LABEL@@", label); STRING = strrep (STRING, "@@PATH@@", path); STRING = strrep (STRING, "@@FF_CPPFLAGS@@", get_vars ("CPPFLAGS")); STRING = strrep (STRING, "@@FF_LIBS@@", get_vars ("LIBS")); -fid = fopen (["Makefile_", typename], "w"); +fid = fopen (["Makefile_", label], "w"); if (is_valid_file_id (fid)) fputs (fid, STRING); output = fclose (fid);