From: Wolfgang Bangerth Date: Fri, 6 Mar 1998 07:52:10 +0000 (+0000) Subject: Update make files. X-Git-Tag: v8.0.0~23229 X-Git-Url: https://gitweb.dealii.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=74f1cfa5c7746e5ecbc73e4b356ba70a5cb8310d;p=dealii.git Update make files. git-svn-id: https://svn.dealii.org/trunk@22 0785d39b-7218-0410-832d-ea1e28bc413d --- diff --git a/deal.II/deal.II/source/dofs/dof_constraints.cc b/deal.II/deal.II/source/dofs/dof_constraints.cc index 5a605d070d..682d8b71fa 100644 --- a/deal.II/deal.II/source/dofs/dof_constraints.cc +++ b/deal.II/deal.II/source/dofs/dof_constraints.cc @@ -3,7 +3,7 @@ #include #include -#include "../deal/dsmatrix.h" +#include #include diff --git a/deal.II/deal.II/source/dofs/dof_handler.cc b/deal.II/deal.II/source/dofs/dof_handler.cc index 893568e8a1..ef6bf77ba5 100644 --- a/deal.II/deal.II/source/dofs/dof_handler.cc +++ b/deal.II/deal.II/source/dofs/dof_handler.cc @@ -6,7 +6,7 @@ #include #include #include -#include "../deal/dsmatrix.h" +#include #include #include diff --git a/deal.II/deal.II/source/fe/Makefile b/deal.II/deal.II/source/fe/Makefile index aa2591854a..0e63b3c670 100644 --- a/deal.II/deal.II/source/fe/Makefile +++ b/deal.II/deal.II/source/fe/Makefile @@ -1,8 +1,12 @@ # $Id$ -CXX =c++ -CXXFLAGS.g=-DDEBUG -g -Wall -pedantic -Wconversion -Winline -Woverloaded-virtual -I../../include -CXXFLAGS =-O3 -Wuninitialized -finline-functions -ffast-math -funroll-loops -felide-constructors -fnonnull-objects -I../../include +CXX = c++ +INCLUDE = -I../../include -I../../../lac/include \ + -I../../../base/include -I../../../mia/include +CXXFLAGS.g= -DDEBUG -g -Wall -pedantic -Wconversion \ + -Winline -Woverloaded-virtual $(INCLUDE) +CXXFLAGS =-O3 -Wuninitialized -finline-functions -ffast-math \ + -funroll-loops -felide-constructors -fnonnull-objects $(INCLUDE) ifeq ($(shell uname),SunOS) CXXFLAGS := -V2.7.2.3 $(CXXFLAGS) @@ -28,9 +32,9 @@ h-files = $(wildcard ../include/*/*.h) lib: lib.g.a lib.a -lib.a: ../../lib/libbasic.a($(o-files)) +lib.a: ../../lib/libfe.a($(o-files)) -lib.g.a: ../../lib/libbasic.g.a($(go-files)) +lib.g.a: ../../lib/libfe.g.a($(go-files)) clean: rm -f *.o *.go *~ Makefile.dep @@ -48,15 +52,11 @@ clean: # #use perl to generate rules for the .go files as well #as to make rules not for tria.o and the like, but -#rather for libbasic.a(tria.o) +#rather for libfe.a(tria.o) Makefile.dep: $(cc-files) $(h-files) @echo ============================ Remaking Makefile - @$(CXX) -I../../include -DDEBUG -M *.cc > Makefile.dep.o - @cp Makefile.dep.o Makefile.dep.go - @perl -pi -e 's!^(.*\.o):!../../lib/libbasic.a(\1):!g' Makefile.dep.o - @perl -pi -e 's!\.o:!.go:!g' Makefile.dep.go - @perl -pi -e 's!^(.*\.go):!../../lib/libbasic.g.a(\1):!g' Makefile.dep.go - @cat Makefile.dep.o Makefile.dep.go > Makefile.dep - @rm Makefile.dep.o Makefile.dep.go + perl ../../Make_dep.pl ../../lib/libfe $(INCLUDE) $(cc-files) \ + > Makefile.dep + include Makefile.dep diff --git a/deal.II/deal.II/source/fe/Makefile.dep b/deal.II/deal.II/source/fe/Makefile.dep deleted file mode 100644 index 9866009022..0000000000 --- a/deal.II/deal.II/source/fe/Makefile.dep +++ /dev/null @@ -1,176 +0,0 @@ -../../lib/libbasic.a(fe.o): fe.cc ../../include/fe/fe.h ../../include/../deal/dfmatrix.h \ - /usr/include/stdio.h /usr/include/sys/feature_tests.h \ - /usr/include/sys/va_list.h ../../include/../deal/dvector.h \ - ../../include/../deal/types.h /usr/include/stdlib.h \ - ../../include/../deal/errors.h ../../include/../deal/vectorbase.h \ - ../../include/../deal/ivector.h ../../include/grid/point.h \ - ../../include/basic/exceptions.h /usr/local/include/g++/iostream.h \ - /usr/local/include/g++/streambuf.h /usr/local/include/g++/libio.h \ - /usr/local/lib/g++-include/_G_config.h ../../include/grid/tria.h \ - /usr/local/include/g++/vector.h /usr/local/include/g++/algobase.h \ - /usr/local/include/g++/pair.h /usr/local/include/g++/stl_config.h \ - /usr/local/include/g++/stl_relops.h /usr/local/include/g++/stl_pair.h \ - /usr/local/include/g++/iterator.h /usr/local/include/g++/function.h \ - /usr/local/lib/gcc-lib/sparc-sun-solaris2.5.1/2.8.0/include/stddef.h \ - /usr/local/include/g++/stl_function.h \ - /usr/local/include/g++/stl_iterator.h \ - /usr/local/include/g++/type_traits.h \ - /usr/local/include/g++/stl_construct.h \ - /usr/local/lib/g++-include/new.h /usr/local/lib/g++-include/std/new.h \ - /usr/local/lib/g++-include/std/cstddef.h \ - /usr/local/include/g++/stl_raw_storage_iter.h \ - /usr/local/include/g++/stl_algobase.h /usr/include/string.h \ - /usr/local/lib/gcc-lib/sparc-sun-solaris2.5.1/2.8.0/include/limits.h \ - /usr/local/lib/gcc-lib/sparc-sun-solaris2.5.1/2.8.0/include/syslimits.h \ - /usr/include/limits.h /usr/include/sys/isa_defs.h \ - /usr/local/include/g++/stl_uninitialized.h \ - /usr/local/include/g++/alloc.h /usr/local/include/g++/stl_alloc.h \ - /usr/local/sparc-sun-solaris2.5.1/include/assert.h \ - /usr/local/include/g++/stl_vector.h ../../include/grid/tria_line.h \ - ../../include/grid/tria_quad.h ../../include/grid/tria_boundary.h \ - ../../include/fe/quadrature.h -../../lib/libbasic.a(fe_lib.o): fe_lib.cc ../../include/fe/fe_lib.h ../../include/fe/fe.h \ - ../../include/../deal/dfmatrix.h /usr/include/stdio.h \ - /usr/include/sys/feature_tests.h /usr/include/sys/va_list.h \ - ../../include/../deal/dvector.h ../../include/../deal/types.h \ - /usr/include/stdlib.h ../../include/../deal/errors.h \ - ../../include/../deal/vectorbase.h ../../include/../deal/ivector.h \ - ../../include/grid/point.h ../../include/basic/exceptions.h \ - /usr/local/include/g++/iostream.h /usr/local/include/g++/streambuf.h \ - /usr/local/include/g++/libio.h /usr/local/lib/g++-include/_G_config.h \ - ../../include/grid/tria.h /usr/local/include/g++/vector.h \ - /usr/local/include/g++/algobase.h /usr/local/include/g++/pair.h \ - /usr/local/include/g++/stl_config.h \ - /usr/local/include/g++/stl_relops.h /usr/local/include/g++/stl_pair.h \ - /usr/local/include/g++/iterator.h /usr/local/include/g++/function.h \ - /usr/local/lib/gcc-lib/sparc-sun-solaris2.5.1/2.8.0/include/stddef.h \ - /usr/local/include/g++/stl_function.h \ - /usr/local/include/g++/stl_iterator.h \ - /usr/local/include/g++/type_traits.h \ - /usr/local/include/g++/stl_construct.h \ - /usr/local/lib/g++-include/new.h /usr/local/lib/g++-include/std/new.h \ - /usr/local/lib/g++-include/std/cstddef.h \ - /usr/local/include/g++/stl_raw_storage_iter.h \ - /usr/local/include/g++/stl_algobase.h /usr/include/string.h \ - /usr/local/lib/gcc-lib/sparc-sun-solaris2.5.1/2.8.0/include/limits.h \ - /usr/local/lib/gcc-lib/sparc-sun-solaris2.5.1/2.8.0/include/syslimits.h \ - /usr/include/limits.h /usr/include/sys/isa_defs.h \ - /usr/local/include/g++/stl_uninitialized.h \ - /usr/local/include/g++/alloc.h /usr/local/include/g++/stl_alloc.h \ - /usr/local/sparc-sun-solaris2.5.1/include/assert.h \ - /usr/local/include/g++/stl_vector.h ../../include/grid/tria_line.h \ - ../../include/grid/tria_quad.h ../../include/grid/tria_boundary.h -../../lib/libbasic.a(quadrature_lib.o): quadrature_lib.cc ../../include/fe/quadrature_lib.h \ - ../../include/fe/quadrature.h ../../include/grid/point.h \ - ../../include/basic/exceptions.h /usr/local/include/g++/iostream.h \ - /usr/local/include/g++/streambuf.h /usr/local/include/g++/libio.h \ - /usr/local/lib/g++-include/_G_config.h \ - /usr/local/include/g++/vector.h /usr/local/include/g++/algobase.h \ - /usr/local/include/g++/pair.h /usr/local/include/g++/stl_config.h \ - /usr/local/include/g++/stl_relops.h /usr/local/include/g++/stl_pair.h \ - /usr/local/include/g++/iterator.h /usr/local/include/g++/function.h \ - /usr/local/lib/gcc-lib/sparc-sun-solaris2.5.1/2.8.0/include/stddef.h \ - /usr/local/include/g++/stl_function.h \ - /usr/local/include/g++/stl_iterator.h \ - /usr/local/include/g++/type_traits.h \ - /usr/local/include/g++/stl_construct.h \ - /usr/local/lib/g++-include/new.h /usr/local/lib/g++-include/std/new.h \ - /usr/local/lib/g++-include/std/cstddef.h \ - /usr/local/include/g++/stl_raw_storage_iter.h \ - /usr/local/include/g++/stl_algobase.h /usr/include/string.h \ - /usr/include/sys/feature_tests.h \ - /usr/local/lib/gcc-lib/sparc-sun-solaris2.5.1/2.8.0/include/limits.h \ - /usr/local/lib/gcc-lib/sparc-sun-solaris2.5.1/2.8.0/include/syslimits.h \ - /usr/include/limits.h /usr/include/sys/isa_defs.h \ - /usr/include/stdlib.h /usr/local/include/g++/stl_uninitialized.h \ - /usr/local/include/g++/alloc.h /usr/local/include/g++/stl_alloc.h \ - /usr/local/sparc-sun-solaris2.5.1/include/assert.h \ - /usr/local/include/g++/stl_vector.h -../../lib/libbasic.g.a(fe.go): fe.cc ../../include/fe/fe.h ../../include/../deal/dfmatrix.h \ - /usr/include/stdio.h /usr/include/sys/feature_tests.h \ - /usr/include/sys/va_list.h ../../include/../deal/dvector.h \ - ../../include/../deal/types.h /usr/include/stdlib.h \ - ../../include/../deal/errors.h ../../include/../deal/vectorbase.h \ - ../../include/../deal/ivector.h ../../include/grid/point.h \ - ../../include/basic/exceptions.h /usr/local/include/g++/iostream.h \ - /usr/local/include/g++/streambuf.h /usr/local/include/g++/libio.h \ - /usr/local/lib/g++-include/_G_config.h ../../include/grid/tria.h \ - /usr/local/include/g++/vector.h /usr/local/include/g++/algobase.h \ - /usr/local/include/g++/pair.h /usr/local/include/g++/stl_config.h \ - /usr/local/include/g++/stl_relops.h /usr/local/include/g++/stl_pair.h \ - /usr/local/include/g++/iterator.h /usr/local/include/g++/function.h \ - /usr/local/lib/gcc-lib/sparc-sun-solaris2.5.1/2.8.0/include/stddef.h \ - /usr/local/include/g++/stl_function.h \ - /usr/local/include/g++/stl_iterator.h \ - /usr/local/include/g++/type_traits.h \ - /usr/local/include/g++/stl_construct.h \ - /usr/local/lib/g++-include/new.h /usr/local/lib/g++-include/std/new.h \ - /usr/local/lib/g++-include/std/cstddef.h \ - /usr/local/include/g++/stl_raw_storage_iter.h \ - /usr/local/include/g++/stl_algobase.h /usr/include/string.h \ - /usr/local/lib/gcc-lib/sparc-sun-solaris2.5.1/2.8.0/include/limits.h \ - /usr/local/lib/gcc-lib/sparc-sun-solaris2.5.1/2.8.0/include/syslimits.h \ - /usr/include/limits.h /usr/include/sys/isa_defs.h \ - /usr/local/include/g++/stl_uninitialized.h \ - /usr/local/include/g++/alloc.h /usr/local/include/g++/stl_alloc.h \ - /usr/local/sparc-sun-solaris2.5.1/include/assert.h \ - /usr/local/include/g++/stl_vector.h ../../include/grid/tria_line.h \ - ../../include/grid/tria_quad.h ../../include/grid/tria_boundary.h \ - ../../include/fe/quadrature.h -../../lib/libbasic.g.a(fe_lib.go): fe_lib.cc ../../include/fe/fe_lib.h ../../include/fe/fe.h \ - ../../include/../deal/dfmatrix.h /usr/include/stdio.h \ - /usr/include/sys/feature_tests.h /usr/include/sys/va_list.h \ - ../../include/../deal/dvector.h ../../include/../deal/types.h \ - /usr/include/stdlib.h ../../include/../deal/errors.h \ - ../../include/../deal/vectorbase.h ../../include/../deal/ivector.h \ - ../../include/grid/point.h ../../include/basic/exceptions.h \ - /usr/local/include/g++/iostream.h /usr/local/include/g++/streambuf.h \ - /usr/local/include/g++/libio.h /usr/local/lib/g++-include/_G_config.h \ - ../../include/grid/tria.h /usr/local/include/g++/vector.h \ - /usr/local/include/g++/algobase.h /usr/local/include/g++/pair.h \ - /usr/local/include/g++/stl_config.h \ - /usr/local/include/g++/stl_relops.h /usr/local/include/g++/stl_pair.h \ - /usr/local/include/g++/iterator.h /usr/local/include/g++/function.h \ - /usr/local/lib/gcc-lib/sparc-sun-solaris2.5.1/2.8.0/include/stddef.h \ - /usr/local/include/g++/stl_function.h \ - /usr/local/include/g++/stl_iterator.h \ - /usr/local/include/g++/type_traits.h \ - /usr/local/include/g++/stl_construct.h \ - /usr/local/lib/g++-include/new.h /usr/local/lib/g++-include/std/new.h \ - /usr/local/lib/g++-include/std/cstddef.h \ - /usr/local/include/g++/stl_raw_storage_iter.h \ - /usr/local/include/g++/stl_algobase.h /usr/include/string.h \ - /usr/local/lib/gcc-lib/sparc-sun-solaris2.5.1/2.8.0/include/limits.h \ - /usr/local/lib/gcc-lib/sparc-sun-solaris2.5.1/2.8.0/include/syslimits.h \ - /usr/include/limits.h /usr/include/sys/isa_defs.h \ - /usr/local/include/g++/stl_uninitialized.h \ - /usr/local/include/g++/alloc.h /usr/local/include/g++/stl_alloc.h \ - /usr/local/sparc-sun-solaris2.5.1/include/assert.h \ - /usr/local/include/g++/stl_vector.h ../../include/grid/tria_line.h \ - ../../include/grid/tria_quad.h ../../include/grid/tria_boundary.h -../../lib/libbasic.g.a(quadrature_lib.go): quadrature_lib.cc ../../include/fe/quadrature_lib.h \ - ../../include/fe/quadrature.h ../../include/grid/point.h \ - ../../include/basic/exceptions.h /usr/local/include/g++/iostream.h \ - /usr/local/include/g++/streambuf.h /usr/local/include/g++/libio.h \ - /usr/local/lib/g++-include/_G_config.h \ - /usr/local/include/g++/vector.h /usr/local/include/g++/algobase.h \ - /usr/local/include/g++/pair.h /usr/local/include/g++/stl_config.h \ - /usr/local/include/g++/stl_relops.h /usr/local/include/g++/stl_pair.h \ - /usr/local/include/g++/iterator.h /usr/local/include/g++/function.h \ - /usr/local/lib/gcc-lib/sparc-sun-solaris2.5.1/2.8.0/include/stddef.h \ - /usr/local/include/g++/stl_function.h \ - /usr/local/include/g++/stl_iterator.h \ - /usr/local/include/g++/type_traits.h \ - /usr/local/include/g++/stl_construct.h \ - /usr/local/lib/g++-include/new.h /usr/local/lib/g++-include/std/new.h \ - /usr/local/lib/g++-include/std/cstddef.h \ - /usr/local/include/g++/stl_raw_storage_iter.h \ - /usr/local/include/g++/stl_algobase.h /usr/include/string.h \ - /usr/include/sys/feature_tests.h \ - /usr/local/lib/gcc-lib/sparc-sun-solaris2.5.1/2.8.0/include/limits.h \ - /usr/local/lib/gcc-lib/sparc-sun-solaris2.5.1/2.8.0/include/syslimits.h \ - /usr/include/limits.h /usr/include/sys/isa_defs.h \ - /usr/include/stdlib.h /usr/local/include/g++/stl_uninitialized.h \ - /usr/local/include/g++/alloc.h /usr/local/include/g++/stl_alloc.h \ - /usr/local/sparc-sun-solaris2.5.1/include/assert.h \ - /usr/local/include/g++/stl_vector.h diff --git a/deal.II/deal.II/source/grid/Makefile b/deal.II/deal.II/source/grid/Makefile index aa2591854a..21374272f1 100644 --- a/deal.II/deal.II/source/grid/Makefile +++ b/deal.II/deal.II/source/grid/Makefile @@ -1,8 +1,12 @@ # $Id$ -CXX =c++ -CXXFLAGS.g=-DDEBUG -g -Wall -pedantic -Wconversion -Winline -Woverloaded-virtual -I../../include -CXXFLAGS =-O3 -Wuninitialized -finline-functions -ffast-math -funroll-loops -felide-constructors -fnonnull-objects -I../../include +CXX = c++ +INCLUDE = -I../../include -I../../../lac/include \ + -I../../../base/include -I../../../mia/include +CXXFLAGS.g= -DDEBUG -g -Wall -pedantic -Wconversion \ + -Winline -Woverloaded-virtual $(INCLUDE) +CXXFLAGS =-O3 -Wuninitialized -finline-functions -ffast-math \ + -funroll-loops -felide-constructors -fnonnull-objects $(INCLUDE) ifeq ($(shell uname),SunOS) CXXFLAGS := -V2.7.2.3 $(CXXFLAGS) @@ -28,9 +32,9 @@ h-files = $(wildcard ../include/*/*.h) lib: lib.g.a lib.a -lib.a: ../../lib/libbasic.a($(o-files)) +lib.a: ../../lib/libgrid.a($(o-files)) -lib.g.a: ../../lib/libbasic.g.a($(go-files)) +lib.g.a: ../../lib/libgrid.g.a($(go-files)) clean: rm -f *.o *.go *~ Makefile.dep @@ -48,15 +52,11 @@ clean: # #use perl to generate rules for the .go files as well #as to make rules not for tria.o and the like, but -#rather for libbasic.a(tria.o) +#rather for libgrid.a(tria.o) Makefile.dep: $(cc-files) $(h-files) @echo ============================ Remaking Makefile - @$(CXX) -I../../include -DDEBUG -M *.cc > Makefile.dep.o - @cp Makefile.dep.o Makefile.dep.go - @perl -pi -e 's!^(.*\.o):!../../lib/libbasic.a(\1):!g' Makefile.dep.o - @perl -pi -e 's!\.o:!.go:!g' Makefile.dep.go - @perl -pi -e 's!^(.*\.go):!../../lib/libbasic.g.a(\1):!g' Makefile.dep.go - @cat Makefile.dep.o Makefile.dep.go > Makefile.dep - @rm Makefile.dep.o Makefile.dep.go + perl ../../Make_dep.pl ../../lib/libgrid $(INCLUDE) $(cc-files) \ + > Makefile.dep + include Makefile.dep diff --git a/deal.II/deal.II/source/grid/Makefile.dep b/deal.II/deal.II/source/grid/Makefile.dep deleted file mode 100644 index 93da71b1d0..0000000000 --- a/deal.II/deal.II/source/grid/Makefile.dep +++ /dev/null @@ -1,340 +0,0 @@ -../../lib/libbasic.a(dof.o): dof.cc ../../include/grid/dof.h /usr/local/include/g++/vector.h \ - /usr/local/include/g++/algobase.h /usr/local/include/g++/pair.h \ - /usr/local/include/g++/stl_config.h \ - /usr/local/include/g++/stl_relops.h /usr/local/include/g++/stl_pair.h \ - /usr/local/include/g++/iterator.h /usr/local/include/g++/function.h \ - /usr/local/lib/gcc-lib/sparc-sun-solaris2.5.1/2.8.0/include/stddef.h \ - /usr/local/include/g++/stl_function.h \ - /usr/local/include/g++/iostream.h /usr/local/include/g++/streambuf.h \ - /usr/local/include/g++/libio.h /usr/local/lib/g++-include/_G_config.h \ - /usr/local/include/g++/stl_iterator.h \ - /usr/local/include/g++/type_traits.h \ - /usr/local/include/g++/stl_construct.h \ - /usr/local/lib/g++-include/new.h /usr/local/lib/g++-include/std/new.h \ - /usr/local/lib/g++-include/std/cstddef.h \ - /usr/local/include/g++/stl_raw_storage_iter.h \ - /usr/local/include/g++/stl_algobase.h /usr/include/string.h \ - /usr/include/sys/feature_tests.h \ - /usr/local/lib/gcc-lib/sparc-sun-solaris2.5.1/2.8.0/include/limits.h \ - /usr/local/lib/gcc-lib/sparc-sun-solaris2.5.1/2.8.0/include/syslimits.h \ - /usr/include/limits.h /usr/include/sys/isa_defs.h \ - /usr/include/stdlib.h /usr/local/include/g++/stl_uninitialized.h \ - /usr/local/include/g++/alloc.h /usr/local/include/g++/stl_alloc.h \ - /usr/local/sparc-sun-solaris2.5.1/include/assert.h \ - /usr/local/include/g++/stl_vector.h ../../include/fe/fe.h \ - ../../include/../deal/dfmatrix.h /usr/include/stdio.h \ - /usr/include/sys/va_list.h ../../include/../deal/dvector.h \ - ../../include/../deal/types.h ../../include/../deal/errors.h \ - ../../include/../deal/vectorbase.h ../../include/../deal/ivector.h \ - ../../include/grid/point.h ../../include/basic/exceptions.h \ - ../../include/grid/tria.h ../../include/grid/tria_line.h \ - ../../include/grid/tria_quad.h ../../include/grid/tria_boundary.h \ - ../../include/grid/dof_accessor.h ../../include/grid/tria_accessor.h \ - ../../include/grid/dof_constraints.h \ - ../../include/grid/tria_iterator.h ../../include/../deal/dsmatrix.h \ - /usr/local/lib/gcc-lib/sparc-sun-solaris2.5.1/2.8.0/include/math.h \ - /usr/include/math.h /usr/include/floatingpoint.h \ - /usr/include/sys/ieeefp.h /usr/local/include/g++/multimap.h \ - /usr/local/include/g++/tree.h /usr/local/include/g++/stl_tree.h \ - /usr/local/include/g++/stl_multimap.h /usr/local/include/g++/algo.h \ - /usr/local/include/g++/tempbuf.h /usr/local/include/g++/stl_tempbuf.h \ - /usr/local/include/g++/stl_algo.h /usr/local/include/g++/stl_heap.h \ - /usr/local/include/g++/stl_numeric.h -../../lib/libbasic.a(dof_accessor.o): dof_accessor.cc ../../include/grid/dof_accessor.h \ - ../../include/grid/tria_accessor.h ../../include/basic/exceptions.h \ - /usr/local/include/g++/iostream.h /usr/local/include/g++/streambuf.h \ - /usr/local/include/g++/libio.h /usr/local/lib/g++-include/_G_config.h \ - ../../include/grid/dof.h /usr/local/include/g++/vector.h \ - /usr/local/include/g++/algobase.h /usr/local/include/g++/pair.h \ - /usr/local/include/g++/stl_config.h \ - /usr/local/include/g++/stl_relops.h /usr/local/include/g++/stl_pair.h \ - /usr/local/include/g++/iterator.h /usr/local/include/g++/function.h \ - /usr/local/lib/gcc-lib/sparc-sun-solaris2.5.1/2.8.0/include/stddef.h \ - /usr/local/include/g++/stl_function.h \ - /usr/local/include/g++/stl_iterator.h \ - /usr/local/include/g++/type_traits.h \ - /usr/local/include/g++/stl_construct.h \ - /usr/local/lib/g++-include/new.h /usr/local/lib/g++-include/std/new.h \ - /usr/local/lib/g++-include/std/cstddef.h \ - /usr/local/include/g++/stl_raw_storage_iter.h \ - /usr/local/include/g++/stl_algobase.h /usr/include/string.h \ - /usr/include/sys/feature_tests.h \ - /usr/local/lib/gcc-lib/sparc-sun-solaris2.5.1/2.8.0/include/limits.h \ - /usr/local/lib/gcc-lib/sparc-sun-solaris2.5.1/2.8.0/include/syslimits.h \ - /usr/include/limits.h /usr/include/sys/isa_defs.h \ - /usr/include/stdlib.h /usr/local/include/g++/stl_uninitialized.h \ - /usr/local/include/g++/alloc.h /usr/local/include/g++/stl_alloc.h \ - /usr/local/sparc-sun-solaris2.5.1/include/assert.h \ - /usr/local/include/g++/stl_vector.h ../../include/fe/fe.h \ - ../../include/../deal/dfmatrix.h /usr/include/stdio.h \ - /usr/include/sys/va_list.h ../../include/../deal/dvector.h \ - ../../include/../deal/types.h ../../include/../deal/errors.h \ - ../../include/../deal/vectorbase.h ../../include/../deal/ivector.h \ - ../../include/grid/point.h ../../include/grid/tria.h \ - ../../include/grid/tria_line.h ../../include/grid/tria_quad.h \ - ../../include/grid/tria_boundary.h ../../include/grid/tria_iterator.h \ - ../../include/grid/tria_iterator.templates.h -../../lib/libbasic.a(dof_constraints.o): dof_constraints.cc /usr/local/include/g++/algo.h \ - /usr/local/include/g++/algobase.h /usr/local/include/g++/pair.h \ - /usr/local/include/g++/stl_config.h \ - /usr/local/include/g++/stl_relops.h /usr/local/include/g++/stl_pair.h \ - /usr/local/include/g++/iterator.h /usr/local/include/g++/function.h \ - /usr/local/lib/gcc-lib/sparc-sun-solaris2.5.1/2.8.0/include/stddef.h \ - /usr/local/include/g++/stl_function.h \ - /usr/local/include/g++/iostream.h /usr/local/include/g++/streambuf.h \ - /usr/local/include/g++/libio.h /usr/local/lib/g++-include/_G_config.h \ - /usr/local/include/g++/stl_iterator.h \ - /usr/local/include/g++/type_traits.h \ - /usr/local/include/g++/stl_construct.h \ - /usr/local/lib/g++-include/new.h /usr/local/lib/g++-include/std/new.h \ - /usr/local/lib/g++-include/std/cstddef.h \ - /usr/local/include/g++/stl_raw_storage_iter.h \ - /usr/local/include/g++/stl_algobase.h /usr/include/string.h \ - /usr/include/sys/feature_tests.h \ - /usr/local/lib/gcc-lib/sparc-sun-solaris2.5.1/2.8.0/include/limits.h \ - /usr/local/lib/gcc-lib/sparc-sun-solaris2.5.1/2.8.0/include/syslimits.h \ - /usr/include/limits.h /usr/include/sys/isa_defs.h \ - /usr/include/stdlib.h /usr/local/include/g++/stl_uninitialized.h \ - /usr/local/include/g++/tempbuf.h /usr/local/include/g++/stl_tempbuf.h \ - /usr/local/include/g++/stl_algo.h /usr/local/include/g++/stl_heap.h \ - /usr/local/include/g++/stl_numeric.h \ - ../../include/grid/dof_constraints.h /usr/local/include/g++/vector.h \ - /usr/local/include/g++/alloc.h /usr/local/include/g++/stl_alloc.h \ - /usr/local/sparc-sun-solaris2.5.1/include/assert.h \ - /usr/local/include/g++/stl_vector.h ../../include/basic/exceptions.h \ - ../../include/../deal/dsmatrix.h \ - /usr/local/lib/gcc-lib/sparc-sun-solaris2.5.1/2.8.0/include/math.h \ - /usr/include/math.h /usr/include/floatingpoint.h /usr/include/stdio.h \ - /usr/include/sys/va_list.h /usr/include/sys/ieeefp.h \ - ../../include/../deal/dvector.h ../../include/../deal/types.h \ - ../../include/../deal/errors.h ../../include/../deal/vectorbase.h -../../lib/libbasic.a(tria.o): tria.cc ../../include/grid/tria_iterator.h \ - /usr/local/include/g++/iterator.h /usr/local/include/g++/function.h \ - /usr/local/include/g++/stl_config.h \ - /usr/local/include/g++/stl_relops.h \ - /usr/local/lib/gcc-lib/sparc-sun-solaris2.5.1/2.8.0/include/stddef.h \ - /usr/local/include/g++/stl_function.h \ - /usr/local/include/g++/iostream.h /usr/local/include/g++/streambuf.h \ - /usr/local/include/g++/libio.h /usr/local/lib/g++-include/_G_config.h \ - /usr/local/include/g++/stl_iterator.h \ - /usr/local/include/g++/type_traits.h \ - /usr/local/include/g++/stl_construct.h \ - /usr/local/lib/g++-include/new.h /usr/local/lib/g++-include/std/new.h \ - /usr/local/lib/g++-include/std/cstddef.h \ - /usr/local/include/g++/stl_raw_storage_iter.h \ - ../../include/basic/exceptions.h ../../include/grid/point.h \ - ../../include/grid/tria_accessor.h ../../include/grid/tria.h \ - /usr/local/include/g++/vector.h /usr/local/include/g++/algobase.h \ - /usr/local/include/g++/pair.h /usr/local/include/g++/stl_pair.h \ - /usr/local/include/g++/stl_algobase.h /usr/include/string.h \ - /usr/include/sys/feature_tests.h \ - /usr/local/lib/gcc-lib/sparc-sun-solaris2.5.1/2.8.0/include/limits.h \ - /usr/local/lib/gcc-lib/sparc-sun-solaris2.5.1/2.8.0/include/syslimits.h \ - /usr/include/limits.h /usr/include/sys/isa_defs.h \ - /usr/include/stdlib.h /usr/local/include/g++/stl_uninitialized.h \ - /usr/local/include/g++/alloc.h /usr/local/include/g++/stl_alloc.h \ - /usr/local/sparc-sun-solaris2.5.1/include/assert.h \ - /usr/local/include/g++/stl_vector.h ../../include/grid/tria_line.h \ - ../../include/grid/tria_quad.h ../../include/grid/tria_boundary.h \ - ../../include/basic/magic_numbers.h /usr/local/include/g++/algo.h \ - /usr/local/include/g++/tempbuf.h /usr/local/include/g++/stl_tempbuf.h \ - /usr/local/include/g++/stl_algo.h /usr/local/include/g++/stl_heap.h \ - /usr/local/include/g++/stl_numeric.h -../../lib/libbasic.a(tria_accessor.o): tria_accessor.cc ../../include/grid/tria.h \ - /usr/local/include/g++/vector.h /usr/local/include/g++/algobase.h \ - /usr/local/include/g++/pair.h /usr/local/include/g++/stl_config.h \ - /usr/local/include/g++/stl_relops.h /usr/local/include/g++/stl_pair.h \ - /usr/local/include/g++/iterator.h /usr/local/include/g++/function.h \ - /usr/local/lib/gcc-lib/sparc-sun-solaris2.5.1/2.8.0/include/stddef.h \ - /usr/local/include/g++/stl_function.h \ - /usr/local/include/g++/iostream.h /usr/local/include/g++/streambuf.h \ - /usr/local/include/g++/libio.h /usr/local/lib/g++-include/_G_config.h \ - /usr/local/include/g++/stl_iterator.h \ - /usr/local/include/g++/type_traits.h \ - /usr/local/include/g++/stl_construct.h \ - /usr/local/lib/g++-include/new.h /usr/local/lib/g++-include/std/new.h \ - /usr/local/lib/g++-include/std/cstddef.h \ - /usr/local/include/g++/stl_raw_storage_iter.h \ - /usr/local/include/g++/stl_algobase.h /usr/include/string.h \ - /usr/include/sys/feature_tests.h \ - /usr/local/lib/gcc-lib/sparc-sun-solaris2.5.1/2.8.0/include/limits.h \ - /usr/local/lib/gcc-lib/sparc-sun-solaris2.5.1/2.8.0/include/syslimits.h \ - /usr/include/limits.h /usr/include/sys/isa_defs.h \ - /usr/include/stdlib.h /usr/local/include/g++/stl_uninitialized.h \ - /usr/local/include/g++/alloc.h /usr/local/include/g++/stl_alloc.h \ - /usr/local/sparc-sun-solaris2.5.1/include/assert.h \ - /usr/local/include/g++/stl_vector.h ../../include/grid/tria_line.h \ - ../../include/basic/exceptions.h ../../include/grid/tria_quad.h \ - ../../include/grid/point.h ../../include/grid/tria_boundary.h \ - ../../include/grid/tria_iterator.h ../../include/grid/tria_accessor.h \ - ../../include/grid/tria_iterator.templates.h -../../lib/libbasic.g.a(dof.go): dof.cc ../../include/grid/dof.h /usr/local/include/g++/vector.h \ - /usr/local/include/g++/algobase.h /usr/local/include/g++/pair.h \ - /usr/local/include/g++/stl_config.h \ - /usr/local/include/g++/stl_relops.h /usr/local/include/g++/stl_pair.h \ - /usr/local/include/g++/iterator.h /usr/local/include/g++/function.h \ - /usr/local/lib/gcc-lib/sparc-sun-solaris2.5.1/2.8.0/include/stddef.h \ - /usr/local/include/g++/stl_function.h \ - /usr/local/include/g++/iostream.h /usr/local/include/g++/streambuf.h \ - /usr/local/include/g++/libio.h /usr/local/lib/g++-include/_G_config.h \ - /usr/local/include/g++/stl_iterator.h \ - /usr/local/include/g++/type_traits.h \ - /usr/local/include/g++/stl_construct.h \ - /usr/local/lib/g++-include/new.h /usr/local/lib/g++-include/std/new.h \ - /usr/local/lib/g++-include/std/cstddef.h \ - /usr/local/include/g++/stl_raw_storage_iter.h \ - /usr/local/include/g++/stl_algobase.h /usr/include/string.h \ - /usr/include/sys/feature_tests.h \ - /usr/local/lib/gcc-lib/sparc-sun-solaris2.5.1/2.8.0/include/limits.h \ - /usr/local/lib/gcc-lib/sparc-sun-solaris2.5.1/2.8.0/include/syslimits.h \ - /usr/include/limits.h /usr/include/sys/isa_defs.h \ - /usr/include/stdlib.h /usr/local/include/g++/stl_uninitialized.h \ - /usr/local/include/g++/alloc.h /usr/local/include/g++/stl_alloc.h \ - /usr/local/sparc-sun-solaris2.5.1/include/assert.h \ - /usr/local/include/g++/stl_vector.h ../../include/fe/fe.h \ - ../../include/../deal/dfmatrix.h /usr/include/stdio.h \ - /usr/include/sys/va_list.h ../../include/../deal/dvector.h \ - ../../include/../deal/types.h ../../include/../deal/errors.h \ - ../../include/../deal/vectorbase.h ../../include/../deal/ivector.h \ - ../../include/grid/point.h ../../include/basic/exceptions.h \ - ../../include/grid/tria.h ../../include/grid/tria_line.h \ - ../../include/grid/tria_quad.h ../../include/grid/tria_boundary.h \ - ../../include/grid/dof_accessor.h ../../include/grid/tria_accessor.h \ - ../../include/grid/dof_constraints.h \ - ../../include/grid/tria_iterator.h ../../include/../deal/dsmatrix.h \ - /usr/local/lib/gcc-lib/sparc-sun-solaris2.5.1/2.8.0/include/math.h \ - /usr/include/math.h /usr/include/floatingpoint.h \ - /usr/include/sys/ieeefp.h /usr/local/include/g++/multimap.h \ - /usr/local/include/g++/tree.h /usr/local/include/g++/stl_tree.h \ - /usr/local/include/g++/stl_multimap.h /usr/local/include/g++/algo.h \ - /usr/local/include/g++/tempbuf.h /usr/local/include/g++/stl_tempbuf.h \ - /usr/local/include/g++/stl_algo.h /usr/local/include/g++/stl_heap.h \ - /usr/local/include/g++/stl_numeric.h -../../lib/libbasic.g.a(dof_accessor.go): dof_accessor.cc ../../include/grid/dof_accessor.h \ - ../../include/grid/tria_accessor.h ../../include/basic/exceptions.h \ - /usr/local/include/g++/iostream.h /usr/local/include/g++/streambuf.h \ - /usr/local/include/g++/libio.h /usr/local/lib/g++-include/_G_config.h \ - ../../include/grid/dof.h /usr/local/include/g++/vector.h \ - /usr/local/include/g++/algobase.h /usr/local/include/g++/pair.h \ - /usr/local/include/g++/stl_config.h \ - /usr/local/include/g++/stl_relops.h /usr/local/include/g++/stl_pair.h \ - /usr/local/include/g++/iterator.h /usr/local/include/g++/function.h \ - /usr/local/lib/gcc-lib/sparc-sun-solaris2.5.1/2.8.0/include/stddef.h \ - /usr/local/include/g++/stl_function.h \ - /usr/local/include/g++/stl_iterator.h \ - /usr/local/include/g++/type_traits.h \ - /usr/local/include/g++/stl_construct.h \ - /usr/local/lib/g++-include/new.h /usr/local/lib/g++-include/std/new.h \ - /usr/local/lib/g++-include/std/cstddef.h \ - /usr/local/include/g++/stl_raw_storage_iter.h \ - /usr/local/include/g++/stl_algobase.h /usr/include/string.h \ - /usr/include/sys/feature_tests.h \ - /usr/local/lib/gcc-lib/sparc-sun-solaris2.5.1/2.8.0/include/limits.h \ - /usr/local/lib/gcc-lib/sparc-sun-solaris2.5.1/2.8.0/include/syslimits.h \ - /usr/include/limits.h /usr/include/sys/isa_defs.h \ - /usr/include/stdlib.h /usr/local/include/g++/stl_uninitialized.h \ - /usr/local/include/g++/alloc.h /usr/local/include/g++/stl_alloc.h \ - /usr/local/sparc-sun-solaris2.5.1/include/assert.h \ - /usr/local/include/g++/stl_vector.h ../../include/fe/fe.h \ - ../../include/../deal/dfmatrix.h /usr/include/stdio.h \ - /usr/include/sys/va_list.h ../../include/../deal/dvector.h \ - ../../include/../deal/types.h ../../include/../deal/errors.h \ - ../../include/../deal/vectorbase.h ../../include/../deal/ivector.h \ - ../../include/grid/point.h ../../include/grid/tria.h \ - ../../include/grid/tria_line.h ../../include/grid/tria_quad.h \ - ../../include/grid/tria_boundary.h ../../include/grid/tria_iterator.h \ - ../../include/grid/tria_iterator.templates.h -../../lib/libbasic.g.a(dof_constraints.go): dof_constraints.cc /usr/local/include/g++/algo.h \ - /usr/local/include/g++/algobase.h /usr/local/include/g++/pair.h \ - /usr/local/include/g++/stl_config.h \ - /usr/local/include/g++/stl_relops.h /usr/local/include/g++/stl_pair.h \ - /usr/local/include/g++/iterator.h /usr/local/include/g++/function.h \ - /usr/local/lib/gcc-lib/sparc-sun-solaris2.5.1/2.8.0/include/stddef.h \ - /usr/local/include/g++/stl_function.h \ - /usr/local/include/g++/iostream.h /usr/local/include/g++/streambuf.h \ - /usr/local/include/g++/libio.h /usr/local/lib/g++-include/_G_config.h \ - /usr/local/include/g++/stl_iterator.h \ - /usr/local/include/g++/type_traits.h \ - /usr/local/include/g++/stl_construct.h \ - /usr/local/lib/g++-include/new.h /usr/local/lib/g++-include/std/new.h \ - /usr/local/lib/g++-include/std/cstddef.h \ - /usr/local/include/g++/stl_raw_storage_iter.h \ - /usr/local/include/g++/stl_algobase.h /usr/include/string.h \ - /usr/include/sys/feature_tests.h \ - /usr/local/lib/gcc-lib/sparc-sun-solaris2.5.1/2.8.0/include/limits.h \ - /usr/local/lib/gcc-lib/sparc-sun-solaris2.5.1/2.8.0/include/syslimits.h \ - /usr/include/limits.h /usr/include/sys/isa_defs.h \ - /usr/include/stdlib.h /usr/local/include/g++/stl_uninitialized.h \ - /usr/local/include/g++/tempbuf.h /usr/local/include/g++/stl_tempbuf.h \ - /usr/local/include/g++/stl_algo.h /usr/local/include/g++/stl_heap.h \ - /usr/local/include/g++/stl_numeric.h \ - ../../include/grid/dof_constraints.h /usr/local/include/g++/vector.h \ - /usr/local/include/g++/alloc.h /usr/local/include/g++/stl_alloc.h \ - /usr/local/sparc-sun-solaris2.5.1/include/assert.h \ - /usr/local/include/g++/stl_vector.h ../../include/basic/exceptions.h \ - ../../include/../deal/dsmatrix.h \ - /usr/local/lib/gcc-lib/sparc-sun-solaris2.5.1/2.8.0/include/math.h \ - /usr/include/math.h /usr/include/floatingpoint.h /usr/include/stdio.h \ - /usr/include/sys/va_list.h /usr/include/sys/ieeefp.h \ - ../../include/../deal/dvector.h ../../include/../deal/types.h \ - ../../include/../deal/errors.h ../../include/../deal/vectorbase.h -../../lib/libbasic.g.a(tria.go): tria.cc ../../include/grid/tria_iterator.h \ - /usr/local/include/g++/iterator.h /usr/local/include/g++/function.h \ - /usr/local/include/g++/stl_config.h \ - /usr/local/include/g++/stl_relops.h \ - /usr/local/lib/gcc-lib/sparc-sun-solaris2.5.1/2.8.0/include/stddef.h \ - /usr/local/include/g++/stl_function.h \ - /usr/local/include/g++/iostream.h /usr/local/include/g++/streambuf.h \ - /usr/local/include/g++/libio.h /usr/local/lib/g++-include/_G_config.h \ - /usr/local/include/g++/stl_iterator.h \ - /usr/local/include/g++/type_traits.h \ - /usr/local/include/g++/stl_construct.h \ - /usr/local/lib/g++-include/new.h /usr/local/lib/g++-include/std/new.h \ - /usr/local/lib/g++-include/std/cstddef.h \ - /usr/local/include/g++/stl_raw_storage_iter.h \ - ../../include/basic/exceptions.h ../../include/grid/point.h \ - ../../include/grid/tria_accessor.h ../../include/grid/tria.h \ - /usr/local/include/g++/vector.h /usr/local/include/g++/algobase.h \ - /usr/local/include/g++/pair.h /usr/local/include/g++/stl_pair.h \ - /usr/local/include/g++/stl_algobase.h /usr/include/string.h \ - /usr/include/sys/feature_tests.h \ - /usr/local/lib/gcc-lib/sparc-sun-solaris2.5.1/2.8.0/include/limits.h \ - /usr/local/lib/gcc-lib/sparc-sun-solaris2.5.1/2.8.0/include/syslimits.h \ - /usr/include/limits.h /usr/include/sys/isa_defs.h \ - /usr/include/stdlib.h /usr/local/include/g++/stl_uninitialized.h \ - /usr/local/include/g++/alloc.h /usr/local/include/g++/stl_alloc.h \ - /usr/local/sparc-sun-solaris2.5.1/include/assert.h \ - /usr/local/include/g++/stl_vector.h ../../include/grid/tria_line.h \ - ../../include/grid/tria_quad.h ../../include/grid/tria_boundary.h \ - ../../include/basic/magic_numbers.h /usr/local/include/g++/algo.h \ - /usr/local/include/g++/tempbuf.h /usr/local/include/g++/stl_tempbuf.h \ - /usr/local/include/g++/stl_algo.h /usr/local/include/g++/stl_heap.h \ - /usr/local/include/g++/stl_numeric.h -../../lib/libbasic.g.a(tria_accessor.go): tria_accessor.cc ../../include/grid/tria.h \ - /usr/local/include/g++/vector.h /usr/local/include/g++/algobase.h \ - /usr/local/include/g++/pair.h /usr/local/include/g++/stl_config.h \ - /usr/local/include/g++/stl_relops.h /usr/local/include/g++/stl_pair.h \ - /usr/local/include/g++/iterator.h /usr/local/include/g++/function.h \ - /usr/local/lib/gcc-lib/sparc-sun-solaris2.5.1/2.8.0/include/stddef.h \ - /usr/local/include/g++/stl_function.h \ - /usr/local/include/g++/iostream.h /usr/local/include/g++/streambuf.h \ - /usr/local/include/g++/libio.h /usr/local/lib/g++-include/_G_config.h \ - /usr/local/include/g++/stl_iterator.h \ - /usr/local/include/g++/type_traits.h \ - /usr/local/include/g++/stl_construct.h \ - /usr/local/lib/g++-include/new.h /usr/local/lib/g++-include/std/new.h \ - /usr/local/lib/g++-include/std/cstddef.h \ - /usr/local/include/g++/stl_raw_storage_iter.h \ - /usr/local/include/g++/stl_algobase.h /usr/include/string.h \ - /usr/include/sys/feature_tests.h \ - /usr/local/lib/gcc-lib/sparc-sun-solaris2.5.1/2.8.0/include/limits.h \ - /usr/local/lib/gcc-lib/sparc-sun-solaris2.5.1/2.8.0/include/syslimits.h \ - /usr/include/limits.h /usr/include/sys/isa_defs.h \ - /usr/include/stdlib.h /usr/local/include/g++/stl_uninitialized.h \ - /usr/local/include/g++/alloc.h /usr/local/include/g++/stl_alloc.h \ - /usr/local/sparc-sun-solaris2.5.1/include/assert.h \ - /usr/local/include/g++/stl_vector.h ../../include/grid/tria_line.h \ - ../../include/basic/exceptions.h ../../include/grid/tria_quad.h \ - ../../include/grid/point.h ../../include/grid/tria_boundary.h \ - ../../include/grid/tria_iterator.h ../../include/grid/tria_accessor.h \ - ../../include/grid/tria_iterator.templates.h diff --git a/deal.II/deal.II/source/numerics/Makefile b/deal.II/deal.II/source/numerics/Makefile index aa2591854a..8efb5f04e7 100644 --- a/deal.II/deal.II/source/numerics/Makefile +++ b/deal.II/deal.II/source/numerics/Makefile @@ -1,8 +1,12 @@ # $Id$ -CXX =c++ -CXXFLAGS.g=-DDEBUG -g -Wall -pedantic -Wconversion -Winline -Woverloaded-virtual -I../../include -CXXFLAGS =-O3 -Wuninitialized -finline-functions -ffast-math -funroll-loops -felide-constructors -fnonnull-objects -I../../include +CXX = c++ +INCLUDE = -I../../include -I../../../lac/include \ + -I../../../base/include -I../../../mia/include +CXXFLAGS.g= -DDEBUG -g -Wall -pedantic -Wconversion \ + -Winline -Woverloaded-virtual $(INCLUDE) +CXXFLAGS =-O3 -Wuninitialized -finline-functions -ffast-math \ + -funroll-loops -felide-constructors -fnonnull-objects $(INCLUDE) ifeq ($(shell uname),SunOS) CXXFLAGS := -V2.7.2.3 $(CXXFLAGS) @@ -28,9 +32,9 @@ h-files = $(wildcard ../include/*/*.h) lib: lib.g.a lib.a -lib.a: ../../lib/libbasic.a($(o-files)) +lib.a: ../../lib/libnumerics.a($(o-files)) -lib.g.a: ../../lib/libbasic.g.a($(go-files)) +lib.g.a: ../../lib/libnumerics.g.a($(go-files)) clean: rm -f *.o *.go *~ Makefile.dep @@ -48,15 +52,11 @@ clean: # #use perl to generate rules for the .go files as well #as to make rules not for tria.o and the like, but -#rather for libbasic.a(tria.o) +#rather for libnumerics.a(tria.o) Makefile.dep: $(cc-files) $(h-files) @echo ============================ Remaking Makefile - @$(CXX) -I../../include -DDEBUG -M *.cc > Makefile.dep.o - @cp Makefile.dep.o Makefile.dep.go - @perl -pi -e 's!^(.*\.o):!../../lib/libbasic.a(\1):!g' Makefile.dep.o - @perl -pi -e 's!\.o:!.go:!g' Makefile.dep.go - @perl -pi -e 's!^(.*\.go):!../../lib/libbasic.g.a(\1):!g' Makefile.dep.go - @cat Makefile.dep.o Makefile.dep.go > Makefile.dep - @rm Makefile.dep.o Makefile.dep.go + perl ../../Make_dep.pl ../../lib/libnumerics $(INCLUDE) $(cc-files) \ + > Makefile.dep + include Makefile.dep diff --git a/deal.II/deal.II/source/numerics/assembler.cc b/deal.II/deal.II/source/numerics/assembler.cc index 1c15331c86..9859fe28c8 100644 --- a/deal.II/deal.II/source/numerics/assembler.cc +++ b/deal.II/deal.II/source/numerics/assembler.cc @@ -3,8 +3,8 @@ #include #include #include -#include "../../deal/dfmatrix.h" -#include "../../deal/dvector.h" +#include +#include extern TriaIterator<1,CellAccessor<1> > __dummy127; // do this to calm down gcc2.7,