updated Makefile.am to reflect current state of directories

[[Imported from SVN: r430]]

Makefile.am

@@ -3,7 +3,7 @@
 # don't follow the full GNU-standard
 AUTOMAKE_OPTIONS = foreign
 
-SUBDIRS = lib common fem grid solver doc m4
+SUBDIRS = lib common fem grid operator solver doc m4
 
 pkgconfigdir = $(libdir)/pkgconfig
 pkgconfig_DATA = dune.pc

common/Makefile.am

 # $Id$
 
 commonincludedir = $(includedir)/dune/common
-commoninclude_HEADERS = array.hh config.hh dlist.hh matvec.hh misc.hh Stack.hh
+commoninclude_HEADERS = dlist.cc mapping.cc array.hh dlist.hh \
+  dynamictype.hh function.hh functionspace.hh mapping.hh matvec.hh \
+  misc.hh operator.hh Stack.hh vectorspace.hh

configure.ac

@@ -18,7 +18,10 @@ AC_PROG_LIBTOOL
 AC_CONFIG_FILES([Makefile
 	         common/Makefile
                  fem/Makefile
-                 fem/localbase/Makefile
+                 fem/common/Makefile
+                 fem/discfuncarray/Makefile
+                 fem/fastquad/Makefile
+                 fem/gaussquadrature/Makefile
                  fem/operator/Makefile
                  grid/Makefile
                  grid/albertgrid/Makefile
@@ -27,6 +30,7 @@ AC_CONFIG_FILES([Makefile
                  grid/spgrid/Makefile
                  lib/Makefile
                  lib/io/Makefile
+                 operator/Makefile
                  solver/Makefile
                  solver/common/Makefile
                  solver/pmgsolver/Makefile

fem/Makefile.am

 # $Id$
 
-SUBDIRS = common discfuncarray gaussquadrature quadlqh
+SUBDIRS = common discfuncarray fastquad gaussquadrature operator
 
 femincludedir = $(includedir)/dune/fem
-feminclude_HEADERS = \
-              discfuncarray.hh \
-              discreteoperatorimp.hh \
-              feoperator.hh \
-              gaussquadrature.hh \
-              inverseoperators.hh \
-              quadlqh.hh \
-              quadtetratri.hh
+feminclude_HEADERS = discfuncarray.hh discreteoperatorimp.hh fastquad.hh \
+  feoperator.hh gaussquadrature.hh inverseoperators.hh lagrangebase.hh

fem/common/.gitignore

+Makefile
+Makefile.in
\ No newline at end of file

fem/common/Makefile.am

+# $Id$
+
+femcommondir = $(includedir)/dune/fem/common
+femcommon_HEADERS = basefunctions.hh discreteoperator.hh localfunction.hh \
+  discretefunction.cc dofiterator.hh localoperator.hh discretefunction.hh \
+  fastbase.cc quadrature.hh discretefunctionspace.hh fastbase.hh

fem/discfuncarray/.gitignore

+Makefile
+Makefile.in
\ No newline at end of file

fem/discfuncarray/Makefile.am

+# $Id$
+
+femdiscfuncdir = $(includedir)/dune/fem/discfuncarray
+femdiscfunc_HEADERS = discfuncarray.cc
+

fem/fastquad/.gitignore

+Makefile
+Makefile.in
\ No newline at end of file

fem/fastquad/Makefile.am

+# $Id$
+
+femfastquaddir = $(includedir)/dune/fem/fastquad
+femfastquad_HEADERS = gaussquadimp.cc ugquadratures.cc facecenterpoints.hh \
+  gaussquadimp.hh quadlqh.hh quadtetratri.hh ugquadratures.hh

fem/gaussquadrature/.gitignore

+Makefile
+Makefile.in
\ No newline at end of file

fem/gaussquadrature/Makefile.am

+# $Id$
+
+femgaussquaddir = $(includedir)/dune/fem/gaussquadrature
+femgaussquad_HEADERS = gaussquadrature.cc
+

fem/localbase/Makefile.am

-# $Id$
-
-femlocaldir = $(includedir)/dune/fem/localbase
-femlocal_HEADERS = defaultmmgr.cc \
-                   defaultmmgr.hh \
-                   discretefunction.cc \
-                   functionspace.cc \
-                   localbase.cc \
-                   mmgr.hh \
-                   scalarblas.cc \
-                   scalarblas.hh

operator/.gitignore

+Makefile
+Makefile.in
\ No newline at end of file

operator/Makefile.am

+# $Id$
+
+operatorincludedir = $(includedir)/dune/operator
+operatorinclude_HEADERS = discreteoperator.hh solveoperator.hh