From 6ff8067ba8d34928318653bb2ccf3f0d71ffddff Mon Sep 17 00:00:00 2001
From: Achim Gsell <achim.gsell@psi.ch>
Date: Fri, 14 Jun 2013 09:35:20 +0000
Subject: [PATCH] fixes to get 'make dest' working

---
 Makefile.am             |  3 ++-
 configure.ac            |  3 ---
 doc/Makefile.am         |  7 +++---
 src/C/Makefile.am       |  3 +++
 src/Fortran/Makefile.am |  1 +
 src/Makefile.am         |  2 +-
 src/include/Makefile.am | 49 ++++++++++++++++++++++++-----------------
 7 files changed, 40 insertions(+), 28 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index 48b1381..37ded14 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -3,7 +3,8 @@ ACLOCAL_AMFLAGS = -I m4
 SUBDIRS = \
 	src \
 	test \
-	tools
+	tools \
+	doc 
 
 MAINTAINERCLEANFILES = \
 	config.h \
diff --git a/configure.ac b/configure.ac
index e1a016b..a8de117 100644
--- a/configure.ac
+++ b/configure.ac
@@ -351,9 +351,6 @@ AC_CONFIG_FILES([
         src/Fortran/Makefile
 	test/Makefile
         doc/Makefile
-        examples/H5Part/Makefile
-        examples/H5Block/Makefile
-        examples/H5Fed/Makefile
 	tools/Makefile
 	tools/h5hutcc
         tools/vtk2h5grid/Makefile
diff --git a/doc/Makefile.am b/doc/Makefile.am
index 2c6a332..26b6d6e 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -1,6 +1,7 @@
-EXTRA_DIST = \
-	Doxyfile \
-        H5.dox
+EXTRA_DIST = 		\
+	Doxyfile	\
+        H5.dox		\
+	Makefile.in
 
 all:
 
diff --git a/src/C/Makefile.am b/src/C/Makefile.am
index b17cddd..463bd7b 100644
--- a/src/C/Makefile.am
+++ b/src/C/Makefile.am
@@ -18,7 +18,10 @@ include_HEADERS =				\
 
 # Listing of all possible headers that I may include
 EXTRA_HEADERS =
+
 endif
 
+EXTRA_DIST = Makefile.in
+
 clean-local:
 	$(RM) *~
diff --git a/src/Fortran/Makefile.am b/src/Fortran/Makefile.am
index 9900fb5..1ea2308 100644
--- a/src/Fortran/Makefile.am
+++ b/src/Fortran/Makefile.am
@@ -18,6 +18,7 @@ EXTRA_HEADERS =
 EXTRA_DIST =			\
 	TestUnderscoreC.c 	\
 	TestUnderscore.f 	\
+	h5_private.h		\
 	$(F90_FILES)
 
 # Files that I don't want to include in the dist tar ball
diff --git a/src/Makefile.am b/src/Makefile.am
index 5383ba8..23b71e7 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,4 +1,4 @@
 # test level Makefile.am
 
-SUBDIRS = h5core C Fortran
+SUBDIRS = h5core C Fortran include
 
diff --git a/src/include/Makefile.am b/src/include/Makefile.am
index bbeca23..65c1994 100644
--- a/src/include/Makefile.am
+++ b/src/include/Makefile.am
@@ -1,29 +1,38 @@
-# src/C level Makefile.am
 
 # Header files that I wish to install in $(prefix)/include
-include_HEADERS =				\
-	../include/h5core/h5.h			\
-	../include/h5core/h5_attribs.h		\
-	../include/h5core/h5_debug.h		\
-	../include/h5core/h5_errorhandling.h	\
-	../include/h5core/h5_model.h		\
-	../include/h5core/h5_syscall.h		\
-	../include/h5core/h5_types.h		\
-	../include/h5core/h5b_attribs.h		\
-	../include/h5core/h5b_model.h		\
-	../include/h5core/h5b_io.h	\
-	../include/h5core/h5t_adjacencies.h	\
-	../include/h5core/h5t_map.h		\
-	../include/h5core/h5t_model.h		\
-	../include/h5core/h5t_retrieve.h	\
-	../include/h5core/h5t_store.h		\
-	../include/h5core/h5t_tags.h		\
-	../include/h5core/h5u_model.h		\
-	../include/h5core/h5u_io.h
+include_HEADERS =						\
+	$(top_srcdir)/src/include/h5core/h5_attach.h		\
+	$(top_srcdir)/src/include/h5core/h5_attribs.h		\
+	$(top_srcdir)/src/include/h5core/h5_core.h		\
+	$(top_srcdir)/src/include/h5core/h5_errno.h		\
+	$(top_srcdir)/src/include/h5core/h5_errorhandling.h	\
+	$(top_srcdir)/src/include/h5core/h5_hdf5.h		\
+	$(top_srcdir)/src/include/h5core/h5_maps.h		\
+	$(top_srcdir)/src/include/h5core/h5_openclose.h	\
+	$(top_srcdir)/src/include/h5core/h5_readwrite.h	\
+	$(top_srcdir)/src/include/h5core/h5_syscall.h		\
+	$(top_srcdir)/src/include/h5core/h5_types.h		\
+	$(top_srcdir)/src/include/h5core/h5b_attribs.h		\
+	$(top_srcdir)/src/include/h5core/h5b_model.h		\
+	$(top_srcdir)/src/include/h5core/h5b_readwrite.h	\
+	$(top_srcdir)/src/include/h5core/h5t_adjacencies.h	\
+	$(top_srcdir)/src/include/h5core/h5t_core.h		\
+	$(top_srcdir)/src/include/h5core/h5t_inquiry.h		\
+	$(top_srcdir)/src/include/h5core/h5t_map.h		\
+	$(top_srcdir)/src/include/h5core/h5t_model.h		\
+	$(top_srcdir)/src/include/h5core/h5t_readwrite.h	\
+	$(top_srcdir)/src/include/h5core/h5t_ref_elements.h	\
+	$(top_srcdir)/src/include/h5core/h5t_retrieve.h	\
+	$(top_srcdir)/src/include/h5core/h5t_storemesh.h	\
+	$(top_srcdir)/src/include/h5core/h5t_tags.h		\
+	$(top_srcdir)/src/include/h5core/h5u_model.h		\
+	$(top_srcdir)/src/include/h5core/h5u_readwrite.h
 
 # Listing of all possible headers that I may include
 EXTRA_HEADERS =
 
+EXTRA_DIST = Makefile.in
+
 clean-local:
 	$(RM) *~
 	$(RM) h5core/*~