improved intermodule lib handling

[[Imported from SVN: r4503]]

common/test/Makefile.am

@@ -11,49 +11,45 @@ TESTS = $(TESTPROGS)
 # programs just to build when "make check" is used
 check_PROGRAMS = $(TESTPROGS)
 
-# output code coverage
-#AM_CXXFLAGS = -fprofile-arcs -ftest-coverage
-AM_LDFLAGS = $(LIBDUNE)
-
 # define the programs
 
 parsetest_SOURCES = parsetest.cc
-parsetest_DEPENDENCIES = $(LIBDUNE)
+parsetest_DEPENDENCIES = $(LOCAL_LIBS)
 
 sllisttest_SOURCES = sllisttest.cc
-sllisttest_DEPENDENCIES = $(LIBDUNE)
+sllisttest_DEPENDENCIES = $(LOCAL_LIBS)
 
 test_stack_SOURCES = test-stack.cc
-test_stack_DEPENDENCIES = $(LIBDUNE)
+test_stack_DEPENDENCIES = $(LOCAL_LIBS)
 
 arraylisttest_SOURCES = arraylisttest.cc
-arraylisttest_DEPENDENCIES = $(LIBDUNE)
+arraylisttest_DEPENDENCIES = $(LOCAL_LIBS)
 
 smartpointertest_SOURCES = smartpointertest.cc
-smartpointertest_DEPENDENCIES = $(LIBDUNE)
+smartpointertest_DEPENDENCIES = $(LOCAL_LIBS)
 
 tuplestest_SOURCES = tuplestest.cc
-tuplestest_DEPENDENCIES = $(LIBDUNE)
+tuplestest_DEPENDENCIES = $(LOCAL_LIBS)
 
 streamtest_SOURCES = streamtest.cc
-streamtest_DEPENDENCIES = $(LIBDUNE)
+streamtest_DEPENDENCIES = $(LOCAL_LIBS)
 
 # mention headers so that they are distributed too
 iteratorfacadetest_SOURCES = iteratorfacadetest.cc iteratorfacadetest.hh \
    iteratortest.hh
-iteratorfacadetest_DEPENDENCIES = $(LIBDUNE)
+iteratorfacadetest_DEPENDENCIES = $(LOCAL_LIBS)
 
 fmatrixtest_SOURCES = fmatrixtest.cc
-fmatrixtest_DEPENDENCIES = $(LIBDUNE)
+fmatrixtest_DEPENDENCIES = $(LOCAL_LIBS)
 
 poolallocatortest_SOURCES = poolallocatortest.cc
-poolallocatortest_DEPENDENCIES = $(LIBDUNE)
+poolallocatortest_DEPENDENCIES = $(LOCAL_LIBS)
 
 settest_SOURCES=settest.cc
-settest_DEPENDENCIES = $(LIBDUNE)
+settest_DEPENDENCIES = $(LOCAL_LIBS)
 
 gcdlcdtest_SOURCES = gcdlcdtest.cc
-gcdlcdtest_DEPENDENCIES = $(LIBDUNE)
+gcdlcdtest_DEPENDENCIES = $(LOCAL_LIBS)
 
 sourcescheck_NOSOURCES = exprtmpl.cc
 # bin_PROGRAMS = exprtmpl timing_old timing_xpr timing_flt
@@ -61,16 +57,16 @@ sourcescheck_NOSOURCES = exprtmpl.cc
 exprtmpl_SOURCES = exprtmpl.cc
 exprtmpl_CXXFLAGS = -DDUNE_EXPRESSIONTEMPLATES -DDUNE_ISTL_WITH_CHECKING -g
 # -DNOPRINT
-exprtmpl_DEPENDENCIES = $(LIBDUNE)
+exprtmpl_DEPENDENCIES = $(LOCAL_LIBS)
 
 dist_noinst_DATA = timing.cc
 timing_old_SOURCES = timing.cc
-timing_old_DEPENDENCIES = $(LIBDUNE)
+timing_old_DEPENDENCIES = $(LOCAL_LIBS)
 timing_xpr_SOURCES = timing.cc
 timing_xpr_CXXFLAGS = -DDUNE_EXPRESSIONTEMPLATES -g
-timing_xpr_DEPENDENCIES = $(LIBDUNE)
+timing_xpr_DEPENDENCIES = $(LOCAL_LIBS)
 timing_flt_SOURCES = timing.cc
 timing_flt_CXXFLAGS = -DDUNE_EXPRESSIONTEMPLATES -DDUNE_FLATIT -g
-timing_flt_DEPENDENCIES = $(LIBDUNE)
+timing_flt_DEPENDENCIES = $(LOCAL_LIBS)
 
 include $(top_srcdir)/am/global-rules

configure.ac

@@ -15,8 +15,8 @@ fi
 
 # preset variable to path such that #include <dune/...> works
 AC_SUBST([AM_CPPFLAGS], '-I$(top_srcdir)')
-
-AC_SUBST([LIBDUNE], '$(top_builddir)/common/libcommon.la')
+AC_SUBST([AM_LDFLAGS], '-L$(top_builddir)/common -lcommon')
+AC_SUBST([LOCAL_LIBS], '$(top_builddir)/common/libcommon.la')
 
 DUNE_SUMMARY_ALL
 

m4/dune.m4

@@ -77,7 +77,7 @@ AC_DEFUN([DUNE_CHECK_MODULES],[
         # only check for a .la-file
         if test -s $_DUNE_MODULE[]ROOT/_dune_ldpath/lib[]_dune_lib[].la ; then
             _DUNE_MODULE[]_LDFLAGS="-L$_DUNE_MODULE[]ROOT/_dune_ldpath"
-            echo found lib[]_dune_lib.la, setting LDFLAGS to _DUNE_MODULE[]_LDFLAGS
+            echo found lib[]_dune_lib.la, setting LDFLAGS to $_DUNE_MODULE[]_LDFLAGS
 
             # provide arguments like normal lib-check
             _DUNE_MODULE[]_LIBS="-l[]_dune_lib"