diff --git a/dune/common/Makefile.am b/dune/common/Makefile.am index aa3db8e7..c5c26b8f 100644 --- a/dune/common/Makefile.am +++ b/dune/common/Makefile.am @@ -1,17 +1,17 @@ # $Date$ # $Revision$ -SUBDIRS = . param test +SUBDIRS = param . test common_HEADERS = \ Average.hpp \ EclipseGridInspector.hpp \ EclipseGridParser.hpp \ EclipseGridParserHelpers.hpp \ - ErrorMacros.hpp \ + ErrorMacros.hpp \ Factory.hpp \ linInt.hpp \ - MonotCubicInterpolator.hpp \ + MonotCubicInterpolator.hpp \ RootFinders.hpp \ SparseTable.hpp \ SparseVector.hpp \ diff --git a/dune/common/param/Makefile.am b/dune/common/param/Makefile.am index 7846b5fb..7eb2ffc2 100644 --- a/dune/common/param/Makefile.am +++ b/dune/common/param/Makefile.am @@ -14,8 +14,8 @@ noinst_LTLIBRARIES = libparam.la libparam_la_SOURCES = Parameter.cpp ParameterGroup.cpp ParameterTools.cpp \ ParameterXML.cpp -libparam_la_CPPFLAGS = $(BOOST_CPPFLAGS) -libparam_la_LDFLAGS = $(BOOST_LDFLAGS) -libparam_la_LIBADD = tinyxml/libtinyxml.la $(BOOST_FILESYSTEM_LIB) $(BOOST_SYSTEM_LIB) +libparam_la_CPPFLAGS = $(ALL_PKG_CPPFLAGS) $(BOOST_CPPFLAGS) +libparam_la_LDFLAGS = $(ALL_PKG_LDFLAGS) $(BOOST_LDFLAGS) +libparam_la_LIBADD = tinyxml/libtinyxml.la $(ALL_PKG_LIBS) $(BOOST_FILESYSTEM_LIB) $(BOOST_SYSTEM_LIB) include $(top_srcdir)/am/global-rules