* Makefile.am (tools): Remove useless target. (doc, tutorial): Do not use make's non portable `-C' option. --- milena/ChangeLog | 7 +++++++ milena/Makefile.am | 10 ++++------ 2 files changed, 11 insertions(+), 6 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index 772be01..7cd29fb 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,5 +1,12 @@ 2009-06-08 Roland Levillain <roland@lrde.epita.fr> + Improve and clean up Makefile.am. + + * Makefile.am (tools): Remove useless target. + (doc, tutorial): Do not use make's non portable `-C' option. + +2009-06-08 Roland Levillain <roland@lrde.epita.fr> + Adjust Milena's top-level Makefile w.r.t the pretty-check target. * Makefile.am (pretty-check): New (phony) target. diff --git a/milena/Makefile.am b/milena/Makefile.am index 7a0bdfa..c148931 100644 --- a/milena/Makefile.am +++ b/milena/Makefile.am @@ -13,20 +13,18 @@ if ENABLE_TOOLS SUBDIRS += tools endif ENABLE_TOOLS -.PHONY: doc tutorial tools pretty-check +.PHONY: doc tutorial pretty-check doc: - $(MAKE) -C doc doc + cd doc && $(MAKE) $(AM_MAKEFLAGS) $@ +# FIXME: This target has no trigger in the top-level. tutorial: - $(MAKE) -C doc tutorial + cd doc && $(MAKE) $(AM_MAKEFLAGS) $@ pretty-check: cd tests && $(MAKE) $(AM_MAKEFLAGS) $@ -tools: - $(MAKE) -C tools all - # Regen files recursively. include $(top_srcdir)/build-aux/regen-recursive.mk REGEN_SUBDIRS += doc tests -- 1.6.1.2