fixes for building outside source tree

tools/Makefile.am

@@ -6,28 +6,22 @@ if ENABLE_VTKCONVERTER
 SUBDIRS +=	vtk2h5grid
 endif
 
-AM_LDFLAGS = -L../src/lib @LDFLAGS@
-LIBS = -lH5hut @LIBS@
+AM_CPPFLAGS += -I${abs_top_builddir}/src/include -Wno-deprecated
+FFLAGS += -cpp $(AM_CPPFLAGS)
+AM_LDFLAGS += -L${abs_top_builddir}/src/lib
 
-AM_CPPFLAGS = -I../src/include @AM_CPPFLAGS@
+LDADD =
+LDADD += -lH5hut
 
-LDADD = \
-	../src/C/libH5hutC.la \
-	../src/h5core/libH5hut.la
-
-# What to build... make install will place these files in the $(prefix)/bin directory.
-bin_PROGRAMS = @BUILD_TOOLS@
-EXTRA_PROGRAMS = h5pAttrib
-
-# Listing of all programs that maybe built. (Has to know statically...)
+if ENABLE_C
 EXTRA_SCRIPTS = h5hutcc
+EXTRA_PROGRAMS = h5pAttrib
+endif
+
 
-# Extra files that I wish to include in the dist tar ball.
 #EXTRA_DIST = h5pAttrib.cc h5pToGNUplot.cc## TO BE TAILORED LATER...
 
-# Listing of sources
 h5pAttrib_SOURCES = h5pAttrib.cc
-
 #h5pToGNUplot_SOURCES = h5pToGNUplot.cc
 
 clean: clean-am

tools/vtk2h5grid/Makefile.am

@@ -1,14 +1,12 @@
 AM_CPPFLAGS += -I${abs_top_builddir}/src/include -Wno-deprecated
 FFLAGS += -cpp $(AM_CPPFLAGS)
-LDFLAGS += -L${abs_top_builddir}/src/lib
+AM_LDFLAGS += -L${abs_top_builddir}/src/lib
 
 LDADD = 
-
 LDADD += -lH5hut -lvtkCommon -lvtkIO
 
 
 bin_PROGRAMS = 
-
 bin_PROGRAMS += vtk2h5grid
 vtk2h5grid_SOURCES = vtk2h5grid.cc