[Olena-patches] [PATCH 08/12] Install recursive regeneration rules in SCRIBO.

* Makefile.am: Include build-aux/regen-recursive.mk. (REGEN_SUBDIRS): Add tests. * tests/Makefile.am: Include build-aux/regen-recursive.mk. (REGEN_SUBDIRS): Add unit_test. * tests/unit_test/Makefile.am: Include build-aux/regen-recursive.mk. (regen): Remove phony status (now handled by regen-recursive.mk). Rename target as... (regen-am): ...this. Do not make unit-tests.mk read-only, since bootstrap expects it to be writable. ($(srcdir)/unit-tests.mk): Likewise. --- scribo/ChangeLog | 16 ++++++++++++++++ scribo/Makefile.am | 6 ++++++ scribo/tests/Makefile.am | 3 +++ scribo/tests/unit_test/Makefile.am | 11 +++++++---- 4 files changed, 32 insertions(+), 4 deletions(-) diff --git a/scribo/ChangeLog b/scribo/ChangeLog index b48929a..4baddfe 100644 --- a/scribo/ChangeLog +++ b/scribo/ChangeLog @@ -1,3 +1,19 @@ +2009-06-08 Roland Levillain &lt;roland(a)lrde.epita.fr&gt; + + Install recursive regeneration rules in SCRIBO. + + * Makefile.am: Include build-aux/regen-recursive.mk. + (REGEN_SUBDIRS): Add tests. + * tests/Makefile.am: Include build-aux/regen-recursive.mk. + (REGEN_SUBDIRS): Add unit_test. + * tests/unit_test/Makefile.am: Include build-aux/regen-recursive.mk. + (regen): Remove phony status (now handled by regen-recursive.mk). + Rename target as... + (regen-am): ...this. + Do not make unit-tests.mk read-only, since bootstrap expects it + to be writable. + ($(srcdir)/unit-tests.mk): Likewise. + 2009-05-29 Guillaume Lazzara &lt;lazzara(a)lrde.epita.fr&gt; Remove unused files in Scribo. diff --git a/scribo/Makefile.am b/scribo/Makefile.am index 98a71f3..23d2fc2 100644 --- a/scribo/Makefile.am +++ b/scribo/Makefile.am @@ -1,6 +1,12 @@ +## Process this file through Automake to create Makefile.in. + SUBDIRS = tests src .PHONY: bin bin: make -C src + +# Regen files recursively. +include $(top_srcdir)/build-aux/regen-recursive.mk +REGEN_SUBDIRS += tests diff --git a/scribo/tests/Makefile.am b/scribo/tests/Makefile.am index 8646e68..ef6d0b7 100644 --- a/scribo/tests/Makefile.am +++ b/scribo/tests/Makefile.am @@ -7,3 +7,6 @@ SUBDIRS = \ text \ unit_test +# Regen files recursively. +include $(top_srcdir)/build-aux/regen-recursive.mk +REGEN_SUBDIRS += unit_test diff --git a/scribo/tests/unit_test/Makefile.am b/scribo/tests/unit_test/Makefile.am index c0be7d6..4e5d02d 100644 --- a/scribo/tests/unit_test/Makefile.am +++ b/scribo/tests/unit_test/Makefile.am @@ -2,8 +2,12 @@ include $(top_srcdir)/scribo/scribo.mk -.PHONY: regen-tests -regen-tests: $(srcdir)/unit-tests.mk +# Regen files. +include $(top_srcdir)/build-aux/regen-recursive.mk +regen-am: + cd $(srcdir) \ + && ./build_unit_test.sh $(abs_top_srcdir)/scribo + # FIXME: Change build_unit_test.sh so that the action looks like this: # # $< $@.tmp && mv -f $@.tmp $@ && chmod -w $@ @@ -12,8 +16,7 @@ regen-tests: $(srcdir)/unit-tests.mk # at the beginning og the action. $(srcdir)/unit-tests.mk: $(srcdir)/build_unit_test.sh cd $(srcdir) \ - && ./build_unit_test.sh $(abs_top_srcdir)/scribo \ - && chmod a-w unit-tests.mk + && ./build_unit_test.sh $(abs_top_srcdir)/scribo include $(srcdir)/unit-tests.mk -- 1.6.1.2