Mercurial > fem-fenics-eugenio
diff src/Makefile.in @ 247:8ca45824938e
Add factories hierarchy for matrices' and vectors' assembly
| author | Eugenio Gianniti <eugenio.gianniti@mail.polimi.it> |
|---|---|
| date | Sat, 12 Jul 2014 12:30:13 +0200 |
| parents | e348b84ecb70 |
| children | b1dc98050634 |
line wrap: on
line diff
--- a/src/Makefile.in Sat Jun 28 16:22:13 2014 +0200 +++ b/src/Makefile.in Sat Jul 12 12:30:13 2014 +0200 @@ -17,6 +17,7 @@ MKOCTFILE ?= mkoctfile FFC ?= ffc +ARFLAGS=-r -s CPPFLAGS='@DENSE_CPPFLAGS@ @DOLFIN_CPPFLAGS@ @EIGEN_CPPFLAGS@ -I.' LIBS_RAW=@EIGEN_LIBS@ @DOLFIN_LIBS@ LIBS=$(patsubst %, "%", $(LIBS_RAW)) @@ -73,16 +74,18 @@ Function.o: Function.cc function.h CPPFLAGS=$(CPPFLAGS) $(MKOCTFILE) -c Function.cc -o $@ -assemble.oct: assemble.o - CPPFLAGS=$(CPPFLAGS) $(MKOCTFILE) assemble.o -o $@ $(LIBS) +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 +assemble.o: assemble.cc form.h boundarycondition.h femfenics_factory.h CPPFLAGS=$(CPPFLAGS) $(MKOCTFILE) -c assemble.cc -o $@ -assemble_system.oct: assemble_system.o - CPPFLAGS=$(CPPFLAGS) $(MKOCTFILE) assemble_system.o -o $@ $(LIBS) +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 +assemble_system.o: assemble_system.cc form.h boundarycondition.h femfenics_factory.h CPPFLAGS=$(CPPFLAGS) $(MKOCTFILE) -c assemble_system.cc -o $@ save.oct: save.o mkfunction @@ -130,8 +133,18 @@ interpolate.o: interpolate.cc function.h CPPFLAGS=$(CPPFLAGS) $(MKOCTFILE) -c interpolate.cc -o $@ +femfenics_factory.o: femfenics_factory.cc femfenics_factory.h femfenics_base_factory.h\ + uBLAS_factory.h + CPPFLAGS=$(CPPFLAGS) $(MKOCTFILE) -c $< -o $@ + +uBLAS_factory.o: uBLAS_factory.cc uBLAS_factory.h femfenics_base_factory.h + CPPFLAGS=$(CPPFLAGS) $(MKOCTFILE) -c $< -o $@ + +libfemfenics_factories.a: femfenics_factory.o uBLAS_factory.o + $(AR) $(ARFLAGS) $@ $^ + clean: - $(RM) *.o core octave-core *.oct *~ *.xml + $(RM) *.o core octave-core *.oct *~ *.xml *.a cleanall: $(RM) *.o core octave-core *.oct *~ *.xml *.status *.log \