From 95903d2711c9ba6a4449b874194fcfbb778c8ed2 Mon Sep 17 00:00:00 2001
From: Andreas Adelmann <andreas.adelmann@psi.ch>
Date: Thu, 11 Aug 2011 14:31:55 +0000
Subject: [PATCH] fix tools makefile

---
 configure.ac      | 3 ++-
 tools/Makefile.am | 7 +++++--
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/configure.ac b/configure.ac
index a9a742d..f8d650e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -113,6 +113,7 @@ else
 fi
 
 AC_PROG_CC($CCOMPILERS)
+AC_PROG_CXX
 
 # Use macro to set C99 mode instead of checking for gcc, which breaks with
 # parallel builds.
@@ -193,7 +194,7 @@ if test "X$USE_C" = "Xyes"; then
 	LIB_C="libH5hutC.la"
 	BUILD_LIBS="$BUILD_LIBS libH5hutC"
 	BUILD_TESTS="$BUILD_TESTS h5u_test h5b_test"
-	BUILD_TOOLS="$BUILD_TOOLS h5hutcc"
+	BUILD_TOOLS="$BUILD_TOOLS h5hutcc h5PartDcToVtk h5PartSurfaceToVtk"
 fi
 
 ############################ fortran enabled ##################################
diff --git a/tools/Makefile.am b/tools/Makefile.am
index e57aa5e..3f4f998 100644
--- a/tools/Makefile.am
+++ b/tools/Makefile.am
@@ -8,7 +8,8 @@ LIBS = -lH5hutC -lH5hut @LIBS@
 INCLUDES = -I../src/include @INCLUDES@
 
 # What to build... make install will place these files in the $(prefix)/bin directory.
-bin_SCRIPTS = @BUILD_TOOLS@
+bin_PROGRAMS = @BUILD_TOOLS@
+EXTRA_PROGRAMS = h5pAttrib h5PartDcToVtk
 
 # Listing of all programs that maybe built. (Has to know statically...)
 EXTRA_SCRIPTS = h5hutcc
@@ -17,11 +18,13 @@ EXTRA_SCRIPTS = h5hutcc
 #EXTRA_DIST = h5pAttrib.cc h5pToGNUplot.cc## TO BE TAILORED LATER...
 
 # Listing of sources
-#h5pAttrib_SOURCES = h5pAttrib.cc
+h5pAttrib_SOURCES = h5pAttrib.cc
 
 #h5pToGNUplot_SOURCES = h5pToGNUplot.cc
 
 #homdynToH5p_SOURCES = homdynToH5p.cc
 
+h5PartDcToVtk_SOURCES = h5PartDcToVtk.cc
+
 clean: clean-am