[Olena-patches] olena: olena-2.0-891-g96938fc Make Scribo more compatible with BSD Make.

* doc/Makefile.am: Do not use `$<' outside suffix rules. * Makefile.am, * tests/unit_test/Makefile.am: Adjust comments. --- scribo/ChangeLog | 9 +++++++++ scribo/Makefile.am | 5 +++-- scribo/doc/Makefile.am | 12 ++++++------ scribo/tests/unit_test/Makefile.am | 5 +++-- 4 files changed, 21 insertions(+), 10 deletions(-) diff --git a/scribo/ChangeLog b/scribo/ChangeLog index 2e4bc02..cdcb6c0 100644 --- a/scribo/ChangeLog +++ b/scribo/ChangeLog @@ -1,3 +1,12 @@ +2014-06-26 Roland Levillain &lt;roland(a)lrde.epita.fr&gt; + + Make Scribo more compatible with BSD Make. + + * doc/Makefile.am: Do not use `$<' outside suffix rules. + * Makefile.am, + * tests/unit_test/Makefile.am: + Adjust comments. + 2014-06-25 Roland Levillain &lt;roland(a)lrde.epita.fr&gt; Convert Scribo to UTF-8. diff --git a/scribo/Makefile.am b/scribo/Makefile.am index 9dd3d76..01bce66 100644 --- a/scribo/Makefile.am +++ b/scribo/Makefile.am @@ -1,4 +1,4 @@ -# Copyright (C) 2009, 2010, 2011, 2012 EPITA Research and Development +# Copyright (C) 2009, 2010, 2011, 2012, 2014 EPITA Research and Development # Laboratory (LRDE). # # This file is part of Olena. @@ -36,7 +36,8 @@ regen-am: # FIXME: Change generate_dist_headers.sh so that the action looks like this: # -# $< $@.tmp && mv -f $@.tmp $@ && chmod -w $@ +# $(top_srcdir)/build-aux/generate_dist_headers.sh \ +# $@.tmp && mv -f $@.tmp $@ && chmod -w $@ # $(srcdir)/headers.mk: $(top_srcdir)/build-aux/generate_dist_headers.sh cd $(srcdir) \ diff --git a/scribo/doc/Makefile.am b/scribo/doc/Makefile.am index 16a5b6c..14ce71c 100644 --- a/scribo/doc/Makefile.am +++ b/scribo/doc/Makefile.am @@ -56,7 +56,7 @@ edit = sed -e "s|@ID[@]|$(ID)|" \ -e 's,@builddir[@],$(builddir),g' $(DOXYFILE_USER): $(srcdir)/$(DOXYFILE).in - $(edit) $< >$@ + $(edit) $(srcdir)/$(DOXYFILE).in >$@ MAINTAINERCLEANFILES = $(DOXYFILE_USER) USER_REFMAN = user-refman @@ -94,8 +94,8 @@ $(srcdir)/user-refman.stamp: $(srcdir)/$(DOXYFILE).in $(REFMAN_deps) $(srcdir)/$(USER_REFMAN): $(srcdir)/user-refman.stamp ## Recover from the removal of $@. @if test -d $@; then :; else \ - rm -f $<; \ - $(MAKE) $(AM_MAKEFLAGS) $<; \ + rm -f $(srcdir)/user-refman.stamp; \ + $(MAKE) $(AM_MAKEFLAGS) $(srcdir)/user-refman.stamp; \ fi # Installing a directory located in the source dir is not supported by @@ -137,7 +137,7 @@ edit_devel = sed \ $(DOXYFILE_DEVEL): $(srcdir)/$(DOXYFILE).in rm -f $@.tmp - $(edit) $< >$@.tmp + $(edit) $(srcdir)/$(DOXYFILE).in >$@.tmp $(edit_devel) $@.tmp >$@ rm -f $@.tmp MAINTAINERCLEANFILES += $(DOXYFILE_DEVEL) @@ -176,8 +176,8 @@ $(srcdir)/devel-refman.stamp: $(srcdir)/$(DOXYFILE).in $(REFMAN_deps) $(srcdir)/$(DEVEL_REFMAN): $(srcdir)/devel-refman.stamp ## Recover from the removal of $@. @if test -d $@; then :; else \ - rm -f $<; \ - $(MAKE) $(AM_MAKEFLAGS) $<; \ + rm -f $(srcdir)/devel-refman.stamp; \ + $(MAKE) $(AM_MAKEFLAGS) $(srcdir)/devel-refman.stamp; \ fi ## -------------- ## diff --git a/scribo/tests/unit_test/Makefile.am b/scribo/tests/unit_test/Makefile.am index c5b2621..afdb1c6 100644 --- a/scribo/tests/unit_test/Makefile.am +++ b/scribo/tests/unit_test/Makefile.am @@ -1,4 +1,4 @@ -# Copyright (C) 2009, 2010, 2011 EPITA Research and Development +# Copyright (C) 2009, 2010, 2011, 2014 EPITA Research and Development # Laboratory (LRDE). # # This file is part of Olena. @@ -48,7 +48,8 @@ regen-am: # FIXME: Change build_unit_test.sh so that the action looks like this: # -# $< $@.tmp && mv -f $@.tmp $@ && chmod -w $@ +# $(top_srcdir)/build-aux/build_unit_test.sh \ +# $@.tmp && mv -f $@.tmp $@ && chmod -w $@ # # `$(abs_top_srcdir)' is required because of the change of directory # at the beginning og the action. -- 1.7.10.4