Mercurial > fem-fenics-eugenio

changeset 27:cb21a4ac2314

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Compile also new class and functions available. * configure.ac: check also for the presence of ffc
author gedeone-octave <marco.vassallo@outlook.com>
date Mon, 15 Jul 2013 16:55:45 +0200
parents d6e600fa8116
children 82660c13123c
files src/Makefile.in src/configure.ac
diffstat 2 files changed, 27 insertions(+), 16 deletions(-) [+]
line wrap: on
line diff
--- a/src/Makefile.in	Mon Jul 15 16:32:21 2013 +0200
+++ b/src/Makefile.in	Mon Jul 15 16:55:45 2013 +0200
@@ -1,48 +1,53 @@
 MKOCTFILE ?= mkoctfile
 
-OCTFILES=fem_init_env.oct fem_init_mesh.oct fem_get_mesh.oct fem_fs.oct
-LIBS = 
+OCTFILES=fem_init_env.oct fem_init_mesh.oct fem_get_mesh.oct fem_fs.oct fem_bc.oct
 
-HAVE_DOLFIN_H = @HAVE_DOLFIN_H@
-ifdef HAVE_DOLFIN_H
-  CPPFLAGS += -DHAVE_DOLFIN_H
-  LIBS += -ldolfin
-endif
+LIBS += -ldolfin
+
 
 all: $(OCTFILES)
 
 fem_init_env.oct: fem_init_env.o
 	$(MKOCTFILE) $(CPPFLAGS) -s fem_init_env.o -o $@ $(LDFLAGS) $(LIBS)
 
-fem_init_env.o:  fem_init_env.cc mesh.h functionspace.h
+fem_init_env.o:  fem_init_env.cc mesh.h functionspace.h boundarycondition.h
 	$(MKOCTFILE) $(CPPFLAGS) -c fem_init_env.cc $(LDFLAGS) -o $@ -I.
 
-fem_init_mesh.oct:  mesh.o fem_init_mesh.o fem_init_env.o
+fem_init_mesh.oct: mesh.o fem_init_mesh.o fem_init_env.o
 	$(MKOCTFILE) $(CPPFLAGS) -s mesh.o fem_init_env.o fem_init_mesh.o -o $@ $(LDFLAGS) $(LIBS)
 
-mesh.o:  mesh.cc mesh.h
+mesh.o: mesh.cc mesh.h
 	$(MKOCTFILE) $(CPPFLAGS) -c mesh.cc $(LDFLAGS) -o $@ -I.
 
-fem_init_mesh.o:  fem_init_mesh.cc mesh.cc mesh.h
+fem_init_mesh.o: fem_init_mesh.cc mesh.cc mesh.h
 	$(MKOCTFILE) $(CPPFLAGS) -c fem_init_mesh.cc $(LDFLAGS) -o $@ -I.
 
-fem_get_mesh.oct:  mesh.o fem_get_mesh.o fem_init_env.o
+fem_get_mesh.oct: mesh.o fem_get_mesh.o fem_init_env.o
 	$(MKOCTFILE) $(CPPFLAGS) -s mesh.o fem_init_env.o fem_get_mesh.o -o $@ $(LDFLAGS) $(LIBS)
 
-fem_get_mesh.o:  fem_get_mesh.cc mesh.o
+fem_get_mesh.o: fem_get_mesh.cc mesh.o
 	$(MKOCTFILE) $(CPPFLAGS) -c fem_get_mesh.cc $(LDFLAGS) -o $@ -I.
 
-fem_fs.oct:  mesh.o fem_fs.o fem_init_env.o
+fem_fs.oct: mesh.o fem_fs.o fem_init_env.o
 	$(MKOCTFILE) $(CPPFLAGS) -s mesh.o fem_init_env.o fem_fs.o -o $@ $(LDFLAGS) $(LIBS)
 
-fem_fs.o:  fem_fs.cc functionspace.h
+fem_fs.o: fem_fs.cc functionspace.h Laplace.h
 	$(MKOCTFILE) $(CPPFLAGS) -c fem_fs.cc $(LDFLAGS) -o $@ -I.
 
+fem_bc.oct: fem_bc.o fem_init_env.o
+	$(MKOCTFILE) $(CPPFLAGS) -s fem_init_env.o fem_bc.o -o $@ $(LDFLAGS) $(LIBS)
+
+fem_bc.o: fem_bc.cc functionspace.h boundarycondition.h expression.h
+	$(MKOCTFILE) $(CPPFLAGS) -c fem_bc.cc $(LDFLAGS) -o $@ -I.
+
+Laplace.h: Laplace.ufl
+	ffc -l dolfin Laplace.ufl
+
 clean:
 	-rm -f *.o core octave-core *.oct *~ *.xml
 
 cleanall:
-	-rm -f *.o core octave-core *.oct *~ *.xml *.status *.log octave-workspace configure
+	-rm -f *.o core octave-core *.oct *~ *.xml *.status *.log octave-workspace configure Laplace.h
 	-rm -r autom4te.cache
 	-rm -f Makefile
 
--- a/src/configure.ac	Mon Jul 15 16:32:21 2013 +0200
+++ b/src/configure.ac	Mon Jul 15 16:55:45 2013 +0200
@@ -12,5 +12,11 @@
 AC_CHECK_HEADERS([dolfin.h], [ ],
   [AC_MSG_ERROR([dolfin required to install $PACKAGE_NAME])]
 )
+
+AC_CHECK_PROG([HAVE_FFC], [ffc], [yes], [no])
+if [test $HAVE_FFC = "no"]; then
+  AC_MSG_ERROR([ffc required to install $PACKAGE_NAME])
+fi
+
 AC_CONFIG_FILES([Makefile])
 AC_OUTPUT