* tests/tests-recursive.mk: Include build-aux/extra-recursive-targets.mk. (EXTRA_RECURSIVE_TARGETS): Add tests-recursive. Remove redundant parts.

--- milena/ChangeLog | 9 ++++++++ milena/tests/tests-recursive.mk | 42 +------------------------------------- 2 files changed, 11 insertions(+), 40 deletions(-)

diff --git a/milena/ChangeLog b/milena/ChangeLog index ebc6fcc..8f0da1c 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,5 +1,14 @@ 2009-06-08 Roland Levillain roland@lrde.epita.fr

+ Factor tests/tests-recursive.mk. + + * tests/tests-recursive.mk: Include + build-aux/extra-recursive-targets.mk. + (EXTRA_RECURSIVE_TARGETS): Add tests-recursive. + Remove redundant parts. + +2009-06-08 Roland Levillain roland@lrde.epita.fr + Rename Make target `regen-dist' as `regen'.

* Makefile.am, doc/Makefile.am (regen-dist): Rename target as... diff --git a/milena/tests/tests-recursive.mk b/milena/tests/tests-recursive.mk index 800ef6d..5816d7c 100644 --- a/milena/tests/tests-recursive.mk +++ b/milena/tests/tests-recursive.mk @@ -1,52 +1,14 @@ # tests-recursive.mk -*- Automake -*- # Compile tests recursively, but don't run them.

-# Copyright (C) 1994, 1995, 1996, 1997, 1998, 1999, 2000, 2001, 2002, -# 2003, 2004, 2005, 2006, 2008 Free Software Foundation, Inc. -# This Makefile.in is free software; the Free Software Foundation -# gives unlimited permission to copy and/or distribute it, -# with or without modifications, as long as this notice is preserved. - -# This program is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY, to the extent permitted by law; without -# even the implied warranty of MERCHANTABILITY or FITNESS FOR A -# PARTICULAR PURPOSE. - +include $(top_srcdir)/build-aux/extra-recursive-targets.mk

# Sometimes, we just want to check whether tests compile, without # actually running them. Hence this `tests' target, which does half # the job of the `check' target. - +EXTRA_RECURSIVE_TARGETS += tests-recursive .PHONY: tests-am tests-recursive tests # ``Halved'' version of check-am. tests-am: $(check_PROGRAMS) $(MAKE) $(AM_MAKEFLAGS) $(check_PROGRAMS) -# FIXME: Copied from a generated Makefile.in (rule `$(RECURSIVE_TARGETS)'). -# (Automake does not allow us to interact with the code it generates in -# Makefile.in.) We might want to propose this as a patch to the Automake -# project. -tests-recursive: - @failcom='exit 1'; \ - for f in x $$MAKEFLAGS; do \ - case $$f in \ - *=* | --[!k]*);; \ - *k*) failcom='fail=yes';; \ - esac; \ - done; \ - dot_seen=no; \ - target=`echo $@ | sed s/-recursive//`; \ - list='$(SUBDIRS)'; for subdir in $$list; do \ - echo "Making $$target in $$subdir"; \ - if test "$$subdir" = "."; then \ - dot_seen=yes; \ - local_target="$$target-am"; \ - else \ - local_target="$$target"; \ - fi; \ - (cd $$subdir && $(MAKE) $(AM_MAKEFLAGS) $$local_target) \ - || eval $$failcom; \ - done; \ - if test "$$dot_seen" = "no"; then \ - $(MAKE) $(AM_MAKEFLAGS) "$$target-am" || exit 1; \ - fi; test -z "$$fail" tests: tests-recursive