improved intermodule lib handling

[[Imported from SVN: r574]]

configure.ac

@@ -14,9 +14,8 @@ if test x$HAVE_DUNECOMMON != x1 ; then
 fi
 
 # preset variable to path such that #include <dune/...> works
-AC_SUBST([AM_CPPFLAGS], '$(DUNECOMMON_CPPFLAGS) -I$(top_srcdir)')
-
-AC_SUBST([LIBDUNE], '$(DUNECOMMONROOT)/common/libcommon.la')
+AC_SUBST([AM_CPPFLAGS], '$(DUNE_CPPFLAGS) -I$(top_srcdir)')
+AC_SUBST([AM_LDFLAGS], '$(DUNE_LDFLAGS) $(DUNE_LIBS)')
 
 DUNE_SUMMARY_ALL
 

istl/paamg/test/Makefile.am

@@ -6,9 +6,6 @@ if MPI
   TESTRUNS = run-galerkin run-hierarchy run-amg
 endif
 
-# link against libcommon to utilize dune stdstreams
-AM_LDFLAGS = $(LIBDUNE)
-
 NORMALTESTS = $(MPITESTS)
 
 # which tests to run
@@ -24,25 +21,25 @@ graphtest_SOURCES = graphtest.cc
 transfertest_SOURCES = transfertest.cc
 transfertest_CXXFLAGS = $(MPI_CPPFLAGS)
 transfertest_LDFLAGS = $(MPI_LDFLAGS) $(MPI_LIBS)
-transfertest_DEPENDENCIES = $(LIBDUNE)
+transfertest_DEPENDENCIES = $(LOCAL_LIBS)
 
 galerkintest_SOURCES = galerkintest.cc anisotropic.hh
 galerkintest_CXXFLAGS = $(MPI_CPPFLAGS)
 galerkintest_LDFLAGS = $(MPI_LDFLAGS) $(MPI_LIBS)
-galerkintest_DEPENDENCIES = $(LIBDUNE)
+galerkintest_DEPENDENCIES = $(LOCAL_LIBS)
 
 hierarchytest_SOURCES = hierarchytest.cc anisotropic.hh
 hierarchytest_CXXFLAGS = $(MPI_CPPFLAGS)
 hierarchytest_LDFLAGS = $(MPI_LDFLAGS) $(MPI_LIBS)
-hierarchytest_DEPENDENCIES = $(LIBDUNE)
+hierarchytest_DEPENDENCIES = $(LOCAL_LIBS)
 
 amgtest_SOURCES = amgtest.cc
 amgtest_CXXFLAGS = $(MPI_CPPFLAGS)
 amgtest_LDFLAGS = $(MPI_LDFLAGS) $(MPI_LIBS)
-amgtest_DEPENDENCIES = $(LIBDUNE)
+amgtest_DEPENDENCIES = $(LOCAL_LIBS)
 
 pamgtest_SOURCES = parallelamgtest.cc
 pamgtest_CXXFLAGS = $(MPI_CPPFLAGS)
 pamgtest_LDFLAGS = $(MPI_LDFLAGS) $(MPI_LIBS)
-pamgtest_DEPENDENCIES = $(LIBDUNE)
+pamgtest_DEPENDENCIES = $(LOCAL_LIBS)
 include $(top_srcdir)/am/global-rules

istl/test/Makefile.am

@@ -6,9 +6,6 @@ if MPI
   INDEXRUN = run-indices run-syncer run-vectorcommtest
 endif
 
-# link against libcommon to utilize dune stdstreams
-AM_LDFLAGS = $(LIBDUNE)
-
 # which tests where program to build and run are equal
 NORMALTESTS = matrixutilstest bvectortest indexsettest $(SELECTPROG)
 
@@ -21,32 +18,32 @@ check_PROGRAMS = $(NORMALTESTS) $(INDEXPROG)
 # define the programs
 
 bvectortest_SOURCES = bvectortest.cc
-bvectortest_DEPENDENCIES = $(LIBDUNE)
+bvectortest_DEPENDENCIES = $(LOCAL_LIBS)
 
 matrixutilstest_SOURCES = matrixutilstest.cc laplacian.hh
-matrixutilstest_DEPENDENCIES = $(LIBDUNE)
+matrixutilstest_DEPENDENCIES = $(LOCAL_LIBS)
 
 indicestest_SOURCES = indicestest.cc
 indicestest_CXXFLAGS = $(MPI_CPPFLAGS)
 indicestest_LDFLAGS = $(MPI_LDFLAGS) $(MPI_LIBS)
-indicestest_DEPENDENCIES = $(LIBDUNE)
+indicestest_DEPENDENCIES = $(LOCAL_LIBS)
 
 selectiontest_SOURCES = selectiontest.cc
 selectiontest_CXXFLAGS = $(MPI_CPPFLAGS)
 selectiontest_LDFLAGS = $(MPI_LDFLAGS) $(MPI_LIBS)
-selectiontest_DEPENDENCIES = $(LIBDUNE)
+selectiontest_DEPENDENCIES = $(LOCAL_LIBS)
 
 indexsettest_SOURCES = indexsettest.cc
-indexsettest_DEPENDENCIES = $(LIBDUNE)
+indexsettest_DEPENDENCIES = $(LOCAL_LIBS)
 
 syncertest_SOURCES = syncertest.cc
 syncertest_CXXFLAGS = $(MPI_CPPFLAGS)
 syncertest_LDFLAGS = $(MPI_LDFLAGS) $(MPI_LIBS)
-syncertest_DEPENDENCIES = $(LIBDUNE)
+syncertest_DEPENDENCIES = $(LOCAL_LIBS)
 
 vectorcommtest_SOURCES = vectorcommtest.cc
 vectorcommtest_CXXFLAGS = $(MPI_CPPFLAGS)
 vectorcommtest_LDFLAGS = $(MPI_LDFLAGS) $(MPI_LIBS)
-vectorcommtest_DEPENDENCIES = $(LIBDUNE)
+vectorcommtest_DEPENDENCIES = $(LOCAL_LIBS)
 
 include $(top_srcdir)/am/global-rules