- Olena-patches

olena: olena-2.0-890-gc2ba187 Regen Milena's Makefile bits in doc/.
by Roland Levillain 26 Jun '14

26 Jun '14

* doc/examples-outputs.mk, * doc/figures.mk, * doc/split-examples.mk, * doc/split-outputs.mk: Regen. --- milena/ChangeLog | 10 ++ milena/doc/examples-outputs.mk | 204 +++++++++++++-------------- milena/doc/figures.mk | 48 +++---- milena/doc/split-examples.mk | 300 ++++++++++++++++++++-------------------- milena/doc/split-outputs.mk | 18 +-- 5 files changed, 295 insertions(+), 285 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index 45a0c75..932b1b5 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,5 +1,15 @@ 2014-06-26 Roland Levillain <roland(a)lrde.epita.fr> + Regen Milena's Makefile bits in doc/. + + * doc/examples-outputs.mk, + * doc/figures.mk, + * doc/split-examples.mk, + * doc/split-outputs.mk: + Regen. + +2014-06-26 Roland Levillain <roland(a)lrde.epita.fr> + Make Milena more compatible with BSD Make. * apps/bench/Makefile.am, diff --git a/milena/doc/examples-outputs.mk b/milena/doc/examples-outputs.mk index 51bba63..3be6897 100644 --- a/milena/doc/examples-outputs.mk +++ b/milena/doc/examples-outputs.mk @@ -14,8 +14,8 @@ MAINTAINERCLEANFILES += $(srcdir)/examples/accu-right-instantiation.stamp $(srcdir)/outputs/accu-right-instantiation.txt: $(srcdir)/examples/accu-right-instantiation.stamp ## Recover from the removal of $@ @if test -f $@; then :; else \ - rm -f $<; \ - $(MAKE) $(AM_MAKEFLAGS) $<; \ + rm -f $(srcdir)/examples/accu-right-instantiation.stamp; \ + $(MAKE) $(AM_MAKEFLAGS) $(srcdir)/examples/accu-right-instantiation.stamp; \ fi @@ -32,8 +32,8 @@ MAINTAINERCLEANFILES += $(srcdir)/examples/borderthickness.stamp $(srcdir)/outputs/borderthickness.txt: $(srcdir)/examples/borderthickness.stamp ## Recover from the removal of $@ @if test -f $@; then :; else \ - rm -f $<; \ - $(MAKE) $(AM_MAKEFLAGS) $<; \ + rm -f $(srcdir)/examples/borderthickness.stamp; \ + $(MAKE) $(AM_MAKEFLAGS) $(srcdir)/examples/borderthickness.stamp; \ fi @@ -50,8 +50,8 @@ MAINTAINERCLEANFILES += $(srcdir)/examples/box2d-bbox.stamp $(srcdir)/outputs/box2d-bbox.txt: $(srcdir)/examples/box2d-bbox.stamp ## Recover from the removal of $@ @if test -f $@; then :; else \ - rm -f $<; \ - $(MAKE) $(AM_MAKEFLAGS) $<; \ + rm -f $(srcdir)/examples/box2d-bbox.stamp; \ + $(MAKE) $(AM_MAKEFLAGS) $(srcdir)/examples/box2d-bbox.stamp; \ fi @@ -68,8 +68,8 @@ MAINTAINERCLEANFILES += $(srcdir)/examples/domain-display.stamp $(srcdir)/outputs/domain-display.txt: $(srcdir)/examples/domain-display.stamp ## Recover from the removal of $@ @if test -f $@; then :; else \ - rm -f $<; \ - $(MAKE) $(AM_MAKEFLAGS) $<; \ + rm -f $(srcdir)/examples/domain-display.stamp; \ + $(MAKE) $(AM_MAKEFLAGS) $(srcdir)/examples/domain-display.stamp; \ fi @@ -86,8 +86,8 @@ MAINTAINERCLEANFILES += $(srcdir)/examples/dpoint-1.stamp $(srcdir)/outputs/dpoint-1.txt: $(srcdir)/examples/dpoint-1.stamp ## Recover from the removal of $@ @if test -f $@; then :; else \ - rm -f $<; \ - $(MAKE) $(AM_MAKEFLAGS) $<; \ + rm -f $(srcdir)/examples/dpoint-1.stamp; \ + $(MAKE) $(AM_MAKEFLAGS) $(srcdir)/examples/dpoint-1.stamp; \ fi @@ -104,8 +104,8 @@ MAINTAINERCLEANFILES += $(srcdir)/examples/estim-sites.stamp $(srcdir)/outputs/estim-sites.txt: $(srcdir)/examples/estim-sites.stamp ## Recover from the removal of $@ @if test -f $@; then :; else \ - rm -f $<; \ - $(MAKE) $(AM_MAKEFLAGS) $<; \ + rm -f $(srcdir)/examples/estim-sites.stamp; \ + $(MAKE) $(AM_MAKEFLAGS) $(srcdir)/examples/estim-sites.stamp; \ fi @@ -122,8 +122,8 @@ MAINTAINERCLEANFILES += $(srcdir)/examples/extend.stamp $(srcdir)/outputs/extend.txt: $(srcdir)/examples/extend.stamp ## Recover from the removal of $@ @if test -f $@; then :; else \ - rm -f $<; \ - $(MAKE) $(AM_MAKEFLAGS) $<; \ + rm -f $(srcdir)/examples/extend.stamp; \ + $(MAKE) $(AM_MAKEFLAGS) $(srcdir)/examples/extend.stamp; \ fi @@ -140,8 +140,8 @@ MAINTAINERCLEANFILES += $(srcdir)/examples/extension-ignore.stamp $(srcdir)/outputs/extension-ignore.txt: $(srcdir)/examples/extension-ignore.stamp ## Recover from the removal of $@ @if test -f $@; then :; else \ - rm -f $<; \ - $(MAKE) $(AM_MAKEFLAGS) $<; \ + rm -f $(srcdir)/examples/extension-ignore.stamp; \ + $(MAKE) $(AM_MAKEFLAGS) $(srcdir)/examples/extension-ignore.stamp; \ fi @@ -158,8 +158,8 @@ MAINTAINERCLEANFILES += $(srcdir)/examples/fill-call-1.stamp $(srcdir)/outputs/fill-call-1.txt: $(srcdir)/examples/fill-call-1.stamp ## Recover from the removal of $@ @if test -f $@; then :; else \ - rm -f $<; \ - $(MAKE) $(AM_MAKEFLAGS) $<; \ + rm -f $(srcdir)/examples/fill-call-1.stamp; \ + $(MAKE) $(AM_MAKEFLAGS) $(srcdir)/examples/fill-call-1.stamp; \ fi @@ -176,8 +176,8 @@ MAINTAINERCLEANFILES += $(srcdir)/examples/fill-imageif-cfun.stamp $(srcdir)/outputs/fill-imageif-cfun.txt: $(srcdir)/examples/fill-imageif-cfun.stamp ## Recover from the removal of $@ @if test -f $@; then :; else \ - rm -f $<; \ - $(MAKE) $(AM_MAKEFLAGS) $<; \ + rm -f $(srcdir)/examples/fill-imageif-cfun.stamp; \ + $(MAKE) $(AM_MAKEFLAGS) $(srcdir)/examples/fill-imageif-cfun.stamp; \ fi @@ -194,8 +194,8 @@ MAINTAINERCLEANFILES += $(srcdir)/examples/fill-part-image.stamp $(srcdir)/outputs/fill-part-image.txt: $(srcdir)/examples/fill-part-image.stamp ## Recover from the removal of $@ @if test -f $@; then :; else \ - rm -f $<; \ - $(MAKE) $(AM_MAKEFLAGS) $<; \ + rm -f $(srcdir)/examples/fill-part-image.stamp; \ + $(MAKE) $(AM_MAKEFLAGS) $(srcdir)/examples/fill-part-image.stamp; \ fi @@ -212,8 +212,8 @@ MAINTAINERCLEANFILES += $(srcdir)/examples/fill-subdomain-shorter.stamp $(srcdir)/outputs/fill-subdomain-shorter.txt: $(srcdir)/examples/fill-subdomain-shorter.stamp ## Recover from the removal of $@ @if test -f $@; then :; else \ - rm -f $<; \ - $(MAKE) $(AM_MAKEFLAGS) $<; \ + rm -f $(srcdir)/examples/fill-subdomain-shorter.stamp; \ + $(MAKE) $(AM_MAKEFLAGS) $(srcdir)/examples/fill-subdomain-shorter.stamp; \ fi @@ -230,8 +230,8 @@ MAINTAINERCLEANFILES += $(srcdir)/examples/fill-subdomain.stamp $(srcdir)/outputs/fill-subdomain.txt: $(srcdir)/examples/fill-subdomain.stamp ## Recover from the removal of $@ @if test -f $@; then :; else \ - rm -f $<; \ - $(MAKE) $(AM_MAKEFLAGS) $<; \ + rm -f $(srcdir)/examples/fill-subdomain.stamp; \ + $(MAKE) $(AM_MAKEFLAGS) $(srcdir)/examples/fill-subdomain.stamp; \ fi @@ -248,8 +248,8 @@ MAINTAINERCLEANFILES += $(srcdir)/examples/fill.stamp $(srcdir)/outputs/fill.txt: $(srcdir)/examples/fill.stamp ## Recover from the removal of $@ @if test -f $@; then :; else \ - rm -f $<; \ - $(MAKE) $(AM_MAKEFLAGS) $<; \ + rm -f $(srcdir)/examples/fill.stamp; \ + $(MAKE) $(AM_MAKEFLAGS) $(srcdir)/examples/fill.stamp; \ fi @@ -266,8 +266,8 @@ MAINTAINERCLEANFILES += $(srcdir)/examples/forall-piter.stamp $(srcdir)/outputs/forall-piter.txt: $(srcdir)/examples/forall-piter.stamp ## Recover from the removal of $@ @if test -f $@; then :; else \ - rm -f $<; \ - $(MAKE) $(AM_MAKEFLAGS) $<; \ + rm -f $(srcdir)/examples/forall-piter.stamp; \ + $(MAKE) $(AM_MAKEFLAGS) $(srcdir)/examples/forall-piter.stamp; \ fi @@ -284,8 +284,8 @@ MAINTAINERCLEANFILES += $(srcdir)/examples/fun-p2v-1.stamp $(srcdir)/outputs/fun-p2v-1.txt: $(srcdir)/examples/fun-p2v-1.stamp ## Recover from the removal of $@ @if test -f $@; then :; else \ - rm -f $<; \ - $(MAKE) $(AM_MAKEFLAGS) $<; \ + rm -f $(srcdir)/examples/fun-p2v-1.stamp; \ + $(MAKE) $(AM_MAKEFLAGS) $(srcdir)/examples/fun-p2v-1.stamp; \ fi @@ -302,8 +302,8 @@ MAINTAINERCLEANFILES += $(srcdir)/examples/graph-data.stamp $(srcdir)/outputs/graph-data.txt: $(srcdir)/examples/graph-data.stamp ## Recover from the removal of $@ @if test -f $@; then :; else \ - rm -f $<; \ - $(MAKE) $(AM_MAKEFLAGS) $<; \ + rm -f $(srcdir)/examples/graph-data.stamp; \ + $(MAKE) $(AM_MAKEFLAGS) $(srcdir)/examples/graph-data.stamp; \ fi @@ -320,8 +320,8 @@ MAINTAINERCLEANFILES += $(srcdir)/examples/graph-iter.stamp $(srcdir)/outputs/graph-iter.txt: $(srcdir)/examples/graph-iter.stamp ## Recover from the removal of $@ @if test -f $@; then :; else \ - rm -f $<; \ - $(MAKE) $(AM_MAKEFLAGS) $<; \ + rm -f $(srcdir)/examples/graph-iter.stamp; \ + $(MAKE) $(AM_MAKEFLAGS) $(srcdir)/examples/graph-iter.stamp; \ fi @@ -338,8 +338,8 @@ MAINTAINERCLEANFILES += $(srcdir)/examples/ima-has.stamp $(srcdir)/outputs/ima-has.txt: $(srcdir)/examples/ima-has.stamp ## Recover from the removal of $@ @if test -f $@; then :; else \ - rm -f $<; \ - $(MAKE) $(AM_MAKEFLAGS) $<; \ + rm -f $(srcdir)/examples/ima-has.stamp; \ + $(MAKE) $(AM_MAKEFLAGS) $(srcdir)/examples/ima-has.stamp; \ fi @@ -356,8 +356,8 @@ MAINTAINERCLEANFILES += $(srcdir)/examples/ima-load.stamp $(srcdir)/outputs/ima-load.txt: $(srcdir)/examples/ima-load.stamp ## Recover from the removal of $@ @if test -f $@; then :; else \ - rm -f $<; \ - $(MAKE) $(AM_MAKEFLAGS) $<; \ + rm -f $(srcdir)/examples/ima-load.stamp; \ + $(MAKE) $(AM_MAKEFLAGS) $(srcdir)/examples/ima-load.stamp; \ fi @@ -374,8 +374,8 @@ MAINTAINERCLEANFILES += $(srcdir)/examples/ima-save.stamp $(srcdir)/outputs/ima-save.txt: $(srcdir)/examples/ima-save.stamp ## Recover from the removal of $@ @if test -f $@; then :; else \ - rm -f $<; \ - $(MAKE) $(AM_MAKEFLAGS) $<; \ + rm -f $(srcdir)/examples/ima-save.stamp; \ + $(MAKE) $(AM_MAKEFLAGS) $(srcdir)/examples/ima-save.stamp; \ fi @@ -392,8 +392,8 @@ MAINTAINERCLEANFILES += $(srcdir)/examples/ima-size.stamp $(srcdir)/outputs/ima-size.txt: $(srcdir)/examples/ima-size.stamp ## Recover from the removal of $@ @if test -f $@; then :; else \ - rm -f $<; \ - $(MAKE) $(AM_MAKEFLAGS) $<; \ + rm -f $(srcdir)/examples/ima-size.stamp; \ + $(MAKE) $(AM_MAKEFLAGS) $(srcdir)/examples/ima-size.stamp; \ fi @@ -410,8 +410,8 @@ MAINTAINERCLEANFILES += $(srcdir)/examples/ima2d-1.stamp $(srcdir)/outputs/ima2d-1.txt: $(srcdir)/examples/ima2d-1.stamp ## Recover from the removal of $@ @if test -f $@; then :; else \ - rm -f $<; \ - $(MAKE) $(AM_MAKEFLAGS) $<; \ + rm -f $(srcdir)/examples/ima2d-1.stamp; \ + $(MAKE) $(AM_MAKEFLAGS) $(srcdir)/examples/ima2d-1.stamp; \ fi @@ -428,8 +428,8 @@ MAINTAINERCLEANFILES += $(srcdir)/examples/ima2d-2.stamp $(srcdir)/outputs/ima2d-2.txt: $(srcdir)/examples/ima2d-2.stamp ## Recover from the removal of $@ @if test -f $@; then :; else \ - rm -f $<; \ - $(MAKE) $(AM_MAKEFLAGS) $<; \ + rm -f $(srcdir)/examples/ima2d-2.stamp; \ + $(MAKE) $(AM_MAKEFLAGS) $(srcdir)/examples/ima2d-2.stamp; \ fi @@ -446,8 +446,8 @@ MAINTAINERCLEANFILES += $(srcdir)/examples/ima2d-3.stamp $(srcdir)/outputs/ima2d-3.txt: $(srcdir)/examples/ima2d-3.stamp ## Recover from the removal of $@ @if test -f $@; then :; else \ - rm -f $<; \ - $(MAKE) $(AM_MAKEFLAGS) $<; \ + rm -f $(srcdir)/examples/ima2d-3.stamp; \ + $(MAKE) $(AM_MAKEFLAGS) $(srcdir)/examples/ima2d-3.stamp; \ fi @@ -464,8 +464,8 @@ MAINTAINERCLEANFILES += $(srcdir)/examples/ima2d-4.stamp $(srcdir)/outputs/ima2d-4.txt: $(srcdir)/examples/ima2d-4.stamp ## Recover from the removal of $@ @if test -f $@; then :; else \ - rm -f $<; \ - $(MAKE) $(AM_MAKEFLAGS) $<; \ + rm -f $(srcdir)/examples/ima2d-4.stamp; \ + $(MAKE) $(AM_MAKEFLAGS) $(srcdir)/examples/ima2d-4.stamp; \ fi @@ -482,8 +482,8 @@ MAINTAINERCLEANFILES += $(srcdir)/examples/ima2d-5.stamp $(srcdir)/outputs/ima2d-5.txt: $(srcdir)/examples/ima2d-5.stamp ## Recover from the removal of $@ @if test -f $@; then :; else \ - rm -f $<; \ - $(MAKE) $(AM_MAKEFLAGS) $<; \ + rm -f $(srcdir)/examples/ima2d-5.stamp; \ + $(MAKE) $(AM_MAKEFLAGS) $(srcdir)/examples/ima2d-5.stamp; \ fi @@ -500,8 +500,8 @@ MAINTAINERCLEANFILES += $(srcdir)/examples/ima2d-6-clone.stamp $(srcdir)/outputs/ima2d-6-clone.txt: $(srcdir)/examples/ima2d-6-clone.stamp ## Recover from the removal of $@ @if test -f $@; then :; else \ - rm -f $<; \ - $(MAKE) $(AM_MAKEFLAGS) $<; \ + rm -f $(srcdir)/examples/ima2d-6-clone.stamp; \ + $(MAKE) $(AM_MAKEFLAGS) $(srcdir)/examples/ima2d-6-clone.stamp; \ fi @@ -518,8 +518,8 @@ MAINTAINERCLEANFILES += $(srcdir)/examples/ima2d-7.stamp $(srcdir)/outputs/ima2d-7.txt: $(srcdir)/examples/ima2d-7.stamp ## Recover from the removal of $@ @if test -f $@; then :; else \ - rm -f $<; \ - $(MAKE) $(AM_MAKEFLAGS) $<; \ + rm -f $(srcdir)/examples/ima2d-7.stamp; \ + $(MAKE) $(AM_MAKEFLAGS) $(srcdir)/examples/ima2d-7.stamp; \ fi @@ -536,8 +536,8 @@ MAINTAINERCLEANFILES += $(srcdir)/examples/ima2d-rot.stamp $(srcdir)/outputs/ima2d-rot.txt: $(srcdir)/examples/ima2d-rot.stamp ## Recover from the removal of $@ @if test -f $@; then :; else \ - rm -f $<; \ - $(MAKE) $(AM_MAKEFLAGS) $<; \ + rm -f $(srcdir)/examples/ima2d-rot.stamp; \ + $(MAKE) $(AM_MAKEFLAGS) $(srcdir)/examples/ima2d-rot.stamp; \ fi @@ -554,8 +554,8 @@ MAINTAINERCLEANFILES += $(srcdir)/examples/labeling-compute.stamp $(srcdir)/outputs/labeling-compute.txt: $(srcdir)/examples/labeling-compute.stamp ## Recover from the removal of $@ @if test -f $@; then :; else \ - rm -f $<; \ - $(MAKE) $(AM_MAKEFLAGS) $<; \ + rm -f $(srcdir)/examples/labeling-compute.stamp; \ + $(MAKE) $(AM_MAKEFLAGS) $(srcdir)/examples/labeling-compute.stamp; \ fi @@ -572,8 +572,8 @@ MAINTAINERCLEANFILES += $(srcdir)/examples/logical-not.stamp $(srcdir)/outputs/logical-not.txt: $(srcdir)/examples/logical-not.stamp ## Recover from the removal of $@ @if test -f $@; then :; else \ - rm -f $<; \ - $(MAKE) $(AM_MAKEFLAGS) $<; \ + rm -f $(srcdir)/examples/logical-not.stamp; \ + $(MAKE) $(AM_MAKEFLAGS) $(srcdir)/examples/logical-not.stamp; \ fi @@ -590,8 +590,8 @@ MAINTAINERCLEANFILES += $(srcdir)/examples/mln_var.stamp $(srcdir)/outputs/mln_var.txt: $(srcdir)/examples/mln_var.stamp ## Recover from the removal of $@ @if test -f $@; then :; else \ - rm -f $<; \ - $(MAKE) $(AM_MAKEFLAGS) $<; \ + rm -f $(srcdir)/examples/mln_var.stamp; \ + $(MAKE) $(AM_MAKEFLAGS) $(srcdir)/examples/mln_var.stamp; \ fi @@ -608,8 +608,8 @@ MAINTAINERCLEANFILES += $(srcdir)/examples/parray-append.stamp $(srcdir)/outputs/parray-append.txt: $(srcdir)/examples/parray-append.stamp ## Recover from the removal of $@ @if test -f $@; then :; else \ - rm -f $<; \ - $(MAKE) $(AM_MAKEFLAGS) $<; \ + rm -f $(srcdir)/examples/parray-append.stamp; \ + $(MAKE) $(AM_MAKEFLAGS) $(srcdir)/examples/parray-append.stamp; \ fi @@ -626,8 +626,8 @@ MAINTAINERCLEANFILES += $(srcdir)/examples/parray-bbox.stamp $(srcdir)/outputs/parray-bbox.txt: $(srcdir)/examples/parray-bbox.stamp ## Recover from the removal of $@ @if test -f $@; then :; else \ - rm -f $<; \ - $(MAKE) $(AM_MAKEFLAGS) $<; \ + rm -f $(srcdir)/examples/parray-bbox.stamp; \ + $(MAKE) $(AM_MAKEFLAGS) $(srcdir)/examples/parray-bbox.stamp; \ fi @@ -644,8 +644,8 @@ MAINTAINERCLEANFILES += $(srcdir)/examples/paste-call-1.stamp $(srcdir)/outputs/paste-call-1.txt: $(srcdir)/examples/paste-call-1.stamp ## Recover from the removal of $@ @if test -f $@; then :; else \ - rm -f $<; \ - $(MAKE) $(AM_MAKEFLAGS) $<; \ + rm -f $(srcdir)/examples/paste-call-1.stamp; \ + $(MAKE) $(AM_MAKEFLAGS) $(srcdir)/examples/paste-call-1.stamp; \ fi @@ -662,8 +662,8 @@ MAINTAINERCLEANFILES += $(srcdir)/examples/paste.stamp $(srcdir)/outputs/paste.txt: $(srcdir)/examples/paste.stamp ## Recover from the removal of $@ @if test -f $@; then :; else \ - rm -f $<; \ - $(MAKE) $(AM_MAKEFLAGS) $<; \ + rm -f $(srcdir)/examples/paste.stamp; \ + $(MAKE) $(AM_MAKEFLAGS) $(srcdir)/examples/paste.stamp; \ fi @@ -680,8 +680,8 @@ MAINTAINERCLEANFILES += $(srcdir)/examples/point-1.stamp $(srcdir)/outputs/point-1.txt: $(srcdir)/examples/point-1.stamp ## Recover from the removal of $@ @if test -f $@; then :; else \ - rm -f $<; \ - $(MAKE) $(AM_MAKEFLAGS) $<; \ + rm -f $(srcdir)/examples/point-1.stamp; \ + $(MAKE) $(AM_MAKEFLAGS) $(srcdir)/examples/point-1.stamp; \ fi @@ -698,8 +698,8 @@ MAINTAINERCLEANFILES += $(srcdir)/examples/predicate-1.stamp $(srcdir)/outputs/predicate-1.txt: $(srcdir)/examples/predicate-1.stamp ## Recover from the removal of $@ @if test -f $@; then :; else \ - rm -f $<; \ - $(MAKE) $(AM_MAKEFLAGS) $<; \ + rm -f $(srcdir)/examples/predicate-1.stamp; \ + $(MAKE) $(AM_MAKEFLAGS) $(srcdir)/examples/predicate-1.stamp; \ fi @@ -716,8 +716,8 @@ MAINTAINERCLEANFILES += $(srcdir)/examples/tuto2_first_image.stamp $(srcdir)/outputs/tuto2_first_image.txt: $(srcdir)/examples/tuto2_first_image.stamp ## Recover from the removal of $@ @if test -f $@; then :; else \ - rm -f $<; \ - $(MAKE) $(AM_MAKEFLAGS) $<; \ + rm -f $(srcdir)/examples/tuto2_first_image.stamp; \ + $(MAKE) $(AM_MAKEFLAGS) $(srcdir)/examples/tuto2_first_image.stamp; \ fi @@ -734,8 +734,8 @@ MAINTAINERCLEANFILES += $(srcdir)/examples/tuto3/colorize.stamp $(srcdir)/outputs/tuto3_colorize.txt: $(srcdir)/examples/tuto3/colorize.stamp ## Recover from the removal of $@ @if test -f $@; then :; else \ - rm -f $<; \ - $(MAKE) $(AM_MAKEFLAGS) $<; \ + rm -f $(srcdir)/examples/tuto3/colorize.stamp; \ + $(MAKE) $(AM_MAKEFLAGS) $(srcdir)/examples/tuto3/colorize.stamp; \ fi @@ -752,8 +752,8 @@ MAINTAINERCLEANFILES += $(srcdir)/examples/tuto3/first_routine.stamp $(srcdir)/outputs/tuto3_first_routine.txt: $(srcdir)/examples/tuto3/first_routine.stamp ## Recover from the removal of $@ @if test -f $@; then :; else \ - rm -f $<; \ - $(MAKE) $(AM_MAKEFLAGS) $<; \ + rm -f $(srcdir)/examples/tuto3/first_routine.stamp; \ + $(MAKE) $(AM_MAKEFLAGS) $(srcdir)/examples/tuto3/first_routine.stamp; \ fi @@ -770,8 +770,8 @@ MAINTAINERCLEANFILES += $(srcdir)/examples/tuto3/println.stamp $(srcdir)/outputs/tuto3_println.txt: $(srcdir)/examples/tuto3/println.stamp ## Recover from the removal of $@ @if test -f $@; then :; else \ - rm -f $<; \ - $(MAKE) $(AM_MAKEFLAGS) $<; \ + rm -f $(srcdir)/examples/tuto3/println.stamp; \ + $(MAKE) $(AM_MAKEFLAGS) $(srcdir)/examples/tuto3/println.stamp; \ fi @@ -788,8 +788,8 @@ MAINTAINERCLEANFILES += $(srcdir)/examples/tuto3/trace.stamp $(srcdir)/outputs/tuto3_trace.txt: $(srcdir)/examples/tuto3/trace.stamp ## Recover from the removal of $@ @if test -f $@; then :; else \ - rm -f $<; \ - $(MAKE) $(AM_MAKEFLAGS) $<; \ + rm -f $(srcdir)/examples/tuto3/trace.stamp; \ + $(MAKE) $(AM_MAKEFLAGS) $(srcdir)/examples/tuto3/trace.stamp; \ fi @@ -806,8 +806,8 @@ MAINTAINERCLEANFILES += $(srcdir)/examples/tuto3_rw_image.stamp $(srcdir)/outputs/tuto3_rw_image.txt: $(srcdir)/examples/tuto3_rw_image.stamp ## Recover from the removal of $@ @if test -f $@; then :; else \ - rm -f $<; \ - $(MAKE) $(AM_MAKEFLAGS) $<; \ + rm -f $(srcdir)/examples/tuto3_rw_image.stamp; \ + $(MAKE) $(AM_MAKEFLAGS) $(srcdir)/examples/tuto3_rw_image.stamp; \ fi @@ -824,8 +824,8 @@ MAINTAINERCLEANFILES += $(srcdir)/examples/tuto4/image.stamp $(srcdir)/outputs/tuto4_image.txt: $(srcdir)/examples/tuto4/image.stamp ## Recover from the removal of $@ @if test -f $@; then :; else \ - rm -f $<; \ - $(MAKE) $(AM_MAKEFLAGS) $<; \ + rm -f $(srcdir)/examples/tuto4/image.stamp; \ + $(MAKE) $(AM_MAKEFLAGS) $(srcdir)/examples/tuto4/image.stamp; \ fi @@ -842,8 +842,8 @@ MAINTAINERCLEANFILES += $(srcdir)/examples/tuto4/point2d.stamp $(srcdir)/outputs/tuto4_point2d.txt: $(srcdir)/examples/tuto4/point2d.stamp ## Recover from the removal of $@ @if test -f $@; then :; else \ - rm -f $<; \ - $(MAKE) $(AM_MAKEFLAGS) $<; \ + rm -f $(srcdir)/examples/tuto4/point2d.stamp; \ + $(MAKE) $(AM_MAKEFLAGS) $(srcdir)/examples/tuto4/point2d.stamp; \ fi @@ -860,8 +860,8 @@ MAINTAINERCLEANFILES += $(srcdir)/examples/tuto4/site_set_create.stamp $(srcdir)/outputs/tuto4_site_set_create.txt: $(srcdir)/examples/tuto4/site_set_create.stamp ## Recover from the removal of $@ @if test -f $@; then :; else \ - rm -f $<; \ - $(MAKE) $(AM_MAKEFLAGS) $<; \ + rm -f $(srcdir)/examples/tuto4/site_set_create.stamp; \ + $(MAKE) $(AM_MAKEFLAGS) $(srcdir)/examples/tuto4/site_set_create.stamp; \ fi @@ -878,8 +878,8 @@ MAINTAINERCLEANFILES += $(srcdir)/examples/tuto4_genericity_and_algorithms.stamp $(srcdir)/outputs/tuto4_genericity_and_algorithms.txt: $(srcdir)/examples/tuto4_genericity_and_algorithms.stamp ## Recover from the removal of $@ @if test -f $@; then :; else \ - rm -f $<; \ - $(MAKE) $(AM_MAKEFLAGS) $<; \ + rm -f $(srcdir)/examples/tuto4_genericity_and_algorithms.stamp; \ + $(MAKE) $(AM_MAKEFLAGS) $(srcdir)/examples/tuto4_genericity_and_algorithms.stamp; \ fi @@ -896,8 +896,8 @@ MAINTAINERCLEANFILES += $(srcdir)/examples/win-create-1.stamp $(srcdir)/outputs/win-create-1.txt: $(srcdir)/examples/win-create-1.stamp ## Recover from the removal of $@ @if test -f $@; then :; else \ - rm -f $<; \ - $(MAKE) $(AM_MAKEFLAGS) $<; \ + rm -f $(srcdir)/examples/win-create-1.stamp; \ + $(MAKE) $(AM_MAKEFLAGS) $(srcdir)/examples/win-create-1.stamp; \ fi @@ -914,6 +914,6 @@ MAINTAINERCLEANFILES += $(srcdir)/examples/win-create-2.stamp $(srcdir)/outputs/win-create-2.txt: $(srcdir)/examples/win-create-2.stamp ## Recover from the removal of $@ @if test -f $@; then :; else \ - rm -f $<; \ - $(MAKE) $(AM_MAKEFLAGS) $<; \ + rm -f $(srcdir)/examples/win-create-2.stamp; \ + $(MAKE) $(AM_MAKEFLAGS) $(srcdir)/examples/win-create-2.stamp; \ fi diff --git a/milena/doc/figures.mk b/milena/doc/figures.mk index c3e72f1..c75db00 100644 --- a/milena/doc/figures.mk +++ b/milena/doc/figures.mk @@ -12,8 +12,8 @@ EXTEND_FIGURES = \ $(EXTEND_FIGURES): $(srcdir)/examples/extend.stamp ## Recover from the removal of $@ @if test -f $@; then :; else \ - rm -f $<; \ - $(MAKE) $(AM_MAKEFLAGS) $<; \ + rm -f $(srcdir)/examples/extend.stamp; \ + $(MAKE) $(AM_MAKEFLAGS) $(srcdir)/examples/extend.stamp; \ fi FILL_FIGURES = \ @@ -22,8 +22,8 @@ FILL_FIGURES = \ $(FILL_FIGURES): $(srcdir)/examples/fill.stamp ## Recover from the removal of $@ @if test -f $@; then :; else \ - rm -f $<; \ - $(MAKE) $(AM_MAKEFLAGS) $<; \ + rm -f $(srcdir)/examples/fill.stamp; \ + $(MAKE) $(AM_MAKEFLAGS) $(srcdir)/examples/fill.stamp; \ fi FILL_IMAGEIF_CFUN_FIGURES = \ @@ -31,8 +31,8 @@ FILL_IMAGEIF_CFUN_FIGURES = \ $(FILL_IMAGEIF_CFUN_FIGURES): $(srcdir)/examples/fill-imageif-cfun.stamp ## Recover from the removal of $@ @if test -f $@; then :; else \ - rm -f $<; \ - $(MAKE) $(AM_MAKEFLAGS) $<; \ + rm -f $(srcdir)/examples/fill-imageif-cfun.stamp; \ + $(MAKE) $(AM_MAKEFLAGS) $(srcdir)/examples/fill-imageif-cfun.stamp; \ fi FILL_SUBDOMAIN_FIGURES = \ @@ -43,8 +43,8 @@ FILL_SUBDOMAIN_FIGURES = \ $(FILL_SUBDOMAIN_FIGURES): $(srcdir)/examples/fill-subdomain.stamp ## Recover from the removal of $@ @if test -f $@; then :; else \ - rm -f $<; \ - $(MAKE) $(AM_MAKEFLAGS) $<; \ + rm -f $(srcdir)/examples/fill-subdomain.stamp; \ + $(MAKE) $(AM_MAKEFLAGS) $(srcdir)/examples/fill-subdomain.stamp; \ fi IMA_SAVE_FIGURES = \ @@ -52,8 +52,8 @@ IMA_SAVE_FIGURES = \ $(IMA_SAVE_FIGURES): $(srcdir)/examples/ima-save.stamp ## Recover from the removal of $@ @if test -f $@; then :; else \ - rm -f $<; \ - $(MAKE) $(AM_MAKEFLAGS) $<; \ + rm -f $(srcdir)/examples/ima-save.stamp; \ + $(MAKE) $(AM_MAKEFLAGS) $(srcdir)/examples/ima-save.stamp; \ fi IMA2D_ROT_FIGURES = \ @@ -62,8 +62,8 @@ IMA2D_ROT_FIGURES = \ $(IMA2D_ROT_FIGURES): $(srcdir)/examples/ima2d-rot.stamp ## Recover from the removal of $@ @if test -f $@; then :; else \ - rm -f $<; \ - $(MAKE) $(AM_MAKEFLAGS) $<; \ + rm -f $(srcdir)/examples/ima2d-rot.stamp; \ + $(MAKE) $(AM_MAKEFLAGS) $(srcdir)/examples/ima2d-rot.stamp; \ fi LABELING_COMPUTE_FIGURES = \ @@ -72,8 +72,8 @@ LABELING_COMPUTE_FIGURES = \ $(LABELING_COMPUTE_FIGURES): $(srcdir)/examples/labeling-compute.stamp ## Recover from the removal of $@ @if test -f $@; then :; else \ - rm -f $<; \ - $(MAKE) $(AM_MAKEFLAGS) $<; \ + rm -f $(srcdir)/examples/labeling-compute.stamp; \ + $(MAKE) $(AM_MAKEFLAGS) $(srcdir)/examples/labeling-compute.stamp; \ fi LOGICAL_NOT_FIGURES = \ @@ -83,8 +83,8 @@ LOGICAL_NOT_FIGURES = \ $(LOGICAL_NOT_FIGURES): $(srcdir)/examples/logical-not.stamp ## Recover from the removal of $@ @if test -f $@; then :; else \ - rm -f $<; \ - $(MAKE) $(AM_MAKEFLAGS) $<; \ + rm -f $(srcdir)/examples/logical-not.stamp; \ + $(MAKE) $(AM_MAKEFLAGS) $(srcdir)/examples/logical-not.stamp; \ fi TUTO2_FIRST_IMAGE_FIGURES = \ @@ -92,8 +92,8 @@ TUTO2_FIRST_IMAGE_FIGURES = \ $(TUTO2_FIRST_IMAGE_FIGURES): $(srcdir)/examples/tuto2_first_image.stamp ## Recover from the removal of $@ @if test -f $@; then :; else \ - rm -f $<; \ - $(MAKE) $(AM_MAKEFLAGS) $<; \ + rm -f $(srcdir)/examples/tuto2_first_image.stamp; \ + $(MAKE) $(AM_MAKEFLAGS) $(srcdir)/examples/tuto2_first_image.stamp; \ fi TUTO3_COLORIZE_FIGURES = \ @@ -102,8 +102,8 @@ TUTO3_COLORIZE_FIGURES = \ $(TUTO3_COLORIZE_FIGURES): $(srcdir)/examples/tuto3/colorize.stamp ## Recover from the removal of $@ @if test -f $@; then :; else \ - rm -f $<; \ - $(MAKE) $(AM_MAKEFLAGS) $<; \ + rm -f $(srcdir)/examples/tuto3/colorize.stamp; \ + $(MAKE) $(AM_MAKEFLAGS) $(srcdir)/examples/tuto3/colorize.stamp; \ fi TUTO3_RW_IMAGE_FIGURES = \ @@ -113,8 +113,8 @@ TUTO3_RW_IMAGE_FIGURES = \ $(TUTO3_RW_IMAGE_FIGURES): $(srcdir)/examples/tuto3_rw_image.stamp ## Recover from the removal of $@ @if test -f $@; then :; else \ - rm -f $<; \ - $(MAKE) $(AM_MAKEFLAGS) $<; \ + rm -f $(srcdir)/examples/tuto3_rw_image.stamp; \ + $(MAKE) $(AM_MAKEFLAGS) $(srcdir)/examples/tuto3_rw_image.stamp; \ fi TUTO4_GENERICITY_AND_ALGORITHMS_FIGURES = \ @@ -127,8 +127,8 @@ TUTO4_GENERICITY_AND_ALGORITHMS_FIGURES = \ $(TUTO4_GENERICITY_AND_ALGORITHMS_FIGURES): $(srcdir)/examples/tuto4_genericity_and_algorithms.stamp ## Recover from the removal of $@ @if test -f $@; then :; else \ - rm -f $<; \ - $(MAKE) $(AM_MAKEFLAGS) $<; \ + rm -f $(srcdir)/examples/tuto4_genericity_and_algorithms.stamp; \ + $(MAKE) $(AM_MAKEFLAGS) $(srcdir)/examples/tuto4_genericity_and_algorithms.stamp; \ fi # The list of all generated figures. diff --git a/milena/doc/split-examples.mk b/milena/doc/split-examples.mk index f7141ba..cc3a64d 100644 --- a/milena/doc/split-examples.mk +++ b/milena/doc/split-examples.mk @@ -119,7 +119,7 @@ SPLIT_EXAMPLES = \ $(srcdir)/examples/split/accu-right-instantiation.cc.stamp: $(srcdir)/examples/accu-right-instantiation.cc @rm -f $@.tmp @touch $@.tmp - $(srcdir)/tools/split_sample.sh $< cc raw $(srcdir)/examples/split + $(srcdir)/tools/split_sample.sh $(srcdir)/examples/accu-right-instantiation.cc cc raw $(srcdir)/examples/split @mv -f $@.tmp $@ EXTRA_DIST += $(srcdir)/examples/split/accu-right-instantiation.cc.stamp MAINTAINERCLEANFILES += $(srcdir)/examples/split/accu-right-instantiation.cc.stamp @@ -127,15 +127,15 @@ MAINTAINERCLEANFILES += $(srcdir)/examples/split/accu-right-instantiation.cc.sta $(srcdir)/examples/split/accu-right-instantiation-1.cc.raw: $(srcdir)/examples/split/accu-right-instantiation.cc.stamp ## Recover from the removal of $@ @if test -f $@; then :; else \ - rm -f $<; \ - $(MAKE) $(AM_MAKEFLAGS) $<; \ + rm -f $(srcdir)/examples/split/accu-right-instantiation.cc.stamp; \ + $(MAKE) $(AM_MAKEFLAGS) $(srcdir)/examples/split/accu-right-instantiation.cc.stamp; \ fi $(srcdir)/examples/split/borderthickness.cc.stamp: $(srcdir)/examples/borderthickness.cc @rm -f $@.tmp @touch $@.tmp - $(srcdir)/tools/split_sample.sh $< cc raw $(srcdir)/examples/split + $(srcdir)/tools/split_sample.sh $(srcdir)/examples/borderthickness.cc cc raw $(srcdir)/examples/split @mv -f $@.tmp $@ EXTRA_DIST += $(srcdir)/examples/split/borderthickness.cc.stamp MAINTAINERCLEANFILES += $(srcdir)/examples/split/borderthickness.cc.stamp @@ -143,15 +143,15 @@ MAINTAINERCLEANFILES += $(srcdir)/examples/split/borderthickness.cc.stamp $(srcdir)/examples/split/borderthickness-1.cc.raw: $(srcdir)/examples/split/borderthickness.cc.stamp ## Recover from the removal of $@ @if test -f $@; then :; else \ - rm -f $<; \ - $(MAKE) $(AM_MAKEFLAGS) $<; \ + rm -f $(srcdir)/examples/split/borderthickness.cc.stamp; \ + $(MAKE) $(AM_MAKEFLAGS) $(srcdir)/examples/split/borderthickness.cc.stamp; \ fi $(srcdir)/examples/split/box2d-bbox.cc.stamp: $(srcdir)/examples/box2d-bbox.cc @rm -f $@.tmp @touch $@.tmp - $(srcdir)/tools/split_sample.sh $< cc raw $(srcdir)/examples/split + $(srcdir)/tools/split_sample.sh $(srcdir)/examples/box2d-bbox.cc cc raw $(srcdir)/examples/split @mv -f $@.tmp $@ EXTRA_DIST += $(srcdir)/examples/split/box2d-bbox.cc.stamp MAINTAINERCLEANFILES += $(srcdir)/examples/split/box2d-bbox.cc.stamp @@ -159,15 +159,15 @@ MAINTAINERCLEANFILES += $(srcdir)/examples/split/box2d-bbox.cc.stamp $(srcdir)/examples/split/box2d-bbox-1.cc.raw: $(srcdir)/examples/split/box2d-bbox.cc.stamp ## Recover from the removal of $@ @if test -f $@; then :; else \ - rm -f $<; \ - $(MAKE) $(AM_MAKEFLAGS) $<; \ + rm -f $(srcdir)/examples/split/box2d-bbox.cc.stamp; \ + $(MAKE) $(AM_MAKEFLAGS) $(srcdir)/examples/split/box2d-bbox.cc.stamp; \ fi $(srcdir)/examples/split/domain-display.cc.stamp: $(srcdir)/examples/domain-display.cc @rm -f $@.tmp @touch $@.tmp - $(srcdir)/tools/split_sample.sh $< cc raw $(srcdir)/examples/split + $(srcdir)/tools/split_sample.sh $(srcdir)/examples/domain-display.cc cc raw $(srcdir)/examples/split @mv -f $@.tmp $@ EXTRA_DIST += $(srcdir)/examples/split/domain-display.cc.stamp MAINTAINERCLEANFILES += $(srcdir)/examples/split/domain-display.cc.stamp @@ -175,15 +175,15 @@ MAINTAINERCLEANFILES += $(srcdir)/examples/split/domain-display.cc.stamp $(srcdir)/examples/split/domain-display-1.cc.raw: $(srcdir)/examples/split/domain-display.cc.stamp ## Recover from the removal of $@ @if test -f $@; then :; else \ - rm -f $<; \ - $(MAKE) $(AM_MAKEFLAGS) $<; \ + rm -f $(srcdir)/examples/split/domain-display.cc.stamp; \ + $(MAKE) $(AM_MAKEFLAGS) $(srcdir)/examples/split/domain-display.cc.stamp; \ fi $(srcdir)/examples/split/dpoint-1.cc.stamp: $(srcdir)/examples/dpoint-1.cc @rm -f $@.tmp @touch $@.tmp - $(srcdir)/tools/split_sample.sh $< cc raw $(srcdir)/examples/split + $(srcdir)/tools/split_sample.sh $(srcdir)/examples/dpoint-1.cc cc raw $(srcdir)/examples/split @mv -f $@.tmp $@ EXTRA_DIST += $(srcdir)/examples/split/dpoint-1.cc.stamp MAINTAINERCLEANFILES += $(srcdir)/examples/split/dpoint-1.cc.stamp @@ -191,15 +191,15 @@ MAINTAINERCLEANFILES += $(srcdir)/examples/split/dpoint-1.cc.stamp $(srcdir)/examples/split/dpoint-1-1.cc.raw: $(srcdir)/examples/split/dpoint-1.cc.stamp ## Recover from the removal of $@ @if test -f $@; then :; else \ - rm -f $<; \ - $(MAKE) $(AM_MAKEFLAGS) $<; \ + rm -f $(srcdir)/examples/split/dpoint-1.cc.stamp; \ + $(MAKE) $(AM_MAKEFLAGS) $(srcdir)/examples/split/dpoint-1.cc.stamp; \ fi $(srcdir)/examples/split/estim-sites.cc.stamp: $(srcdir)/examples/estim-sites.cc @rm -f $@.tmp @touch $@.tmp - $(srcdir)/tools/split_sample.sh $< cc raw $(srcdir)/examples/split + $(srcdir)/tools/split_sample.sh $(srcdir)/examples/estim-sites.cc cc raw $(srcdir)/examples/split @mv -f $@.tmp $@ EXTRA_DIST += $(srcdir)/examples/split/estim-sites.cc.stamp MAINTAINERCLEANFILES += $(srcdir)/examples/split/estim-sites.cc.stamp @@ -207,15 +207,15 @@ MAINTAINERCLEANFILES += $(srcdir)/examples/split/estim-sites.cc.stamp $(srcdir)/examples/split/estim-sites-1.cc.raw: $(srcdir)/examples/split/estim-sites.cc.stamp ## Recover from the removal of $@ @if test -f $@; then :; else \ - rm -f $<; \ - $(MAKE) $(AM_MAKEFLAGS) $<; \ + rm -f $(srcdir)/examples/split/estim-sites.cc.stamp; \ + $(MAKE) $(AM_MAKEFLAGS) $(srcdir)/examples/split/estim-sites.cc.stamp; \ fi $(srcdir)/examples/split/extend.cc.stamp: $(srcdir)/examples/extend.cc @rm -f $@.tmp @touch $@.tmp - $(srcdir)/tools/split_sample.sh $< cc raw $(srcdir)/examples/split + $(srcdir)/tools/split_sample.sh $(srcdir)/examples/extend.cc cc raw $(srcdir)/examples/split @mv -f $@.tmp $@ EXTRA_DIST += $(srcdir)/examples/split/extend.cc.stamp MAINTAINERCLEANFILES += $(srcdir)/examples/split/extend.cc.stamp @@ -223,15 +223,15 @@ MAINTAINERCLEANFILES += $(srcdir)/examples/split/extend.cc.stamp $(srcdir)/examples/split/extend-1.cc.raw $(srcdir)/examples/split/extend-2.cc.raw $(srcdir)/examples/split/extend-3.cc.raw $(srcdir)/examples/split/extend-4.cc.raw $(srcdir)/examples/split/extend-5.cc.raw: $(srcdir)/examples/split/extend.cc.stamp ## Recover from the removal of $@ @if test -f $@; then :; else \ - rm -f $<; \ - $(MAKE) $(AM_MAKEFLAGS) $<; \ + rm -f $(srcdir)/examples/split/extend.cc.stamp; \ + $(MAKE) $(AM_MAKEFLAGS) $(srcdir)/examples/split/extend.cc.stamp; \ fi $(srcdir)/examples/split/extension-ignore.cc.stamp: $(srcdir)/examples/extension-ignore.cc @rm -f $@.tmp @touch $@.tmp - $(srcdir)/tools/split_sample.sh $< cc raw $(srcdir)/examples/split + $(srcdir)/tools/split_sample.sh $(srcdir)/examples/extension-ignore.cc cc raw $(srcdir)/examples/split @mv -f $@.tmp $@ EXTRA_DIST += $(srcdir)/examples/split/extension-ignore.cc.stamp MAINTAINERCLEANFILES += $(srcdir)/examples/split/extension-ignore.cc.stamp @@ -239,15 +239,15 @@ MAINTAINERCLEANFILES += $(srcdir)/examples/split/extension-ignore.cc.stamp $(srcdir)/examples/split/extension-ignore-1.cc.raw: $(srcdir)/examples/split/extension-ignore.cc.stamp ## Recover from the removal of $@ @if test -f $@; then :; else \ - rm -f $<; \ - $(MAKE) $(AM_MAKEFLAGS) $<; \ + rm -f $(srcdir)/examples/split/extension-ignore.cc.stamp; \ + $(MAKE) $(AM_MAKEFLAGS) $(srcdir)/examples/split/extension-ignore.cc.stamp; \ fi $(srcdir)/examples/split/fill.cc.stamp: $(srcdir)/examples/fill.cc @rm -f $@.tmp @touch $@.tmp - $(srcdir)/tools/split_sample.sh $< cc raw $(srcdir)/examples/split + $(srcdir)/tools/split_sample.sh $(srcdir)/examples/fill.cc cc raw $(srcdir)/examples/split @mv -f $@.tmp $@ EXTRA_DIST += $(srcdir)/examples/split/fill.cc.stamp MAINTAINERCLEANFILES += $(srcdir)/examples/split/fill.cc.stamp @@ -255,15 +255,15 @@ MAINTAINERCLEANFILES += $(srcdir)/examples/split/fill.cc.stamp $(srcdir)/examples/split/fill-1.cc.raw $(srcdir)/examples/split/fill-2.cc.raw $(srcdir)/examples/split/fill-3.cc.raw: $(srcdir)/examples/split/fill.cc.stamp ## Recover from the removal of $@ @if test -f $@; then :; else \ - rm -f $<; \ - $(MAKE) $(AM_MAKEFLAGS) $<; \ + rm -f $(srcdir)/examples/split/fill.cc.stamp; \ + $(MAKE) $(AM_MAKEFLAGS) $(srcdir)/examples/split/fill.cc.stamp; \ fi $(srcdir)/examples/split/fill-call-1.cc.stamp: $(srcdir)/examples/fill-call-1.cc @rm -f $@.tmp @touch $@.tmp - $(srcdir)/tools/split_sample.sh $< cc raw $(srcdir)/examples/split + $(srcdir)/tools/split_sample.sh $(srcdir)/examples/fill-call-1.cc cc raw $(srcdir)/examples/split @mv -f $@.tmp $@ EXTRA_DIST += $(srcdir)/examples/split/fill-call-1.cc.stamp MAINTAINERCLEANFILES += $(srcdir)/examples/split/fill-call-1.cc.stamp @@ -271,15 +271,15 @@ MAINTAINERCLEANFILES += $(srcdir)/examples/split/fill-call-1.cc.stamp $(srcdir)/examples/split/fill-call-1-1.cc.raw $(srcdir)/examples/split/fill-call-1-2.cc.raw $(srcdir)/examples/split/fill-call-1-3.cc.raw: $(srcdir)/examples/split/fill-call-1.cc.stamp ## Recover from the removal of $@ @if test -f $@; then :; else \ - rm -f $<; \ - $(MAKE) $(AM_MAKEFLAGS) $<; \ + rm -f $(srcdir)/examples/split/fill-call-1.cc.stamp; \ + $(MAKE) $(AM_MAKEFLAGS) $(srcdir)/examples/split/fill-call-1.cc.stamp; \ fi $(srcdir)/examples/split/fill-imageif-cfun.cc.stamp: $(srcdir)/examples/fill-imageif-cfun.cc @rm -f $@.tmp @touch $@.tmp - $(srcdir)/tools/split_sample.sh $< cc raw $(srcdir)/examples/split + $(srcdir)/tools/split_sample.sh $(srcdir)/examples/fill-imageif-cfun.cc cc raw $(srcdir)/examples/split @mv -f $@.tmp $@ EXTRA_DIST += $(srcdir)/examples/split/fill-imageif-cfun.cc.stamp MAINTAINERCLEANFILES += $(srcdir)/examples/split/fill-imageif-cfun.cc.stamp @@ -287,15 +287,15 @@ MAINTAINERCLEANFILES += $(srcdir)/examples/split/fill-imageif-cfun.cc.stamp $(srcdir)/examples/split/fill-imageif-cfun-1.cc.raw $(srcdir)/examples/split/fill-imageif-cfun-2.cc.raw $(srcdir)/examples/split/fill-imageif-cfun-3.cc.raw: $(srcdir)/examples/split/fill-imageif-cfun.cc.stamp ## Recover from the removal of $@ @if test -f $@; then :; else \ - rm -f $<; \ - $(MAKE) $(AM_MAKEFLAGS) $<; \ + rm -f $(srcdir)/examples/split/fill-imageif-cfun.cc.stamp; \ + $(MAKE) $(AM_MAKEFLAGS) $(srcdir)/examples/split/fill-imageif-cfun.cc.stamp; \ fi $(srcdir)/examples/split/fill-part-image.cc.stamp: $(srcdir)/examples/fill-part-image.cc @rm -f $@.tmp @touch $@.tmp - $(srcdir)/tools/split_sample.sh $< cc raw $(srcdir)/examples/split + $(srcdir)/tools/split_sample.sh $(srcdir)/examples/fill-part-image.cc cc raw $(srcdir)/examples/split @mv -f $@.tmp $@ EXTRA_DIST += $(srcdir)/examples/split/fill-part-image.cc.stamp MAINTAINERCLEANFILES += $(srcdir)/examples/split/fill-part-image.cc.stamp @@ -303,15 +303,15 @@ MAINTAINERCLEANFILES += $(srcdir)/examples/split/fill-part-image.cc.stamp $(srcdir)/examples/split/fill-part-image-1.cc.raw $(srcdir)/examples/split/fill-part-image-2.cc.raw: $(srcdir)/examples/split/fill-part-image.cc.stamp ## Recover from the removal of $@ @if test -f $@; then :; else \ - rm -f $<; \ - $(MAKE) $(AM_MAKEFLAGS) $<; \ + rm -f $(srcdir)/examples/split/fill-part-image.cc.stamp; \ + $(MAKE) $(AM_MAKEFLAGS) $(srcdir)/examples/split/fill-part-image.cc.stamp; \ fi $(srcdir)/examples/split/fill-subdomain.cc.stamp: $(srcdir)/examples/fill-subdomain.cc @rm -f $@.tmp @touch $@.tmp - $(srcdir)/tools/split_sample.sh $< cc raw $(srcdir)/examples/split + $(srcdir)/tools/split_sample.sh $(srcdir)/examples/fill-subdomain.cc cc raw $(srcdir)/examples/split @mv -f $@.tmp $@ EXTRA_DIST += $(srcdir)/examples/split/fill-subdomain.cc.stamp MAINTAINERCLEANFILES += $(srcdir)/examples/split/fill-subdomain.cc.stamp @@ -319,15 +319,15 @@ MAINTAINERCLEANFILES += $(srcdir)/examples/split/fill-subdomain.cc.stamp $(srcdir)/examples/split/fill-subdomain-1.cc.raw $(srcdir)/examples/split/fill-subdomain-2.cc.raw $(srcdir)/examples/split/fill-subdomain-3.cc.raw $(srcdir)/examples/split/fill-subdomain-4.cc.raw: $(srcdir)/examples/split/fill-subdomain.cc.stamp ## Recover from the removal of $@ @if test -f $@; then :; else \ - rm -f $<; \ - $(MAKE) $(AM_MAKEFLAGS) $<; \ + rm -f $(srcdir)/examples/split/fill-subdomain.cc.stamp; \ + $(MAKE) $(AM_MAKEFLAGS) $(srcdir)/examples/split/fill-subdomain.cc.stamp; \ fi $(srcdir)/examples/split/fill-subdomain-shorter.cc.stamp: $(srcdir)/examples/fill-subdomain-shorter.cc @rm -f $@.tmp @touch $@.tmp - $(srcdir)/tools/split_sample.sh $< cc raw $(srcdir)/examples/split + $(srcdir)/tools/split_sample.sh $(srcdir)/examples/fill-subdomain-shorter.cc cc raw $(srcdir)/examples/split @mv -f $@.tmp $@ EXTRA_DIST += $(srcdir)/examples/split/fill-subdomain-shorter.cc.stamp MAINTAINERCLEANFILES += $(srcdir)/examples/split/fill-subdomain-shorter.cc.stamp @@ -335,15 +335,15 @@ MAINTAINERCLEANFILES += $(srcdir)/examples/split/fill-subdomain-shorter.cc.stamp $(srcdir)/examples/split/fill-subdomain-shorter-1.cc.raw $(srcdir)/examples/split/fill-subdomain-shorter-2.cc.raw: $(srcdir)/examples/split/fill-subdomain-shorter.cc.stamp ## Recover from the removal of $@ @if test -f $@; then :; else \ - rm -f $<; \ - $(MAKE) $(AM_MAKEFLAGS) $<; \ + rm -f $(srcdir)/examples/split/fill-subdomain-shorter.cc.stamp; \ + $(MAKE) $(AM_MAKEFLAGS) $(srcdir)/examples/split/fill-subdomain-shorter.cc.stamp; \ fi $(srcdir)/examples/split/forall-piter.cc.stamp: $(srcdir)/examples/forall-piter.cc @rm -f $@.tmp @touch $@.tmp - $(srcdir)/tools/split_sample.sh $< cc raw $(srcdir)/examples/split + $(srcdir)/tools/split_sample.sh $(srcdir)/examples/forall-piter.cc cc raw $(srcdir)/examples/split @mv -f $@.tmp $@ EXTRA_DIST += $(srcdir)/examples/split/forall-piter.cc.stamp MAINTAINERCLEANFILES += $(srcdir)/examples/split/forall-piter.cc.stamp @@ -351,15 +351,15 @@ MAINTAINERCLEANFILES += $(srcdir)/examples/split/forall-piter.cc.stamp $(srcdir)/examples/split/forall-piter-1.cc.raw: $(srcdir)/examples/split/forall-piter.cc.stamp ## Recover from the removal of $@ @if test -f $@; then :; else \ - rm -f $<; \ - $(MAKE) $(AM_MAKEFLAGS) $<; \ + rm -f $(srcdir)/examples/split/forall-piter.cc.stamp; \ + $(MAKE) $(AM_MAKEFLAGS) $(srcdir)/examples/split/forall-piter.cc.stamp; \ fi $(srcdir)/examples/split/fun-p2v-1.cc.stamp: $(srcdir)/examples/fun-p2v-1.cc @rm -f $@.tmp @touch $@.tmp - $(srcdir)/tools/split_sample.sh $< cc raw $(srcdir)/examples/split + $(srcdir)/tools/split_sample.sh $(srcdir)/examples/fun-p2v-1.cc cc raw $(srcdir)/examples/split @mv -f $@.tmp $@ EXTRA_DIST += $(srcdir)/examples/split/fun-p2v-1.cc.stamp MAINTAINERCLEANFILES += $(srcdir)/examples/split/fun-p2v-1.cc.stamp @@ -367,15 +367,15 @@ MAINTAINERCLEANFILES += $(srcdir)/examples/split/fun-p2v-1.cc.stamp $(srcdir)/examples/split/fun-p2v-1-1.cc.raw: $(srcdir)/examples/split/fun-p2v-1.cc.stamp ## Recover from the removal of $@ @if test -f $@; then :; else \ - rm -f $<; \ - $(MAKE) $(AM_MAKEFLAGS) $<; \ + rm -f $(srcdir)/examples/split/fun-p2v-1.cc.stamp; \ + $(MAKE) $(AM_MAKEFLAGS) $(srcdir)/examples/split/fun-p2v-1.cc.stamp; \ fi $(srcdir)/examples/split/graph-data.cc.stamp: $(srcdir)/examples/graph-data.cc @rm -f $@.tmp @touch $@.tmp - $(srcdir)/tools/split_sample.sh $< cc raw $(srcdir)/examples/split + $(srcdir)/tools/split_sample.sh $(srcdir)/examples/graph-data.cc cc raw $(srcdir)/examples/split @mv -f $@.tmp $@ EXTRA_DIST += $(srcdir)/examples/split/graph-data.cc.stamp MAINTAINERCLEANFILES += $(srcdir)/examples/split/graph-data.cc.stamp @@ -383,15 +383,15 @@ MAINTAINERCLEANFILES += $(srcdir)/examples/split/graph-data.cc.stamp $(srcdir)/examples/split/graph-data-1.cc.raw $(srcdir)/examples/split/graph-data-2.cc.raw $(srcdir)/examples/split/graph-data-3.cc.raw $(srcdir)/examples/split/graph-data-4.cc.raw $(srcdir)/examples/split/graph-data-5.cc.raw $(srcdir)/examples/split/graph-data-6.cc.raw: $(srcdir)/examples/split/graph-data.cc.stamp ## Recover from the removal of $@ @if test -f $@; then :; else \ - rm -f $<; \ - $(MAKE) $(AM_MAKEFLAGS) $<; \ + rm -f $(srcdir)/examples/split/graph-data.cc.stamp; \ + $(MAKE) $(AM_MAKEFLAGS) $(srcdir)/examples/split/graph-data.cc.stamp; \ fi $(srcdir)/examples/split/graph-iter.cc.stamp: $(srcdir)/examples/graph-iter.cc @rm -f $@.tmp @touch $@.tmp - $(srcdir)/tools/split_sample.sh $< cc raw $(srcdir)/examples/split + $(srcdir)/tools/split_sample.sh $(srcdir)/examples/graph-iter.cc cc raw $(srcdir)/examples/split @mv -f $@.tmp $@ EXTRA_DIST += $(srcdir)/examples/split/graph-iter.cc.stamp MAINTAINERCLEANFILES += $(srcdir)/examples/split/graph-iter.cc.stamp @@ -399,15 +399,15 @@ MAINTAINERCLEANFILES += $(srcdir)/examples/split/graph-iter.cc.stamp $(srcdir)/examples/split/graph-iter-1.cc.raw $(srcdir)/examples/split/graph-iter-2.cc.raw $(srcdir)/examples/split/graph-iter-3.cc.raw $(srcdir)/examples/split/graph-iter-4.cc.raw: $(srcdir)/examples/split/graph-iter.cc.stamp ## Recover from the removal of $@ @if test -f $@; then :; else \ - rm -f $<; \ - $(MAKE) $(AM_MAKEFLAGS) $<; \ + rm -f $(srcdir)/examples/split/graph-iter.cc.stamp; \ + $(MAKE) $(AM_MAKEFLAGS) $(srcdir)/examples/split/graph-iter.cc.stamp; \ fi $(srcdir)/examples/split/ima-has.cc.stamp: $(srcdir)/examples/ima-has.cc @rm -f $@.tmp @touch $@.tmp - $(srcdir)/tools/split_sample.sh $< cc raw $(srcdir)/examples/split + $(srcdir)/tools/split_sample.sh $(srcdir)/examples/ima-has.cc cc raw $(srcdir)/examples/split @mv -f $@.tmp $@ EXTRA_DIST += $(srcdir)/examples/split/ima-has.cc.stamp MAINTAINERCLEANFILES += $(srcdir)/examples/split/ima-has.cc.stamp @@ -415,15 +415,15 @@ MAINTAINERCLEANFILES += $(srcdir)/examples/split/ima-has.cc.stamp $(srcdir)/examples/split/ima-has-1.cc.raw: $(srcdir)/examples/split/ima-has.cc.stamp ## Recover from the removal of $@ @if test -f $@; then :; else \ - rm -f $<; \ - $(MAKE) $(AM_MAKEFLAGS) $<; \ + rm -f $(srcdir)/examples/split/ima-has.cc.stamp; \ + $(MAKE) $(AM_MAKEFLAGS) $(srcdir)/examples/split/ima-has.cc.stamp; \ fi $(srcdir)/examples/split/ima-load.cc.stamp: $(srcdir)/examples/ima-load.cc @rm -f $@.tmp @touch $@.tmp - $(srcdir)/tools/split_sample.sh $< cc raw $(srcdir)/examples/split + $(srcdir)/tools/split_sample.sh $(srcdir)/examples/ima-load.cc cc raw $(srcdir)/examples/split @mv -f $@.tmp $@ EXTRA_DIST += $(srcdir)/examples/split/ima-load.cc.stamp MAINTAINERCLEANFILES += $(srcdir)/examples/split/ima-load.cc.stamp @@ -431,15 +431,15 @@ MAINTAINERCLEANFILES += $(srcdir)/examples/split/ima-load.cc.stamp $(srcdir)/examples/split/ima-load-1.cc.raw: $(srcdir)/examples/split/ima-load.cc.stamp ## Recover from the removal of $@ @if test -f $@; then :; else \ - rm -f $<; \ - $(MAKE) $(AM_MAKEFLAGS) $<; \ + rm -f $(srcdir)/examples/split/ima-load.cc.stamp; \ + $(MAKE) $(AM_MAKEFLAGS) $(srcdir)/examples/split/ima-load.cc.stamp; \ fi $(srcdir)/examples/split/ima-save.cc.stamp: $(srcdir)/examples/ima-save.cc @rm -f $@.tmp @touch $@.tmp - $(srcdir)/tools/split_sample.sh $< cc raw $(srcdir)/examples/split + $(srcdir)/tools/split_sample.sh $(srcdir)/examples/ima-save.cc cc raw $(srcdir)/examples/split @mv -f $@.tmp $@ EXTRA_DIST += $(srcdir)/examples/split/ima-save.cc.stamp MAINTAINERCLEANFILES += $(srcdir)/examples/split/ima-save.cc.stamp @@ -447,15 +447,15 @@ MAINTAINERCLEANFILES += $(srcdir)/examples/split/ima-save.cc.stamp $(srcdir)/examples/split/ima-save-1.cc.raw: $(srcdir)/examples/split/ima-save.cc.stamp ## Recover from the removal of $@ @if test -f $@; then :; else \ - rm -f $<; \ - $(MAKE) $(AM_MAKEFLAGS) $<; \ + rm -f $(srcdir)/examples/split/ima-save.cc.stamp; \ + $(MAKE) $(AM_MAKEFLAGS) $(srcdir)/examples/split/ima-save.cc.stamp; \ fi $(srcdir)/examples/split/ima-size.cc.stamp: $(srcdir)/examples/ima-size.cc @rm -f $@.tmp @touch $@.tmp - $(srcdir)/tools/split_sample.sh $< cc raw $(srcdir)/examples/split + $(srcdir)/tools/split_sample.sh $(srcdir)/examples/ima-size.cc cc raw $(srcdir)/examples/split @mv -f $@.tmp $@ EXTRA_DIST += $(srcdir)/examples/split/ima-size.cc.stamp MAINTAINERCLEANFILES += $(srcdir)/examples/split/ima-size.cc.stamp @@ -463,15 +463,15 @@ MAINTAINERCLEANFILES += $(srcdir)/examples/split/ima-size.cc.stamp $(srcdir)/examples/split/ima-size-1.cc.raw: $(srcdir)/examples/split/ima-size.cc.stamp ## Recover from the removal of $@ @if test -f $@; then :; else \ - rm -f $<; \ - $(MAKE) $(AM_MAKEFLAGS) $<; \ + rm -f $(srcdir)/examples/split/ima-size.cc.stamp; \ + $(MAKE) $(AM_MAKEFLAGS) $(srcdir)/examples/split/ima-size.cc.stamp; \ fi $(srcdir)/examples/split/ima2d-1.cc.stamp: $(srcdir)/examples/ima2d-1.cc @rm -f $@.tmp @touch $@.tmp - $(srcdir)/tools/split_sample.sh $< cc raw $(srcdir)/examples/split + $(srcdir)/tools/split_sample.sh $(srcdir)/examples/ima2d-1.cc cc raw $(srcdir)/examples/split @mv -f $@.tmp $@ EXTRA_DIST += $(srcdir)/examples/split/ima2d-1.cc.stamp MAINTAINERCLEANFILES += $(srcdir)/examples/split/ima2d-1.cc.stamp @@ -479,15 +479,15 @@ MAINTAINERCLEANFILES += $(srcdir)/examples/split/ima2d-1.cc.stamp $(srcdir)/examples/split/ima2d-1-1.cc.raw: $(srcdir)/examples/split/ima2d-1.cc.stamp ## Recover from the removal of $@ @if test -f $@; then :; else \ - rm -f $<; \ - $(MAKE) $(AM_MAKEFLAGS) $<; \ + rm -f $(srcdir)/examples/split/ima2d-1.cc.stamp; \ + $(MAKE) $(AM_MAKEFLAGS) $(srcdir)/examples/split/ima2d-1.cc.stamp; \ fi $(srcdir)/examples/split/ima2d-2.cc.stamp: $(srcdir)/examples/ima2d-2.cc @rm -f $@.tmp @touch $@.tmp - $(srcdir)/tools/split_sample.sh $< cc raw $(srcdir)/examples/split + $(srcdir)/tools/split_sample.sh $(srcdir)/examples/ima2d-2.cc cc raw $(srcdir)/examples/split @mv -f $@.tmp $@ EXTRA_DIST += $(srcdir)/examples/split/ima2d-2.cc.stamp MAINTAINERCLEANFILES += $(srcdir)/examples/split/ima2d-2.cc.stamp @@ -495,15 +495,15 @@ MAINTAINERCLEANFILES += $(srcdir)/examples/split/ima2d-2.cc.stamp $(srcdir)/examples/split/ima2d-2-1.cc.raw: $(srcdir)/examples/split/ima2d-2.cc.stamp ## Recover from the removal of $@ @if test -f $@; then :; else \ - rm -f $<; \ - $(MAKE) $(AM_MAKEFLAGS) $<; \ + rm -f $(srcdir)/examples/split/ima2d-2.cc.stamp; \ + $(MAKE) $(AM_MAKEFLAGS) $(srcdir)/examples/split/ima2d-2.cc.stamp; \ fi $(srcdir)/examples/split/ima2d-3.cc.stamp: $(srcdir)/examples/ima2d-3.cc @rm -f $@.tmp @touch $@.tmp - $(srcdir)/tools/split_sample.sh $< cc raw $(srcdir)/examples/split + $(srcdir)/tools/split_sample.sh $(srcdir)/examples/ima2d-3.cc cc raw $(srcdir)/examples/split @mv -f $@.tmp $@ EXTRA_DIST += $(srcdir)/examples/split/ima2d-3.cc.stamp MAINTAINERCLEANFILES += $(srcdir)/examples/split/ima2d-3.cc.stamp @@ -511,15 +511,15 @@ MAINTAINERCLEANFILES += $(srcdir)/examples/split/ima2d-3.cc.stamp $(srcdir)/examples/split/ima2d-3-1.cc.raw: $(srcdir)/examples/split/ima2d-3.cc.stamp ## Recover from the removal of $@ @if test -f $@; then :; else \ - rm -f $<; \ - $(MAKE) $(AM_MAKEFLAGS) $<; \ + rm -f $(srcdir)/examples/split/ima2d-3.cc.stamp; \ + $(MAKE) $(AM_MAKEFLAGS) $(srcdir)/examples/split/ima2d-3.cc.stamp; \ fi $(srcdir)/examples/split/ima2d-4.cc.stamp: $(srcdir)/examples/ima2d-4.cc @rm -f $@.tmp @touch $@.tmp - $(srcdir)/tools/split_sample.sh $< cc raw $(srcdir)/examples/split + $(srcdir)/tools/split_sample.sh $(srcdir)/examples/ima2d-4.cc cc raw $(srcdir)/examples/split @mv -f $@.tmp $@ EXTRA_DIST += $(srcdir)/examples/split/ima2d-4.cc.stamp MAINTAINERCLEANFILES += $(srcdir)/examples/split/ima2d-4.cc.stamp @@ -527,15 +527,15 @@ MAINTAINERCLEANFILES += $(srcdir)/examples/split/ima2d-4.cc.stamp $(srcdir)/examples/split/ima2d-4-1.cc.raw: $(srcdir)/examples/split/ima2d-4.cc.stamp ## Recover from the removal of $@ @if test -f $@; then :; else \ - rm -f $<; \ - $(MAKE) $(AM_MAKEFLAGS) $<; \ + rm -f $(srcdir)/examples/split/ima2d-4.cc.stamp; \ + $(MAKE) $(AM_MAKEFLAGS) $(srcdir)/examples/split/ima2d-4.cc.stamp; \ fi $(srcdir)/examples/split/ima2d-5.cc.stamp: $(srcdir)/examples/ima2d-5.cc @rm -f $@.tmp @touch $@.tmp - $(srcdir)/tools/split_sample.sh $< cc raw $(srcdir)/examples/split + $(srcdir)/tools/split_sample.sh $(srcdir)/examples/ima2d-5.cc cc raw $(srcdir)/examples/split @mv -f $@.tmp $@ EXTRA_DIST += $(srcdir)/examples/split/ima2d-5.cc.stamp MAINTAINERCLEANFILES += $(srcdir)/examples/split/ima2d-5.cc.stamp @@ -543,15 +543,15 @@ MAINTAINERCLEANFILES += $(srcdir)/examples/split/ima2d-5.cc.stamp $(srcdir)/examples/split/ima2d-5-1.cc.raw: $(srcdir)/examples/split/ima2d-5.cc.stamp ## Recover from the removal of $@ @if test -f $@; then :; else \ - rm -f $<; \ - $(MAKE) $(AM_MAKEFLAGS) $<; \ + rm -f $(srcdir)/examples/split/ima2d-5.cc.stamp; \ + $(MAKE) $(AM_MAKEFLAGS) $(srcdir)/examples/split/ima2d-5.cc.stamp; \ fi $(srcdir)/examples/split/ima2d-6-clone.cc.stamp: $(srcdir)/examples/ima2d-6-clone.cc @rm -f $@.tmp @touch $@.tmp - $(srcdir)/tools/split_sample.sh $< cc raw $(srcdir)/examples/split + $(srcdir)/tools/split_sample.sh $(srcdir)/examples/ima2d-6-clone.cc cc raw $(srcdir)/examples/split @mv -f $@.tmp $@ EXTRA_DIST += $(srcdir)/examples/split/ima2d-6-clone.cc.stamp MAINTAINERCLEANFILES += $(srcdir)/examples/split/ima2d-6-clone.cc.stamp @@ -559,15 +559,15 @@ MAINTAINERCLEANFILES += $(srcdir)/examples/split/ima2d-6-clone.cc.stamp $(srcdir)/examples/split/ima2d-6-clone-1.cc.raw: $(srcdir)/examples/split/ima2d-6-clone.cc.stamp ## Recover from the removal of $@ @if test -f $@; then :; else \ - rm -f $<; \ - $(MAKE) $(AM_MAKEFLAGS) $<; \ + rm -f $(srcdir)/examples/split/ima2d-6-clone.cc.stamp; \ + $(MAKE) $(AM_MAKEFLAGS) $(srcdir)/examples/split/ima2d-6-clone.cc.stamp; \ fi $(srcdir)/examples/split/ima2d-7.cc.stamp: $(srcdir)/examples/ima2d-7.cc @rm -f $@.tmp @touch $@.tmp - $(srcdir)/tools/split_sample.sh $< cc raw $(srcdir)/examples/split + $(srcdir)/tools/split_sample.sh $(srcdir)/examples/ima2d-7.cc cc raw $(srcdir)/examples/split @mv -f $@.tmp $@ EXTRA_DIST += $(srcdir)/examples/split/ima2d-7.cc.stamp MAINTAINERCLEANFILES += $(srcdir)/examples/split/ima2d-7.cc.stamp @@ -575,15 +575,15 @@ MAINTAINERCLEANFILES += $(srcdir)/examples/split/ima2d-7.cc.stamp $(srcdir)/examples/split/ima2d-7-1.cc.raw: $(srcdir)/examples/split/ima2d-7.cc.stamp ## Recover from the removal of $@ @if test -f $@; then :; else \ - rm -f $<; \ - $(MAKE) $(AM_MAKEFLAGS) $<; \ + rm -f $(srcdir)/examples/split/ima2d-7.cc.stamp; \ + $(MAKE) $(AM_MAKEFLAGS) $(srcdir)/examples/split/ima2d-7.cc.stamp; \ fi $(srcdir)/examples/split/ima2d-rot.cc.stamp: $(srcdir)/examples/ima2d-rot.cc @rm -f $@.tmp @touch $@.tmp - $(srcdir)/tools/split_sample.sh $< cc raw $(srcdir)/examples/split + $(srcdir)/tools/split_sample.sh $(srcdir)/examples/ima2d-rot.cc cc raw $(srcdir)/examples/split @mv -f $@.tmp $@ EXTRA_DIST += $(srcdir)/examples/split/ima2d-rot.cc.stamp MAINTAINERCLEANFILES += $(srcdir)/examples/split/ima2d-rot.cc.stamp @@ -591,15 +591,15 @@ MAINTAINERCLEANFILES += $(srcdir)/examples/split/ima2d-rot.cc.stamp $(srcdir)/examples/split/ima2d-rot-1.cc.raw: $(srcdir)/examples/split/ima2d-rot.cc.stamp ## Recover from the removal of $@ @if test -f $@; then :; else \ - rm -f $<; \ - $(MAKE) $(AM_MAKEFLAGS) $<; \ + rm -f $(srcdir)/examples/split/ima2d-rot.cc.stamp; \ + $(MAKE) $(AM_MAKEFLAGS) $(srcdir)/examples/split/ima2d-rot.cc.stamp; \ fi $(srcdir)/examples/split/labeling-compute.cc.stamp: $(srcdir)/examples/labeling-compute.cc @rm -f $@.tmp @touch $@.tmp - $(srcdir)/tools/split_sample.sh $< cc raw $(srcdir)/examples/split + $(srcdir)/tools/split_sample.sh $(srcdir)/examples/labeling-compute.cc cc raw $(srcdir)/examples/split @mv -f $@.tmp $@ EXTRA_DIST += $(srcdir)/examples/split/labeling-compute.cc.stamp MAINTAINERCLEANFILES += $(srcdir)/examples/split/labeling-compute.cc.stamp @@ -607,15 +607,15 @@ MAINTAINERCLEANFILES += $(srcdir)/examples/split/labeling-compute.cc.stamp $(srcdir)/examples/split/labeling-compute-1.cc.raw $(srcdir)/examples/split/labeling-compute-2.cc.raw $(srcdir)/examples/split/labeling-compute-3.cc.raw $(srcdir)/examples/split/labeling-compute-4.cc.raw: $(srcdir)/examples/split/labeling-compute.cc.stamp ## Recover from the removal of $@ @if test -f $@; then :; else \ - rm -f $<; \ - $(MAKE) $(AM_MAKEFLAGS) $<; \ + rm -f $(srcdir)/examples/split/labeling-compute.cc.stamp; \ + $(MAKE) $(AM_MAKEFLAGS) $(srcdir)/examples/split/labeling-compute.cc.stamp; \ fi $(srcdir)/examples/split/logical-not.cc.stamp: $(srcdir)/examples/logical-not.cc @rm -f $@.tmp @touch $@.tmp - $(srcdir)/tools/split_sample.sh $< cc raw $(srcdir)/examples/split + $(srcdir)/tools/split_sample.sh $(srcdir)/examples/logical-not.cc cc raw $(srcdir)/examples/split @mv -f $@.tmp $@ EXTRA_DIST += $(srcdir)/examples/split/logical-not.cc.stamp MAINTAINERCLEANFILES += $(srcdir)/examples/split/logical-not.cc.stamp @@ -623,15 +623,15 @@ MAINTAINERCLEANFILES += $(srcdir)/examples/split/logical-not.cc.stamp $(srcdir)/examples/split/logical-not-1.cc.raw $(srcdir)/examples/split/logical-not-2.cc.raw $(srcdir)/examples/split/logical-not-3.cc.raw: $(srcdir)/examples/split/logical-not.cc.stamp ## Recover from the removal of $@ @if test -f $@; then :; else \ - rm -f $<; \ - $(MAKE) $(AM_MAKEFLAGS) $<; \ + rm -f $(srcdir)/examples/split/logical-not.cc.stamp; \ + $(MAKE) $(AM_MAKEFLAGS) $(srcdir)/examples/split/logical-not.cc.stamp; \ fi $(srcdir)/examples/split/mln_var.cc.stamp: $(srcdir)/examples/mln_var.cc @rm -f $@.tmp @touch $@.tmp - $(srcdir)/tools/split_sample.sh $< cc raw $(srcdir)/examples/split + $(srcdir)/tools/split_sample.sh $(srcdir)/examples/mln_var.cc cc raw $(srcdir)/examples/split @mv -f $@.tmp $@ EXTRA_DIST += $(srcdir)/examples/split/mln_var.cc.stamp MAINTAINERCLEANFILES += $(srcdir)/examples/split/mln_var.cc.stamp @@ -639,15 +639,15 @@ MAINTAINERCLEANFILES += $(srcdir)/examples/split/mln_var.cc.stamp $(srcdir)/examples/split/mln_var-1.cc.raw $(srcdir)/examples/split/mln_var-2.cc.raw $(srcdir)/examples/split/mln_var-3.cc.raw: $(srcdir)/examples/split/mln_var.cc.stamp ## Recover from the removal of $@ @if test -f $@; then :; else \ - rm -f $<; \ - $(MAKE) $(AM_MAKEFLAGS) $<; \ + rm -f $(srcdir)/examples/split/mln_var.cc.stamp; \ + $(MAKE) $(AM_MAKEFLAGS) $(srcdir)/examples/split/mln_var.cc.stamp; \ fi $(srcdir)/examples/split/parray-append.cc.stamp: $(srcdir)/examples/parray-append.cc @rm -f $@.tmp @touch $@.tmp - $(srcdir)/tools/split_sample.sh $< cc raw $(srcdir)/examples/split + $(srcdir)/tools/split_sample.sh $(srcdir)/examples/parray-append.cc cc raw $(srcdir)/examples/split @mv -f $@.tmp $@ EXTRA_DIST += $(srcdir)/examples/split/parray-append.cc.stamp MAINTAINERCLEANFILES += $(srcdir)/examples/split/parray-append.cc.stamp @@ -655,15 +655,15 @@ MAINTAINERCLEANFILES += $(srcdir)/examples/split/parray-append.cc.stamp $(srcdir)/examples/split/parray-append-1.cc.raw: $(srcdir)/examples/split/parray-append.cc.stamp ## Recover from the removal of $@ @if test -f $@; then :; else \ - rm -f $<; \ - $(MAKE) $(AM_MAKEFLAGS) $<; \ + rm -f $(srcdir)/examples/split/parray-append.cc.stamp; \ + $(MAKE) $(AM_MAKEFLAGS) $(srcdir)/examples/split/parray-append.cc.stamp; \ fi $(srcdir)/examples/split/parray-bbox.cc.stamp: $(srcdir)/examples/parray-bbox.cc @rm -f $@.tmp @touch $@.tmp - $(srcdir)/tools/split_sample.sh $< cc raw $(srcdir)/examples/split + $(srcdir)/tools/split_sample.sh $(srcdir)/examples/parray-bbox.cc cc raw $(srcdir)/examples/split @mv -f $@.tmp $@ EXTRA_DIST += $(srcdir)/examples/split/parray-bbox.cc.stamp MAINTAINERCLEANFILES += $(srcdir)/examples/split/parray-bbox.cc.stamp @@ -671,15 +671,15 @@ MAINTAINERCLEANFILES += $(srcdir)/examples/split/parray-bbox.cc.stamp $(srcdir)/examples/split/parray-bbox-1.cc.raw: $(srcdir)/examples/split/parray-bbox.cc.stamp ## Recover from the removal of $@ @if test -f $@; then :; else \ - rm -f $<; \ - $(MAKE) $(AM_MAKEFLAGS) $<; \ + rm -f $(srcdir)/examples/split/parray-bbox.cc.stamp; \ + $(MAKE) $(AM_MAKEFLAGS) $(srcdir)/examples/split/parray-bbox.cc.stamp; \ fi $(srcdir)/examples/split/paste.cc.stamp: $(srcdir)/examples/paste.cc @rm -f $@.tmp @touch $@.tmp - $(srcdir)/tools/split_sample.sh $< cc raw $(srcdir)/examples/split + $(srcdir)/tools/split_sample.sh $(srcdir)/examples/paste.cc cc raw $(srcdir)/examples/split @mv -f $@.tmp $@ EXTRA_DIST += $(srcdir)/examples/split/paste.cc.stamp MAINTAINERCLEANFILES += $(srcdir)/examples/split/paste.cc.stamp @@ -687,15 +687,15 @@ MAINTAINERCLEANFILES += $(srcdir)/examples/split/paste.cc.stamp $(srcdir)/examples/split/paste-1.cc.raw: $(srcdir)/examples/split/paste.cc.stamp ## Recover from the removal of $@ @if test -f $@; then :; else \ - rm -f $<; \ - $(MAKE) $(AM_MAKEFLAGS) $<; \ + rm -f $(srcdir)/examples/split/paste.cc.stamp; \ + $(MAKE) $(AM_MAKEFLAGS) $(srcdir)/examples/split/paste.cc.stamp; \ fi $(srcdir)/examples/split/paste-call-1.cc.stamp: $(srcdir)/examples/paste-call-1.cc @rm -f $@.tmp @touch $@.tmp - $(srcdir)/tools/split_sample.sh $< cc raw $(srcdir)/examples/split + $(srcdir)/tools/split_sample.sh $(srcdir)/examples/paste-call-1.cc cc raw $(srcdir)/examples/split @mv -f $@.tmp $@ EXTRA_DIST += $(srcdir)/examples/split/paste-call-1.cc.stamp MAINTAINERCLEANFILES += $(srcdir)/examples/split/paste-call-1.cc.stamp @@ -703,15 +703,15 @@ MAINTAINERCLEANFILES += $(srcdir)/examples/split/paste-call-1.cc.stamp $(srcdir)/examples/split/paste-call-1-1.cc.raw: $(srcdir)/examples/split/paste-call-1.cc.stamp ## Recover from the removal of $@ @if test -f $@; then :; else \ - rm -f $<; \ - $(MAKE) $(AM_MAKEFLAGS) $<; \ + rm -f $(srcdir)/examples/split/paste-call-1.cc.stamp; \ + $(MAKE) $(AM_MAKEFLAGS) $(srcdir)/examples/split/paste-call-1.cc.stamp; \ fi $(srcdir)/examples/split/point-1.cc.stamp: $(srcdir)/examples/point-1.cc @rm -f $@.tmp @touch $@.tmp - $(srcdir)/tools/split_sample.sh $< cc raw $(srcdir)/examples/split + $(srcdir)/tools/split_sample.sh $(srcdir)/examples/point-1.cc cc raw $(srcdir)/examples/split @mv -f $@.tmp $@ EXTRA_DIST += $(srcdir)/examples/split/point-1.cc.stamp MAINTAINERCLEANFILES += $(srcdir)/examples/split/point-1.cc.stamp @@ -719,15 +719,15 @@ MAINTAINERCLEANFILES += $(srcdir)/examples/split/point-1.cc.stamp $(srcdir)/examples/split/point-1-1.cc.raw: $(srcdir)/examples/split/point-1.cc.stamp ## Recover from the removal of $@ @if test -f $@; then :; else \ - rm -f $<; \ - $(MAKE) $(AM_MAKEFLAGS) $<; \ + rm -f $(srcdir)/examples/split/point-1.cc.stamp; \ + $(MAKE) $(AM_MAKEFLAGS) $(srcdir)/examples/split/point-1.cc.stamp; \ fi $(srcdir)/examples/split/predicate-1.cc.stamp: $(srcdir)/examples/predicate-1.cc @rm -f $@.tmp @touch $@.tmp - $(srcdir)/tools/split_sample.sh $< cc raw $(srcdir)/examples/split + $(srcdir)/tools/split_sample.sh $(srcdir)/examples/predicate-1.cc cc raw $(srcdir)/examples/split @mv -f $@.tmp $@ EXTRA_DIST += $(srcdir)/examples/split/predicate-1.cc.stamp MAINTAINERCLEANFILES += $(srcdir)/examples/split/predicate-1.cc.stamp @@ -735,15 +735,15 @@ MAINTAINERCLEANFILES += $(srcdir)/examples/split/predicate-1.cc.stamp $(srcdir)/examples/split/predicate-1-1.cc.raw: $(srcdir)/examples/split/predicate-1.cc.stamp ## Recover from the removal of $@ @if test -f $@; then :; else \ - rm -f $<; \ - $(MAKE) $(AM_MAKEFLAGS) $<; \ + rm -f $(srcdir)/examples/split/predicate-1.cc.stamp; \ + $(MAKE) $(AM_MAKEFLAGS) $(srcdir)/examples/split/predicate-1.cc.stamp; \ fi $(srcdir)/examples/split/tuto2_first_image.cc.stamp: $(srcdir)/examples/tuto2_first_image.cc @rm -f $@.tmp @touch $@.tmp - $(srcdir)/tools/split_sample.sh $< cc raw $(srcdir)/examples/split + $(srcdir)/tools/split_sample.sh $(srcdir)/examples/tuto2_first_image.cc cc raw $(srcdir)/examples/split @mv -f $@.tmp $@ EXTRA_DIST += $(srcdir)/examples/split/tuto2_first_image.cc.stamp MAINTAINERCLEANFILES += $(srcdir)/examples/split/tuto2_first_image.cc.stamp @@ -751,15 +751,15 @@ MAINTAINERCLEANFILES += $(srcdir)/examples/split/tuto2_first_image.cc.stamp $(srcdir)/examples/split/tuto2_first_image-1.cc.raw $(srcdir)/examples/split/tuto2_first_image-2.cc.raw $(srcdir)/examples/split/tuto2_first_image-3.cc.raw $(srcdir)/examples/split/tuto2_first_image-4.cc.raw: $(srcdir)/examples/split/tuto2_first_image.cc.stamp ## Recover from the removal of $@ @if test -f $@; then :; else \ - rm -f $<; \ - $(MAKE) $(AM_MAKEFLAGS) $<; \ + rm -f $(srcdir)/examples/split/tuto2_first_image.cc.stamp; \ + $(MAKE) $(AM_MAKEFLAGS) $(srcdir)/examples/split/tuto2_first_image.cc.stamp; \ fi $(srcdir)/examples/split/tuto3_colorize.cc.stamp: $(srcdir)/examples/tuto3/colorize.cc @rm -f $@.tmp @touch $@.tmp - $(srcdir)/tools/split_sample.sh $< cc raw $(srcdir)/examples/split + $(srcdir)/tools/split_sample.sh $(srcdir)/examples/tuto3/colorize.cc cc raw $(srcdir)/examples/split @mv -f $@.tmp $@ EXTRA_DIST += $(srcdir)/examples/split/tuto3_colorize.cc.stamp MAINTAINERCLEANFILES += $(srcdir)/examples/split/tuto3_colorize.cc.stamp @@ -767,15 +767,15 @@ MAINTAINERCLEANFILES += $(srcdir)/examples/split/tuto3_colorize.cc.stamp $(srcdir)/examples/split/tuto3_colorize-1.cc.raw: $(srcdir)/examples/split/tuto3_colorize.cc.stamp ## Recover from the removal of $@ @if test -f $@; then :; else \ - rm -f $<; \ - $(MAKE) $(AM_MAKEFLAGS) $<; \ + rm -f $(srcdir)/examples/split/tuto3_colorize.cc.stamp; \ + $(MAKE) $(AM_MAKEFLAGS) $(srcdir)/examples/split/tuto3_colorize.cc.stamp; \ fi $(srcdir)/examples/split/tuto3_first_routine.cc.stamp: $(srcdir)/examples/tuto3/first_routine.cc @rm -f $@.tmp @touch $@.tmp - $(srcdir)/tools/split_sample.sh $< cc raw $(srcdir)/examples/split + $(srcdir)/tools/split_sample.sh $(srcdir)/examples/tuto3/first_routine.cc cc raw $(srcdir)/examples/split @mv -f $@.tmp $@ EXTRA_DIST += $(srcdir)/examples/split/tuto3_first_routine.cc.stamp MAINTAINERCLEANFILES += $(srcdir)/examples/split/tuto3_first_routine.cc.stamp @@ -783,15 +783,15 @@ MAINTAINERCLEANFILES += $(srcdir)/examples/split/tuto3_first_routine.cc.stamp $(srcdir)/examples/split/tuto3_first_routine-1.cc.raw $(srcdir)/examples/split/tuto3_first_routine-2.cc.raw $(srcdir)/examples/split/tuto3_first_routine-3.cc.raw $(srcdir)/examples/split/tuto3_first_routine-4.cc.raw $(srcdir)/examples/split/tuto3_first_routine-5.cc.raw $(srcdir)/examples/split/tuto3_first_routine-6.cc.raw $(srcdir)/examples/split/tuto3_first_routine-7.cc.raw $(srcdir)/examples/split/tuto3_first_routine-8.cc.raw: $(srcdir)/examples/split/tuto3_first_routine.cc.stamp ## Recover from the removal of $@ @if test -f $@; then :; else \ - rm -f $<; \ - $(MAKE) $(AM_MAKEFLAGS) $<; \ + rm -f $(srcdir)/examples/split/tuto3_first_routine.cc.stamp; \ + $(MAKE) $(AM_MAKEFLAGS) $(srcdir)/examples/split/tuto3_first_routine.cc.stamp; \ fi $(srcdir)/examples/split/tuto3_println.cc.stamp: $(srcdir)/examples/tuto3/println.cc @rm -f $@.tmp @touch $@.tmp - $(srcdir)/tools/split_sample.sh $< cc raw $(srcdir)/examples/split + $(srcdir)/tools/split_sample.sh $(srcdir)/examples/tuto3/println.cc cc raw $(srcdir)/examples/split @mv -f $@.tmp $@ EXTRA_DIST += $(srcdir)/examples/split/tuto3_println.cc.stamp MAINTAINERCLEANFILES += $(srcdir)/examples/split/tuto3_println.cc.stamp @@ -799,15 +799,15 @@ MAINTAINERCLEANFILES += $(srcdir)/examples/split/tuto3_println.cc.stamp $(srcdir)/examples/split/tuto3_println-1.cc.raw $(srcdir)/examples/split/tuto3_println-2.cc.raw: $(srcdir)/examples/split/tuto3_println.cc.stamp ## Recover from the removal of $@ @if test -f $@; then :; else \ - rm -f $<; \ - $(MAKE) $(AM_MAKEFLAGS) $<; \ + rm -f $(srcdir)/examples/split/tuto3_println.cc.stamp; \ + $(MAKE) $(AM_MAKEFLAGS) $(srcdir)/examples/split/tuto3_println.cc.stamp; \ fi $(srcdir)/examples/split/tuto3_trace.cc.stamp: $(srcdir)/examples/tuto3/trace.cc @rm -f $@.tmp @touch $@.tmp - $(srcdir)/tools/split_sample.sh $< cc raw $(srcdir)/examples/split + $(srcdir)/tools/split_sample.sh $(srcdir)/examples/tuto3/trace.cc cc raw $(srcdir)/examples/split @mv -f $@.tmp $@ EXTRA_DIST += $(srcdir)/examples/split/tuto3_trace.cc.stamp MAINTAINERCLEANFILES += $(srcdir)/examples/split/tuto3_trace.cc.stamp @@ -815,15 +815,15 @@ MAINTAINERCLEANFILES += $(srcdir)/examples/split/tuto3_trace.cc.stamp $(srcdir)/examples/split/tuto3_trace-1.cc.raw $(srcdir)/examples/split/tuto3_trace-2.cc.raw: $(srcdir)/examples/split/tuto3_trace.cc.stamp ## Recover from the removal of $@ @if test -f $@; then :; else \ - rm -f $<; \ - $(MAKE) $(AM_MAKEFLAGS) $<; \ + rm -f $(srcdir)/examples/split/tuto3_trace.cc.stamp; \ + $(MAKE) $(AM_MAKEFLAGS) $(srcdir)/examples/split/tuto3_trace.cc.stamp; \ fi $(srcdir)/examples/split/tuto3_rw_image.cc.stamp: $(srcdir)/examples/tuto3_rw_image.cc @rm -f $@.tmp @touch $@.tmp - $(srcdir)/tools/split_sample.sh $< cc raw $(srcdir)/examples/split + $(srcdir)/tools/split_sample.sh $(srcdir)/examples/tuto3_rw_image.cc cc raw $(srcdir)/examples/split @mv -f $@.tmp $@ EXTRA_DIST += $(srcdir)/examples/split/tuto3_rw_image.cc.stamp MAINTAINERCLEANFILES += $(srcdir)/examples/split/tuto3_rw_image.cc.stamp @@ -831,15 +831,15 @@ MAINTAINERCLEANFILES += $(srcdir)/examples/split/tuto3_rw_image.cc.stamp $(srcdir)/examples/split/tuto3_rw_image-1.cc.raw $(srcdir)/examples/split/tuto3_rw_image-2.cc.raw $(srcdir)/examples/split/tuto3_rw_image-3.cc.raw $(srcdir)/examples/split/tuto3_rw_image-4.cc.raw $(srcdir)/examples/split/tuto3_rw_image-5.cc.raw $(srcdir)/examples/split/tuto3_rw_image-6.cc.raw $(srcdir)/examples/split/tuto3_rw_image-7.cc.raw: $(srcdir)/examples/split/tuto3_rw_image.cc.stamp ## Recover from the removal of $@ @if test -f $@; then :; else \ - rm -f $<; \ - $(MAKE) $(AM_MAKEFLAGS) $<; \ + rm -f $(srcdir)/examples/split/tuto3_rw_image.cc.stamp; \ + $(MAKE) $(AM_MAKEFLAGS) $(srcdir)/examples/split/tuto3_rw_image.cc.stamp; \ fi $(srcdir)/examples/split/tuto4_point2d.cc.stamp: $(srcdir)/examples/tuto4/point2d.cc @rm -f $@.tmp @touch $@.tmp - $(srcdir)/tools/split_sample.sh $< cc raw $(srcdir)/examples/split + $(srcdir)/tools/split_sample.sh $(srcdir)/examples/tuto4/point2d.cc cc raw $(srcdir)/examples/split @mv -f $@.tmp $@ EXTRA_DIST += $(srcdir)/examples/split/tuto4_point2d.cc.stamp MAINTAINERCLEANFILES += $(srcdir)/examples/split/tuto4_point2d.cc.stamp @@ -847,15 +847,15 @@ MAINTAINERCLEANFILES += $(srcdir)/examples/split/tuto4_point2d.cc.stamp $(srcdir)/examples/split/tuto4_point2d-1.cc.raw: $(srcdir)/examples/split/tuto4_point2d.cc.stamp ## Recover from the removal of $@ @if test -f $@; then :; else \ - rm -f $<; \ - $(MAKE) $(AM_MAKEFLAGS) $<; \ + rm -f $(srcdir)/examples/split/tuto4_point2d.cc.stamp; \ + $(MAKE) $(AM_MAKEFLAGS) $(srcdir)/examples/split/tuto4_point2d.cc.stamp; \ fi $(srcdir)/examples/split/tuto4_site_set_create.cc.stamp: $(srcdir)/examples/tuto4/site_set_create.cc @rm -f $@.tmp @touch $@.tmp - $(srcdir)/tools/split_sample.sh $< cc raw $(srcdir)/examples/split + $(srcdir)/tools/split_sample.sh $(srcdir)/examples/tuto4/site_set_create.cc cc raw $(srcdir)/examples/split @mv -f $@.tmp $@ EXTRA_DIST += $(srcdir)/examples/split/tuto4_site_set_create.cc.stamp MAINTAINERCLEANFILES += $(srcdir)/examples/split/tuto4_site_set_create.cc.stamp @@ -863,15 +863,15 @@ MAINTAINERCLEANFILES += $(srcdir)/examples/split/tuto4_site_set_create.cc.stamp $(srcdir)/examples/split/tuto4_site_set_create-1.cc.raw $(srcdir)/examples/split/tuto4_site_set_create-2.cc.raw $(srcdir)/examples/split/tuto4_site_set_create-3.cc.raw $(srcdir)/examples/split/tuto4_site_set_create-4.cc.raw $(srcdir)/examples/split/tuto4_site_set_create-5.cc.raw: $(srcdir)/examples/split/tuto4_site_set_create.cc.stamp ## Recover from the removal of $@ @if test -f $@; then :; else \ - rm -f $<; \ - $(MAKE) $(AM_MAKEFLAGS) $<; \ + rm -f $(srcdir)/examples/split/tuto4_site_set_create.cc.stamp; \ + $(MAKE) $(AM_MAKEFLAGS) $(srcdir)/examples/split/tuto4_site_set_create.cc.stamp; \ fi $(srcdir)/examples/split/tuto4_genericity_and_algorithms.cc.stamp: $(srcdir)/examples/tuto4_genericity_and_algorithms.cc @rm -f $@.tmp @touch $@.tmp - $(srcdir)/tools/split_sample.sh $< cc raw $(srcdir)/examples/split + $(srcdir)/tools/split_sample.sh $(srcdir)/examples/tuto4_genericity_and_algorithms.cc cc raw $(srcdir)/examples/split @mv -f $@.tmp $@ EXTRA_DIST += $(srcdir)/examples/split/tuto4_genericity_and_algorithms.cc.stamp MAINTAINERCLEANFILES += $(srcdir)/examples/split/tuto4_genericity_and_algorithms.cc.stamp @@ -879,15 +879,15 @@ MAINTAINERCLEANFILES += $(srcdir)/examples/split/tuto4_genericity_and_algorithms $(srcdir)/examples/split/tuto4_genericity_and_algorithms-1.cc.raw $(srcdir)/examples/split/tuto4_genericity_and_algorithms-2.cc.raw $(srcdir)/examples/split/tuto4_genericity_and_algorithms-3.cc.raw $(srcdir)/examples/split/tuto4_genericity_and_algorithms-4.cc.raw $(srcdir)/examples/split/tuto4_genericity_and_algorithms-5.cc.raw $(srcdir)/examples/split/tuto4_genericity_and_algorithms-6.cc.raw $(srcdir)/examples/split/tuto4_genericity_and_algorithms-7.cc.raw $(srcdir)/examples/split/tuto4_genericity_and_algorithms-8.cc.raw $(srcdir)/examples/split/tuto4_genericity_and_algorithms-9.cc.raw $(srcdir)/examples/split/tuto4_genericity_and_algorithms-10.cc.raw $(srcdir)/examples/split/tuto4_genericity_and_algorithms-11.cc.raw $(srcdir)/examples/split/tuto4_genericity_and_algorithms-12.cc.raw: $(srcdir)/examples/split/tuto4_genericity_and_algorithms.cc.stamp ## Recover from the removal of $@ @if test -f $@; then :; else \ - rm -f $<; \ - $(MAKE) $(AM_MAKEFLAGS) $<; \ + rm -f $(srcdir)/examples/split/tuto4_genericity_and_algorithms.cc.stamp; \ + $(MAKE) $(AM_MAKEFLAGS) $(srcdir)/examples/split/tuto4_genericity_and_algorithms.cc.stamp; \ fi $(srcdir)/examples/split/win-create-1.cc.stamp: $(srcdir)/examples/win-create-1.cc @rm -f $@.tmp @touch $@.tmp - $(srcdir)/tools/split_sample.sh $< cc raw $(srcdir)/examples/split + $(srcdir)/tools/split_sample.sh $(srcdir)/examples/win-create-1.cc cc raw $(srcdir)/examples/split @mv -f $@.tmp $@ EXTRA_DIST += $(srcdir)/examples/split/win-create-1.cc.stamp MAINTAINERCLEANFILES += $(srcdir)/examples/split/win-create-1.cc.stamp @@ -895,15 +895,15 @@ MAINTAINERCLEANFILES += $(srcdir)/examples/split/win-create-1.cc.stamp $(srcdir)/examples/split/win-create-1-1.cc.raw: $(srcdir)/examples/split/win-create-1.cc.stamp ## Recover from the removal of $@ @if test -f $@; then :; else \ - rm -f $<; \ - $(MAKE) $(AM_MAKEFLAGS) $<; \ + rm -f $(srcdir)/examples/split/win-create-1.cc.stamp; \ + $(MAKE) $(AM_MAKEFLAGS) $(srcdir)/examples/split/win-create-1.cc.stamp; \ fi $(srcdir)/examples/split/win-create-2.cc.stamp: $(srcdir)/examples/win-create-2.cc @rm -f $@.tmp @touch $@.tmp - $(srcdir)/tools/split_sample.sh $< cc raw $(srcdir)/examples/split + $(srcdir)/tools/split_sample.sh $(srcdir)/examples/win-create-2.cc cc raw $(srcdir)/examples/split @mv -f $@.tmp $@ EXTRA_DIST += $(srcdir)/examples/split/win-create-2.cc.stamp MAINTAINERCLEANFILES += $(srcdir)/examples/split/win-create-2.cc.stamp @@ -911,6 +911,6 @@ MAINTAINERCLEANFILES += $(srcdir)/examples/split/win-create-2.cc.stamp $(srcdir)/examples/split/win-create-2-1.cc.raw: $(srcdir)/examples/split/win-create-2.cc.stamp ## Recover from the removal of $@ @if test -f $@; then :; else \ - rm -f $<; \ - $(MAKE) $(AM_MAKEFLAGS) $<; \ + rm -f $(srcdir)/examples/split/win-create-2.cc.stamp; \ + $(MAKE) $(AM_MAKEFLAGS) $(srcdir)/examples/split/win-create-2.cc.stamp; \ fi diff --git a/milena/doc/split-outputs.mk b/milena/doc/split-outputs.mk index 417c25d..7472aec 100644 --- a/milena/doc/split-outputs.mk +++ b/milena/doc/split-outputs.mk @@ -15,7 +15,7 @@ SPLIT_OUTPUTS = \ $(srcdir)/outputs/split/graph-iter.txt.stamp: $(srcdir)/outputs/graph-iter.txt @rm -f $@.tmp @touch $@.tmp - $(srcdir)/tools/split_sample.sh $< txt "" $(srcdir)/outputs/split + $(srcdir)/tools/split_sample.sh $(srcdir)/outputs/graph-iter.txt txt "" $(srcdir)/outputs/split @mv -f $@.tmp $@ EXTRA_DIST += $(srcdir)/outputs/split/graph-iter.txt.stamp MAINTAINERCLEANFILES += $(srcdir)/outputs/split/graph-iter.txt.stamp @@ -23,15 +23,15 @@ MAINTAINERCLEANFILES += $(srcdir)/outputs/split/graph-iter.txt.stamp $(srcdir)/outputs/split/graph-iter-1.txt $(srcdir)/outputs/split/graph-iter-2.txt $(srcdir)/outputs/split/graph-iter-3.txt $(srcdir)/outputs/split/graph-iter-4.txt: $(srcdir)/outputs/split/graph-iter.txt.stamp ## Recover from the removal of $@ @if test -f $@; then :; else \ - rm -f $<; \ - $(MAKE) $(AM_MAKEFLAGS) $<; \ + rm -f $(srcdir)/outputs/split/graph-iter.txt.stamp; \ + $(MAKE) $(AM_MAKEFLAGS) $(srcdir)/outputs/split/graph-iter.txt.stamp; \ fi $(srcdir)/outputs/split/tuto3_println.txt.stamp: $(srcdir)/outputs/tuto3_println.txt @rm -f $@.tmp @touch $@.tmp - $(srcdir)/tools/split_sample.sh $< txt "" $(srcdir)/outputs/split + $(srcdir)/tools/split_sample.sh $(srcdir)/outputs/tuto3_println.txt txt "" $(srcdir)/outputs/split @mv -f $@.tmp $@ EXTRA_DIST += $(srcdir)/outputs/split/tuto3_println.txt.stamp MAINTAINERCLEANFILES += $(srcdir)/outputs/split/tuto3_println.txt.stamp @@ -39,15 +39,15 @@ MAINTAINERCLEANFILES += $(srcdir)/outputs/split/tuto3_println.txt.stamp $(srcdir)/outputs/split/tuto3_println-1.txt $(srcdir)/outputs/split/tuto3_println-2.txt: $(srcdir)/outputs/split/tuto3_println.txt.stamp ## Recover from the removal of $@ @if test -f $@; then :; else \ - rm -f $<; \ - $(MAKE) $(AM_MAKEFLAGS) $<; \ + rm -f $(srcdir)/outputs/split/tuto3_println.txt.stamp; \ + $(MAKE) $(AM_MAKEFLAGS) $(srcdir)/outputs/split/tuto3_println.txt.stamp; \ fi $(srcdir)/outputs/split/tuto4_site_set_create.txt.stamp: $(srcdir)/outputs/tuto4_site_set_create.txt @rm -f $@.tmp @touch $@.tmp - $(srcdir)/tools/split_sample.sh $< txt "" $(srcdir)/outputs/split + $(srcdir)/tools/split_sample.sh $(srcdir)/outputs/tuto4_site_set_create.txt txt "" $(srcdir)/outputs/split @mv -f $@.tmp $@ EXTRA_DIST += $(srcdir)/outputs/split/tuto4_site_set_create.txt.stamp MAINTAINERCLEANFILES += $(srcdir)/outputs/split/tuto4_site_set_create.txt.stamp @@ -55,6 +55,6 @@ MAINTAINERCLEANFILES += $(srcdir)/outputs/split/tuto4_site_set_create.txt.stamp $(srcdir)/outputs/split/tuto4_site_set_create-1.txt $(srcdir)/outputs/split/tuto4_site_set_create-2.txt $(srcdir)/outputs/split/tuto4_site_set_create-3.txt: $(srcdir)/outputs/split/tuto4_site_set_create.txt.stamp ## Recover from the removal of $@ @if test -f $@; then :; else \ - rm -f $<; \ - $(MAKE) $(AM_MAKEFLAGS) $<; \ + rm -f $(srcdir)/outputs/split/tuto4_site_set_create.txt.stamp; \ + $(MAKE) $(AM_MAKEFLAGS) $(srcdir)/outputs/split/tuto4_site_set_create.txt.stamp; \ fi -- 1.7.10.4

1 0

olena: olena-2.0-889-ge0131fc Make Milena more compatible with BSD Make.
by Roland Levillain 26 Jun '14

26 Jun '14

* apps/bench/Makefile.am, * apps/morphers/Makefile.am, * doc/Makefile.am, * doc/gen-examples-outputs-mk, * doc/gen-figures-mk, * doc/gen-split-examples-mk, * doc/gen-split-outputs-mk: Do not use `$<' outside suffix rules. * apps/papers/levillain.09.ismm/Makefile.am: Likewise. Add explicit `$(srcdir)/' prefixes to prerequisites' paths. * milena/Makefile.am, * milena/tests/unit_test/Makefile.am: Adjust comments. --- milena/ChangeLog | 18 +++++++++++ milena/Makefile.am | 7 +++-- milena/apps/bench/Makefile.am | 7 +++-- milena/apps/morphers/Makefile.am | 4 +-- milena/apps/papers/levillain.09.ismm/Makefile.am | 24 +++++++-------- milena/doc/Makefile.am | 36 +++++++++++----------- milena/doc/gen-examples-outputs-mk | 6 ++-- milena/doc/gen-figures-mk | 4 +-- milena/doc/gen-split-examples-mk | 8 ++--- milena/doc/gen-split-outputs-mk | 6 ++-- milena/tests/unit_test/Makefile.am | 5 +-- milena/tools/Makefile.am | 11 ++++--- 12 files changed, 79 insertions(+), 57 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index 393e761..45a0c75 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,3 +1,21 @@ +2014-06-26 Roland Levillain <roland(a)lrde.epita.fr> + + Make Milena more compatible with BSD Make. + + * apps/bench/Makefile.am, + * apps/morphers/Makefile.am, + * doc/Makefile.am, + * doc/gen-examples-outputs-mk, + * doc/gen-figures-mk, + * doc/gen-split-examples-mk, + * doc/gen-split-outputs-mk: + Do not use `$<' outside suffix rules. + * apps/papers/levillain.09.ismm/Makefile.am: Likewise. + Add explicit `$(srcdir)/' prefixes to prerequisites' paths. + * milena/Makefile.am, + * milena/tests/unit_test/Makefile.am: + Adjust comments. + 2014-06-25 Roland Levillain <roland(a)lrde.epita.fr> Convert Milena to UTF-8. diff --git a/milena/Makefile.am b/milena/Makefile.am index 850417d..51594fa 100644 --- a/milena/Makefile.am +++ b/milena/Makefile.am @@ -1,5 +1,5 @@ -# Copyright (C) 2007, 2008, 2009, 2012, 2013 EPITA Research and Development -# Laboratory (LRDE). +# Copyright (C) 2007, 2008, 2009, 2012, 2013, 2014 EPITA Research and +# Development Laboratory (LRDE). # # This file is part of Olena. # @@ -74,7 +74,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/milena/apps/bench/Makefile.am b/milena/apps/bench/Makefile.am index 7cc6a26..379f65c 100644 --- a/milena/apps/bench/Makefile.am +++ b/milena/apps/bench/Makefile.am @@ -1,4 +1,5 @@ -# Copyright (C) 2010, 2011 EPITA Research and Development Laboratory (LRDE). +# Copyright (C) 2010, 2011, 2014 EPITA Research and Development +# Laboratory (LRDE). # # This file is part of Olena. # @@ -108,8 +109,8 @@ EXTRA_DIST += test-dilation-lena-bench.in test-dilation-lena-bench: test-dilation-lena-bench.in Makefile rm -f $@ $@.tmp srcdir=''; \ - test -f ./$< || srcdir=$(srcdir)/; \ - $(edit) $${srcdir}$< >>$@.tmp + test -f ./test-dilation-lena-bench.in || srcdir=$(srcdir)/; \ + $(edit) $${srcdir}test-dilation-lena-bench.in >>$@.tmp chmod a-w,a+x $@.tmp mv $@.tmp $@ CLEANFILES = test-dilation-lena-bench diff --git a/milena/apps/morphers/Makefile.am b/milena/apps/morphers/Makefile.am index bdff9c1..6cbb1c7 100644 --- a/milena/apps/morphers/Makefile.am +++ b/milena/apps/morphers/Makefile.am @@ -1,4 +1,4 @@ -# Copyright (C) 2011, 2012, 2013 EPITA Research and Development +# Copyright (C) 2011, 2012, 2013, 2014 EPITA Research and Development # Laboratory (LRDE). # # This file is part of Olena. @@ -40,7 +40,7 @@ iz_LDFLAGS = $(AM_LDFLAGS) $(MAGICKXX_LDFLAGS) # This target is phony: `iz' never writes `iz_output.ppm' actually. iz_output.ppm: iz$(EXEEXT) iz_input.pbm - ./$< $(srcdir)/iz_input.pbm $@ + ./iz$(EXEEXT) $(srcdir)/iz_input.pbm $@ # Likewise, the dependency of this target is a (wrong) shortcut. tmp_iz.avi: iz_output.ppm mencoder "mf://tmp_iz*.png" -o tmp_iz.avi -ovc lavc -lavcopts vcodec=mjpeg -speed 50 diff --git a/milena/apps/papers/levillain.09.ismm/Makefile.am b/milena/apps/papers/levillain.09.ismm/Makefile.am index db94f24..0bdd126 100644 --- a/milena/apps/papers/levillain.09.ismm/Makefile.am +++ b/milena/apps/papers/levillain.09.ismm/Makefile.am @@ -1,5 +1,5 @@ -# Copyright (C) 2008, 2009, 2010, 2011, 2013 EPITA Research and Development -# Laboratory (LRDE). +# Copyright (C) 2008, 2009, 2010, 2011, 2013, 2014 EPITA Research and +# Development Laboratory (LRDE). # # This file is part of Olena. # @@ -40,18 +40,18 @@ MOSTLYCLEANFILES = $(noinst_DATA) graph-s.neato # FIXME: Also generate intermediate images (gradients, etc.). lena-s.ppm: $(top_srcdir)/milena/img/lena.pgm image2d$(EXEEXT) - ./image2d$(EXEEXT) $< 1000 $@ + ./image2d$(EXEEXT) $(top_srcdir)/milena/img/lena.pgm 1000 $@ graph-s.png: graph-s.neato - neato -Tpng $< >$@ -graph-s.neato: seeds.pgm graph$(EXEEXT) - ./graph$(EXEEXT) $< 2 $@ + neato -Tpng graph-s.neato >$@ +graph-s.neato: $(srcdir)/seeds.pgm graph$(EXEEXT) + ./graph$(EXEEXT) $(srcdir)/seeds.pgm 2 $@ -m283-s.off: m283-c.off complex$(EXEEXT) - ./complex$(EXEEXT) $< 100 $@ +m283-s.off: $(srcdir)/m283-c.off complex$(EXEEXT) + ./complex$(EXEEXT) $(srcdir)/m283-c.off 100 $@ -classwst-graph.ppm: classseedsi.pbm classif-graph$(EXEEXT) - ./classif-graph$(EXEEXT) $< 4 $@ +classwst-graph.ppm: $(srcdir)/classseedsi.pbm classif-graph$(EXEEXT) + ./classif-graph$(EXEEXT) $(srcdir)/classseedsi.pbm 4 $@ -classwst-1complex.ppm: classseedsi.pbm classif-1complex$(EXEEXT) - ./classif-1complex$(EXEEXT) $< 4 $@ +classwst-1complex.ppm: $(srcdir)/classseedsi.pbm classif-1complex$(EXEEXT) + ./classif-1complex$(EXEEXT) $(srcdir)/classseedsi.pbm 4 $@ diff --git a/milena/doc/Makefile.am b/milena/doc/Makefile.am index 69b783d..33dd06d 100644 --- a/milena/doc/Makefile.am +++ b/milena/doc/Makefile.am @@ -229,7 +229,7 @@ edit = sed -e "s|@ID[@]|$(ID)|" \ -e 's,@boostcppflags[@],$(BOOST_CPPFLAGS),g' $(DOXYFILE_USER): $(srcdir)/$(DOXYFILE).in - $(edit) $< >$@ + $(edit) $(srcdir)/$(DOXYFILE).in >$@ MAINTAINERCLEANFILES += $(DOXYFILE_USER) USER_REFMAN = user-refman @@ -273,8 +273,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 @@ -315,7 +315,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) @@ -358,8 +358,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 @@ -393,7 +393,7 @@ $(srcdir)/$(TECHNICAL).stamp: $(srcdir)/technical.tex $(TECHNICAL_deps) rm -rf $(TECHNICAL).tmp mkdir $(TECHNICAL).tmp $(TEXI2HTML) $(TEXI2HTML_FLAGS) \ - -o $(TECHNICAL).tmp/$(TECHNICAL).html $< + -o $(TECHNICAL).tmp/$(TECHNICAL).html $(srcdir)/technical.tex rm -rf $(srcdir)/$(TECHNICAL) ## FIXME: moving directories between file systems is not portable. mv $(TECHNICAL).tmp $(srcdir)/$(TECHNICAL) @@ -404,8 +404,8 @@ MAINTAINERCLEANFILES += $(srcdir)/$(TECHNICAL).stamp $(srcdir)/$(TECHNICAL): $(srcdir)/$(TECHNICAL).stamp ## Recover from the removal of $@. @if test -d $@; then :; else \ - rm -f $<; \ - $(MAKE) $(AM_MAKEFLAGS) $<; \ + rm -f $(srcdir)/$(TECHNICAL).stamp; \ + $(MAKE) $(AM_MAKEFLAGS) $(srcdir)/$(TECHNICAL).stamp; \ fi DATA_html_dirs = $(TECHNICAL) @@ -443,7 +443,7 @@ $(srcdir)/$(TUTORIAL).stamp: $(srcdir)/tutorial.tex $(TUTORIAL_deps) rm -rf $(TUTORIAL).tmp mkdir $(TUTORIAL).tmp $(TEXI2HTML) $(TEXI2HTML_FLAGS) \ - -o $(TUTORIAL).tmp/$(TUTORIAL).html $< + -o $(TUTORIAL).tmp/$(TUTORIAL).html $(srcdir)/tutorial.tex rm -rf $(srcdir)/$(TUTORIAL) ## FIXME: moving directories between file systems is not portable. mv $(TUTORIAL).tmp $(srcdir)/$(TUTORIAL) @@ -454,8 +454,8 @@ MAINTAINERCLEANFILES += $(srcdir)/$(TUTORIAL).stamp $(srcdir)/$(TUTORIAL): $(srcdir)/$(TUTORIAL).stamp ## Recover from the removal of $@. @if test -d $@; then :; else \ - rm -f $<; \ - $(MAKE) $(AM_MAKEFLAGS) $<; \ + rm -f $(srcdir)/$(TUTORIAL).stamp; \ + $(MAKE) $(AM_MAKEFLAGS) $(srcdir)/$(TUTORIAL).stamp; \ fi DATA_html_dirs += $(TUTORIAL) @@ -506,7 +506,7 @@ $(srcdir)/$(WHITE_PAPER).stamp: $(srcdir)/white-paper.tex $(WHITE_PAPER_deps) mkdir $(WHITE_PAPER).tmp/figures cp $(WHITE_PAPER_FIGURES) $(WHITE_PAPER).tmp/figures $(TEXI2HTML) $(TEXI2HTML_FLAGS) \ - -o $(WHITE_PAPER).tmp/$(WHITE_PAPER).html $< + -o $(WHITE_PAPER).tmp/$(WHITE_PAPER).html $(srcdir)/white-paper.tex rm -rf $(srcdir)/$(WHITE_PAPER) ## FIXME: moving directories between file systems is not portable. mv $(WHITE_PAPER).tmp $(srcdir)/$(WHITE_PAPER) @@ -517,8 +517,8 @@ MAINTAINERCLEANFILES += $(srcdir)/$(WHITE_PAPER).stamp $(srcdir)/$(WHITE_PAPER): $(srcdir)/$(WHITE_PAPER).stamp ## Recover from the removal of $@. @if test -d $@; then :; else \ - rm -f $<; \ - $(MAKE) $(AM_MAKEFLAGS) $<; \ + rm -f $(srcdir)/$(WHITE_PAPER).stamp; \ + $(MAKE) $(AM_MAKEFLAGS) $(srcdir)/$(WHITE_PAPER).stamp; \ fi DATA_html_dirs += $(WHITE_PAPER) @@ -556,7 +556,7 @@ $(srcdir)/$(REF_GUIDE).stamp: $(srcdir)/ref-guide.tex $(REF_GUIDE_deps) rm -rf $(REF_GUIDE).tmp mkdir $(REF_GUIDE).tmp $(TEXI2HTML) $(TEXI2HTML_FLAGS) \ - -o $(REF_GUIDE).tmp/$(REF_GUIDE).html $< + -o $(REF_GUIDE).tmp/$(REF_GUIDE).html $(srcdir)/ref-guide.tex rm -rf $(srcdir)/$(REF_GUIDE) ## FIXME: moving directories between file systems is not portable. mv $(REF_GUIDE).tmp $(srcdir)/$(REF_GUIDE) @@ -567,8 +567,8 @@ MAINTAINERCLEANFILES += $(srcdir)/$(REF_GUIDE).stamp $(srcdir)/$(REF_GUIDE): $(srcdir)/$(REF_GUIDE).stamp ## Recover from the removal of $@. @if test -d $@; then :; else \ - rm -f $<; \ - $(MAKE) $(AM_MAKEFLAGS) $<; \ + rm -f $(srcdir)/$(REF_GUIDE).stamp; \ + $(MAKE) $(AM_MAKEFLAGS) $(srcdir)/$(REF_GUIDE).stamp; \ fi DATA_html_dirs += $(REF_GUIDE) diff --git a/milena/doc/gen-examples-outputs-mk b/milena/doc/gen-examples-outputs-mk index 440d960..a55ecdb 100755 --- a/milena/doc/gen-examples-outputs-mk +++ b/milena/doc/gen-examples-outputs-mk @@ -1,6 +1,6 @@ #! /bin/sh -# Copyright (C) 2010 EPITA Research and Development Laboratory (LRDE). +# Copyright (C) 2010, 2014 EPITA Research and Development Laboratory (LRDE). # # This file is part of Olena. # @@ -64,8 +64,8 @@ MAINTAINERCLEANFILES += $timestamp $output: $timestamp ## Recover from the removal of \$@ @if test -f \$@; then :; else \\ - rm -f \$<; \\ - \$(MAKE) \$(AM_MAKEFLAGS) \$<; \\ + rm -f $timestamp; \\ + \$(MAKE) \$(AM_MAKEFLAGS) $timestamp; \\ fi EOF done diff --git a/milena/doc/gen-figures-mk b/milena/doc/gen-figures-mk index 80a55a5..6ee9a3b 100755 --- a/milena/doc/gen-figures-mk +++ b/milena/doc/gen-figures-mk @@ -169,8 +169,8 @@ for file in `inputs`; do \$($fig_var): $timestamp ## Recover from the removal of \$@ @if test -f \$@; then :; else \\ - rm -f \$<; \\ - \$(MAKE) \$(AM_MAKEFLAGS) \$<; \\ + rm -f $timestamp; \\ + \$(MAKE) \$(AM_MAKEFLAGS) $timestamp; \\ fi EOF diff --git a/milena/doc/gen-split-examples-mk b/milena/doc/gen-split-examples-mk index b505370..a6ac193 100755 --- a/milena/doc/gen-split-examples-mk +++ b/milena/doc/gen-split-examples-mk @@ -1,6 +1,6 @@ #! /bin/sh -# Copyright (C) 2010 EPITA Research and Development Laboratory (LRDE). +# Copyright (C) 2010, 2014 EPITA Research and Development Laboratory (LRDE). # # This file is part of Olena. # @@ -116,7 +116,7 @@ EOF $timestamp: \$(srcdir)/$file @rm -f \$@.tmp @touch \$@.tmp - \$(srcdir)/tools/split_sample.sh \$< cc raw \$(srcdir)/$output_dir + \$(srcdir)/tools/split_sample.sh \$(srcdir)/$file cc raw \$(srcdir)/$output_dir @mv -f \$@.tmp \$@ EXTRA_DIST += $timestamp MAINTAINERCLEANFILES += $timestamp @@ -124,8 +124,8 @@ MAINTAINERCLEANFILES += $timestamp $targets: $timestamp ## Recover from the removal of \$@ @if test -f \$@; then :; else \\ - rm -f \$<; \\ - \$(MAKE) \$(AM_MAKEFLAGS) \$<; \\ + rm -f $timestamp; \\ + \$(MAKE) \$(AM_MAKEFLAGS) $timestamp; \\ fi EOF } diff --git a/milena/doc/gen-split-outputs-mk b/milena/doc/gen-split-outputs-mk index a2313be..34ab6ba 100755 --- a/milena/doc/gen-split-outputs-mk +++ b/milena/doc/gen-split-outputs-mk @@ -119,7 +119,7 @@ EOF $timestamp: $output @rm -f \$@.tmp @touch \$@.tmp - \$(srcdir)/tools/split_sample.sh \$< txt "" \$(srcdir)/$output_dir + \$(srcdir)/tools/split_sample.sh $output txt "" \$(srcdir)/$output_dir @mv -f \$@.tmp \$@ EXTRA_DIST += $timestamp MAINTAINERCLEANFILES += $timestamp @@ -127,8 +127,8 @@ MAINTAINERCLEANFILES += $timestamp $targets: $timestamp ## Recover from the removal of \$@ @if test -f \$@; then :; else \\ - rm -f \$<; \\ - \$(MAKE) \$(AM_MAKEFLAGS) \$<; \\ + rm -f $timestamp; \\ + \$(MAKE) \$(AM_MAKEFLAGS) $timestamp; \\ fi EOF } diff --git a/milena/tests/unit_test/Makefile.am b/milena/tests/unit_test/Makefile.am index 1c3016f..e80dec9 100644 --- a/milena/tests/unit_test/Makefile.am +++ b/milena/tests/unit_test/Makefile.am @@ -1,4 +1,4 @@ -# Copyright (C) 2008, 2009, 2010, 2013 EPITA Research and Development +# Copyright (C) 2008, 2009, 2010, 2013, 2014 EPITA Research and Development # Laboratory (LRDE). # # This file is part of Olena. @@ -41,7 +41,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. diff --git a/milena/tools/Makefile.am b/milena/tools/Makefile.am index bb7a35f..595b816 100644 --- a/milena/tools/Makefile.am +++ b/milena/tools/Makefile.am @@ -1,5 +1,5 @@ -# Copyright (C) 2008, 2009, 2010, 2011, 2013 EPITA Research and Development -# Laboratory (LRDE) +# Copyright (C) 2008, 2009, 2010, 2011, 2013, 2014 EPITA Research and +# Development Laboratory (LRDE). # # This file is part of Olena. # @@ -58,13 +58,14 @@ simple_point_luts: simple_point3d_lut_26_6.hh CLEANFILES = simple_point3d_lut_26_6.txt simple_point3d_lut_26_6.txt: simple_point3d_lut_tbb$(EXEEXT) - ./$< 26_6 >$@ + ./simple_point3d_lut_tbb$(EXEEXT) 26_6 >$@ EXTRA_DIST = gen_cxx_lut CLEANFILES += simple_point3d_lut_26_6.hh simple_point3d_lut_26_6.hh: simple_point3d_lut_26_6.txt $(srcdir)/gen_cxx_lut rm -f $@.tmp - $(srcdir)/gen_cxx_lut simple_point3d_lut_26_6 "(26, 6)" <$< >$@.tmp + $(srcdir)/gen_cxx_lut simple_point3d_lut_26_6 "(26, 6)" \ + <simple_point3d_lut_26_6.txt >$@.tmp mv $@.tmp $@ # Very long (both to compile and execute) optional test, checking the @@ -73,7 +74,7 @@ simple_point3d_lut_26_6.hh: simple_point3d_lut_26_6.txt $(srcdir)/gen_cxx_lut .PHONY: check-extra check-extra: test_simple_point3d_lut_26_6$(EXEEXT) - ./$< + ./test_simple_point3d_lut_26_6$(EXEEXT) EXTRA_LTLIBRARIES = libsimple_point3d_lut_26_6.la libsimple_point3d_lut_26_6_la_SOURCES = simple_point3d_lut_26_6.cc -- 1.7.10.4

1 0

olena: olena-2.0-888-g45bcbda Make Olena more compatible with BSD Make.
by Roland Levillain 26 Jun '14

26 Jun '14

* doc/Makefile.am: Do not use `$<' outside suffix rules. --- ChangeLog | 6 ++++++ doc/Makefile.am | 14 +++++++------- 2 files changed, 13 insertions(+), 7 deletions(-) diff --git a/ChangeLog b/ChangeLog index 65c134a..c8c159b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2014-06-26 Roland Levillain <roland(a)lrde.epita.fr> + + Make Olena more compatible with BSD Make. + + * doc/Makefile.am: Do not use `$<' outside suffix rules. + 2014-06-25 Roland Levillain <roland(a)lrde.epita.fr> Convert Olena to UTF-8. diff --git a/doc/Makefile.am b/doc/Makefile.am index f30ad39..d5322c4 100644 --- a/doc/Makefile.am +++ b/doc/Makefile.am @@ -1,4 +1,4 @@ -# Copyright (C) 2007, 2008, 2009, 2010, 2013 EPITA Research and +# Copyright (C) 2007, 2008, 2009, 2010, 2013, 2014 EPITA Research and # Development Laboratory (LRDE). # # This file is part of Olena. @@ -104,7 +104,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 @@ -132,8 +132,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 @@ -154,7 +154,7 @@ contributors.html: $(top_srcdir)/AUTHORS exit 1; } $(RST2HTML) --input-encoding=UTF-8 --output-encoding=UTF-8 \ --stylesheet-path=$(srcdir)/doxygen.css --link-stylesheet \ - $< >$@ + $(top_srcdir)/AUTHORS >$@ ## -------------- ## @@ -168,7 +168,7 @@ lrde_olena.bib: $(srcdir)/lrde.bib exit 1; } $(BIB2BIB) -s plain -oc lrde_olena.cite -ob $@ \ -c 'project = "Image" or project = "Olena"' \ - -s year -r $< + -s year -r $(srcdir)/lrde.bib # Warning: also generates lrde_olena_bib.html lrde_olena.html: lrde_olena.bib @@ -180,7 +180,7 @@ lrde_olena.html: lrde_olena.bib # Mac OS X (see https://www.lri.fr/~filliatr/bibtex2html/) env TMPDIR=. $(BIBTEX2HTML) -s plain -nokeywords \ -citefile lrde_olena.cite -noabstract -nofooter -labelname \ - -nodoc -linebreak -nf urllrde PDF $< + -nodoc -linebreak -nf urllrde PDF lrde_olena.bib EXTRA_DIST += \ -- 1.7.10.4

1 0

olena: branch utf-8 deleted: olena-2.0-887-g28832f9
by git＠lrde.epita.fr 25 Jun '14

25 Jun '14

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "Olena, a generic and efficient image processing platform". The branch utf-8 has been deleted was 28832f9ecdedeb3797c5e01040cbe8bb95660bd0 ----------------------------------------------------------------------- 28832f9ecdedeb3797c5e01040cbe8bb95660bd0 Convert old (no longer distributed) files to UTF-8. ----------------------------------------------------------------------- hooks/post-receive -- Olena, a generic and efficient image processing platform

1 0

olena: branch next updated: olena-2.0-887-g28832f9
by git＠lrde.epita.fr 25 Jun '14

25 Jun '14

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "Olena, a generic and efficient image processing platform". The branch next has been updated via 28832f9ecdedeb3797c5e01040cbe8bb95660bd0 (commit) via ec75045a8c8c682f4dbb1981670b5348d8e834cd (commit) via e7bfdf7cccbd73ddc40b91dde465aba1c75bdf8b (commit) via 4c2812937c8dde4a8d7d2c15c9ae70cd71fb778a (commit) via 0a4c6e4b702fec0f7d98a43e78d95a7fa3a60ff9 (commit) via b8febd14830bc4059f57bc9d388eb291324a0986 (commit) via 600b8e3d2024a064ab408c4c30cae1a63ce01bdd (commit) from 3c1bf651a333bc132cf27bcdcc600039b44cee6e (commit) Those revisions listed above that are new to this repository have not appeared on any other notification email; so we list those revisions in full, below. - Log ----------------------------------------------------------------- No new revisions were added by this update. ----------------------------------------------------------------------- Summary of changes: AUTHORS | 28 +++++++-------- ChangeLog | 13 ++++++- README | 36 +++++++++---------- doc/Doxyfile.in | 2 +- doc/Makefile.am | 2 +- dynamic-use-of-static-c++/ChangeLog | 12 +++++++ dynamic-use-of-static-c++/swig/run.in | 2 +- milena/ChangeLog | 38 ++++++++++++++++---- milena/apps/morphers/iz.cc | 4 +-- milena/doc/Doxyfile.in | 2 +- milena/doc/oldies/2007__tour.cc | 2 +- milena/doc/tutorial.old/slides.tex | 2 +- milena/mln/accu/shape/volume.hh | 2 +- milena/mln/core/concept/point_site.hh | 4 +-- milena/mln/io/pdf/get_header.hh | 2 +- milena/mln/morpho/watershed/flooding.hh | 2 +- milena/mln/topo/skeleton/breadth_first_thinning.hh | 4 +-- .../mln/topo/skeleton/priority_driven_thinning.hh | 4 +-- milena/tests/core/image/complex_image.cc | 2 +- milena/tests/core/image/complex_image.hh | 2 +- milena/tests/core/site_set/p_complex.cc | 2 +- milena/tests/make/attachment.cc | 2 +- milena/tests/make/detachment.cc | 2 +- milena/tests/morpho/complex_image_morpho.cc | 2 +- milena/tests/topo/complex.cc | 8 ++--- milena/tests/topo/is_facet.cc | 2 +- scribo/ChangeLog | 12 ++++++- scribo/doc/Doxyfile.in | 2 +- scribo/doc/mainpage.dox | 4 +-- scribo/scribo/preprocessing/rotate_90.hh | 14 ++++---- swilena/ChangeLog | 12 ++++++- swilena/box2d_piter.i | 2 +- swilena/complex.ixx | 2 +- swilena/dynamic_image2d.i | 2 +- swilena/python/complex2-misc.py | 13 ++++--- 35 files changed, 156 insertions(+), 90 deletions(-) hooks/post-receive -- Olena, a generic and efficient image processing platform

1 0

olena: branch utf-8 created: olena-2.0-887-g28832f9
by git＠lrde.epita.fr 25 Jun '14

25 Jun '14

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "Olena, a generic and efficient image processing platform". The branch utf-8 has been created at 28832f9ecdedeb3797c5e01040cbe8bb95660bd0 (commit) - Log ----------------------------------------------------------------- 28832f9 Convert old (no longer distributed) files to UTF-8. ec75045 Convert dynamic-use-of-static-c++ to UTF-8. e7bfdf7 Remove extended characters from Swilena. 4c28129 Convert Scribo to UTF-8. 0a4c6e4 Convert Milena to UTF-8. b8febd1 Convert Olena to UTF-8. 600b8e3 Convert ChangeLogs to UTF-8. ----------------------------------------------------------------------- hooks/post-receive -- Olena, a generic and efficient image processing platform

1 0

olena: olena-2.0-887-g28832f9 Convert old (no longer distributed) files to UTF-8.
by Roland Levillain 25 Jun '14

25 Jun '14

--- milena/doc/oldies/2007__tour.cc | 2 +- milena/doc/tutorial.old/slides.tex | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/milena/doc/oldies/2007__tour.cc b/milena/doc/oldies/2007__tour.cc index 1078cc4..a00c99a 100644 --- a/milena/doc/oldies/2007__tour.cc +++ b/milena/doc/oldies/2007__tour.cc @@ -40,7 +40,7 @@ // in this file. using namespace oln; -// Data types are defined in the Int�gre library, so they are +// Data types are defined in the Intègre library, so they are // in the ntg namespace. // In this file, we will neglect the 'ntg::' prefix. using namespace ntg; diff --git a/milena/doc/tutorial.old/slides.tex b/milena/doc/tutorial.old/slides.tex index 68eddc4..c0f2a6c 100644 --- a/milena/doc/tutorial.old/slides.tex +++ b/milena/doc/tutorial.old/slides.tex @@ -65,7 +65,7 @@ in head/foot}% \usepackage{pgf,pgfarrows,pgfnodes,pgfautomata,pgfheaps,pgfshade} \usepackage{amsmath,amssymb} -\usepackage[latin1]{inputenc} +\usepackage[utf8]{inputenc} \usepackage{colortbl} \usepackage[english]{babel} -- 1.7.10.4

1 0

olena: olena-2.0-886-gec75045 Convert dynamic-use-of-static-c++ to UTF-8.
by Roland Levillain 25 Jun '14

25 Jun '14

* swig/run.in: Here. --- dynamic-use-of-static-c++/ChangeLog | 6 ++++++ dynamic-use-of-static-c++/swig/run.in | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/dynamic-use-of-static-c++/ChangeLog b/dynamic-use-of-static-c++/ChangeLog index e199524..c990c1b 100644 --- a/dynamic-use-of-static-c++/ChangeLog +++ b/dynamic-use-of-static-c++/ChangeLog @@ -1,3 +1,9 @@ +2014-06-25 Roland Levillain <roland(a)lrde.epita.fr> + + Convert dynamic-use-of-static-c++ to UTF-8. + + * swig/run.in: Here. + 2009-11-03 Roland Levillain <roland(a)lrde.epita.fr> Normalize header guards. diff --git a/dynamic-use-of-static-c++/swig/run.in b/dynamic-use-of-static-c++/swig/run.in index 92d54fe..2663c48 100755 --- a/dynamic-use-of-static-c++/swig/run.in +++ b/dynamic-use-of-static-c++/swig/run.in @@ -1,7 +1,7 @@ #! /bin/sh # Copyright (C) 2003, 2004, 2006, 2009 Laboratoire d'Informatique de Paris 6 -# (LIP6), d�partement Syst�mes R�partis Coop�ratifs (SRC), Universit� +# (LIP6), département Systèmes Répartis Coopératifs (SRC), Université # Pierre et Marie Curie. # # This file is part of Spot, a model checking library. -- 1.7.10.4

1 0

olena: olena-2.0-885-ge7bfdf7 Remove extended characters from Swilena.
by Roland Levillain 25 Jun '14

25 Jun '14

* box2d_piter.i, * complex.ixx, * dynamic_image2d.i, * python/complex2-misc.py: Here, to convert these files to plain ASCII. --- swilena/ChangeLog | 10 ++++++++++ swilena/box2d_piter.i | 2 +- swilena/complex.ixx | 2 +- swilena/dynamic_image2d.i | 2 +- swilena/python/complex2-misc.py | 13 ++++++------- 5 files changed, 19 insertions(+), 10 deletions(-) diff --git a/swilena/ChangeLog b/swilena/ChangeLog index 3955b57..c7daa94 100644 --- a/swilena/ChangeLog +++ b/swilena/ChangeLog @@ -1,3 +1,13 @@ +2014-06-25 Roland Levillain <roland(a)lrde.epita.fr> + + Remove extended characters from Swilena. + + * box2d_piter.i, + * complex.ixx, + * dynamic_image2d.i, + * python/complex2-misc.py: + Here, to convert these files to plain ASCII. + 2014-05-23 Roland Levillain <roland(a)lrde.epita.fr> Improve Swilena's max-tree.py output. diff --git a/swilena/box2d_piter.i b/swilena/box2d_piter.i index 1e3de42..4be2e54 100644 --- a/swilena/box2d_piter.i +++ b/swilena/box2d_piter.i @@ -107,7 +107,7 @@ #if SWIGPYTHON -// Handling iterators � la Python. +// Handling iterators a la Python. %extend mln::box_fwd_piter_< mln::point<mln::grid::square, mln::def::coord> > { diff --git a/swilena/complex.ixx b/swilena/complex.ixx index ec5c196..c93acc6 100644 --- a/swilena/complex.ixx +++ b/swilena/complex.ixx @@ -242,7 +242,7 @@ instantiate_complex_set_iterator_base(Name, mln::topo::face_fwd_iter< D >) #if SWIGPYTHON -// Handling iterators � la Python. +// Handling iterators a la Python. %extend mln::topo::face_fwd_iter< D > { mln::topo::face_fwd_iter< D >& diff --git a/swilena/dynamic_image2d.i b/swilena/dynamic_image2d.i index 2a0430d..7ad7a7d 100644 --- a/swilena/dynamic_image2d.i +++ b/swilena/dynamic_image2d.i @@ -109,7 +109,7 @@ namespace mln below)? Probably not, as internal::image_base contains data (through a tracked_ptr). */ // \brief A semi-abstract class that serves as an entry point - // (called � director � by SWIG) for Python code. + // (called ``director'' by SWIG) for Python code. // // This class is not really abstract in the C++ sense, but it lacks // methods to be a real image class. diff --git a/swilena/python/complex2-misc.py b/swilena/python/complex2-misc.py index 77332e9..765f355 100644 --- a/swilena/python/complex2-misc.py +++ b/swilena/python/complex2-misc.py @@ -1,5 +1,4 @@ #! /usr/bin/env python -# -*- coding: latin-1 -*- # Copyright (C) 2010 EPITA Research and Development Laboratory (LRDE) # @@ -27,12 +26,12 @@ from swilena import * # A 2-d (simplicial) complex and its adjacency graph. # # v0 e3 v3 -# o-----------o v0----e3----v3 -# / \ ,-----. / / \ | / -# / . \ \ t1/ / / \ t1 / -# e0 / / \ e1\ / / e4 e0. ,e1� `e4 -# / /t0 \ \ ' / / t0 \ / -# / `-----' \ / / | \ / +# o-----------o v0----e3----v3 +# / \ ,-----. / / \ | / +# / . \ \ t1/ / / \ t1 / +# e0 / / \ e1\ / / e4 e0. ,e1' `e4 +# / /t0 \ \ ' / / t0 \ / +# / `-----' \ / / | \ / # o-----------o v1----e2----v2 # v1 e2 v2 # -- 1.7.10.4

1 0

olena: olena-2.0-884-g4c28129 Convert Scribo to UTF-8.
by Roland Levillain 25 Jun '14

25 Jun '14

* doc/mainpage.dox: Here. * scribo/preprocessing/rotate_90.hh: Replace extended characters to convert to plain ASCII. Typos. * doc/Doxyfile.in (INPUT_ENCODING): Set to UTF-8. --- scribo/ChangeLog | 10 ++++++++++ scribo/doc/Doxyfile.in | 2 +- scribo/doc/mainpage.dox | 4 ++-- scribo/scribo/preprocessing/rotate_90.hh | 14 +++++++------- 4 files changed, 20 insertions(+), 10 deletions(-) diff --git a/scribo/ChangeLog b/scribo/ChangeLog index 3a157ef..2e4bc02 100644 --- a/scribo/ChangeLog +++ b/scribo/ChangeLog @@ -1,3 +1,13 @@ +2014-06-25 Roland Levillain <roland(a)lrde.epita.fr> + + Convert Scribo to UTF-8. + + * doc/mainpage.dox: Here. + * scribo/preprocessing/rotate_90.hh: + Replace extended characters to convert to plain ASCII. + Typos. + * doc/Doxyfile.in (INPUT_ENCODING): Set to UTF-8. + 2013-04-18 Guillaume Lazzara <z(a)lrde.epita.fr> * demo/xml2doc/main.cc: Add --template-path option. diff --git a/scribo/doc/Doxyfile.in b/scribo/doc/Doxyfile.in index d37780e..6b1754b 100644 --- a/scribo/doc/Doxyfile.in +++ b/scribo/doc/Doxyfile.in @@ -126,7 +126,7 @@ IMAGE_PATH = @top_srcdir@/scribo/doc/images \ INPUT_FILTER = FILTER_PATTERNS = FILTER_SOURCE_FILES = NO -INPUT_ENCODING = ISO-8859-1 +INPUT_ENCODING = UTF-8 CITE_BIB_FILES = @abs_top_srcdir@/doc/doc.bib \ @abs_top_srcdir@/doc/olena.bib LATEX_BIB_STYLE = plain diff --git a/scribo/doc/mainpage.dox b/scribo/doc/mainpage.dox index 77786d9..4fa4014 100644 --- a/scribo/doc/mainpage.dox +++ b/scribo/doc/mainpage.dox @@ -6,9 +6,9 @@ Scribo, a framework for Document Image Analysis. Its initial release has been developed in the context of the SCRIBO project of the Free Software Thematic Group, part of the "Systematic -Paris-R�gion" Cluster (France). This project was partially funded by +Paris-Région" Cluster (France). This project was partially funded by the French government, its economic development agencies and by the -Paris-R�gion institutions. +Paris-Région institutions. It aims at providing the following features: diff --git a/scribo/scribo/preprocessing/rotate_90.hh b/scribo/scribo/preprocessing/rotate_90.hh index af2958e..019fa12 100644 --- a/scribo/scribo/preprocessing/rotate_90.hh +++ b/scribo/scribo/preprocessing/rotate_90.hh @@ -1,5 +1,5 @@ -// Copyright (C) 2010, 2011 EPITA Research and Development Laboratory -// (LRDE) +// Copyright (C) 2010, 2011, 2014 EPITA Research and Development +// Laboratory (LRDE). // // This file is part of Olena. // @@ -29,7 +29,7 @@ /// \file /// -/// Fast +90/-90 degrees rotation. +/// Fast +90/-90 degree rotation. # include <mln/core/concept/image.hh> @@ -48,11 +48,11 @@ namespace scribo using namespace mln; - /*! \brief Perform a +90/-90 degrees rotation. + /*! \brief Perform a +90/-90 degree rotation. \param[in] input An image. - \param[in] positive If set to true, performs a +90� rotation, - -90� otherwise. + \param[in] positive If set to true, performs a +90 degree rotation, + -90 degree otherwise. \return A rotated image. */ @@ -60,7 +60,7 @@ namespace scribo mln_concrete(I) rotate_90(const Image<I>& input, bool positive); - /// \brief Performs a +90� rotation. + /// \brief Performs a +90 degree rotation. /// \overload // template <typename I> -- 1.7.10.4

1 0