implemented dependency tracking for the libs

[[Imported from SVN: r3699]]

am/global-rules

@@ -12,5 +12,8 @@ include $(top_srcdir)/am/sourcescheck
 # add "check-log"-target to create automated build logs
 include $(top_srcdir)/am/checklog
 
-# prevent "make check" if libdune does not yet exist
-include $(top_srcdir)/am/no-check-without-lib
+# automaticly update libs
+include $(top_srcdir)/am/update-libs
+
+# Makefile depends on "me"
+Makefile: $(top_builddir)/am/global-rules

am/inkscape.am

@@ -3,3 +3,5 @@ if INKSCAPE
 	$(INKSCAPE) -e $@ $<
 endif INKSCAPE
 
+# Makefile depends on "me"
+Makefile: $(top_builddir)/am/inkscape.am

am/sourcescheck

@@ -47,3 +47,7 @@ sourcescheck-recursive:
 	fi; test -z "$$fail"
 
 .PHONY: sourcescheck sourcescheck-recursive
+
+# Makefile depends on "me"
+Makefile: $(top_builddir)/am/sourcescheck
+

am/update-libs

+# -*- Makefile -*-
+# $Id$
+#
+# -- update libs in an other directory --
+#
+# applications linking against libdune should also depend on libdune
+#
+# app_SOURCE = app.cc
+# app_LDADD = $(LIBDUNE)
+# app_DEPENDENCIES = $(LIBDUNE)
+#
+# instead, you can also write
+#
+# app_SOURCE = app.cc
+# app_LIBADD = $(LIBDUNE)
+#
+
+LIBDUNE = $(top_builddir)/lib/libdune.la
+
+%.la: MAKELIBS.force
+	make -C $$(dirname $@) $$(basename $@)
+
+.PHONY: MAKELIBS.force
+
+# Makefile depends on "me"
+Makefile: $(top_builddir)/am/update-libs

am/webstuff

@@ -26,3 +26,6 @@ web-install: all
 	  $(MAKE) -f $(DUNEWEBDIR)/Make.global \
             EXTRAINSTALL="$(EXTRAINSTALL)" CURDIR="$(CURDIR)" install ; \
 	fi
+
+# Makefile depends on "me"
+Makefile: $(top_builddir)/am/webstuff

common/test/.gitignore

@@ -20,4 +20,5 @@ gcdlcdtest
 streamtest
 exprtmpl
 timing_xpr
-timing_old
\ No newline at end of file
+timing_old
+timing_flt
\ No newline at end of file

common/test/Makefile.am

@@ -12,47 +12,63 @@ check_PROGRAMS = $(TESTPROGS)
 
 # output code coverage
 #AM_CXXFLAGS = -fprofile-arcs -ftest-coverage
-#AM_LDFLAGS = $(top_builddir)/lib/libdune.la
-AM_LDFLAGS = $(top_builddir)/common/libcommon.la
+AM_LDFLAGS = $(LIBDUNE)
 
 # define the programs
 
 parsetest_SOURCES = parsetest.cc
+parsetest_DEPENDENCIES = $(LIBDUNE)
 
 sllisttest_SOURCES = sllisttest.cc
+sllisttest_DEPENDENCIES = $(LIBDUNE)
 
 test_stack_SOURCES = test-stack.cc
+test_stack_DEPENDENCIES = $(LIBDUNE)
 
 arraylisttest_SOURCES = arraylisttest.cc
+arraylisttest_DEPENDENCIES = $(LIBDUNE)
 
 smartpointertest_SOURCES = smartpointertest.cc
+smartpointertest_DEPENDENCIES = $(LIBDUNE)
 
 tuplestest_SOURCES = tuplestest.cc
+tuplestest_DEPENDENCIES = $(LIBDUNE)
 
 streamtest_SOURCES = streamtest.cc
+streamtest_DEPENDENCIES = $(LIBDUNE)
 
 # mention headers so that they are distributed too
 iteratorfacadetest_SOURCES = iteratorfacadetest.cc iteratorfacadetest.hh \
    iteratortest.hh
+iteratorfacadetest_DEPENDENCIES = $(LIBDUNE)
 
 fmatrixtest_SOURCES = fmatrixtest.cc
+fmatrixtest_DEPENDENCIES = $(LIBDUNE)
 
 poolallocatortest_SOURCES = poolallocatortest.cc
+poolallocatortest_DEPENDENCIES = $(LIBDUNE)
 
 settest_SOURCES=settest.cc
+settest_DEPENDENCIES = $(LIBDUNE)
 
 gcdlcdtest_SOURCES = gcdlcdtest.cc
+gcdlcdtest_DEPENDENCIES = $(LIBDUNE)
 
 # bin_PROGRAMS = exprtmpl timing_old timing_xpr timing_flt
+#
 exprtmpl_SOURCES = exprtmpl.cc
 exprtmpl_CXXFLAGS = -DDUNE_EXPRESSIONTEMPLATES -DDUNE_ISTL_WITH_CHECKING -g
 # -DNOPRINT
+exprtmpl_DEPENDENCIES = $(LIBDUNE)
 
 dist_noinst_DATA = timing.cc
 timing_old_SOURCES = timing.cc
+timing_old_DEPENDENCIES = $(LIBDUNE)
 timing_xpr_SOURCES = timing.cc
-timing_xpr_CXXFLAGS = -DDUNE_EXPRESSIONTEMPLATES -g -finline-limit=1200
+timing_xpr_CXXFLAGS = -DDUNE_EXPRESSIONTEMPLATES -g
+timing_xpr_DEPENDENCIES = $(LIBDUNE)
 timing_flt_SOURCES = timing.cc
-timing_flt_CXXFLAGS = -DDUNE_FLATIT -g
+timing_flt_CXXFLAGS = -DDUNE_EXPRESSIONTEMPLATES -DDUNE_FLATIT -g
+timing_flt_DEPENDENCIES = $(LIBDUNE)
 
 include $(top_srcdir)/am/global-rules

disc/shapefunctions/test/Makefile.am

@@ -7,7 +7,7 @@ check_PROGRAMS = refelemshapefunctest
 ## common flags
 #
 
-AM_LDFLAGS = $(top_builddir)/lib/libdune.la
+AM_LDFLAGS = $(LIBDUNE)
 
 # paranoia
 DUNE_EXTRA_CHECKS =  -DDUNE_ISTL_WITH_CHECKING -DDUNE_DEVEL_MODE
@@ -21,6 +21,7 @@ AM_CPPFLAGS = $(DUNE_EXTRA_CHECKS) -g -Wall
 #
 
 refelemshapefunctest_SOURCES = refelemshapefunctest.cc
+refelemshapefunctest_DEPENDENCIES = $(LIBDUNE)
 
 ## distribution tarball
 

fem/test/Makefile.am

@@ -46,7 +46,7 @@ check_PROGRAMS = $(NORMALTESTS) $(YPROG)
 ## common flags
 #
 
-AM_LDFLAGS = $(top_builddir)/lib/libdune.la
+AM_LDFLAGS = $(LIBDUNE)
 
 # paranoia
 DUNE_EXTRA_CHECKS =  -DDUNE_ISTL_WITH_CHECKING -DDUNE_DEVEL_MODE
@@ -59,27 +59,33 @@ AM_CXXFLAGS = $(COVERAGE) $(DUNE_EXTRA_CHECKS)
 #
 
 test_fem_sgrid_SOURCES = test-fem-sgrid.cc
+test_fem_sgrid_DEPENDENCIES = $(LIBDUNE)
 
 test_fem_oned_SOURCES = test-fem-oned.cc
+test_fem_oned_DEPENDENCIES = $(LIBDUNE)
 
 test_fem_yaspgrid_SOURCES = test-fem-yaspgrid.cc
 test_fem_yaspgrid_CXXFLAGS = $(AM_CPPFLAGS) $(MPI_CPPFLAGS)
 test_fem_yaspgrid_LDADD = $(MPI_LDFLAGS) $(MPI_LIBS)
+test_fem_yaspgrid_DEPENDENCIES = $(LIBDUNE)
 
 # this implicitly checks the autoconf-test as well...
 test_fem_alberta_SOURCES = test-fem-alberta.cc
 test_fem_alberta_CXXFLAGS = $(ALBERTA_CPPFLAGS) $(AM_CPPFLAGS)
 test_fem_alberta_LDADD = $(ALBERTA_LDFLAGS) $(ALBERTA_LIBS)
+test_fem_alberta_DEPENDENCIES = $(LIBDUNE)
 
 # files for alu3dgrid
 test_fem_alu3dgrid_SOURCES = test-fem-alu3dgrid.cc
 test_fem_alu3dgrid_CXXFLAGS = $(ALUGRID_CPPFLAGS) $(AM_CPPFLAGS)
 test_fem_alu3dgrid_LDADD = $(ALUGRID_LDFLAGS) $(ALUGRID_LIBS)
+test_fem_alu3dgrid_DEPENDENCIES = $(LIBDUNE)
 
 # libdune contains both libug2 and libug3, always test both dimensions
 test_fem_ug_SOURCES = test-fem-ug.cc
 test_fem_ug_CXXFLAGS = $(AM_CPPFLAGS) $(UG_CPPFLAGS) $(AMIRAMESH_CPPFLAGS)
 test_fem_ug_LDADD = $(AMIRAMESH_LDFLAGS) $(AMIRAMESH_LIBS)
+test_fem_ug_DEPENDENCIES = $(LIBDUNE)
 
 ## distribution tarball
 

grid/test/Makefile.am

@@ -46,7 +46,7 @@ check_PROGRAMS = $(NORMALTESTS) $(YPROG)
 ## common flags
 #
 
-AM_LDFLAGS = $(top_builddir)/lib/libdune.la
+AM_LDFLAGS = $(LIBDUNE)
 
 # paranoia
 DUNE_EXTRA_CHECKS =  -DDUNE_ISTL_WITH_CHECKING -DDUNE_DEVEL_MODE
@@ -59,27 +59,33 @@ AM_CPPFLAGS = $(COVERAGE) $(DUNE_EXTRA_CHECKS)
 #
 
 test_sgrid_SOURCES = test-sgrid.cc
+test_sgrid_DEPENDENCIES = $(LIBDUNE)
 
 test_oned_SOURCES = test-oned.cc
+test_oned_DEPENDENCIES = $(LIBDUNE)
 
 test_yaspgrid_SOURCES = test-yaspgrid.cc
 test_yaspgrid_CXXFLAGS = $(AM_CPPFLAGS) $(MPI_CPPFLAGS)
 test_yaspgrid_LDADD = $(MPI_LDFLAGS) $(MPI_LIBS)
+test_yaspgrid_DEPENDENCIES = $(LIBDUNE)
 
 # this implicitly checks the autoconf-test as well...
 test_alberta_SOURCES = test-alberta.cc
 test_alberta_CXXFLAGS = $(ALBERTA_CPPFLAGS) $(AM_CPPFLAGS)
 test_alberta_LDADD = $(ALBERTA_LDFLAGS) $(ALBERTA_LIBS)
+test_alberta_DEPENDENCIES = $(LIBDUNE)
 
 # files for alu3dgrid
 test_alu3dgrid_SOURCES = test-alu3dgrid.cc
 test_alu3dgrid_CXXFLAGS = $(ALUGRID_CPPFLAGS) $(AM_CPPFLAGS)
 test_alu3dgrid_LDADD = $(ALUGRID_LDFLAGS) $(ALUGRID_LIBS)
+test_alu3dgrid_DEPENDENCIES = $(LIBDUNE)
 
 # libdune contains both libug2 and libug3, always test both dimensions
 test_ug_SOURCES = test-ug.cc
 test_ug_CXXFLAGS = $(AM_CPPFLAGS) $(UG_CPPFLAGS) $(AMIRAMESH_CPPFLAGS)
 test_ug_LDADD = $(AMIRAMESH_LDFLAGS) $(AMIRAMESH_LIBS) $(UG_LDFLAGS) $(UG_LIBS)
+test_ug_DEPENDENCIES = $(LIBDUNE)
 
 ## distribution tarball
 

istl/paamg/test/Makefile.am

@@ -24,18 +24,21 @@ graphtest_SOURCES = graphtest.cc
 transfertest_SOURCES = transfertest.cc
 transfertest_CXXFLAGS = $(MPI_CPPFLAGS)
 transfertest_LDFLAGS = $(MPI_LDFLAGS) $(MPI_LIBS)
+transfertest_DEPENDENCIES = $(LIBDUNE)
 
 galerkintest_SOURCES = galerkintest.cc anisotropic.hh
 galerkintest_CXXFLAGS = $(MPI_CPPFLAGS)
 galerkintest_LDFLAGS = $(MPI_LDFLAGS) $(MPI_LIBS)
-
+galerkintest_DEPENDENCIES = $(LIBDUNE)
 
 hierarchytest_SOURCES = hierarchytest.cc anisotropic.hh
 hierarchytest_CXXFLAGS = $(MPI_CPPFLAGS)
 hierarchytest_LDFLAGS = $(MPI_LDFLAGS) $(MPI_LIBS)
+hierarchytest_DEPENDENCIES = $(LIBDUNE)
 
 amgtest_SOURCES = amgtest.cc
 amgtest_CXXFLAGS = $(MPI_CPPFLAGS)
 amgtest_LDFLAGS = $(MPI_LDFLAGS) $(MPI_LIBS)
+amgtest_DEPENDENCIES = $(LIBDUNE)
 
 include $(top_srcdir)/am/global-rules

istl/test/Makefile.am

@@ -21,29 +21,34 @@ check_PROGRAMS = $(NORMALTESTS) $(INDEXPROG)
 # define the programs
 
 bvectortest_SOURCES = bvectortest.cc
+bvectortest_DEPENDENCIES = $(LIBDUNE)
 
 indicestest_SOURCES = indicestest.cc
+indicestest_DEPENDENCIES = $(LIBDUNE)
 
 matrixutilstest_SOURCES = matrixutilstest.cc laplacian.hh
+matrixutilstest_DEPENDENCIES = $(LIBDUNE)
 
 indicestest_CXXFLAGS = $(MPI_CPPFLAGS)
 indicestest_LDFLAGS = $(MPI_LDFLAGS) $(MPI_LIBS)
+indicestest_DEPENDENCIES = $(LIBDUNE)
 
 selectiontest_SOURCES = selectiontest.cc
-
 selectiontest_CXXFLAGS = $(MPI_CPPFLAGS)
 selectiontest_LDFLAGS = $(MPI_LDFLAGS) $(MPI_LIBS)
+selectiontest_DEPENDENCIES = $(LIBDUNE)
 
 indexsettest_SOURCES = indexsettest.cc
+indexsettest_DEPENDENCIES = $(LIBDUNE)
 
 syncertest_SOURCES = syncertest.cc
-
 syncertest_CXXFLAGS = $(MPI_CPPFLAGS)
 syncertest_LDFLAGS = $(MPI_LDFLAGS) $(MPI_LIBS)
+syncertest_DEPENDENCIES = $(LIBDUNE)
 
 vectorcommtest_SOURCES = vectorcommtest.cc
-
 vectorcommtest_CXXFLAGS = $(MPI_CPPFLAGS)
 vectorcommtest_LDFLAGS = $(MPI_LDFLAGS) $(MPI_LIBS)
+vectorcommtest_DEPENDENCIES = $(LIBDUNE)
 
 include $(top_srcdir)/am/global-rules