Mercurial > fem-fenics-eugenio

diff src/Makefile.in @ 253:5e9b5bbdc56b

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Support both DOLFIN 1.3.0 and 1.4.0 * src/dolfin_compat.h: use a macro to set the correct shared_ptr (std or boost)
author Eugenio Gianniti <eugenio.gianniti@mail.polimi.it>
date Tue, 29 Jul 2014 18:05:56 +0200
parents 7f33554e439a
children 072aee55bb75
line wrap: on
line diff
--- a/src/Makefile.in	Tue Jul 29 17:11:59 2014 +0200
+++ b/src/Makefile.in	Tue Jul 29 18:05:56 2014 +0200
@@ -53,7 +53,7 @@
 Mesh.oct: Mesh.o
 	CPPFLAGS=$(CPPFLAGS) $(MKOCTFILE) Mesh.o -o $@ $(LIBS)
 
-Mesh.o: Mesh.cc mesh.h
+Mesh.o: Mesh.cc mesh.h dolfin_compat.h
 	CPPFLAGS=$(CPPFLAGS) $(MKOCTFILE) -c Mesh.cc -o $@
 
 fem_get_mesh.oct: fem_get_mesh.o
@@ -65,7 +65,7 @@
 DirichletBC.oct: DirichletBC.o
 	CPPFLAGS=$(CPPFLAGS) $(MKOCTFILE) DirichletBC.o -o $@ $(LIBS)
 
-DirichletBC.o: DirichletBC.cc functionspace.h boundarycondition.h expression.h
+DirichletBC.o: DirichletBC.cc functionspace.h boundarycondition.h expression.h dolfin_compat.h
 	CPPFLAGS=$(CPPFLAGS) $(MKOCTFILE) -c DirichletBC.cc -o $@
 
 Expression.oct: Expression.o
@@ -77,27 +77,27 @@
 Function.oct: Function.o
 	CPPFLAGS=$(CPPFLAGS) $(MKOCTFILE) Function.o -o $@ $(LIBS)
 
-Function.o: Function.cc function.h
+Function.o: Function.cc function.h dolfin_compat.h
 	CPPFLAGS=$(CPPFLAGS) $(MKOCTFILE) -c Function.cc -o $@
 
 assemble.oct: assemble.o libfemfenics_factories.a
 	CPPFLAGS=$(CPPFLAGS) $(MKOCTFILE) assemble.o -o $@ \
     libfemfenics_factories.a $(LIBS)
 
-assemble.o: assemble.cc form.h boundarycondition.h femfenics_factory.h
+assemble.o: assemble.cc form.h boundarycondition.h femfenics_factory.h dolfin_compat.h
 	CPPFLAGS=$(CPPFLAGS) $(MKOCTFILE) -c assemble.cc -o $@
 
 assemble_system.oct: assemble_system.o libfemfenics_factories.a
 	CPPFLAGS=$(CPPFLAGS) $(MKOCTFILE) assemble_system.o -o $@ \
     libfemfenics_factories.a $(LIBS)
 
-assemble_system.o: assemble_system.cc form.h boundarycondition.h femfenics_factory.h
+assemble_system.o: assemble_system.cc form.h boundarycondition.h femfenics_factory.h dolfin_compat.h
 	CPPFLAGS=$(CPPFLAGS) $(MKOCTFILE) -c assemble_system.cc -o $@
 
 save.oct: save.o mkfunction
 	CPPFLAGS=$(CPPFLAGS) $(MKOCTFILE) save.o -o ./@function/save.oct $(LIBS)
 
-save.o: save.cc 
+save.o: save.cc dolfin_compat.h
 	CPPFLAGS=$(CPPFLAGS) $(MKOCTFILE) -c save.cc -o $@
 
 mkfunction:
@@ -109,7 +109,7 @@
 plot_mesh.oct: plot_mesh.o mkmesh
 	CPPFLAGS=$(CPPFLAGS) $(MKOCTFILE) plot_mesh.o -o ./@mesh/plot.oct $(LIBS)
 
-plot_mesh.o: plot_mesh.cc Plot_2d.h mesh.h Plot_3d.h
+plot_mesh.o: plot_mesh.cc Plot_2d.h mesh.h Plot_3d.h dolfin_compat.h
 	CPPFLAGS=$(CPPFLAGS) $(MKOCTFILE) -c plot_mesh.cc -o $@
 
 Plot_2d.h: Plot_2d.ufl
@@ -121,22 +121,22 @@
 plot_func.oct: plot_func.o mkfunction
 	CPPFLAGS=$(CPPFLAGS) $(MKOCTFILE) plot_func.o -o ./@function/plot.oct $(LIBS)
 
-plot_func.o: plot_func.cc Plot_2d.h mesh.h Plot_3d.h
+plot_func.o: plot_func.cc Plot_2d.h mesh.h Plot_3d.h dolfin_compat.h
 	CPPFLAGS=$(CPPFLAGS) $(MKOCTFILE) -c plot_func.cc -o $@
 
-SubSpace.oct: SubSpace.cc functionspace.h
+SubSpace.oct: SubSpace.cc functionspace.h dolfin_compat.h
 	CPPFLAGS=$(CPPFLAGS) $(MKOCTFILE) -I. SubSpace.cc $(LIBS)
 
 feval.oct: feval.o mkfunction
 	CPPFLAGS=$(CPPFLAGS) $(MKOCTFILE) feval.o -o ./@function/feval.oct $(LIBS)
 
-feval.o: feval.cc function.h
+feval.o: feval.cc function.h dolfin_compat.h
 	CPPFLAGS=$(CPPFLAGS) $(MKOCTFILE) -c feval.cc -o $@
 
 interpolate.oct: interpolate.o
 	CPPFLAGS=$(CPPFLAGS) $(MKOCTFILE) interpolate.o -o $@ $(LIBS)
 
-interpolate.o: interpolate.cc function.h
+interpolate.o: interpolate.cc function.h dolfin_compat.h
 	CPPFLAGS=$(CPPFLAGS) $(MKOCTFILE) -c interpolate.cc -o $@
 
 femfenics_factory.o: femfenics_factory.cc femfenics_factory.h femfenics_base_factory.h\