[Olena-patches] olena: olena-2.0-790-g6cc1347 Have `make regen- also regenerate Milena's mln/version.hh.

* Makefile.am (regen-am): Here. --- milena/ChangeLog | 6 ++++++ milena/Makefile.am | 10 ++++++++++ 2 files changed, 16 insertions(+) diff --git a/milena/ChangeLog b/milena/ChangeLog index c6be167..b7a2eb0 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,5 +1,11 @@ 2013-09-06 Roland Levillain <roland(a)lrde.epita.fr> + Have `make regen- also regenerate Milena's mln/version.hh. + + * Makefile.am (regen-am): Here. + +2013-09-06 Roland Levillain <roland(a)lrde.epita.fr> + Do not harcode OLN_PACKAGE_AUTHORS in Milena's mln/version.hh.in. * mln/version.hh.in (OLN_PACKAGE_AUTHORS): Set it to diff --git a/milena/Makefile.am b/milena/Makefile.am index 058cadd..da3b91b 100644 --- a/milena/Makefile.am +++ b/milena/Makefile.am @@ -64,6 +64,16 @@ regen-am: cd $(srcdir) \ && $(abs_top_srcdir)/build-aux/generate_dist_headers.sh \ mln headers.mk +# Also regenerate mln/version.hh. Again, the action is duplicated +# (see target $(srcdir)/mln/version.hh below). There's probably a +# (portable) way to factor this. + rm -f $(srcdir)/mln/version.hh $(srcdir)/mln/version.hh.tmp + srcdir=''; \ + test -f ./$(srcdir)/mln/version.hh.in || srcdir=$(srcdir)/; \ + $(edit) $${srcdir}$(srcdir)/mln/version.hh.in \ + >$(srcdir)/mln/version.hh.tmp + chmod a-w $(srcdir)/mln/version.hh.tmp + mv $(srcdir)/mln/version.hh.tmp $(srcdir)/mln/version.hh # FIXME: Change generate_dist_headers.sh so that the action looks like this: # -- 1.7.10.4