Mercurial > fem-fenics-eugenio

diff inst/generate_makefile.m @ 82:5a4371f45fc4

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Create the corresponding function following new naming convention.
author gedeone-octave <marcovass89@hotmail.it>
date Sat, 03 Aug 2013 14:45:57 +0200
parents 4ef8dbafcdfc
children 50753c3cb0b6
line wrap: on
line diff
--- a/inst/generate_makefile.m	Sat Aug 03 14:44:07 2013 +0200
+++ b/inst/generate_makefile.m	Sat Aug 03 14:45:57 2013 +0200
@@ -8,30 +8,21 @@
 MKOCTFILE = mkoctfile\n\
 FFC = ffc\n\
 \n\
-OCTFILES = fem_fs_@@UFL_NAME@@.oct fem_rhs_@@UFL_NAME@@.oct fem_lhs_@@UFL_NAME@@.oct\n\
+OCTFILES = @@UFL_NAME@@_FunctionSpace.oct @@UFL_NAME@@_BilinearForm.oct @@UFL_NAME@@_LinearForm.oct\n\
 \n\
 all : $(OCTFILES)\n\
-fs : fem_fs_@@UFL_NAME@@.oct\n\
-rhs : fem_rhs_@@UFL_NAME@@.oct\n\
-lhs : fem_lhs_@@UFL_NAME@@.oct\n\
-\n\
-fem_fs_@@UFL_NAME@@.o: fem_fs_@@UFL_NAME@@.cc\n\
-	$(MKOCTFILE) -I$(DIR) -I. $(CPPFLAGS) $(LDFLAGS) $< -c $@\n\
-\n\
-fem_fs_@@UFL_NAME@@.oct: @@UFL_NAME@@.h fem_fs_@@UFL_NAME@@.o\n\
-	$(MKOCTFILE) -s fem_fs_@@UFL_NAME@@.o $(DIR)fem_init_env.o $(LDFLAGS) $(LIBS) -o $@\n\
+fs : @@UFL_NAME@@_FunctionSpace.oct\n\
+rhs : @@UFL_NAME@@_BilinearForm.oct\n\
+lhs : @@UFL_NAME@@_LinearForm.oct\n\
 \n\
-fem_rhs_@@UFL_NAME@@.o: fem_rhs_@@UFL_NAME@@.cc\n\
-	$(MKOCTFILE) -I$(DIR) -I. $(LDFLAGS) $(CPPFLAGS) $< -c $@\n\
-\n\
-fem_rhs_@@UFL_NAME@@.oct: @@UFL_NAME@@.h fem_rhs_@@UFL_NAME@@.o\n\
-	$(MKOCTFILE) -s fem_rhs_@@UFL_NAME@@.o $(DIR)fem_init_env.o $(LDFLAGS) $(LIBS) -o $@\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\
 \n\
-fem_lhs_@@UFL_NAME@@.o: fem_lhs_@@UFL_NAME@@.cc\n\
-	$(MKOCTFILE) -I$(DIR) -I. $(LDFLAGS) $(CPPFLAGS) $< -c $@\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\
 \n\
-fem_lhs_@@UFL_NAME@@.oct: @@UFL_NAME@@.h fem_lhs_@@UFL_NAME@@.o\n\
-	$(MKOCTFILE) -s fem_lhs_@@UFL_NAME@@.o $(DIR)fem_init_env.o $(LDFLAGS) $(LIBS) -o $@\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\
 \n\
 @@UFL_NAME@@.h: @@UFL_NAME@@.ufl\n\
 	$(FFC) -l dolfin @@UFL_NAME@@.ufl\n\
@@ -39,9 +30,9 @@
 .PHONY: clean\n\
 \n\
 clean:\n\
-	 rm -f fem_fs_@@UFL_NAME@@.o fem_fs_@@UFL_NAME@@.cc @@UFL_NAME@@.h\n\
-	 rm -f fem_rhs_@@UFL_NAME@@.o fem_rhs_@@UFL_NAME@@.cc\n\
-	 rm -f fem_lhs_@@UFL_NAME@@.o fem_lhs_@@UFL_NAME@@.cc\n\
+	 rm -f @@UFL_NAME@@_FunctionSpace.o @@UFL_NAME@@_FunctionSpace.cc @@UFL_NAME@@.h\n\
+	 rm -f @@UFL_NAME@@_BilinearForm.o @@UFL_NAME@@_BilinearForm.cc\n\
+	 rm -f @@UFL_NAME@@_LinearForm.o @@UFL_NAME@@_LinearForm.cc\n\
 	 rm -f Makefile_@@UFL_NAME@@\n\
 ";