make distcheck runs through now.

[[Imported from SVN: r4553]]

am/webstuff

@@ -16,7 +16,7 @@ export BASEDIR
 
 # pass files through wrapper
 .wml.html:
-	sh $(DUNECOMMONROOT)/bin/wmlwrap $< -o $@
+	sh $(DUNECOMMONROOT)/bin/wmlwrap -I $(srcdir) $< -o $@
 
 web-install: all
 	if test -d $(DUNEWEBDIR) && test -r $(DUNEWEBDIR)/Make.global ; then \

common/Makefile.am

 # $Id$
 
-SUBDIRS = . test
+SUBDIRS = . test exprtmpl
 
 # the standard debug streams are put into the libdune
 noinst_LTLIBRARIES = libcommon.la

common/exprtmpl/.gitignore

+Makefile
+Makefile.in

common/poolallocator.hh

@@ -9,7 +9,7 @@
 #include "lcm.hh"
 //#include<typeinfo>
 #include <iostream>
-
+#include <cassert>
 
 template<std::size_t size, typename T>
 int testPool();

configure.ac

@@ -29,6 +29,7 @@ AC_CONFIG_FILES([Makefile
      bin/Makefile
      common/Makefile
      common/test/Makefile
+     common/exprtmpl/Makefile
      doc/Makefile
      doc/devel/Makefile
      doc/layout/Makefile

doc/Makefile.am

@@ -17,6 +17,11 @@ CURDIR=doc
 # relative to $(CURDIR)
 BASEDIR=..
 
+# install the html pages
+docdir=$(datadir)/doc/dune
+doc_DATA = $(PAGES)
+EXTRA_DIST = $(PAGES)
+
 # include rules for wml -> html transformation
 include $(top_srcdir)/am/webstuff
 

doc/buildsystem/Makefile.am

@@ -13,6 +13,12 @@ CURDIR=doc
 BASEDIR=..
 EXTRAINSTALL = buildsystem.pdf
 
+EXTRA_DIST = $(DOCS)
+
+# install the html pages
+docdir=$(datadir)/doc/dune
+doc_DATA = $(DOCS)
+
 # include rules for wml -> html transformation
 include $(top_srcdir)/am/webstuff
 

doc/devel/Makefile.am

@@ -11,6 +11,11 @@ all: $(PAGES)
 BASEDIR=../..
 CURDIR=doc/devel
 
+# install the html pages
+docdir=$(datadir)/doc/dune/devel
+doc_DATA = $(PAGES)
+EXTRA_DIST= $(PAGES)
+
 include $(top_srcdir)/am/webstuff
 
 CLEANFILES = $(PAGES)

doc/doxygen/Makefile.am

 # $Id$
 
 # distribute these files:
-EXTRA_DIST = Doxyfile Doxydep \
+DOXY_DIST = Doxyfile Doxydep \
   doxy-footer.html doxy-header.html dune-doxy.css mainpage
 
 if BUILD_DOCS
   WHAT = bestpractice.html doxygen-tag
 endif
 
+#we need this in the distribution
+EXTRA_DIST = bestpractice.html $(DOXY_DIST)
+
+DISTCLEANFILES = doxygen.log
+
 all: $(WHAT)
 
 # setting like in dune-web