Olena-patches
Threads by month
- ----- 2025 -----
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2024 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2023 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2022 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2021 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2020 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2019 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2018 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2017 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2016 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2015 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2014 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2013 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2012 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2011 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2010 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2009 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2008 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2007 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2006 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2005 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2004 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- 9625 discussions
last-svn-commit-63-gb435aae Generate the list of outputs in the documentation.
by Roland Levillain 17 Mar '10
by Roland Levillain 17 Mar '10
17 Mar '10
* doc/Makefile.am (OUTPUTS): Remove this variable that used to be
populated by hand.
Include $(srcdir)/outputs.mk.
No longer include $(srcdir)/outputs/outputs.mk.
$(srcdir)/outputs.mk: New target.
(EXTRA_DIST): Add $(OUTPUTS).
(regen-outputs-mk): New (phony) target.
(regen-am): Remake regen-outputs-mk.
Do not recreate $(srcdir)/headers.stamp.tmp.
(EXTRA_DIST): Remove headers.stamp.
($(srcdir)/outputs/outputs.mk)
($(srcdir)/headers.stamp):
Remove rules.
(outputs/outputs.mk): Remove this Make helper.
Supersed by...
(outputs.mk): ...this (new) Make helper.
---
milena/ChangeLog | 21 ++++++++
milena/doc/Makefile.am | 111 +++++++++++++----------------------------
milena/doc/outputs.mk | 54 ++++++++++++++++++++
milena/doc/outputs/outputs.mk | 69 -------------------------
4 files changed, 110 insertions(+), 145 deletions(-)
create mode 100644 milena/doc/outputs.mk
delete mode 100644 milena/doc/outputs/outputs.mk
diff --git a/milena/ChangeLog b/milena/ChangeLog
index 3d0719a..e2c3756 100644
--- a/milena/ChangeLog
+++ b/milena/ChangeLog
@@ -1,5 +1,26 @@
2010-03-17 Roland Levillain <roland(a)lrde.epita.fr>
+ Generate the list of outputs in the documentation.
+
+ * doc/Makefile.am (OUTPUTS): Remove this variable that used to be
+ populated by hand.
+ Include $(srcdir)/outputs.mk.
+ No longer include $(srcdir)/outputs/outputs.mk.
+ $(srcdir)/outputs.mk: New target.
+ (EXTRA_DIST): Add $(OUTPUTS).
+ (regen-outputs-mk): New (phony) target.
+ (regen-am): Remake regen-outputs-mk.
+ Do not recreate $(srcdir)/headers.stamp.tmp.
+ (EXTRA_DIST): Remove headers.stamp.
+ ($(srcdir)/outputs/outputs.mk)
+ ($(srcdir)/headers.stamp):
+ Remove rules.
+ (outputs/outputs.mk): Remove this Make helper.
+ Supersed by...
+ (outputs.mk): ...this (new) Make helper.
+
+2010-03-17 Roland Levillain <roland(a)lrde.epita.fr>
+
Handle dependencies of generated figures.
* doc/figures.mk: New Make helper.
diff --git a/milena/doc/Makefile.am b/milena/doc/Makefile.am
index feda59c..32e9395 100644
--- a/milena/doc/Makefile.am
+++ b/milena/doc/Makefile.am
@@ -842,59 +842,39 @@ include $(srcdir)/programs-examples.mk
EXTRA_PROGRAMS = $(PROGRAMS_examples)
CLEANFILES = $(PROGRAMS_examples)
-# FIXME: Try to avoid the use an extensive list: either use Make's
-# substitution rules or generate it. Actually this list is already
-# generated (see outputs/outputs.mk).
-OUTPUTS = \
- $(srcdir)/outputs/accu-right-instanciation.txt \
- $(srcdir)/outputs/borderthickness.txt \
- $(srcdir)/outputs/box2d-bbox.txt \
- $(srcdir)/outputs/domain-display.txt \
- $(srcdir)/outputs/dpoint-1.txt \
- $(srcdir)/outputs/estim-sites.txt \
- $(srcdir)/outputs/extend.txt \
- $(srcdir)/outputs/extension-ignore.txt \
- $(srcdir)/outputs/fill-call-1.txt \
- $(srcdir)/outputs/fill-imageif-cfun.txt \
- $(srcdir)/outputs/fill-part-image.txt \
- $(srcdir)/outputs/fill-subdomain-shorter.txt \
- $(srcdir)/outputs/fill-subdomain.txt \
- $(srcdir)/outputs/fill.txt \
- $(srcdir)/outputs/first_routine.txt \
- $(srcdir)/outputs/forall-piter.txt \
- $(srcdir)/outputs/fun-p2v-1.txt \
- $(srcdir)/outputs/graph-data.txt \
- $(srcdir)/outputs/graph-iter.txt \
- $(srcdir)/outputs/ima-has.txt \
- $(srcdir)/outputs/ima-save.txt \
- $(srcdir)/outputs/ima-size.txt \
- $(srcdir)/outputs/ima2d-1.txt \
- $(srcdir)/outputs/ima2d-2.txt \
- $(srcdir)/outputs/ima2d-3.txt \
- $(srcdir)/outputs/ima2d-4.txt \
- $(srcdir)/outputs/ima2d-5.txt \
- $(srcdir)/outputs/ima2d-6-clone.txt \
- $(srcdir)/outputs/ima2d-7.txt \
- $(srcdir)/outputs/ima2d-rot.txt \
- $(srcdir)/outputs/labeling-compute.txt \
- $(srcdir)/outputs/logical-not.txt \
- $(srcdir)/outputs/mln_var.txt \
- $(srcdir)/outputs/parray-append.txt \
- $(srcdir)/outputs/parray-bbox.txt \
- $(srcdir)/outputs/paste-call-1.txt \
- $(srcdir)/outputs/paste.txt \
- $(srcdir)/outputs/point-1.txt \
- $(srcdir)/outputs/predicate-1.txt \
- $(srcdir)/outputs/tuto2_first_image.txt \
- $(srcdir)/outputs/tuto3_colorize.txt \
- $(srcdir)/outputs/tuto3_println.txt \
- $(srcdir)/outputs/tuto3_rw_image.txt \
- $(srcdir)/outputs/tuto3_trace.txt \
- $(srcdir)/outputs/tuto4_genericity_and_algorithms.txt \
- $(srcdir)/outputs/tuto4_point2d.txt \
- $(srcdir)/outputs/tuto4_site_set_create.txt \
- $(srcdir)/outputs/win-create-1.txt \
- $(srcdir)/outputs/win-create-2.txt
+## --------- ##
+## Outputs. ##
+## --------- ##
+
+$(srcdir)/outputs.mk: $(srcdir)/gen-make-variable
+ rm -f $@.tmp
+# Ignore sources in examples/trash/.
+ $(srcdir)/gen-make-variable OUTPUTS \
+ `find $(srcdir)/examples \
+ -name \*.cc -a \! -path $(srcdir)/examples/trash/\* \
+ | sed -e 's,$(srcdir)/examples/,,' \
+ -e 'y,/,_,' \
+ -e 's,\(.*\)\.cc$$,$$(srcdir)/outputs/\1.txt,'` \
+ >$@.tmp
+ mv -f $@.tmp $@
+ chmod -w $@
+include $(srcdir)/outputs.mk
+EXTRA_DIST += $(OUTPUTS)
+MAINTAINERCLEANFILES += $(OUTPUTS)
+
+.PHONY: regen-outputs-mk
+regen-outputs-mk:
+ rm -f $(srcdir)/outputs.mk.tmp
+# Ignore sources in examples/trash/.
+ $(srcdir)/gen-make-variable OUTPUTS \
+ `find $(srcdir)/examples \
+ -name \*.cc -a \! -path $(srcdir)/examples/trash/\* \
+ | sed -e 's,$(srcdir)/examples/,,' \
+ -e 'y,/,_,' \
+ -e 's,\(.*\)\.cc$$,$$(srcdir)/outputs/\1.txt,'` \
+ >$(srcdir)/outputs.mk.tmp
+ mv -f $(srcdir)/outputs.mk.tmp $(srcdir)/outputs.mk
+ chmod -w $(srcdir)/outputs.mk
## FIXME: These outpouts are also required by the (LaTeX)
## documentation. However, they have no corresponding program in
@@ -932,8 +912,6 @@ regen-examples-outputs-mk:
mv -f $(srcdir)/examples-outputs.mk.tmp $(srcdir)/examples-outputs.mk
chmod -w $(srcdir)/examples-outputs.mk
-MAINTAINERCLEANFILES += $(OUTPUTS)
-
include $(srcdir)/figures.mk
## --------------- ##
@@ -963,35 +941,16 @@ $(srcdir)/split-outputs.stamp: $(OUTPUTS)
## -------------- ##
# Regen Make helpers.
-EXTRA_DIST += generate_dist_files.sh headers.stamp
+EXTRA_DIST += generate_dist_files.sh
include $(top_srcdir)/build-aux/regen-recursive.mk
-## FIXME: Get rid of headers.stamp, which is (was) used by two many
-## generators.
regen-am:
- @rm -f $(srcdir)/headers.stamp.tmp
- @touch $(srcdir)/headers.stamp.tmp
$(MAKE) $(AM_MAKEFLAGS) regen-pbm-figures-mk
$(MAKE) $(AM_MAKEFLAGS) regen-pgm-figures-mk
$(MAKE) $(AM_MAKEFLAGS) regen-ppm-figures-mk
$(MAKE) $(AM_MAKEFLAGS) regen-examples-mk
$(MAKE) $(AM_MAKEFLAGS) regen-split-examples-mk
+ $(MAKE) $(AM_MAKEFLAGS) regen-outputs-mk
$(MAKE) $(AM_MAKEFLAGS) regen-examples-outputs-mk
- @cd $(srcdir) && \
- ./generate_dist_files.sh outputs txt && \
- @mv -f $(srcdir)/headers.stamp.tmp $(srcdir)/headers.stamp
-
-$(srcdir)/outputs/outputs.mk: $(srcdir)/headers.stamp
-
-
-$(srcdir)/headers.stamp: $(srcdir)/generate_dist_files.sh
- @rm -f $@.tmp
- @touch $@.tmp
- @cd $(srcdir) && \
- ./generate_dist_files.sh outputs txt && \
- @mv -f $@.tmp $@
-
-
-include $(srcdir)/outputs/outputs.mk
## -------------- ##
diff --git a/milena/doc/outputs.mk b/milena/doc/outputs.mk
new file mode 100644
index 0000000..5e60012
--- /dev/null
+++ b/milena/doc/outputs.mk
@@ -0,0 +1,54 @@
+## Generated by gen-make-variable. Do not edit by hand.
+
+OUTPUTS = \
+ $(srcdir)/outputs/accu-right-instanciation.txt \
+ $(srcdir)/outputs/borderthickness.txt \
+ $(srcdir)/outputs/box2d-bbox.txt \
+ $(srcdir)/outputs/domain-display.txt \
+ $(srcdir)/outputs/dpoint-1.txt \
+ $(srcdir)/outputs/estim-sites.txt \
+ $(srcdir)/outputs/extend.txt \
+ $(srcdir)/outputs/extension-ignore.txt \
+ $(srcdir)/outputs/fill-call-1.txt \
+ $(srcdir)/outputs/fill-imageif-cfun.txt \
+ $(srcdir)/outputs/fill-part-image.txt \
+ $(srcdir)/outputs/fill-subdomain-shorter.txt \
+ $(srcdir)/outputs/fill-subdomain.txt \
+ $(srcdir)/outputs/fill.txt \
+ $(srcdir)/outputs/forall-piter.txt \
+ $(srcdir)/outputs/fun-p2v-1.txt \
+ $(srcdir)/outputs/graph-data.txt \
+ $(srcdir)/outputs/graph-iter.txt \
+ $(srcdir)/outputs/ima-has.txt \
+ $(srcdir)/outputs/ima-load.txt \
+ $(srcdir)/outputs/ima-save.txt \
+ $(srcdir)/outputs/ima-size.txt \
+ $(srcdir)/outputs/ima2d-1.txt \
+ $(srcdir)/outputs/ima2d-2.txt \
+ $(srcdir)/outputs/ima2d-3.txt \
+ $(srcdir)/outputs/ima2d-4.txt \
+ $(srcdir)/outputs/ima2d-5.txt \
+ $(srcdir)/outputs/ima2d-6-clone.txt \
+ $(srcdir)/outputs/ima2d-7.txt \
+ $(srcdir)/outputs/ima2d-rot.txt \
+ $(srcdir)/outputs/labeling-compute.txt \
+ $(srcdir)/outputs/logical-not.txt \
+ $(srcdir)/outputs/mln_var.txt \
+ $(srcdir)/outputs/parray-append.txt \
+ $(srcdir)/outputs/parray-bbox.txt \
+ $(srcdir)/outputs/paste-call-1.txt \
+ $(srcdir)/outputs/paste.txt \
+ $(srcdir)/outputs/point-1.txt \
+ $(srcdir)/outputs/predicate-1.txt \
+ $(srcdir)/outputs/tuto2_first_image.txt \
+ $(srcdir)/outputs/tuto3_colorize.txt \
+ $(srcdir)/outputs/tuto3_first_routine.txt \
+ $(srcdir)/outputs/tuto3_println.txt \
+ $(srcdir)/outputs/tuto3_rw_image.txt \
+ $(srcdir)/outputs/tuto3_trace.txt \
+ $(srcdir)/outputs/tuto4_genericity_and_algorithms.txt \
+ $(srcdir)/outputs/tuto4_image.txt \
+ $(srcdir)/outputs/tuto4_point2d.txt \
+ $(srcdir)/outputs/tuto4_site_set_create.txt \
+ $(srcdir)/outputs/win-create-1.txt \
+ $(srcdir)/outputs/win-create-2.txt
diff --git a/milena/doc/outputs/outputs.mk b/milena/doc/outputs/outputs.mk
deleted file mode 100644
index ac71800..0000000
--- a/milena/doc/outputs/outputs.mk
+++ /dev/null
@@ -1,69 +0,0 @@
-## Generated by ../generate_dist_files, do not modify.
-
-EXTRA_DIST += \
-outputs/accu-right-instanciation.txt \
-outputs/borderthickness.txt \
-outputs/box2d-bbox.txt \
-outputs/domain-display.txt \
-outputs/dpoint-1.txt \
-outputs/estim-sites.txt \
-outputs/extend.txt \
-outputs/extension-ignore.txt \
-outputs/fill-call-1.txt \
-outputs/fill-imageif-cfun.txt \
-outputs/fill-part-image.txt \
-outputs/fill-subdomain-shorter.txt \
-outputs/fill-subdomain.txt \
-outputs/fill.txt \
-outputs/first_routine.txt \
-outputs/forall-piter.txt \
-outputs/fun-p2v-1.txt \
-outputs/graph-data.txt \
-outputs/graph-iter.txt \
-outputs/graph-output-1.txt \
-outputs/ima-has.txt \
-outputs/ima-save.txt \
-outputs/ima-size.txt \
-outputs/ima2d-1.txt \
-outputs/ima2d-2.txt \
-outputs/ima2d-3.txt \
-outputs/ima2d-4.txt \
-outputs/ima2d-5.txt \
-outputs/ima2d-6-clone.txt \
-outputs/ima2d-7.txt \
-outputs/ima2d-decl-2.txt \
-outputs/ima2d-display-1.txt \
-outputs/ima2d-display-2.txt \
-outputs/ima2d-display-output-1.txt \
-outputs/ima2d-display-output-2.txt \
-outputs/ima2d-rot.txt \
-outputs/labeling-compute.txt \
-outputs/logical-not.txt \
-outputs/mln_var.txt \
-outputs/parray-append.txt \
-outputs/parray-bbox.txt \
-outputs/parray-display-1.txt \
-outputs/paste-call-1.txt \
-outputs/paste.txt \
-outputs/point-1.txt \
-outputs/predicate-1.txt \
-outputs/split/graph-iter-1.txt \
-outputs/split/graph-iter-2.txt \
-outputs/split/graph-iter-3.txt \
-outputs/split/graph-iter-4.txt \
-outputs/split/tuto3_println-1.txt \
-outputs/split/tuto3_println-2.txt \
-outputs/split/tuto4_site_set_create-1.txt \
-outputs/split/tuto4_site_set_create-2.txt \
-outputs/split/tuto4_site_set_create-3.txt \
-outputs/tuto2_first_image.txt \
-outputs/tuto3_colorize.txt \
-outputs/tuto3_println.txt \
-outputs/tuto3_rw_image.txt \
-outputs/tuto3_trace.txt \
-outputs/tuto4_genericity_and_algorithms.txt \
-outputs/tuto4_point2d.txt \
-outputs/tuto4_site_set_create.txt \
-outputs/win-create-1-display.txt \
-outputs/win-create-1.txt \
-outputs/win-create-2.txt
--
1.5.6.5
1
0
last-svn-commit-70-g8aae86d Generate the list of outputs in the documentation.
by Roland Levillain 17 Mar '10
by Roland Levillain 17 Mar '10
17 Mar '10
* doc/Makefile.am (OUTPUTS): Remove this variable that used to be
populated by hand.
Include $(srcdir)/outputs.mk.
No longer include $(srcdir)/outputs/outputs.mk.
$(srcdir)/outputs.mk: New target.
(EXTRA_DIST): Add $(OUTPUTS).
(regen-outputs-mk): New (phony) target.
(regen-am): Remake regen-outputs-mk.
Do not recreate $(srcdir)/headers.stamp.tmp.
(EXTRA_DIST): Remove headers.stamp.
($(srcdir)/outputs/outputs.mk)
($(srcdir)/headers.stamp):
Remove rules.
(outputs/outputs.mk): Remove this Make helper.
Supersed by...
(outputs.mk): ...this (new) Make helper.
---
milena/ChangeLog | 21 ++++++++
milena/doc/Makefile.am | 111 +++++++++++++----------------------------
milena/doc/outputs.mk | 54 ++++++++++++++++++++
milena/doc/outputs/outputs.mk | 69 -------------------------
4 files changed, 110 insertions(+), 145 deletions(-)
create mode 100644 milena/doc/outputs.mk
delete mode 100644 milena/doc/outputs/outputs.mk
diff --git a/milena/ChangeLog b/milena/ChangeLog
index 66ed89f..5c38891 100644
--- a/milena/ChangeLog
+++ b/milena/ChangeLog
@@ -1,5 +1,26 @@
2010-03-17 Roland Levillain <roland(a)lrde.epita.fr>
+ Generate the list of outputs in the documentation.
+
+ * doc/Makefile.am (OUTPUTS): Remove this variable that used to be
+ populated by hand.
+ Include $(srcdir)/outputs.mk.
+ No longer include $(srcdir)/outputs/outputs.mk.
+ $(srcdir)/outputs.mk: New target.
+ (EXTRA_DIST): Add $(OUTPUTS).
+ (regen-outputs-mk): New (phony) target.
+ (regen-am): Remake regen-outputs-mk.
+ Do not recreate $(srcdir)/headers.stamp.tmp.
+ (EXTRA_DIST): Remove headers.stamp.
+ ($(srcdir)/outputs/outputs.mk)
+ ($(srcdir)/headers.stamp):
+ Remove rules.
+ (outputs/outputs.mk): Remove this Make helper.
+ Supersed by...
+ (outputs.mk): ...this (new) Make helper.
+
+2010-03-17 Roland Levillain <roland(a)lrde.epita.fr>
+
Handle dependencies of generated figures.
* doc/figures.mk: New Make helper.
diff --git a/milena/doc/Makefile.am b/milena/doc/Makefile.am
index feda59c..32e9395 100644
--- a/milena/doc/Makefile.am
+++ b/milena/doc/Makefile.am
@@ -842,59 +842,39 @@ include $(srcdir)/programs-examples.mk
EXTRA_PROGRAMS = $(PROGRAMS_examples)
CLEANFILES = $(PROGRAMS_examples)
-# FIXME: Try to avoid the use an extensive list: either use Make's
-# substitution rules or generate it. Actually this list is already
-# generated (see outputs/outputs.mk).
-OUTPUTS = \
- $(srcdir)/outputs/accu-right-instanciation.txt \
- $(srcdir)/outputs/borderthickness.txt \
- $(srcdir)/outputs/box2d-bbox.txt \
- $(srcdir)/outputs/domain-display.txt \
- $(srcdir)/outputs/dpoint-1.txt \
- $(srcdir)/outputs/estim-sites.txt \
- $(srcdir)/outputs/extend.txt \
- $(srcdir)/outputs/extension-ignore.txt \
- $(srcdir)/outputs/fill-call-1.txt \
- $(srcdir)/outputs/fill-imageif-cfun.txt \
- $(srcdir)/outputs/fill-part-image.txt \
- $(srcdir)/outputs/fill-subdomain-shorter.txt \
- $(srcdir)/outputs/fill-subdomain.txt \
- $(srcdir)/outputs/fill.txt \
- $(srcdir)/outputs/first_routine.txt \
- $(srcdir)/outputs/forall-piter.txt \
- $(srcdir)/outputs/fun-p2v-1.txt \
- $(srcdir)/outputs/graph-data.txt \
- $(srcdir)/outputs/graph-iter.txt \
- $(srcdir)/outputs/ima-has.txt \
- $(srcdir)/outputs/ima-save.txt \
- $(srcdir)/outputs/ima-size.txt \
- $(srcdir)/outputs/ima2d-1.txt \
- $(srcdir)/outputs/ima2d-2.txt \
- $(srcdir)/outputs/ima2d-3.txt \
- $(srcdir)/outputs/ima2d-4.txt \
- $(srcdir)/outputs/ima2d-5.txt \
- $(srcdir)/outputs/ima2d-6-clone.txt \
- $(srcdir)/outputs/ima2d-7.txt \
- $(srcdir)/outputs/ima2d-rot.txt \
- $(srcdir)/outputs/labeling-compute.txt \
- $(srcdir)/outputs/logical-not.txt \
- $(srcdir)/outputs/mln_var.txt \
- $(srcdir)/outputs/parray-append.txt \
- $(srcdir)/outputs/parray-bbox.txt \
- $(srcdir)/outputs/paste-call-1.txt \
- $(srcdir)/outputs/paste.txt \
- $(srcdir)/outputs/point-1.txt \
- $(srcdir)/outputs/predicate-1.txt \
- $(srcdir)/outputs/tuto2_first_image.txt \
- $(srcdir)/outputs/tuto3_colorize.txt \
- $(srcdir)/outputs/tuto3_println.txt \
- $(srcdir)/outputs/tuto3_rw_image.txt \
- $(srcdir)/outputs/tuto3_trace.txt \
- $(srcdir)/outputs/tuto4_genericity_and_algorithms.txt \
- $(srcdir)/outputs/tuto4_point2d.txt \
- $(srcdir)/outputs/tuto4_site_set_create.txt \
- $(srcdir)/outputs/win-create-1.txt \
- $(srcdir)/outputs/win-create-2.txt
+## --------- ##
+## Outputs. ##
+## --------- ##
+
+$(srcdir)/outputs.mk: $(srcdir)/gen-make-variable
+ rm -f $@.tmp
+# Ignore sources in examples/trash/.
+ $(srcdir)/gen-make-variable OUTPUTS \
+ `find $(srcdir)/examples \
+ -name \*.cc -a \! -path $(srcdir)/examples/trash/\* \
+ | sed -e 's,$(srcdir)/examples/,,' \
+ -e 'y,/,_,' \
+ -e 's,\(.*\)\.cc$$,$$(srcdir)/outputs/\1.txt,'` \
+ >$@.tmp
+ mv -f $@.tmp $@
+ chmod -w $@
+include $(srcdir)/outputs.mk
+EXTRA_DIST += $(OUTPUTS)
+MAINTAINERCLEANFILES += $(OUTPUTS)
+
+.PHONY: regen-outputs-mk
+regen-outputs-mk:
+ rm -f $(srcdir)/outputs.mk.tmp
+# Ignore sources in examples/trash/.
+ $(srcdir)/gen-make-variable OUTPUTS \
+ `find $(srcdir)/examples \
+ -name \*.cc -a \! -path $(srcdir)/examples/trash/\* \
+ | sed -e 's,$(srcdir)/examples/,,' \
+ -e 'y,/,_,' \
+ -e 's,\(.*\)\.cc$$,$$(srcdir)/outputs/\1.txt,'` \
+ >$(srcdir)/outputs.mk.tmp
+ mv -f $(srcdir)/outputs.mk.tmp $(srcdir)/outputs.mk
+ chmod -w $(srcdir)/outputs.mk
## FIXME: These outpouts are also required by the (LaTeX)
## documentation. However, they have no corresponding program in
@@ -932,8 +912,6 @@ regen-examples-outputs-mk:
mv -f $(srcdir)/examples-outputs.mk.tmp $(srcdir)/examples-outputs.mk
chmod -w $(srcdir)/examples-outputs.mk
-MAINTAINERCLEANFILES += $(OUTPUTS)
-
include $(srcdir)/figures.mk
## --------------- ##
@@ -963,35 +941,16 @@ $(srcdir)/split-outputs.stamp: $(OUTPUTS)
## -------------- ##
# Regen Make helpers.
-EXTRA_DIST += generate_dist_files.sh headers.stamp
+EXTRA_DIST += generate_dist_files.sh
include $(top_srcdir)/build-aux/regen-recursive.mk
-## FIXME: Get rid of headers.stamp, which is (was) used by two many
-## generators.
regen-am:
- @rm -f $(srcdir)/headers.stamp.tmp
- @touch $(srcdir)/headers.stamp.tmp
$(MAKE) $(AM_MAKEFLAGS) regen-pbm-figures-mk
$(MAKE) $(AM_MAKEFLAGS) regen-pgm-figures-mk
$(MAKE) $(AM_MAKEFLAGS) regen-ppm-figures-mk
$(MAKE) $(AM_MAKEFLAGS) regen-examples-mk
$(MAKE) $(AM_MAKEFLAGS) regen-split-examples-mk
+ $(MAKE) $(AM_MAKEFLAGS) regen-outputs-mk
$(MAKE) $(AM_MAKEFLAGS) regen-examples-outputs-mk
- @cd $(srcdir) && \
- ./generate_dist_files.sh outputs txt && \
- @mv -f $(srcdir)/headers.stamp.tmp $(srcdir)/headers.stamp
-
-$(srcdir)/outputs/outputs.mk: $(srcdir)/headers.stamp
-
-
-$(srcdir)/headers.stamp: $(srcdir)/generate_dist_files.sh
- @rm -f $@.tmp
- @touch $@.tmp
- @cd $(srcdir) && \
- ./generate_dist_files.sh outputs txt && \
- @mv -f $@.tmp $@
-
-
-include $(srcdir)/outputs/outputs.mk
## -------------- ##
diff --git a/milena/doc/outputs.mk b/milena/doc/outputs.mk
new file mode 100644
index 0000000..5e60012
--- /dev/null
+++ b/milena/doc/outputs.mk
@@ -0,0 +1,54 @@
+## Generated by gen-make-variable. Do not edit by hand.
+
+OUTPUTS = \
+ $(srcdir)/outputs/accu-right-instanciation.txt \
+ $(srcdir)/outputs/borderthickness.txt \
+ $(srcdir)/outputs/box2d-bbox.txt \
+ $(srcdir)/outputs/domain-display.txt \
+ $(srcdir)/outputs/dpoint-1.txt \
+ $(srcdir)/outputs/estim-sites.txt \
+ $(srcdir)/outputs/extend.txt \
+ $(srcdir)/outputs/extension-ignore.txt \
+ $(srcdir)/outputs/fill-call-1.txt \
+ $(srcdir)/outputs/fill-imageif-cfun.txt \
+ $(srcdir)/outputs/fill-part-image.txt \
+ $(srcdir)/outputs/fill-subdomain-shorter.txt \
+ $(srcdir)/outputs/fill-subdomain.txt \
+ $(srcdir)/outputs/fill.txt \
+ $(srcdir)/outputs/forall-piter.txt \
+ $(srcdir)/outputs/fun-p2v-1.txt \
+ $(srcdir)/outputs/graph-data.txt \
+ $(srcdir)/outputs/graph-iter.txt \
+ $(srcdir)/outputs/ima-has.txt \
+ $(srcdir)/outputs/ima-load.txt \
+ $(srcdir)/outputs/ima-save.txt \
+ $(srcdir)/outputs/ima-size.txt \
+ $(srcdir)/outputs/ima2d-1.txt \
+ $(srcdir)/outputs/ima2d-2.txt \
+ $(srcdir)/outputs/ima2d-3.txt \
+ $(srcdir)/outputs/ima2d-4.txt \
+ $(srcdir)/outputs/ima2d-5.txt \
+ $(srcdir)/outputs/ima2d-6-clone.txt \
+ $(srcdir)/outputs/ima2d-7.txt \
+ $(srcdir)/outputs/ima2d-rot.txt \
+ $(srcdir)/outputs/labeling-compute.txt \
+ $(srcdir)/outputs/logical-not.txt \
+ $(srcdir)/outputs/mln_var.txt \
+ $(srcdir)/outputs/parray-append.txt \
+ $(srcdir)/outputs/parray-bbox.txt \
+ $(srcdir)/outputs/paste-call-1.txt \
+ $(srcdir)/outputs/paste.txt \
+ $(srcdir)/outputs/point-1.txt \
+ $(srcdir)/outputs/predicate-1.txt \
+ $(srcdir)/outputs/tuto2_first_image.txt \
+ $(srcdir)/outputs/tuto3_colorize.txt \
+ $(srcdir)/outputs/tuto3_first_routine.txt \
+ $(srcdir)/outputs/tuto3_println.txt \
+ $(srcdir)/outputs/tuto3_rw_image.txt \
+ $(srcdir)/outputs/tuto3_trace.txt \
+ $(srcdir)/outputs/tuto4_genericity_and_algorithms.txt \
+ $(srcdir)/outputs/tuto4_image.txt \
+ $(srcdir)/outputs/tuto4_point2d.txt \
+ $(srcdir)/outputs/tuto4_site_set_create.txt \
+ $(srcdir)/outputs/win-create-1.txt \
+ $(srcdir)/outputs/win-create-2.txt
diff --git a/milena/doc/outputs/outputs.mk b/milena/doc/outputs/outputs.mk
deleted file mode 100644
index ac71800..0000000
--- a/milena/doc/outputs/outputs.mk
+++ /dev/null
@@ -1,69 +0,0 @@
-## Generated by ../generate_dist_files, do not modify.
-
-EXTRA_DIST += \
-outputs/accu-right-instanciation.txt \
-outputs/borderthickness.txt \
-outputs/box2d-bbox.txt \
-outputs/domain-display.txt \
-outputs/dpoint-1.txt \
-outputs/estim-sites.txt \
-outputs/extend.txt \
-outputs/extension-ignore.txt \
-outputs/fill-call-1.txt \
-outputs/fill-imageif-cfun.txt \
-outputs/fill-part-image.txt \
-outputs/fill-subdomain-shorter.txt \
-outputs/fill-subdomain.txt \
-outputs/fill.txt \
-outputs/first_routine.txt \
-outputs/forall-piter.txt \
-outputs/fun-p2v-1.txt \
-outputs/graph-data.txt \
-outputs/graph-iter.txt \
-outputs/graph-output-1.txt \
-outputs/ima-has.txt \
-outputs/ima-save.txt \
-outputs/ima-size.txt \
-outputs/ima2d-1.txt \
-outputs/ima2d-2.txt \
-outputs/ima2d-3.txt \
-outputs/ima2d-4.txt \
-outputs/ima2d-5.txt \
-outputs/ima2d-6-clone.txt \
-outputs/ima2d-7.txt \
-outputs/ima2d-decl-2.txt \
-outputs/ima2d-display-1.txt \
-outputs/ima2d-display-2.txt \
-outputs/ima2d-display-output-1.txt \
-outputs/ima2d-display-output-2.txt \
-outputs/ima2d-rot.txt \
-outputs/labeling-compute.txt \
-outputs/logical-not.txt \
-outputs/mln_var.txt \
-outputs/parray-append.txt \
-outputs/parray-bbox.txt \
-outputs/parray-display-1.txt \
-outputs/paste-call-1.txt \
-outputs/paste.txt \
-outputs/point-1.txt \
-outputs/predicate-1.txt \
-outputs/split/graph-iter-1.txt \
-outputs/split/graph-iter-2.txt \
-outputs/split/graph-iter-3.txt \
-outputs/split/graph-iter-4.txt \
-outputs/split/tuto3_println-1.txt \
-outputs/split/tuto3_println-2.txt \
-outputs/split/tuto4_site_set_create-1.txt \
-outputs/split/tuto4_site_set_create-2.txt \
-outputs/split/tuto4_site_set_create-3.txt \
-outputs/tuto2_first_image.txt \
-outputs/tuto3_colorize.txt \
-outputs/tuto3_println.txt \
-outputs/tuto3_rw_image.txt \
-outputs/tuto3_trace.txt \
-outputs/tuto4_genericity_and_algorithms.txt \
-outputs/tuto4_point2d.txt \
-outputs/tuto4_site_set_create.txt \
-outputs/win-create-1-display.txt \
-outputs/win-create-1.txt \
-outputs/win-create-2.txt
--
1.5.6.5
1
0
last-svn-commit-62-g9995f2f Handle dependencies of generated figures.
by Roland Levillain 17 Mar '10
by Roland Levillain 17 Mar '10
17 Mar '10
* doc/figures.mk: New Make helper.
Include it...
* doc/Makefile.am: ...here.
---
milena/ChangeLog | 8 ++++
milena/doc/Makefile.am | 2 +
milena/doc/figures.mk | 110 ++++++++++++++++++++++++++++++++++++++++++++++++
3 files changed, 120 insertions(+), 0 deletions(-)
create mode 100644 milena/doc/figures.mk
diff --git a/milena/ChangeLog b/milena/ChangeLog
index e104118..3d0719a 100644
--- a/milena/ChangeLog
+++ b/milena/ChangeLog
@@ -1,5 +1,13 @@
2010-03-17 Roland Levillain <roland(a)lrde.epita.fr>
+ Handle dependencies of generated figures.
+
+ * doc/figures.mk: New Make helper.
+ Include it...
+ * doc/Makefile.am: ...here.
+
+2010-03-17 Roland Levillain <roland(a)lrde.epita.fr>
+
* doc/examples-outputs.mk: Regen.
2010-03-17 Roland Levillain <roland(a)lrde.epita.fr>
diff --git a/milena/doc/Makefile.am b/milena/doc/Makefile.am
index 6e2822f..feda59c 100644
--- a/milena/doc/Makefile.am
+++ b/milena/doc/Makefile.am
@@ -934,6 +934,8 @@ regen-examples-outputs-mk:
MAINTAINERCLEANFILES += $(OUTPUTS)
+include $(srcdir)/figures.mk
+
## --------------- ##
## Split outputs. ##
## --------------- ##
diff --git a/milena/doc/figures.mk b/milena/doc/figures.mk
new file mode 100644
index 0000000..e6ea731
--- /dev/null
+++ b/milena/doc/figures.mk
@@ -0,0 +1,110 @@
+## Figures' dependencies. -*- Makefile-Automake -*-
+
+## Copyright (C) 2010 EPITA Research and Development Laboratory (LRDE).
+##
+## This file is part of Olena.
+##
+## Olena is free software: you can redistribute it and/or modify it under
+## the terms of the GNU General Public License as published by the Free
+## Software Foundation, version 2 of the License.
+##
+## Olena is distributed in the hope that it will be useful,
+## but WITHOUT ANY WARRANTY; without even the implied warranty of
+## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+## General Public License for more details.
+##
+## You should have received a copy of the GNU General Public License
+## along with Olena. If not, see <http://www.gnu.org/licenses/>.
+
+## Figures depend on the timestamp associated with their generator.
+## See also examples-outputs.mk.
+
+## FIXME: Generate this file.
+##
+## It'd be cool if programs themselves could generate a list of their
+## outputs (as a side effect) or at least if the extraction of this
+## list from the source file was straightforward.
+
+$(srcdir)/figures/extend-1.ppm $(srcdir)/figures/extend-2.ppm $(srcdir)/figures/extend-3.ppm $(srcdir)/figures/extend-4.ppm $(srcdir)/figures/extend-5.ppm: $(srcdir)/examples/extend.stamp
+## Recover from the removal of $@
+ @if test -f $@; then :; else \
+ rm -f $<; \
+ $(MAKE) $(AM_MAKEFLAGS) $<; \
+ fi
+
+$(srcdir)/figures/fill-1.ppm $(srcdir)/figures/fill-2.ppm: $(srcdir)/examples/fill.stamp
+## Recover from the removal of $@
+ @if test -f $@; then :; else \
+ rm -f $<; \
+ $(MAKE) $(AM_MAKEFLAGS) $<; \
+ fi
+
+$(srcdir)/figures/fill-subdomain-1.pbm $(srcdir)/figures/fill-subdomain-2.ppm $(srcdir)/figures/fill-subdomain-3.ppm $(srcdir)/figures/fill-subdomain-4.ppm: $(srcdir)/examples/fill-subdomain.stamp
+## Recover from the removal of $@
+ @if test -f $@; then :; else \
+ rm -f $<; \
+ $(MAKE) $(AM_MAKEFLAGS) $<; \
+ fi
+
+$(srcdir)/figures/fill-subimage-cfun-1.ppm: $(srcdir)/examples/fill-imageif-cfun.stamp
+## Recover from the removal of $@
+ @if test -f $@; then :; else \
+ rm -f $<; \
+ $(MAKE) $(AM_MAKEFLAGS) $<; \
+ fi
+
+$(srcdir)/figures/ima2d-rot-1.ppm $(srcdir)/figures/ima2d-rot-2.ppm: $(srcdir)/examples/ima2d-rot.stamp
+## Recover from the removal of $@
+ @if test -f $@; then :; else \
+ rm -f $<; \
+ $(MAKE) $(AM_MAKEFLAGS) $<; \
+ fi
+
+$(srcdir)/figures/ima_save.pbm: $(srcdir)/examples/ima-save.stamp
+## Recover from the removal of $@
+ @if test -f $@; then :; else \
+ rm -f $<; \
+ $(MAKE) $(AM_MAKEFLAGS) $<; \
+ fi
+
+$(srcdir)/figures/labeling-compute-1.pbm $(srcdir)/figures/labeling-compute-2.ppm: $(srcdir)/examples/labeling-compute.stamp
+## Recover from the removal of $@
+ @if test -f $@; then :; else \
+ rm -f $<; \
+ $(MAKE) $(AM_MAKEFLAGS) $<; \
+ fi
+
+$(srcdir)/figures/logical-not-1.pbm $(srcdir)/figures/logical-not-2.pbm $(srcdir)/figures/logical-not-3.pbm: $(srcdir)/examples/logical-not.stamp
+## Recover from the removal of $@
+ @if test -f $@; then :; else \
+ rm -f $<; \
+ $(MAKE) $(AM_MAKEFLAGS) $<; \
+ fi
+
+$(srcdir)/figures/tuto2_first_image-1.pbm: $(srcdir)/examples/tuto2_first_image.stamp
+## Recover from the removal of $@
+ @if test -f $@; then :; else \
+ rm -f $<; \
+ $(MAKE) $(AM_MAKEFLAGS) $<; \
+ fi
+
+$(srcdir)/figures/tuto3_colorize-1.pgm $(srcdir)/figures/tuto3_colorize-2.ppm: $(srcdir)/examples/tuto3/colorize.stamp
+## Recover from the removal of $@
+ @if test -f $@; then :; else \
+ rm -f $<; \
+ $(MAKE) $(AM_MAKEFLAGS) $<; \
+ fi
+
+$(srcdir)/figures/tuto3_rw_image-1.ppm $(srcdir)/figures/tuto3_rw_image-3.ppm: $(srcdir)/examples/tuto3_rw_image.stamp
+## Recover from the removal of $@
+ @if test -f $@; then :; else \
+ rm -f $<; \
+ $(MAKE) $(AM_MAKEFLAGS) $<; \
+ fi
+
+$(srcdir)/figures/tuto4_genericity_and_algorithms-1.ppm $(srcdir)/figures/tuto4_genericity_and_algorithms-2.ppm $(srcdir)/figures/tuto4_genericity_and_algorithms-3.pbm $(srcdir)/figures/tuto4_genericity_and_algorithms-4.ppm $(srcdir)/figures/tuto4_genericity_and_algorithms-5.ppm $(srcdir)/figures/tuto4_genericity_and_algorithms-6.ppm: $(srcdir)/examples/tuto4_genericity_and_algorithms.stamp
+## Recover from the removal of $@
+ @if test -f $@; then :; else \
+ rm -f $<; \
+ $(MAKE) $(AM_MAKEFLAGS) $<; \
+ fi
--
1.5.6.5
1
0
last-svn-commit-69-ga8e00b1 Handle dependencies of generated figures.
by Roland Levillain 17 Mar '10
by Roland Levillain 17 Mar '10
17 Mar '10
* doc/figures.mk: New Make helper.
Include it...
* doc/Makefile.am: ...here.
---
milena/ChangeLog | 8 ++++
milena/doc/Makefile.am | 2 +
milena/doc/figures.mk | 110 ++++++++++++++++++++++++++++++++++++++++++++++++
3 files changed, 120 insertions(+), 0 deletions(-)
create mode 100644 milena/doc/figures.mk
diff --git a/milena/ChangeLog b/milena/ChangeLog
index 85d1c1c..66ed89f 100644
--- a/milena/ChangeLog
+++ b/milena/ChangeLog
@@ -1,5 +1,13 @@
2010-03-17 Roland Levillain <roland(a)lrde.epita.fr>
+ Handle dependencies of generated figures.
+
+ * doc/figures.mk: New Make helper.
+ Include it...
+ * doc/Makefile.am: ...here.
+
+2010-03-17 Roland Levillain <roland(a)lrde.epita.fr>
+
* doc/examples-outputs.mk: Regen.
2010-03-17 Roland Levillain <roland(a)lrde.epita.fr>
diff --git a/milena/doc/Makefile.am b/milena/doc/Makefile.am
index 6e2822f..feda59c 100644
--- a/milena/doc/Makefile.am
+++ b/milena/doc/Makefile.am
@@ -934,6 +934,8 @@ regen-examples-outputs-mk:
MAINTAINERCLEANFILES += $(OUTPUTS)
+include $(srcdir)/figures.mk
+
## --------------- ##
## Split outputs. ##
## --------------- ##
diff --git a/milena/doc/figures.mk b/milena/doc/figures.mk
new file mode 100644
index 0000000..e6ea731
--- /dev/null
+++ b/milena/doc/figures.mk
@@ -0,0 +1,110 @@
+## Figures' dependencies. -*- Makefile-Automake -*-
+
+## Copyright (C) 2010 EPITA Research and Development Laboratory (LRDE).
+##
+## This file is part of Olena.
+##
+## Olena is free software: you can redistribute it and/or modify it under
+## the terms of the GNU General Public License as published by the Free
+## Software Foundation, version 2 of the License.
+##
+## Olena is distributed in the hope that it will be useful,
+## but WITHOUT ANY WARRANTY; without even the implied warranty of
+## MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+## General Public License for more details.
+##
+## You should have received a copy of the GNU General Public License
+## along with Olena. If not, see <http://www.gnu.org/licenses/>.
+
+## Figures depend on the timestamp associated with their generator.
+## See also examples-outputs.mk.
+
+## FIXME: Generate this file.
+##
+## It'd be cool if programs themselves could generate a list of their
+## outputs (as a side effect) or at least if the extraction of this
+## list from the source file was straightforward.
+
+$(srcdir)/figures/extend-1.ppm $(srcdir)/figures/extend-2.ppm $(srcdir)/figures/extend-3.ppm $(srcdir)/figures/extend-4.ppm $(srcdir)/figures/extend-5.ppm: $(srcdir)/examples/extend.stamp
+## Recover from the removal of $@
+ @if test -f $@; then :; else \
+ rm -f $<; \
+ $(MAKE) $(AM_MAKEFLAGS) $<; \
+ fi
+
+$(srcdir)/figures/fill-1.ppm $(srcdir)/figures/fill-2.ppm: $(srcdir)/examples/fill.stamp
+## Recover from the removal of $@
+ @if test -f $@; then :; else \
+ rm -f $<; \
+ $(MAKE) $(AM_MAKEFLAGS) $<; \
+ fi
+
+$(srcdir)/figures/fill-subdomain-1.pbm $(srcdir)/figures/fill-subdomain-2.ppm $(srcdir)/figures/fill-subdomain-3.ppm $(srcdir)/figures/fill-subdomain-4.ppm: $(srcdir)/examples/fill-subdomain.stamp
+## Recover from the removal of $@
+ @if test -f $@; then :; else \
+ rm -f $<; \
+ $(MAKE) $(AM_MAKEFLAGS) $<; \
+ fi
+
+$(srcdir)/figures/fill-subimage-cfun-1.ppm: $(srcdir)/examples/fill-imageif-cfun.stamp
+## Recover from the removal of $@
+ @if test -f $@; then :; else \
+ rm -f $<; \
+ $(MAKE) $(AM_MAKEFLAGS) $<; \
+ fi
+
+$(srcdir)/figures/ima2d-rot-1.ppm $(srcdir)/figures/ima2d-rot-2.ppm: $(srcdir)/examples/ima2d-rot.stamp
+## Recover from the removal of $@
+ @if test -f $@; then :; else \
+ rm -f $<; \
+ $(MAKE) $(AM_MAKEFLAGS) $<; \
+ fi
+
+$(srcdir)/figures/ima_save.pbm: $(srcdir)/examples/ima-save.stamp
+## Recover from the removal of $@
+ @if test -f $@; then :; else \
+ rm -f $<; \
+ $(MAKE) $(AM_MAKEFLAGS) $<; \
+ fi
+
+$(srcdir)/figures/labeling-compute-1.pbm $(srcdir)/figures/labeling-compute-2.ppm: $(srcdir)/examples/labeling-compute.stamp
+## Recover from the removal of $@
+ @if test -f $@; then :; else \
+ rm -f $<; \
+ $(MAKE) $(AM_MAKEFLAGS) $<; \
+ fi
+
+$(srcdir)/figures/logical-not-1.pbm $(srcdir)/figures/logical-not-2.pbm $(srcdir)/figures/logical-not-3.pbm: $(srcdir)/examples/logical-not.stamp
+## Recover from the removal of $@
+ @if test -f $@; then :; else \
+ rm -f $<; \
+ $(MAKE) $(AM_MAKEFLAGS) $<; \
+ fi
+
+$(srcdir)/figures/tuto2_first_image-1.pbm: $(srcdir)/examples/tuto2_first_image.stamp
+## Recover from the removal of $@
+ @if test -f $@; then :; else \
+ rm -f $<; \
+ $(MAKE) $(AM_MAKEFLAGS) $<; \
+ fi
+
+$(srcdir)/figures/tuto3_colorize-1.pgm $(srcdir)/figures/tuto3_colorize-2.ppm: $(srcdir)/examples/tuto3/colorize.stamp
+## Recover from the removal of $@
+ @if test -f $@; then :; else \
+ rm -f $<; \
+ $(MAKE) $(AM_MAKEFLAGS) $<; \
+ fi
+
+$(srcdir)/figures/tuto3_rw_image-1.ppm $(srcdir)/figures/tuto3_rw_image-3.ppm: $(srcdir)/examples/tuto3_rw_image.stamp
+## Recover from the removal of $@
+ @if test -f $@; then :; else \
+ rm -f $<; \
+ $(MAKE) $(AM_MAKEFLAGS) $<; \
+ fi
+
+$(srcdir)/figures/tuto4_genericity_and_algorithms-1.ppm $(srcdir)/figures/tuto4_genericity_and_algorithms-2.ppm $(srcdir)/figures/tuto4_genericity_and_algorithms-3.pbm $(srcdir)/figures/tuto4_genericity_and_algorithms-4.ppm $(srcdir)/figures/tuto4_genericity_and_algorithms-5.ppm $(srcdir)/figures/tuto4_genericity_and_algorithms-6.ppm: $(srcdir)/examples/tuto4_genericity_and_algorithms.stamp
+## Recover from the removal of $@
+ @if test -f $@; then :; else \
+ rm -f $<; \
+ $(MAKE) $(AM_MAKEFLAGS) $<; \
+ fi
--
1.5.6.5
1
0
17 Mar '10
---
milena/ChangeLog | 4 +
milena/doc/examples-outputs.mk | 1186 +++++++++++++++++++++++++++++-----------
2 files changed, 877 insertions(+), 313 deletions(-)
diff --git a/milena/ChangeLog b/milena/ChangeLog
index 536253c..e104118 100644
--- a/milena/ChangeLog
+++ b/milena/ChangeLog
@@ -1,5 +1,9 @@
2010-03-17 Roland Levillain <roland(a)lrde.epita.fr>
+ * doc/examples-outputs.mk: Regen.
+
+2010-03-17 Roland Levillain <roland(a)lrde.epita.fr>
+
Prepare for the generation of multiple outputs from doc/ programs.
* doc/gen-examples-outputs-mk: Split generated rules in two so
diff --git a/milena/doc/examples-outputs.mk b/milena/doc/examples-outputs.mk
index f70feca..b4b7c43 100644
--- a/milena/doc/examples-outputs.mk
+++ b/milena/doc/examples-outputs.mk
@@ -1,359 +1,919 @@
## Generated by gen-examples-outputs-mk. Do not edit by hand.
-$(srcdir)/outputs/accu-right-instanciation.txt: examples/accu-right-instanciation.cc
- rm -f $@.tmp
- $(MAKE) $(AM_MAKEFLAGS) accu-right-instanciation$(EXEEXT)
- ./$< >$@.tmp
- cp -f $@.tmp $@
- rm -f $@.tmp
-$(srcdir)/outputs/borderthickness.txt: examples/borderthickness.cc
- rm -f $@.tmp
+$(srcdir)/examples/accu-right-instanciation.stamp: examples/accu-right-instanciation.cc
+ @rm -f $@.tmp
+ @touch $@.tmp
+ $(MAKE) $(AM_MAKEFLAGS) accu-right-instanciation$(EXEEXT)
+ ./accu-right-instanciation$(EXEEXT) >$(srcdir)/outputs/accu-right-instanciation.txt.tmp
+ mv $(srcdir)/outputs/accu-right-instanciation.txt.tmp $(srcdir)/outputs/accu-right-instanciation.txt
+ @mv -f $@.tmp $@
+EXTRA_DIST += $(srcdir)/examples/accu-right-instanciation.stamp
+MAINTAINERCLEANFILES += $(srcdir)/examples/accu-right-instanciation.stamp
+
+$(srcdir)/outputs/accu-right-instanciation.txt: $(srcdir)/examples/accu-right-instanciation.stamp
+## Recover from the removal of $@
+ @if test -f $@; then :; else \
+ rm -f $<; \
+ $(MAKE) $(AM_MAKEFLAGS) $<; \
+ fi
+
+
+$(srcdir)/examples/borderthickness.stamp: examples/borderthickness.cc
+ @rm -f $@.tmp
+ @touch $@.tmp
$(MAKE) $(AM_MAKEFLAGS) borderthickness$(EXEEXT)
- ./$< >$@.tmp
- cp -f $@.tmp $@
- rm -f $@.tmp
-
-$(srcdir)/outputs/box2d-bbox.txt: examples/box2d-bbox.cc
- rm -f $@.tmp
+ ./borderthickness$(EXEEXT) >$(srcdir)/outputs/borderthickness.txt.tmp
+ mv $(srcdir)/outputs/borderthickness.txt.tmp $(srcdir)/outputs/borderthickness.txt
+ @mv -f $@.tmp $@
+EXTRA_DIST += $(srcdir)/examples/borderthickness.stamp
+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) $<; \
+ fi
+
+
+$(srcdir)/examples/box2d-bbox.stamp: examples/box2d-bbox.cc
+ @rm -f $@.tmp
+ @touch $@.tmp
$(MAKE) $(AM_MAKEFLAGS) box2d-bbox$(EXEEXT)
- ./$< >$@.tmp
- cp -f $@.tmp $@
- rm -f $@.tmp
-
-$(srcdir)/outputs/domain-display.txt: examples/domain-display.cc
- rm -f $@.tmp
+ ./box2d-bbox$(EXEEXT) >$(srcdir)/outputs/box2d-bbox.txt.tmp
+ mv $(srcdir)/outputs/box2d-bbox.txt.tmp $(srcdir)/outputs/box2d-bbox.txt
+ @mv -f $@.tmp $@
+EXTRA_DIST += $(srcdir)/examples/box2d-bbox.stamp
+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) $<; \
+ fi
+
+
+$(srcdir)/examples/domain-display.stamp: examples/domain-display.cc
+ @rm -f $@.tmp
+ @touch $@.tmp
$(MAKE) $(AM_MAKEFLAGS) domain-display$(EXEEXT)
- ./$< >$@.tmp
- cp -f $@.tmp $@
- rm -f $@.tmp
-
-$(srcdir)/outputs/dpoint-1.txt: examples/dpoint-1.cc
- rm -f $@.tmp
+ ./domain-display$(EXEEXT) >$(srcdir)/outputs/domain-display.txt.tmp
+ mv $(srcdir)/outputs/domain-display.txt.tmp $(srcdir)/outputs/domain-display.txt
+ @mv -f $@.tmp $@
+EXTRA_DIST += $(srcdir)/examples/domain-display.stamp
+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) $<; \
+ fi
+
+
+$(srcdir)/examples/dpoint-1.stamp: examples/dpoint-1.cc
+ @rm -f $@.tmp
+ @touch $@.tmp
$(MAKE) $(AM_MAKEFLAGS) dpoint-1$(EXEEXT)
- ./$< >$@.tmp
- cp -f $@.tmp $@
- rm -f $@.tmp
-
-$(srcdir)/outputs/estim-sites.txt: examples/estim-sites.cc
- rm -f $@.tmp
+ ./dpoint-1$(EXEEXT) >$(srcdir)/outputs/dpoint-1.txt.tmp
+ mv $(srcdir)/outputs/dpoint-1.txt.tmp $(srcdir)/outputs/dpoint-1.txt
+ @mv -f $@.tmp $@
+EXTRA_DIST += $(srcdir)/examples/dpoint-1.stamp
+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) $<; \
+ fi
+
+
+$(srcdir)/examples/estim-sites.stamp: examples/estim-sites.cc
+ @rm -f $@.tmp
+ @touch $@.tmp
$(MAKE) $(AM_MAKEFLAGS) estim-sites$(EXEEXT)
- ./$< >$@.tmp
- cp -f $@.tmp $@
- rm -f $@.tmp
-
-$(srcdir)/outputs/extend.txt: examples/extend.cc
- rm -f $@.tmp
+ ./estim-sites$(EXEEXT) >$(srcdir)/outputs/estim-sites.txt.tmp
+ mv $(srcdir)/outputs/estim-sites.txt.tmp $(srcdir)/outputs/estim-sites.txt
+ @mv -f $@.tmp $@
+EXTRA_DIST += $(srcdir)/examples/estim-sites.stamp
+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) $<; \
+ fi
+
+
+$(srcdir)/examples/extend.stamp: examples/extend.cc
+ @rm -f $@.tmp
+ @touch $@.tmp
$(MAKE) $(AM_MAKEFLAGS) extend$(EXEEXT)
- ./$< >$@.tmp
- cp -f $@.tmp $@
- rm -f $@.tmp
-
-$(srcdir)/outputs/extension-ignore.txt: examples/extension-ignore.cc
- rm -f $@.tmp
+ ./extend$(EXEEXT) >$(srcdir)/outputs/extend.txt.tmp
+ mv $(srcdir)/outputs/extend.txt.tmp $(srcdir)/outputs/extend.txt
+ @mv -f $@.tmp $@
+EXTRA_DIST += $(srcdir)/examples/extend.stamp
+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) $<; \
+ fi
+
+
+$(srcdir)/examples/extension-ignore.stamp: examples/extension-ignore.cc
+ @rm -f $@.tmp
+ @touch $@.tmp
$(MAKE) $(AM_MAKEFLAGS) extension-ignore$(EXEEXT)
- ./$< >$@.tmp
- cp -f $@.tmp $@
- rm -f $@.tmp
-
-$(srcdir)/outputs/fill-call-1.txt: examples/fill-call-1.cc
- rm -f $@.tmp
+ ./extension-ignore$(EXEEXT) >$(srcdir)/outputs/extension-ignore.txt.tmp
+ mv $(srcdir)/outputs/extension-ignore.txt.tmp $(srcdir)/outputs/extension-ignore.txt
+ @mv -f $@.tmp $@
+EXTRA_DIST += $(srcdir)/examples/extension-ignore.stamp
+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) $<; \
+ fi
+
+
+$(srcdir)/examples/fill-call-1.stamp: examples/fill-call-1.cc
+ @rm -f $@.tmp
+ @touch $@.tmp
$(MAKE) $(AM_MAKEFLAGS) fill-call-1$(EXEEXT)
- ./$< >$@.tmp
- cp -f $@.tmp $@
- rm -f $@.tmp
-
-$(srcdir)/outputs/fill-imageif-cfun.txt: examples/fill-imageif-cfun.cc
- rm -f $@.tmp
+ ./fill-call-1$(EXEEXT) >$(srcdir)/outputs/fill-call-1.txt.tmp
+ mv $(srcdir)/outputs/fill-call-1.txt.tmp $(srcdir)/outputs/fill-call-1.txt
+ @mv -f $@.tmp $@
+EXTRA_DIST += $(srcdir)/examples/fill-call-1.stamp
+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) $<; \
+ fi
+
+
+$(srcdir)/examples/fill-imageif-cfun.stamp: examples/fill-imageif-cfun.cc
+ @rm -f $@.tmp
+ @touch $@.tmp
$(MAKE) $(AM_MAKEFLAGS) fill-imageif-cfun$(EXEEXT)
- ./$< >$@.tmp
- cp -f $@.tmp $@
- rm -f $@.tmp
-
-$(srcdir)/outputs/fill-part-image.txt: examples/fill-part-image.cc
- rm -f $@.tmp
+ ./fill-imageif-cfun$(EXEEXT) >$(srcdir)/outputs/fill-imageif-cfun.txt.tmp
+ mv $(srcdir)/outputs/fill-imageif-cfun.txt.tmp $(srcdir)/outputs/fill-imageif-cfun.txt
+ @mv -f $@.tmp $@
+EXTRA_DIST += $(srcdir)/examples/fill-imageif-cfun.stamp
+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) $<; \
+ fi
+
+
+$(srcdir)/examples/fill-part-image.stamp: examples/fill-part-image.cc
+ @rm -f $@.tmp
+ @touch $@.tmp
$(MAKE) $(AM_MAKEFLAGS) fill-part-image$(EXEEXT)
- ./$< >$@.tmp
- cp -f $@.tmp $@
- rm -f $@.tmp
-
-$(srcdir)/outputs/fill-subdomain-shorter.txt: examples/fill-subdomain-shorter.cc
- rm -f $@.tmp
+ ./fill-part-image$(EXEEXT) >$(srcdir)/outputs/fill-part-image.txt.tmp
+ mv $(srcdir)/outputs/fill-part-image.txt.tmp $(srcdir)/outputs/fill-part-image.txt
+ @mv -f $@.tmp $@
+EXTRA_DIST += $(srcdir)/examples/fill-part-image.stamp
+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) $<; \
+ fi
+
+
+$(srcdir)/examples/fill-subdomain-shorter.stamp: examples/fill-subdomain-shorter.cc
+ @rm -f $@.tmp
+ @touch $@.tmp
$(MAKE) $(AM_MAKEFLAGS) fill-subdomain-shorter$(EXEEXT)
- ./$< >$@.tmp
- cp -f $@.tmp $@
- rm -f $@.tmp
-
-$(srcdir)/outputs/fill-subdomain.txt: examples/fill-subdomain.cc
- rm -f $@.tmp
+ ./fill-subdomain-shorter$(EXEEXT) >$(srcdir)/outputs/fill-subdomain-shorter.txt.tmp
+ mv $(srcdir)/outputs/fill-subdomain-shorter.txt.tmp $(srcdir)/outputs/fill-subdomain-shorter.txt
+ @mv -f $@.tmp $@
+EXTRA_DIST += $(srcdir)/examples/fill-subdomain-shorter.stamp
+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) $<; \
+ fi
+
+
+$(srcdir)/examples/fill-subdomain.stamp: examples/fill-subdomain.cc
+ @rm -f $@.tmp
+ @touch $@.tmp
$(MAKE) $(AM_MAKEFLAGS) fill-subdomain$(EXEEXT)
- ./$< >$@.tmp
- cp -f $@.tmp $@
- rm -f $@.tmp
-
-$(srcdir)/outputs/fill.txt: examples/fill.cc
- rm -f $@.tmp
+ ./fill-subdomain$(EXEEXT) >$(srcdir)/outputs/fill-subdomain.txt.tmp
+ mv $(srcdir)/outputs/fill-subdomain.txt.tmp $(srcdir)/outputs/fill-subdomain.txt
+ @mv -f $@.tmp $@
+EXTRA_DIST += $(srcdir)/examples/fill-subdomain.stamp
+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) $<; \
+ fi
+
+
+$(srcdir)/examples/fill.stamp: examples/fill.cc
+ @rm -f $@.tmp
+ @touch $@.tmp
$(MAKE) $(AM_MAKEFLAGS) fill$(EXEEXT)
- ./$< >$@.tmp
- cp -f $@.tmp $@
- rm -f $@.tmp
-
-$(srcdir)/outputs/forall-piter.txt: examples/forall-piter.cc
- rm -f $@.tmp
+ ./fill$(EXEEXT) >$(srcdir)/outputs/fill.txt.tmp
+ mv $(srcdir)/outputs/fill.txt.tmp $(srcdir)/outputs/fill.txt
+ @mv -f $@.tmp $@
+EXTRA_DIST += $(srcdir)/examples/fill.stamp
+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) $<; \
+ fi
+
+
+$(srcdir)/examples/forall-piter.stamp: examples/forall-piter.cc
+ @rm -f $@.tmp
+ @touch $@.tmp
$(MAKE) $(AM_MAKEFLAGS) forall-piter$(EXEEXT)
- ./$< >$@.tmp
- cp -f $@.tmp $@
- rm -f $@.tmp
-
-$(srcdir)/outputs/fun-p2v-1.txt: examples/fun-p2v-1.cc
- rm -f $@.tmp
+ ./forall-piter$(EXEEXT) >$(srcdir)/outputs/forall-piter.txt.tmp
+ mv $(srcdir)/outputs/forall-piter.txt.tmp $(srcdir)/outputs/forall-piter.txt
+ @mv -f $@.tmp $@
+EXTRA_DIST += $(srcdir)/examples/forall-piter.stamp
+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) $<; \
+ fi
+
+
+$(srcdir)/examples/fun-p2v-1.stamp: examples/fun-p2v-1.cc
+ @rm -f $@.tmp
+ @touch $@.tmp
$(MAKE) $(AM_MAKEFLAGS) fun-p2v-1$(EXEEXT)
- ./$< >$@.tmp
- cp -f $@.tmp $@
- rm -f $@.tmp
-
-$(srcdir)/outputs/graph-data.txt: examples/graph-data.cc
- rm -f $@.tmp
+ ./fun-p2v-1$(EXEEXT) >$(srcdir)/outputs/fun-p2v-1.txt.tmp
+ mv $(srcdir)/outputs/fun-p2v-1.txt.tmp $(srcdir)/outputs/fun-p2v-1.txt
+ @mv -f $@.tmp $@
+EXTRA_DIST += $(srcdir)/examples/fun-p2v-1.stamp
+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) $<; \
+ fi
+
+
+$(srcdir)/examples/graph-data.stamp: examples/graph-data.cc
+ @rm -f $@.tmp
+ @touch $@.tmp
$(MAKE) $(AM_MAKEFLAGS) graph-data$(EXEEXT)
- ./$< >$@.tmp
- cp -f $@.tmp $@
- rm -f $@.tmp
-
-$(srcdir)/outputs/graph-iter.txt: examples/graph-iter.cc
- rm -f $@.tmp
+ ./graph-data$(EXEEXT) >$(srcdir)/outputs/graph-data.txt.tmp
+ mv $(srcdir)/outputs/graph-data.txt.tmp $(srcdir)/outputs/graph-data.txt
+ @mv -f $@.tmp $@
+EXTRA_DIST += $(srcdir)/examples/graph-data.stamp
+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) $<; \
+ fi
+
+
+$(srcdir)/examples/graph-iter.stamp: examples/graph-iter.cc
+ @rm -f $@.tmp
+ @touch $@.tmp
$(MAKE) $(AM_MAKEFLAGS) graph-iter$(EXEEXT)
- ./$< >$@.tmp
- cp -f $@.tmp $@
- rm -f $@.tmp
-
-$(srcdir)/outputs/ima-has.txt: examples/ima-has.cc
- rm -f $@.tmp
+ ./graph-iter$(EXEEXT) >$(srcdir)/outputs/graph-iter.txt.tmp
+ mv $(srcdir)/outputs/graph-iter.txt.tmp $(srcdir)/outputs/graph-iter.txt
+ @mv -f $@.tmp $@
+EXTRA_DIST += $(srcdir)/examples/graph-iter.stamp
+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) $<; \
+ fi
+
+
+$(srcdir)/examples/ima-has.stamp: examples/ima-has.cc
+ @rm -f $@.tmp
+ @touch $@.tmp
$(MAKE) $(AM_MAKEFLAGS) ima-has$(EXEEXT)
- ./$< >$@.tmp
- cp -f $@.tmp $@
- rm -f $@.tmp
-
-$(srcdir)/outputs/ima-load.txt: examples/ima-load.cc
- rm -f $@.tmp
+ ./ima-has$(EXEEXT) >$(srcdir)/outputs/ima-has.txt.tmp
+ mv $(srcdir)/outputs/ima-has.txt.tmp $(srcdir)/outputs/ima-has.txt
+ @mv -f $@.tmp $@
+EXTRA_DIST += $(srcdir)/examples/ima-has.stamp
+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) $<; \
+ fi
+
+
+$(srcdir)/examples/ima-load.stamp: examples/ima-load.cc
+ @rm -f $@.tmp
+ @touch $@.tmp
$(MAKE) $(AM_MAKEFLAGS) ima-load$(EXEEXT)
- ./$< >$@.tmp
- cp -f $@.tmp $@
- rm -f $@.tmp
-
-$(srcdir)/outputs/ima-save.txt: examples/ima-save.cc
- rm -f $@.tmp
+ ./ima-load$(EXEEXT) >$(srcdir)/outputs/ima-load.txt.tmp
+ mv $(srcdir)/outputs/ima-load.txt.tmp $(srcdir)/outputs/ima-load.txt
+ @mv -f $@.tmp $@
+EXTRA_DIST += $(srcdir)/examples/ima-load.stamp
+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) $<; \
+ fi
+
+
+$(srcdir)/examples/ima-save.stamp: examples/ima-save.cc
+ @rm -f $@.tmp
+ @touch $@.tmp
$(MAKE) $(AM_MAKEFLAGS) ima-save$(EXEEXT)
- ./$< >$@.tmp
- cp -f $@.tmp $@
- rm -f $@.tmp
-
-$(srcdir)/outputs/ima-size.txt: examples/ima-size.cc
- rm -f $@.tmp
+ ./ima-save$(EXEEXT) >$(srcdir)/outputs/ima-save.txt.tmp
+ mv $(srcdir)/outputs/ima-save.txt.tmp $(srcdir)/outputs/ima-save.txt
+ @mv -f $@.tmp $@
+EXTRA_DIST += $(srcdir)/examples/ima-save.stamp
+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) $<; \
+ fi
+
+
+$(srcdir)/examples/ima-size.stamp: examples/ima-size.cc
+ @rm -f $@.tmp
+ @touch $@.tmp
$(MAKE) $(AM_MAKEFLAGS) ima-size$(EXEEXT)
- ./$< >$@.tmp
- cp -f $@.tmp $@
- rm -f $@.tmp
-
-$(srcdir)/outputs/ima2d-1.txt: examples/ima2d-1.cc
- rm -f $@.tmp
+ ./ima-size$(EXEEXT) >$(srcdir)/outputs/ima-size.txt.tmp
+ mv $(srcdir)/outputs/ima-size.txt.tmp $(srcdir)/outputs/ima-size.txt
+ @mv -f $@.tmp $@
+EXTRA_DIST += $(srcdir)/examples/ima-size.stamp
+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) $<; \
+ fi
+
+
+$(srcdir)/examples/ima2d-1.stamp: examples/ima2d-1.cc
+ @rm -f $@.tmp
+ @touch $@.tmp
$(MAKE) $(AM_MAKEFLAGS) ima2d-1$(EXEEXT)
- ./$< >$@.tmp
- cp -f $@.tmp $@
- rm -f $@.tmp
-
-$(srcdir)/outputs/ima2d-2.txt: examples/ima2d-2.cc
- rm -f $@.tmp
+ ./ima2d-1$(EXEEXT) >$(srcdir)/outputs/ima2d-1.txt.tmp
+ mv $(srcdir)/outputs/ima2d-1.txt.tmp $(srcdir)/outputs/ima2d-1.txt
+ @mv -f $@.tmp $@
+EXTRA_DIST += $(srcdir)/examples/ima2d-1.stamp
+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) $<; \
+ fi
+
+
+$(srcdir)/examples/ima2d-2.stamp: examples/ima2d-2.cc
+ @rm -f $@.tmp
+ @touch $@.tmp
$(MAKE) $(AM_MAKEFLAGS) ima2d-2$(EXEEXT)
- ./$< >$@.tmp
- cp -f $@.tmp $@
- rm -f $@.tmp
-
-$(srcdir)/outputs/ima2d-3.txt: examples/ima2d-3.cc
- rm -f $@.tmp
+ ./ima2d-2$(EXEEXT) >$(srcdir)/outputs/ima2d-2.txt.tmp
+ mv $(srcdir)/outputs/ima2d-2.txt.tmp $(srcdir)/outputs/ima2d-2.txt
+ @mv -f $@.tmp $@
+EXTRA_DIST += $(srcdir)/examples/ima2d-2.stamp
+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) $<; \
+ fi
+
+
+$(srcdir)/examples/ima2d-3.stamp: examples/ima2d-3.cc
+ @rm -f $@.tmp
+ @touch $@.tmp
$(MAKE) $(AM_MAKEFLAGS) ima2d-3$(EXEEXT)
- ./$< >$@.tmp
- cp -f $@.tmp $@
- rm -f $@.tmp
-
-$(srcdir)/outputs/ima2d-4.txt: examples/ima2d-4.cc
- rm -f $@.tmp
+ ./ima2d-3$(EXEEXT) >$(srcdir)/outputs/ima2d-3.txt.tmp
+ mv $(srcdir)/outputs/ima2d-3.txt.tmp $(srcdir)/outputs/ima2d-3.txt
+ @mv -f $@.tmp $@
+EXTRA_DIST += $(srcdir)/examples/ima2d-3.stamp
+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) $<; \
+ fi
+
+
+$(srcdir)/examples/ima2d-4.stamp: examples/ima2d-4.cc
+ @rm -f $@.tmp
+ @touch $@.tmp
$(MAKE) $(AM_MAKEFLAGS) ima2d-4$(EXEEXT)
- ./$< >$@.tmp
- cp -f $@.tmp $@
- rm -f $@.tmp
-
-$(srcdir)/outputs/ima2d-5.txt: examples/ima2d-5.cc
- rm -f $@.tmp
+ ./ima2d-4$(EXEEXT) >$(srcdir)/outputs/ima2d-4.txt.tmp
+ mv $(srcdir)/outputs/ima2d-4.txt.tmp $(srcdir)/outputs/ima2d-4.txt
+ @mv -f $@.tmp $@
+EXTRA_DIST += $(srcdir)/examples/ima2d-4.stamp
+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) $<; \
+ fi
+
+
+$(srcdir)/examples/ima2d-5.stamp: examples/ima2d-5.cc
+ @rm -f $@.tmp
+ @touch $@.tmp
$(MAKE) $(AM_MAKEFLAGS) ima2d-5$(EXEEXT)
- ./$< >$@.tmp
- cp -f $@.tmp $@
- rm -f $@.tmp
-
-$(srcdir)/outputs/ima2d-6-clone.txt: examples/ima2d-6-clone.cc
- rm -f $@.tmp
+ ./ima2d-5$(EXEEXT) >$(srcdir)/outputs/ima2d-5.txt.tmp
+ mv $(srcdir)/outputs/ima2d-5.txt.tmp $(srcdir)/outputs/ima2d-5.txt
+ @mv -f $@.tmp $@
+EXTRA_DIST += $(srcdir)/examples/ima2d-5.stamp
+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) $<; \
+ fi
+
+
+$(srcdir)/examples/ima2d-6-clone.stamp: examples/ima2d-6-clone.cc
+ @rm -f $@.tmp
+ @touch $@.tmp
$(MAKE) $(AM_MAKEFLAGS) ima2d-6-clone$(EXEEXT)
- ./$< >$@.tmp
- cp -f $@.tmp $@
- rm -f $@.tmp
-
-$(srcdir)/outputs/ima2d-7.txt: examples/ima2d-7.cc
- rm -f $@.tmp
+ ./ima2d-6-clone$(EXEEXT) >$(srcdir)/outputs/ima2d-6-clone.txt.tmp
+ mv $(srcdir)/outputs/ima2d-6-clone.txt.tmp $(srcdir)/outputs/ima2d-6-clone.txt
+ @mv -f $@.tmp $@
+EXTRA_DIST += $(srcdir)/examples/ima2d-6-clone.stamp
+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) $<; \
+ fi
+
+
+$(srcdir)/examples/ima2d-7.stamp: examples/ima2d-7.cc
+ @rm -f $@.tmp
+ @touch $@.tmp
$(MAKE) $(AM_MAKEFLAGS) ima2d-7$(EXEEXT)
- ./$< >$@.tmp
- cp -f $@.tmp $@
- rm -f $@.tmp
-
-$(srcdir)/outputs/ima2d-rot.txt: examples/ima2d-rot.cc
- rm -f $@.tmp
+ ./ima2d-7$(EXEEXT) >$(srcdir)/outputs/ima2d-7.txt.tmp
+ mv $(srcdir)/outputs/ima2d-7.txt.tmp $(srcdir)/outputs/ima2d-7.txt
+ @mv -f $@.tmp $@
+EXTRA_DIST += $(srcdir)/examples/ima2d-7.stamp
+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) $<; \
+ fi
+
+
+$(srcdir)/examples/ima2d-rot.stamp: examples/ima2d-rot.cc
+ @rm -f $@.tmp
+ @touch $@.tmp
$(MAKE) $(AM_MAKEFLAGS) ima2d-rot$(EXEEXT)
- ./$< >$@.tmp
- cp -f $@.tmp $@
- rm -f $@.tmp
-
-$(srcdir)/outputs/labeling-compute.txt: examples/labeling-compute.cc
- rm -f $@.tmp
+ ./ima2d-rot$(EXEEXT) >$(srcdir)/outputs/ima2d-rot.txt.tmp
+ mv $(srcdir)/outputs/ima2d-rot.txt.tmp $(srcdir)/outputs/ima2d-rot.txt
+ @mv -f $@.tmp $@
+EXTRA_DIST += $(srcdir)/examples/ima2d-rot.stamp
+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) $<; \
+ fi
+
+
+$(srcdir)/examples/labeling-compute.stamp: examples/labeling-compute.cc
+ @rm -f $@.tmp
+ @touch $@.tmp
$(MAKE) $(AM_MAKEFLAGS) labeling-compute$(EXEEXT)
- ./$< >$@.tmp
- cp -f $@.tmp $@
- rm -f $@.tmp
-
-$(srcdir)/outputs/logical-not.txt: examples/logical-not.cc
- rm -f $@.tmp
+ ./labeling-compute$(EXEEXT) >$(srcdir)/outputs/labeling-compute.txt.tmp
+ mv $(srcdir)/outputs/labeling-compute.txt.tmp $(srcdir)/outputs/labeling-compute.txt
+ @mv -f $@.tmp $@
+EXTRA_DIST += $(srcdir)/examples/labeling-compute.stamp
+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) $<; \
+ fi
+
+
+$(srcdir)/examples/logical-not.stamp: examples/logical-not.cc
+ @rm -f $@.tmp
+ @touch $@.tmp
$(MAKE) $(AM_MAKEFLAGS) logical-not$(EXEEXT)
- ./$< >$@.tmp
- cp -f $@.tmp $@
- rm -f $@.tmp
-
-$(srcdir)/outputs/mln_var.txt: examples/mln_var.cc
- rm -f $@.tmp
+ ./logical-not$(EXEEXT) >$(srcdir)/outputs/logical-not.txt.tmp
+ mv $(srcdir)/outputs/logical-not.txt.tmp $(srcdir)/outputs/logical-not.txt
+ @mv -f $@.tmp $@
+EXTRA_DIST += $(srcdir)/examples/logical-not.stamp
+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) $<; \
+ fi
+
+
+$(srcdir)/examples/mln_var.stamp: examples/mln_var.cc
+ @rm -f $@.tmp
+ @touch $@.tmp
$(MAKE) $(AM_MAKEFLAGS) mln_var$(EXEEXT)
- ./$< >$@.tmp
- cp -f $@.tmp $@
- rm -f $@.tmp
-
-$(srcdir)/outputs/parray-append.txt: examples/parray-append.cc
- rm -f $@.tmp
+ ./mln_var$(EXEEXT) >$(srcdir)/outputs/mln_var.txt.tmp
+ mv $(srcdir)/outputs/mln_var.txt.tmp $(srcdir)/outputs/mln_var.txt
+ @mv -f $@.tmp $@
+EXTRA_DIST += $(srcdir)/examples/mln_var.stamp
+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) $<; \
+ fi
+
+
+$(srcdir)/examples/parray-append.stamp: examples/parray-append.cc
+ @rm -f $@.tmp
+ @touch $@.tmp
$(MAKE) $(AM_MAKEFLAGS) parray-append$(EXEEXT)
- ./$< >$@.tmp
- cp -f $@.tmp $@
- rm -f $@.tmp
-
-$(srcdir)/outputs/parray-bbox.txt: examples/parray-bbox.cc
- rm -f $@.tmp
+ ./parray-append$(EXEEXT) >$(srcdir)/outputs/parray-append.txt.tmp
+ mv $(srcdir)/outputs/parray-append.txt.tmp $(srcdir)/outputs/parray-append.txt
+ @mv -f $@.tmp $@
+EXTRA_DIST += $(srcdir)/examples/parray-append.stamp
+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) $<; \
+ fi
+
+
+$(srcdir)/examples/parray-bbox.stamp: examples/parray-bbox.cc
+ @rm -f $@.tmp
+ @touch $@.tmp
$(MAKE) $(AM_MAKEFLAGS) parray-bbox$(EXEEXT)
- ./$< >$@.tmp
- cp -f $@.tmp $@
- rm -f $@.tmp
-
-$(srcdir)/outputs/paste-call-1.txt: examples/paste-call-1.cc
- rm -f $@.tmp
+ ./parray-bbox$(EXEEXT) >$(srcdir)/outputs/parray-bbox.txt.tmp
+ mv $(srcdir)/outputs/parray-bbox.txt.tmp $(srcdir)/outputs/parray-bbox.txt
+ @mv -f $@.tmp $@
+EXTRA_DIST += $(srcdir)/examples/parray-bbox.stamp
+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) $<; \
+ fi
+
+
+$(srcdir)/examples/paste-call-1.stamp: examples/paste-call-1.cc
+ @rm -f $@.tmp
+ @touch $@.tmp
$(MAKE) $(AM_MAKEFLAGS) paste-call-1$(EXEEXT)
- ./$< >$@.tmp
- cp -f $@.tmp $@
- rm -f $@.tmp
-
-$(srcdir)/outputs/paste.txt: examples/paste.cc
- rm -f $@.tmp
+ ./paste-call-1$(EXEEXT) >$(srcdir)/outputs/paste-call-1.txt.tmp
+ mv $(srcdir)/outputs/paste-call-1.txt.tmp $(srcdir)/outputs/paste-call-1.txt
+ @mv -f $@.tmp $@
+EXTRA_DIST += $(srcdir)/examples/paste-call-1.stamp
+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) $<; \
+ fi
+
+
+$(srcdir)/examples/paste.stamp: examples/paste.cc
+ @rm -f $@.tmp
+ @touch $@.tmp
$(MAKE) $(AM_MAKEFLAGS) paste$(EXEEXT)
- ./$< >$@.tmp
- cp -f $@.tmp $@
- rm -f $@.tmp
-
-$(srcdir)/outputs/point-1.txt: examples/point-1.cc
- rm -f $@.tmp
+ ./paste$(EXEEXT) >$(srcdir)/outputs/paste.txt.tmp
+ mv $(srcdir)/outputs/paste.txt.tmp $(srcdir)/outputs/paste.txt
+ @mv -f $@.tmp $@
+EXTRA_DIST += $(srcdir)/examples/paste.stamp
+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) $<; \
+ fi
+
+
+$(srcdir)/examples/point-1.stamp: examples/point-1.cc
+ @rm -f $@.tmp
+ @touch $@.tmp
$(MAKE) $(AM_MAKEFLAGS) point-1$(EXEEXT)
- ./$< >$@.tmp
- cp -f $@.tmp $@
- rm -f $@.tmp
-
-$(srcdir)/outputs/predicate-1.txt: examples/predicate-1.cc
- rm -f $@.tmp
+ ./point-1$(EXEEXT) >$(srcdir)/outputs/point-1.txt.tmp
+ mv $(srcdir)/outputs/point-1.txt.tmp $(srcdir)/outputs/point-1.txt
+ @mv -f $@.tmp $@
+EXTRA_DIST += $(srcdir)/examples/point-1.stamp
+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) $<; \
+ fi
+
+
+$(srcdir)/examples/predicate-1.stamp: examples/predicate-1.cc
+ @rm -f $@.tmp
+ @touch $@.tmp
$(MAKE) $(AM_MAKEFLAGS) predicate-1$(EXEEXT)
- ./$< >$@.tmp
- cp -f $@.tmp $@
- rm -f $@.tmp
-
-$(srcdir)/outputs/tuto2_first_image.txt: examples/tuto2_first_image.cc
- rm -f $@.tmp
+ ./predicate-1$(EXEEXT) >$(srcdir)/outputs/predicate-1.txt.tmp
+ mv $(srcdir)/outputs/predicate-1.txt.tmp $(srcdir)/outputs/predicate-1.txt
+ @mv -f $@.tmp $@
+EXTRA_DIST += $(srcdir)/examples/predicate-1.stamp
+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) $<; \
+ fi
+
+
+$(srcdir)/examples/tuto2_first_image.stamp: examples/tuto2_first_image.cc
+ @rm -f $@.tmp
+ @touch $@.tmp
$(MAKE) $(AM_MAKEFLAGS) tuto2_first_image$(EXEEXT)
- ./$< >$@.tmp
- cp -f $@.tmp $@
- rm -f $@.tmp
-
-$(srcdir)/outputs/colorize.txt: examples/tuto3/colorize.cc
- rm -f $@.tmp
- $(MAKE) $(AM_MAKEFLAGS) colorize$(EXEEXT)
- ./$< >$@.tmp
- cp -f $@.tmp $@
- rm -f $@.tmp
-
-$(srcdir)/outputs/first_routine.txt: examples/tuto3/first_routine.cc
- rm -f $@.tmp
- $(MAKE) $(AM_MAKEFLAGS) first_routine$(EXEEXT)
- ./$< >$@.tmp
- cp -f $@.tmp $@
- rm -f $@.tmp
-
-$(srcdir)/outputs/println.txt: examples/tuto3/println.cc
- rm -f $@.tmp
- $(MAKE) $(AM_MAKEFLAGS) println$(EXEEXT)
- ./$< >$@.tmp
- cp -f $@.tmp $@
- rm -f $@.tmp
-
-$(srcdir)/outputs/trace.txt: examples/tuto3/trace.cc
- rm -f $@.tmp
- $(MAKE) $(AM_MAKEFLAGS) trace$(EXEEXT)
- ./$< >$@.tmp
- cp -f $@.tmp $@
- rm -f $@.tmp
-
-$(srcdir)/outputs/tuto3_rw_image.txt: examples/tuto3_rw_image.cc
- rm -f $@.tmp
+ ./tuto2_first_image$(EXEEXT) >$(srcdir)/outputs/tuto2_first_image.txt.tmp
+ mv $(srcdir)/outputs/tuto2_first_image.txt.tmp $(srcdir)/outputs/tuto2_first_image.txt
+ @mv -f $@.tmp $@
+EXTRA_DIST += $(srcdir)/examples/tuto2_first_image.stamp
+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) $<; \
+ fi
+
+
+$(srcdir)/examples/tuto3/colorize.stamp: examples/tuto3/colorize.cc
+ @rm -f $@.tmp
+ @touch $@.tmp
+ $(MAKE) $(AM_MAKEFLAGS) tuto3_colorize$(EXEEXT)
+ ./tuto3_colorize$(EXEEXT) >$(srcdir)/outputs/tuto3_colorize.txt.tmp
+ mv $(srcdir)/outputs/tuto3_colorize.txt.tmp $(srcdir)/outputs/tuto3_colorize.txt
+ @mv -f $@.tmp $@
+EXTRA_DIST += $(srcdir)/examples/tuto3/colorize.stamp
+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) $<; \
+ fi
+
+
+$(srcdir)/examples/tuto3/first_routine.stamp: examples/tuto3/first_routine.cc
+ @rm -f $@.tmp
+ @touch $@.tmp
+ $(MAKE) $(AM_MAKEFLAGS) tuto3_first_routine$(EXEEXT)
+ ./tuto3_first_routine$(EXEEXT) >$(srcdir)/outputs/tuto3_first_routine.txt.tmp
+ mv $(srcdir)/outputs/tuto3_first_routine.txt.tmp $(srcdir)/outputs/tuto3_first_routine.txt
+ @mv -f $@.tmp $@
+EXTRA_DIST += $(srcdir)/examples/tuto3/first_routine.stamp
+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) $<; \
+ fi
+
+
+$(srcdir)/examples/tuto3/println.stamp: examples/tuto3/println.cc
+ @rm -f $@.tmp
+ @touch $@.tmp
+ $(MAKE) $(AM_MAKEFLAGS) tuto3_println$(EXEEXT)
+ ./tuto3_println$(EXEEXT) >$(srcdir)/outputs/tuto3_println.txt.tmp
+ mv $(srcdir)/outputs/tuto3_println.txt.tmp $(srcdir)/outputs/tuto3_println.txt
+ @mv -f $@.tmp $@
+EXTRA_DIST += $(srcdir)/examples/tuto3/println.stamp
+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) $<; \
+ fi
+
+
+$(srcdir)/examples/tuto3/trace.stamp: examples/tuto3/trace.cc
+ @rm -f $@.tmp
+ @touch $@.tmp
+ $(MAKE) $(AM_MAKEFLAGS) tuto3_trace$(EXEEXT)
+ ./tuto3_trace$(EXEEXT) >$(srcdir)/outputs/tuto3_trace.txt.tmp
+ mv $(srcdir)/outputs/tuto3_trace.txt.tmp $(srcdir)/outputs/tuto3_trace.txt
+ @mv -f $@.tmp $@
+EXTRA_DIST += $(srcdir)/examples/tuto3/trace.stamp
+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) $<; \
+ fi
+
+
+$(srcdir)/examples/tuto3_rw_image.stamp: examples/tuto3_rw_image.cc
+ @rm -f $@.tmp
+ @touch $@.tmp
$(MAKE) $(AM_MAKEFLAGS) tuto3_rw_image$(EXEEXT)
- ./$< >$@.tmp
- cp -f $@.tmp $@
- rm -f $@.tmp
-
-$(srcdir)/outputs/image.txt: examples/tuto4/image.cc
- rm -f $@.tmp
- $(MAKE) $(AM_MAKEFLAGS) image$(EXEEXT)
- ./$< >$@.tmp
- cp -f $@.tmp $@
- rm -f $@.tmp
-
-$(srcdir)/outputs/point2d.txt: examples/tuto4/point2d.cc
- rm -f $@.tmp
- $(MAKE) $(AM_MAKEFLAGS) point2d$(EXEEXT)
- ./$< >$@.tmp
- cp -f $@.tmp $@
- rm -f $@.tmp
-
-$(srcdir)/outputs/site_set_create.txt: examples/tuto4/site_set_create.cc
- rm -f $@.tmp
- $(MAKE) $(AM_MAKEFLAGS) site_set_create$(EXEEXT)
- ./$< >$@.tmp
- cp -f $@.tmp $@
- rm -f $@.tmp
-
-$(srcdir)/outputs/tuto4_genericity_and_algorithms.txt: examples/tuto4_genericity_and_algorithms.cc
- rm -f $@.tmp
+ ./tuto3_rw_image$(EXEEXT) >$(srcdir)/outputs/tuto3_rw_image.txt.tmp
+ mv $(srcdir)/outputs/tuto3_rw_image.txt.tmp $(srcdir)/outputs/tuto3_rw_image.txt
+ @mv -f $@.tmp $@
+EXTRA_DIST += $(srcdir)/examples/tuto3_rw_image.stamp
+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) $<; \
+ fi
+
+
+$(srcdir)/examples/tuto4/image.stamp: examples/tuto4/image.cc
+ @rm -f $@.tmp
+ @touch $@.tmp
+ $(MAKE) $(AM_MAKEFLAGS) tuto4_image$(EXEEXT)
+ ./tuto4_image$(EXEEXT) >$(srcdir)/outputs/tuto4_image.txt.tmp
+ mv $(srcdir)/outputs/tuto4_image.txt.tmp $(srcdir)/outputs/tuto4_image.txt
+ @mv -f $@.tmp $@
+EXTRA_DIST += $(srcdir)/examples/tuto4/image.stamp
+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) $<; \
+ fi
+
+
+$(srcdir)/examples/tuto4/point2d.stamp: examples/tuto4/point2d.cc
+ @rm -f $@.tmp
+ @touch $@.tmp
+ $(MAKE) $(AM_MAKEFLAGS) tuto4_point2d$(EXEEXT)
+ ./tuto4_point2d$(EXEEXT) >$(srcdir)/outputs/tuto4_point2d.txt.tmp
+ mv $(srcdir)/outputs/tuto4_point2d.txt.tmp $(srcdir)/outputs/tuto4_point2d.txt
+ @mv -f $@.tmp $@
+EXTRA_DIST += $(srcdir)/examples/tuto4/point2d.stamp
+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) $<; \
+ fi
+
+
+$(srcdir)/examples/tuto4/site_set_create.stamp: examples/tuto4/site_set_create.cc
+ @rm -f $@.tmp
+ @touch $@.tmp
+ $(MAKE) $(AM_MAKEFLAGS) tuto4_site_set_create$(EXEEXT)
+ ./tuto4_site_set_create$(EXEEXT) >$(srcdir)/outputs/tuto4_site_set_create.txt.tmp
+ mv $(srcdir)/outputs/tuto4_site_set_create.txt.tmp $(srcdir)/outputs/tuto4_site_set_create.txt
+ @mv -f $@.tmp $@
+EXTRA_DIST += $(srcdir)/examples/tuto4/site_set_create.stamp
+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) $<; \
+ fi
+
+
+$(srcdir)/examples/tuto4_genericity_and_algorithms.stamp: examples/tuto4_genericity_and_algorithms.cc
+ @rm -f $@.tmp
+ @touch $@.tmp
$(MAKE) $(AM_MAKEFLAGS) tuto4_genericity_and_algorithms$(EXEEXT)
- ./$< >$@.tmp
- cp -f $@.tmp $@
- rm -f $@.tmp
-
-$(srcdir)/outputs/win-create-1.txt: examples/win-create-1.cc
- rm -f $@.tmp
+ ./tuto4_genericity_and_algorithms$(EXEEXT) >$(srcdir)/outputs/tuto4_genericity_and_algorithms.txt.tmp
+ mv $(srcdir)/outputs/tuto4_genericity_and_algorithms.txt.tmp $(srcdir)/outputs/tuto4_genericity_and_algorithms.txt
+ @mv -f $@.tmp $@
+EXTRA_DIST += $(srcdir)/examples/tuto4_genericity_and_algorithms.stamp
+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) $<; \
+ fi
+
+
+$(srcdir)/examples/win-create-1.stamp: examples/win-create-1.cc
+ @rm -f $@.tmp
+ @touch $@.tmp
$(MAKE) $(AM_MAKEFLAGS) win-create-1$(EXEEXT)
- ./$< >$@.tmp
- cp -f $@.tmp $@
- rm -f $@.tmp
-
-$(srcdir)/outputs/win-create-2.txt: examples/win-create-2.cc
- rm -f $@.tmp
+ ./win-create-1$(EXEEXT) >$(srcdir)/outputs/win-create-1.txt.tmp
+ mv $(srcdir)/outputs/win-create-1.txt.tmp $(srcdir)/outputs/win-create-1.txt
+ @mv -f $@.tmp $@
+EXTRA_DIST += $(srcdir)/examples/win-create-1.stamp
+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) $<; \
+ fi
+
+
+$(srcdir)/examples/win-create-2.stamp: examples/win-create-2.cc
+ @rm -f $@.tmp
+ @touch $@.tmp
$(MAKE) $(AM_MAKEFLAGS) win-create-2$(EXEEXT)
- ./$< >$@.tmp
- cp -f $@.tmp $@
- rm -f $@.tmp
-
+ ./win-create-2$(EXEEXT) >$(srcdir)/outputs/win-create-2.txt.tmp
+ mv $(srcdir)/outputs/win-create-2.txt.tmp $(srcdir)/outputs/win-create-2.txt
+ @mv -f $@.tmp $@
+EXTRA_DIST += $(srcdir)/examples/win-create-2.stamp
+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) $<; \
+ fi
--
1.5.6.5
1
0
17 Mar '10
---
milena/ChangeLog | 4 +
milena/doc/examples-outputs.mk | 1186 +++++++++++++++++++++++++++++-----------
2 files changed, 877 insertions(+), 313 deletions(-)
diff --git a/milena/ChangeLog b/milena/ChangeLog
index 19a77c3..85d1c1c 100644
--- a/milena/ChangeLog
+++ b/milena/ChangeLog
@@ -1,5 +1,9 @@
2010-03-17 Roland Levillain <roland(a)lrde.epita.fr>
+ * doc/examples-outputs.mk: Regen.
+
+2010-03-17 Roland Levillain <roland(a)lrde.epita.fr>
+
Prepare for the generation of multiple outputs from doc/ programs.
* doc/gen-examples-outputs-mk: Split generated rules in two so
diff --git a/milena/doc/examples-outputs.mk b/milena/doc/examples-outputs.mk
index f70feca..b4b7c43 100644
--- a/milena/doc/examples-outputs.mk
+++ b/milena/doc/examples-outputs.mk
@@ -1,359 +1,919 @@
## Generated by gen-examples-outputs-mk. Do not edit by hand.
-$(srcdir)/outputs/accu-right-instanciation.txt: examples/accu-right-instanciation.cc
- rm -f $@.tmp
- $(MAKE) $(AM_MAKEFLAGS) accu-right-instanciation$(EXEEXT)
- ./$< >$@.tmp
- cp -f $@.tmp $@
- rm -f $@.tmp
-$(srcdir)/outputs/borderthickness.txt: examples/borderthickness.cc
- rm -f $@.tmp
+$(srcdir)/examples/accu-right-instanciation.stamp: examples/accu-right-instanciation.cc
+ @rm -f $@.tmp
+ @touch $@.tmp
+ $(MAKE) $(AM_MAKEFLAGS) accu-right-instanciation$(EXEEXT)
+ ./accu-right-instanciation$(EXEEXT) >$(srcdir)/outputs/accu-right-instanciation.txt.tmp
+ mv $(srcdir)/outputs/accu-right-instanciation.txt.tmp $(srcdir)/outputs/accu-right-instanciation.txt
+ @mv -f $@.tmp $@
+EXTRA_DIST += $(srcdir)/examples/accu-right-instanciation.stamp
+MAINTAINERCLEANFILES += $(srcdir)/examples/accu-right-instanciation.stamp
+
+$(srcdir)/outputs/accu-right-instanciation.txt: $(srcdir)/examples/accu-right-instanciation.stamp
+## Recover from the removal of $@
+ @if test -f $@; then :; else \
+ rm -f $<; \
+ $(MAKE) $(AM_MAKEFLAGS) $<; \
+ fi
+
+
+$(srcdir)/examples/borderthickness.stamp: examples/borderthickness.cc
+ @rm -f $@.tmp
+ @touch $@.tmp
$(MAKE) $(AM_MAKEFLAGS) borderthickness$(EXEEXT)
- ./$< >$@.tmp
- cp -f $@.tmp $@
- rm -f $@.tmp
-
-$(srcdir)/outputs/box2d-bbox.txt: examples/box2d-bbox.cc
- rm -f $@.tmp
+ ./borderthickness$(EXEEXT) >$(srcdir)/outputs/borderthickness.txt.tmp
+ mv $(srcdir)/outputs/borderthickness.txt.tmp $(srcdir)/outputs/borderthickness.txt
+ @mv -f $@.tmp $@
+EXTRA_DIST += $(srcdir)/examples/borderthickness.stamp
+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) $<; \
+ fi
+
+
+$(srcdir)/examples/box2d-bbox.stamp: examples/box2d-bbox.cc
+ @rm -f $@.tmp
+ @touch $@.tmp
$(MAKE) $(AM_MAKEFLAGS) box2d-bbox$(EXEEXT)
- ./$< >$@.tmp
- cp -f $@.tmp $@
- rm -f $@.tmp
-
-$(srcdir)/outputs/domain-display.txt: examples/domain-display.cc
- rm -f $@.tmp
+ ./box2d-bbox$(EXEEXT) >$(srcdir)/outputs/box2d-bbox.txt.tmp
+ mv $(srcdir)/outputs/box2d-bbox.txt.tmp $(srcdir)/outputs/box2d-bbox.txt
+ @mv -f $@.tmp $@
+EXTRA_DIST += $(srcdir)/examples/box2d-bbox.stamp
+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) $<; \
+ fi
+
+
+$(srcdir)/examples/domain-display.stamp: examples/domain-display.cc
+ @rm -f $@.tmp
+ @touch $@.tmp
$(MAKE) $(AM_MAKEFLAGS) domain-display$(EXEEXT)
- ./$< >$@.tmp
- cp -f $@.tmp $@
- rm -f $@.tmp
-
-$(srcdir)/outputs/dpoint-1.txt: examples/dpoint-1.cc
- rm -f $@.tmp
+ ./domain-display$(EXEEXT) >$(srcdir)/outputs/domain-display.txt.tmp
+ mv $(srcdir)/outputs/domain-display.txt.tmp $(srcdir)/outputs/domain-display.txt
+ @mv -f $@.tmp $@
+EXTRA_DIST += $(srcdir)/examples/domain-display.stamp
+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) $<; \
+ fi
+
+
+$(srcdir)/examples/dpoint-1.stamp: examples/dpoint-1.cc
+ @rm -f $@.tmp
+ @touch $@.tmp
$(MAKE) $(AM_MAKEFLAGS) dpoint-1$(EXEEXT)
- ./$< >$@.tmp
- cp -f $@.tmp $@
- rm -f $@.tmp
-
-$(srcdir)/outputs/estim-sites.txt: examples/estim-sites.cc
- rm -f $@.tmp
+ ./dpoint-1$(EXEEXT) >$(srcdir)/outputs/dpoint-1.txt.tmp
+ mv $(srcdir)/outputs/dpoint-1.txt.tmp $(srcdir)/outputs/dpoint-1.txt
+ @mv -f $@.tmp $@
+EXTRA_DIST += $(srcdir)/examples/dpoint-1.stamp
+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) $<; \
+ fi
+
+
+$(srcdir)/examples/estim-sites.stamp: examples/estim-sites.cc
+ @rm -f $@.tmp
+ @touch $@.tmp
$(MAKE) $(AM_MAKEFLAGS) estim-sites$(EXEEXT)
- ./$< >$@.tmp
- cp -f $@.tmp $@
- rm -f $@.tmp
-
-$(srcdir)/outputs/extend.txt: examples/extend.cc
- rm -f $@.tmp
+ ./estim-sites$(EXEEXT) >$(srcdir)/outputs/estim-sites.txt.tmp
+ mv $(srcdir)/outputs/estim-sites.txt.tmp $(srcdir)/outputs/estim-sites.txt
+ @mv -f $@.tmp $@
+EXTRA_DIST += $(srcdir)/examples/estim-sites.stamp
+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) $<; \
+ fi
+
+
+$(srcdir)/examples/extend.stamp: examples/extend.cc
+ @rm -f $@.tmp
+ @touch $@.tmp
$(MAKE) $(AM_MAKEFLAGS) extend$(EXEEXT)
- ./$< >$@.tmp
- cp -f $@.tmp $@
- rm -f $@.tmp
-
-$(srcdir)/outputs/extension-ignore.txt: examples/extension-ignore.cc
- rm -f $@.tmp
+ ./extend$(EXEEXT) >$(srcdir)/outputs/extend.txt.tmp
+ mv $(srcdir)/outputs/extend.txt.tmp $(srcdir)/outputs/extend.txt
+ @mv -f $@.tmp $@
+EXTRA_DIST += $(srcdir)/examples/extend.stamp
+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) $<; \
+ fi
+
+
+$(srcdir)/examples/extension-ignore.stamp: examples/extension-ignore.cc
+ @rm -f $@.tmp
+ @touch $@.tmp
$(MAKE) $(AM_MAKEFLAGS) extension-ignore$(EXEEXT)
- ./$< >$@.tmp
- cp -f $@.tmp $@
- rm -f $@.tmp
-
-$(srcdir)/outputs/fill-call-1.txt: examples/fill-call-1.cc
- rm -f $@.tmp
+ ./extension-ignore$(EXEEXT) >$(srcdir)/outputs/extension-ignore.txt.tmp
+ mv $(srcdir)/outputs/extension-ignore.txt.tmp $(srcdir)/outputs/extension-ignore.txt
+ @mv -f $@.tmp $@
+EXTRA_DIST += $(srcdir)/examples/extension-ignore.stamp
+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) $<; \
+ fi
+
+
+$(srcdir)/examples/fill-call-1.stamp: examples/fill-call-1.cc
+ @rm -f $@.tmp
+ @touch $@.tmp
$(MAKE) $(AM_MAKEFLAGS) fill-call-1$(EXEEXT)
- ./$< >$@.tmp
- cp -f $@.tmp $@
- rm -f $@.tmp
-
-$(srcdir)/outputs/fill-imageif-cfun.txt: examples/fill-imageif-cfun.cc
- rm -f $@.tmp
+ ./fill-call-1$(EXEEXT) >$(srcdir)/outputs/fill-call-1.txt.tmp
+ mv $(srcdir)/outputs/fill-call-1.txt.tmp $(srcdir)/outputs/fill-call-1.txt
+ @mv -f $@.tmp $@
+EXTRA_DIST += $(srcdir)/examples/fill-call-1.stamp
+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) $<; \
+ fi
+
+
+$(srcdir)/examples/fill-imageif-cfun.stamp: examples/fill-imageif-cfun.cc
+ @rm -f $@.tmp
+ @touch $@.tmp
$(MAKE) $(AM_MAKEFLAGS) fill-imageif-cfun$(EXEEXT)
- ./$< >$@.tmp
- cp -f $@.tmp $@
- rm -f $@.tmp
-
-$(srcdir)/outputs/fill-part-image.txt: examples/fill-part-image.cc
- rm -f $@.tmp
+ ./fill-imageif-cfun$(EXEEXT) >$(srcdir)/outputs/fill-imageif-cfun.txt.tmp
+ mv $(srcdir)/outputs/fill-imageif-cfun.txt.tmp $(srcdir)/outputs/fill-imageif-cfun.txt
+ @mv -f $@.tmp $@
+EXTRA_DIST += $(srcdir)/examples/fill-imageif-cfun.stamp
+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) $<; \
+ fi
+
+
+$(srcdir)/examples/fill-part-image.stamp: examples/fill-part-image.cc
+ @rm -f $@.tmp
+ @touch $@.tmp
$(MAKE) $(AM_MAKEFLAGS) fill-part-image$(EXEEXT)
- ./$< >$@.tmp
- cp -f $@.tmp $@
- rm -f $@.tmp
-
-$(srcdir)/outputs/fill-subdomain-shorter.txt: examples/fill-subdomain-shorter.cc
- rm -f $@.tmp
+ ./fill-part-image$(EXEEXT) >$(srcdir)/outputs/fill-part-image.txt.tmp
+ mv $(srcdir)/outputs/fill-part-image.txt.tmp $(srcdir)/outputs/fill-part-image.txt
+ @mv -f $@.tmp $@
+EXTRA_DIST += $(srcdir)/examples/fill-part-image.stamp
+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) $<; \
+ fi
+
+
+$(srcdir)/examples/fill-subdomain-shorter.stamp: examples/fill-subdomain-shorter.cc
+ @rm -f $@.tmp
+ @touch $@.tmp
$(MAKE) $(AM_MAKEFLAGS) fill-subdomain-shorter$(EXEEXT)
- ./$< >$@.tmp
- cp -f $@.tmp $@
- rm -f $@.tmp
-
-$(srcdir)/outputs/fill-subdomain.txt: examples/fill-subdomain.cc
- rm -f $@.tmp
+ ./fill-subdomain-shorter$(EXEEXT) >$(srcdir)/outputs/fill-subdomain-shorter.txt.tmp
+ mv $(srcdir)/outputs/fill-subdomain-shorter.txt.tmp $(srcdir)/outputs/fill-subdomain-shorter.txt
+ @mv -f $@.tmp $@
+EXTRA_DIST += $(srcdir)/examples/fill-subdomain-shorter.stamp
+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) $<; \
+ fi
+
+
+$(srcdir)/examples/fill-subdomain.stamp: examples/fill-subdomain.cc
+ @rm -f $@.tmp
+ @touch $@.tmp
$(MAKE) $(AM_MAKEFLAGS) fill-subdomain$(EXEEXT)
- ./$< >$@.tmp
- cp -f $@.tmp $@
- rm -f $@.tmp
-
-$(srcdir)/outputs/fill.txt: examples/fill.cc
- rm -f $@.tmp
+ ./fill-subdomain$(EXEEXT) >$(srcdir)/outputs/fill-subdomain.txt.tmp
+ mv $(srcdir)/outputs/fill-subdomain.txt.tmp $(srcdir)/outputs/fill-subdomain.txt
+ @mv -f $@.tmp $@
+EXTRA_DIST += $(srcdir)/examples/fill-subdomain.stamp
+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) $<; \
+ fi
+
+
+$(srcdir)/examples/fill.stamp: examples/fill.cc
+ @rm -f $@.tmp
+ @touch $@.tmp
$(MAKE) $(AM_MAKEFLAGS) fill$(EXEEXT)
- ./$< >$@.tmp
- cp -f $@.tmp $@
- rm -f $@.tmp
-
-$(srcdir)/outputs/forall-piter.txt: examples/forall-piter.cc
- rm -f $@.tmp
+ ./fill$(EXEEXT) >$(srcdir)/outputs/fill.txt.tmp
+ mv $(srcdir)/outputs/fill.txt.tmp $(srcdir)/outputs/fill.txt
+ @mv -f $@.tmp $@
+EXTRA_DIST += $(srcdir)/examples/fill.stamp
+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) $<; \
+ fi
+
+
+$(srcdir)/examples/forall-piter.stamp: examples/forall-piter.cc
+ @rm -f $@.tmp
+ @touch $@.tmp
$(MAKE) $(AM_MAKEFLAGS) forall-piter$(EXEEXT)
- ./$< >$@.tmp
- cp -f $@.tmp $@
- rm -f $@.tmp
-
-$(srcdir)/outputs/fun-p2v-1.txt: examples/fun-p2v-1.cc
- rm -f $@.tmp
+ ./forall-piter$(EXEEXT) >$(srcdir)/outputs/forall-piter.txt.tmp
+ mv $(srcdir)/outputs/forall-piter.txt.tmp $(srcdir)/outputs/forall-piter.txt
+ @mv -f $@.tmp $@
+EXTRA_DIST += $(srcdir)/examples/forall-piter.stamp
+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) $<; \
+ fi
+
+
+$(srcdir)/examples/fun-p2v-1.stamp: examples/fun-p2v-1.cc
+ @rm -f $@.tmp
+ @touch $@.tmp
$(MAKE) $(AM_MAKEFLAGS) fun-p2v-1$(EXEEXT)
- ./$< >$@.tmp
- cp -f $@.tmp $@
- rm -f $@.tmp
-
-$(srcdir)/outputs/graph-data.txt: examples/graph-data.cc
- rm -f $@.tmp
+ ./fun-p2v-1$(EXEEXT) >$(srcdir)/outputs/fun-p2v-1.txt.tmp
+ mv $(srcdir)/outputs/fun-p2v-1.txt.tmp $(srcdir)/outputs/fun-p2v-1.txt
+ @mv -f $@.tmp $@
+EXTRA_DIST += $(srcdir)/examples/fun-p2v-1.stamp
+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) $<; \
+ fi
+
+
+$(srcdir)/examples/graph-data.stamp: examples/graph-data.cc
+ @rm -f $@.tmp
+ @touch $@.tmp
$(MAKE) $(AM_MAKEFLAGS) graph-data$(EXEEXT)
- ./$< >$@.tmp
- cp -f $@.tmp $@
- rm -f $@.tmp
-
-$(srcdir)/outputs/graph-iter.txt: examples/graph-iter.cc
- rm -f $@.tmp
+ ./graph-data$(EXEEXT) >$(srcdir)/outputs/graph-data.txt.tmp
+ mv $(srcdir)/outputs/graph-data.txt.tmp $(srcdir)/outputs/graph-data.txt
+ @mv -f $@.tmp $@
+EXTRA_DIST += $(srcdir)/examples/graph-data.stamp
+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) $<; \
+ fi
+
+
+$(srcdir)/examples/graph-iter.stamp: examples/graph-iter.cc
+ @rm -f $@.tmp
+ @touch $@.tmp
$(MAKE) $(AM_MAKEFLAGS) graph-iter$(EXEEXT)
- ./$< >$@.tmp
- cp -f $@.tmp $@
- rm -f $@.tmp
-
-$(srcdir)/outputs/ima-has.txt: examples/ima-has.cc
- rm -f $@.tmp
+ ./graph-iter$(EXEEXT) >$(srcdir)/outputs/graph-iter.txt.tmp
+ mv $(srcdir)/outputs/graph-iter.txt.tmp $(srcdir)/outputs/graph-iter.txt
+ @mv -f $@.tmp $@
+EXTRA_DIST += $(srcdir)/examples/graph-iter.stamp
+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) $<; \
+ fi
+
+
+$(srcdir)/examples/ima-has.stamp: examples/ima-has.cc
+ @rm -f $@.tmp
+ @touch $@.tmp
$(MAKE) $(AM_MAKEFLAGS) ima-has$(EXEEXT)
- ./$< >$@.tmp
- cp -f $@.tmp $@
- rm -f $@.tmp
-
-$(srcdir)/outputs/ima-load.txt: examples/ima-load.cc
- rm -f $@.tmp
+ ./ima-has$(EXEEXT) >$(srcdir)/outputs/ima-has.txt.tmp
+ mv $(srcdir)/outputs/ima-has.txt.tmp $(srcdir)/outputs/ima-has.txt
+ @mv -f $@.tmp $@
+EXTRA_DIST += $(srcdir)/examples/ima-has.stamp
+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) $<; \
+ fi
+
+
+$(srcdir)/examples/ima-load.stamp: examples/ima-load.cc
+ @rm -f $@.tmp
+ @touch $@.tmp
$(MAKE) $(AM_MAKEFLAGS) ima-load$(EXEEXT)
- ./$< >$@.tmp
- cp -f $@.tmp $@
- rm -f $@.tmp
-
-$(srcdir)/outputs/ima-save.txt: examples/ima-save.cc
- rm -f $@.tmp
+ ./ima-load$(EXEEXT) >$(srcdir)/outputs/ima-load.txt.tmp
+ mv $(srcdir)/outputs/ima-load.txt.tmp $(srcdir)/outputs/ima-load.txt
+ @mv -f $@.tmp $@
+EXTRA_DIST += $(srcdir)/examples/ima-load.stamp
+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) $<; \
+ fi
+
+
+$(srcdir)/examples/ima-save.stamp: examples/ima-save.cc
+ @rm -f $@.tmp
+ @touch $@.tmp
$(MAKE) $(AM_MAKEFLAGS) ima-save$(EXEEXT)
- ./$< >$@.tmp
- cp -f $@.tmp $@
- rm -f $@.tmp
-
-$(srcdir)/outputs/ima-size.txt: examples/ima-size.cc
- rm -f $@.tmp
+ ./ima-save$(EXEEXT) >$(srcdir)/outputs/ima-save.txt.tmp
+ mv $(srcdir)/outputs/ima-save.txt.tmp $(srcdir)/outputs/ima-save.txt
+ @mv -f $@.tmp $@
+EXTRA_DIST += $(srcdir)/examples/ima-save.stamp
+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) $<; \
+ fi
+
+
+$(srcdir)/examples/ima-size.stamp: examples/ima-size.cc
+ @rm -f $@.tmp
+ @touch $@.tmp
$(MAKE) $(AM_MAKEFLAGS) ima-size$(EXEEXT)
- ./$< >$@.tmp
- cp -f $@.tmp $@
- rm -f $@.tmp
-
-$(srcdir)/outputs/ima2d-1.txt: examples/ima2d-1.cc
- rm -f $@.tmp
+ ./ima-size$(EXEEXT) >$(srcdir)/outputs/ima-size.txt.tmp
+ mv $(srcdir)/outputs/ima-size.txt.tmp $(srcdir)/outputs/ima-size.txt
+ @mv -f $@.tmp $@
+EXTRA_DIST += $(srcdir)/examples/ima-size.stamp
+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) $<; \
+ fi
+
+
+$(srcdir)/examples/ima2d-1.stamp: examples/ima2d-1.cc
+ @rm -f $@.tmp
+ @touch $@.tmp
$(MAKE) $(AM_MAKEFLAGS) ima2d-1$(EXEEXT)
- ./$< >$@.tmp
- cp -f $@.tmp $@
- rm -f $@.tmp
-
-$(srcdir)/outputs/ima2d-2.txt: examples/ima2d-2.cc
- rm -f $@.tmp
+ ./ima2d-1$(EXEEXT) >$(srcdir)/outputs/ima2d-1.txt.tmp
+ mv $(srcdir)/outputs/ima2d-1.txt.tmp $(srcdir)/outputs/ima2d-1.txt
+ @mv -f $@.tmp $@
+EXTRA_DIST += $(srcdir)/examples/ima2d-1.stamp
+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) $<; \
+ fi
+
+
+$(srcdir)/examples/ima2d-2.stamp: examples/ima2d-2.cc
+ @rm -f $@.tmp
+ @touch $@.tmp
$(MAKE) $(AM_MAKEFLAGS) ima2d-2$(EXEEXT)
- ./$< >$@.tmp
- cp -f $@.tmp $@
- rm -f $@.tmp
-
-$(srcdir)/outputs/ima2d-3.txt: examples/ima2d-3.cc
- rm -f $@.tmp
+ ./ima2d-2$(EXEEXT) >$(srcdir)/outputs/ima2d-2.txt.tmp
+ mv $(srcdir)/outputs/ima2d-2.txt.tmp $(srcdir)/outputs/ima2d-2.txt
+ @mv -f $@.tmp $@
+EXTRA_DIST += $(srcdir)/examples/ima2d-2.stamp
+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) $<; \
+ fi
+
+
+$(srcdir)/examples/ima2d-3.stamp: examples/ima2d-3.cc
+ @rm -f $@.tmp
+ @touch $@.tmp
$(MAKE) $(AM_MAKEFLAGS) ima2d-3$(EXEEXT)
- ./$< >$@.tmp
- cp -f $@.tmp $@
- rm -f $@.tmp
-
-$(srcdir)/outputs/ima2d-4.txt: examples/ima2d-4.cc
- rm -f $@.tmp
+ ./ima2d-3$(EXEEXT) >$(srcdir)/outputs/ima2d-3.txt.tmp
+ mv $(srcdir)/outputs/ima2d-3.txt.tmp $(srcdir)/outputs/ima2d-3.txt
+ @mv -f $@.tmp $@
+EXTRA_DIST += $(srcdir)/examples/ima2d-3.stamp
+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) $<; \
+ fi
+
+
+$(srcdir)/examples/ima2d-4.stamp: examples/ima2d-4.cc
+ @rm -f $@.tmp
+ @touch $@.tmp
$(MAKE) $(AM_MAKEFLAGS) ima2d-4$(EXEEXT)
- ./$< >$@.tmp
- cp -f $@.tmp $@
- rm -f $@.tmp
-
-$(srcdir)/outputs/ima2d-5.txt: examples/ima2d-5.cc
- rm -f $@.tmp
+ ./ima2d-4$(EXEEXT) >$(srcdir)/outputs/ima2d-4.txt.tmp
+ mv $(srcdir)/outputs/ima2d-4.txt.tmp $(srcdir)/outputs/ima2d-4.txt
+ @mv -f $@.tmp $@
+EXTRA_DIST += $(srcdir)/examples/ima2d-4.stamp
+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) $<; \
+ fi
+
+
+$(srcdir)/examples/ima2d-5.stamp: examples/ima2d-5.cc
+ @rm -f $@.tmp
+ @touch $@.tmp
$(MAKE) $(AM_MAKEFLAGS) ima2d-5$(EXEEXT)
- ./$< >$@.tmp
- cp -f $@.tmp $@
- rm -f $@.tmp
-
-$(srcdir)/outputs/ima2d-6-clone.txt: examples/ima2d-6-clone.cc
- rm -f $@.tmp
+ ./ima2d-5$(EXEEXT) >$(srcdir)/outputs/ima2d-5.txt.tmp
+ mv $(srcdir)/outputs/ima2d-5.txt.tmp $(srcdir)/outputs/ima2d-5.txt
+ @mv -f $@.tmp $@
+EXTRA_DIST += $(srcdir)/examples/ima2d-5.stamp
+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) $<; \
+ fi
+
+
+$(srcdir)/examples/ima2d-6-clone.stamp: examples/ima2d-6-clone.cc
+ @rm -f $@.tmp
+ @touch $@.tmp
$(MAKE) $(AM_MAKEFLAGS) ima2d-6-clone$(EXEEXT)
- ./$< >$@.tmp
- cp -f $@.tmp $@
- rm -f $@.tmp
-
-$(srcdir)/outputs/ima2d-7.txt: examples/ima2d-7.cc
- rm -f $@.tmp
+ ./ima2d-6-clone$(EXEEXT) >$(srcdir)/outputs/ima2d-6-clone.txt.tmp
+ mv $(srcdir)/outputs/ima2d-6-clone.txt.tmp $(srcdir)/outputs/ima2d-6-clone.txt
+ @mv -f $@.tmp $@
+EXTRA_DIST += $(srcdir)/examples/ima2d-6-clone.stamp
+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) $<; \
+ fi
+
+
+$(srcdir)/examples/ima2d-7.stamp: examples/ima2d-7.cc
+ @rm -f $@.tmp
+ @touch $@.tmp
$(MAKE) $(AM_MAKEFLAGS) ima2d-7$(EXEEXT)
- ./$< >$@.tmp
- cp -f $@.tmp $@
- rm -f $@.tmp
-
-$(srcdir)/outputs/ima2d-rot.txt: examples/ima2d-rot.cc
- rm -f $@.tmp
+ ./ima2d-7$(EXEEXT) >$(srcdir)/outputs/ima2d-7.txt.tmp
+ mv $(srcdir)/outputs/ima2d-7.txt.tmp $(srcdir)/outputs/ima2d-7.txt
+ @mv -f $@.tmp $@
+EXTRA_DIST += $(srcdir)/examples/ima2d-7.stamp
+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) $<; \
+ fi
+
+
+$(srcdir)/examples/ima2d-rot.stamp: examples/ima2d-rot.cc
+ @rm -f $@.tmp
+ @touch $@.tmp
$(MAKE) $(AM_MAKEFLAGS) ima2d-rot$(EXEEXT)
- ./$< >$@.tmp
- cp -f $@.tmp $@
- rm -f $@.tmp
-
-$(srcdir)/outputs/labeling-compute.txt: examples/labeling-compute.cc
- rm -f $@.tmp
+ ./ima2d-rot$(EXEEXT) >$(srcdir)/outputs/ima2d-rot.txt.tmp
+ mv $(srcdir)/outputs/ima2d-rot.txt.tmp $(srcdir)/outputs/ima2d-rot.txt
+ @mv -f $@.tmp $@
+EXTRA_DIST += $(srcdir)/examples/ima2d-rot.stamp
+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) $<; \
+ fi
+
+
+$(srcdir)/examples/labeling-compute.stamp: examples/labeling-compute.cc
+ @rm -f $@.tmp
+ @touch $@.tmp
$(MAKE) $(AM_MAKEFLAGS) labeling-compute$(EXEEXT)
- ./$< >$@.tmp
- cp -f $@.tmp $@
- rm -f $@.tmp
-
-$(srcdir)/outputs/logical-not.txt: examples/logical-not.cc
- rm -f $@.tmp
+ ./labeling-compute$(EXEEXT) >$(srcdir)/outputs/labeling-compute.txt.tmp
+ mv $(srcdir)/outputs/labeling-compute.txt.tmp $(srcdir)/outputs/labeling-compute.txt
+ @mv -f $@.tmp $@
+EXTRA_DIST += $(srcdir)/examples/labeling-compute.stamp
+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) $<; \
+ fi
+
+
+$(srcdir)/examples/logical-not.stamp: examples/logical-not.cc
+ @rm -f $@.tmp
+ @touch $@.tmp
$(MAKE) $(AM_MAKEFLAGS) logical-not$(EXEEXT)
- ./$< >$@.tmp
- cp -f $@.tmp $@
- rm -f $@.tmp
-
-$(srcdir)/outputs/mln_var.txt: examples/mln_var.cc
- rm -f $@.tmp
+ ./logical-not$(EXEEXT) >$(srcdir)/outputs/logical-not.txt.tmp
+ mv $(srcdir)/outputs/logical-not.txt.tmp $(srcdir)/outputs/logical-not.txt
+ @mv -f $@.tmp $@
+EXTRA_DIST += $(srcdir)/examples/logical-not.stamp
+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) $<; \
+ fi
+
+
+$(srcdir)/examples/mln_var.stamp: examples/mln_var.cc
+ @rm -f $@.tmp
+ @touch $@.tmp
$(MAKE) $(AM_MAKEFLAGS) mln_var$(EXEEXT)
- ./$< >$@.tmp
- cp -f $@.tmp $@
- rm -f $@.tmp
-
-$(srcdir)/outputs/parray-append.txt: examples/parray-append.cc
- rm -f $@.tmp
+ ./mln_var$(EXEEXT) >$(srcdir)/outputs/mln_var.txt.tmp
+ mv $(srcdir)/outputs/mln_var.txt.tmp $(srcdir)/outputs/mln_var.txt
+ @mv -f $@.tmp $@
+EXTRA_DIST += $(srcdir)/examples/mln_var.stamp
+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) $<; \
+ fi
+
+
+$(srcdir)/examples/parray-append.stamp: examples/parray-append.cc
+ @rm -f $@.tmp
+ @touch $@.tmp
$(MAKE) $(AM_MAKEFLAGS) parray-append$(EXEEXT)
- ./$< >$@.tmp
- cp -f $@.tmp $@
- rm -f $@.tmp
-
-$(srcdir)/outputs/parray-bbox.txt: examples/parray-bbox.cc
- rm -f $@.tmp
+ ./parray-append$(EXEEXT) >$(srcdir)/outputs/parray-append.txt.tmp
+ mv $(srcdir)/outputs/parray-append.txt.tmp $(srcdir)/outputs/parray-append.txt
+ @mv -f $@.tmp $@
+EXTRA_DIST += $(srcdir)/examples/parray-append.stamp
+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) $<; \
+ fi
+
+
+$(srcdir)/examples/parray-bbox.stamp: examples/parray-bbox.cc
+ @rm -f $@.tmp
+ @touch $@.tmp
$(MAKE) $(AM_MAKEFLAGS) parray-bbox$(EXEEXT)
- ./$< >$@.tmp
- cp -f $@.tmp $@
- rm -f $@.tmp
-
-$(srcdir)/outputs/paste-call-1.txt: examples/paste-call-1.cc
- rm -f $@.tmp
+ ./parray-bbox$(EXEEXT) >$(srcdir)/outputs/parray-bbox.txt.tmp
+ mv $(srcdir)/outputs/parray-bbox.txt.tmp $(srcdir)/outputs/parray-bbox.txt
+ @mv -f $@.tmp $@
+EXTRA_DIST += $(srcdir)/examples/parray-bbox.stamp
+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) $<; \
+ fi
+
+
+$(srcdir)/examples/paste-call-1.stamp: examples/paste-call-1.cc
+ @rm -f $@.tmp
+ @touch $@.tmp
$(MAKE) $(AM_MAKEFLAGS) paste-call-1$(EXEEXT)
- ./$< >$@.tmp
- cp -f $@.tmp $@
- rm -f $@.tmp
-
-$(srcdir)/outputs/paste.txt: examples/paste.cc
- rm -f $@.tmp
+ ./paste-call-1$(EXEEXT) >$(srcdir)/outputs/paste-call-1.txt.tmp
+ mv $(srcdir)/outputs/paste-call-1.txt.tmp $(srcdir)/outputs/paste-call-1.txt
+ @mv -f $@.tmp $@
+EXTRA_DIST += $(srcdir)/examples/paste-call-1.stamp
+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) $<; \
+ fi
+
+
+$(srcdir)/examples/paste.stamp: examples/paste.cc
+ @rm -f $@.tmp
+ @touch $@.tmp
$(MAKE) $(AM_MAKEFLAGS) paste$(EXEEXT)
- ./$< >$@.tmp
- cp -f $@.tmp $@
- rm -f $@.tmp
-
-$(srcdir)/outputs/point-1.txt: examples/point-1.cc
- rm -f $@.tmp
+ ./paste$(EXEEXT) >$(srcdir)/outputs/paste.txt.tmp
+ mv $(srcdir)/outputs/paste.txt.tmp $(srcdir)/outputs/paste.txt
+ @mv -f $@.tmp $@
+EXTRA_DIST += $(srcdir)/examples/paste.stamp
+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) $<; \
+ fi
+
+
+$(srcdir)/examples/point-1.stamp: examples/point-1.cc
+ @rm -f $@.tmp
+ @touch $@.tmp
$(MAKE) $(AM_MAKEFLAGS) point-1$(EXEEXT)
- ./$< >$@.tmp
- cp -f $@.tmp $@
- rm -f $@.tmp
-
-$(srcdir)/outputs/predicate-1.txt: examples/predicate-1.cc
- rm -f $@.tmp
+ ./point-1$(EXEEXT) >$(srcdir)/outputs/point-1.txt.tmp
+ mv $(srcdir)/outputs/point-1.txt.tmp $(srcdir)/outputs/point-1.txt
+ @mv -f $@.tmp $@
+EXTRA_DIST += $(srcdir)/examples/point-1.stamp
+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) $<; \
+ fi
+
+
+$(srcdir)/examples/predicate-1.stamp: examples/predicate-1.cc
+ @rm -f $@.tmp
+ @touch $@.tmp
$(MAKE) $(AM_MAKEFLAGS) predicate-1$(EXEEXT)
- ./$< >$@.tmp
- cp -f $@.tmp $@
- rm -f $@.tmp
-
-$(srcdir)/outputs/tuto2_first_image.txt: examples/tuto2_first_image.cc
- rm -f $@.tmp
+ ./predicate-1$(EXEEXT) >$(srcdir)/outputs/predicate-1.txt.tmp
+ mv $(srcdir)/outputs/predicate-1.txt.tmp $(srcdir)/outputs/predicate-1.txt
+ @mv -f $@.tmp $@
+EXTRA_DIST += $(srcdir)/examples/predicate-1.stamp
+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) $<; \
+ fi
+
+
+$(srcdir)/examples/tuto2_first_image.stamp: examples/tuto2_first_image.cc
+ @rm -f $@.tmp
+ @touch $@.tmp
$(MAKE) $(AM_MAKEFLAGS) tuto2_first_image$(EXEEXT)
- ./$< >$@.tmp
- cp -f $@.tmp $@
- rm -f $@.tmp
-
-$(srcdir)/outputs/colorize.txt: examples/tuto3/colorize.cc
- rm -f $@.tmp
- $(MAKE) $(AM_MAKEFLAGS) colorize$(EXEEXT)
- ./$< >$@.tmp
- cp -f $@.tmp $@
- rm -f $@.tmp
-
-$(srcdir)/outputs/first_routine.txt: examples/tuto3/first_routine.cc
- rm -f $@.tmp
- $(MAKE) $(AM_MAKEFLAGS) first_routine$(EXEEXT)
- ./$< >$@.tmp
- cp -f $@.tmp $@
- rm -f $@.tmp
-
-$(srcdir)/outputs/println.txt: examples/tuto3/println.cc
- rm -f $@.tmp
- $(MAKE) $(AM_MAKEFLAGS) println$(EXEEXT)
- ./$< >$@.tmp
- cp -f $@.tmp $@
- rm -f $@.tmp
-
-$(srcdir)/outputs/trace.txt: examples/tuto3/trace.cc
- rm -f $@.tmp
- $(MAKE) $(AM_MAKEFLAGS) trace$(EXEEXT)
- ./$< >$@.tmp
- cp -f $@.tmp $@
- rm -f $@.tmp
-
-$(srcdir)/outputs/tuto3_rw_image.txt: examples/tuto3_rw_image.cc
- rm -f $@.tmp
+ ./tuto2_first_image$(EXEEXT) >$(srcdir)/outputs/tuto2_first_image.txt.tmp
+ mv $(srcdir)/outputs/tuto2_first_image.txt.tmp $(srcdir)/outputs/tuto2_first_image.txt
+ @mv -f $@.tmp $@
+EXTRA_DIST += $(srcdir)/examples/tuto2_first_image.stamp
+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) $<; \
+ fi
+
+
+$(srcdir)/examples/tuto3/colorize.stamp: examples/tuto3/colorize.cc
+ @rm -f $@.tmp
+ @touch $@.tmp
+ $(MAKE) $(AM_MAKEFLAGS) tuto3_colorize$(EXEEXT)
+ ./tuto3_colorize$(EXEEXT) >$(srcdir)/outputs/tuto3_colorize.txt.tmp
+ mv $(srcdir)/outputs/tuto3_colorize.txt.tmp $(srcdir)/outputs/tuto3_colorize.txt
+ @mv -f $@.tmp $@
+EXTRA_DIST += $(srcdir)/examples/tuto3/colorize.stamp
+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) $<; \
+ fi
+
+
+$(srcdir)/examples/tuto3/first_routine.stamp: examples/tuto3/first_routine.cc
+ @rm -f $@.tmp
+ @touch $@.tmp
+ $(MAKE) $(AM_MAKEFLAGS) tuto3_first_routine$(EXEEXT)
+ ./tuto3_first_routine$(EXEEXT) >$(srcdir)/outputs/tuto3_first_routine.txt.tmp
+ mv $(srcdir)/outputs/tuto3_first_routine.txt.tmp $(srcdir)/outputs/tuto3_first_routine.txt
+ @mv -f $@.tmp $@
+EXTRA_DIST += $(srcdir)/examples/tuto3/first_routine.stamp
+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) $<; \
+ fi
+
+
+$(srcdir)/examples/tuto3/println.stamp: examples/tuto3/println.cc
+ @rm -f $@.tmp
+ @touch $@.tmp
+ $(MAKE) $(AM_MAKEFLAGS) tuto3_println$(EXEEXT)
+ ./tuto3_println$(EXEEXT) >$(srcdir)/outputs/tuto3_println.txt.tmp
+ mv $(srcdir)/outputs/tuto3_println.txt.tmp $(srcdir)/outputs/tuto3_println.txt
+ @mv -f $@.tmp $@
+EXTRA_DIST += $(srcdir)/examples/tuto3/println.stamp
+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) $<; \
+ fi
+
+
+$(srcdir)/examples/tuto3/trace.stamp: examples/tuto3/trace.cc
+ @rm -f $@.tmp
+ @touch $@.tmp
+ $(MAKE) $(AM_MAKEFLAGS) tuto3_trace$(EXEEXT)
+ ./tuto3_trace$(EXEEXT) >$(srcdir)/outputs/tuto3_trace.txt.tmp
+ mv $(srcdir)/outputs/tuto3_trace.txt.tmp $(srcdir)/outputs/tuto3_trace.txt
+ @mv -f $@.tmp $@
+EXTRA_DIST += $(srcdir)/examples/tuto3/trace.stamp
+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) $<; \
+ fi
+
+
+$(srcdir)/examples/tuto3_rw_image.stamp: examples/tuto3_rw_image.cc
+ @rm -f $@.tmp
+ @touch $@.tmp
$(MAKE) $(AM_MAKEFLAGS) tuto3_rw_image$(EXEEXT)
- ./$< >$@.tmp
- cp -f $@.tmp $@
- rm -f $@.tmp
-
-$(srcdir)/outputs/image.txt: examples/tuto4/image.cc
- rm -f $@.tmp
- $(MAKE) $(AM_MAKEFLAGS) image$(EXEEXT)
- ./$< >$@.tmp
- cp -f $@.tmp $@
- rm -f $@.tmp
-
-$(srcdir)/outputs/point2d.txt: examples/tuto4/point2d.cc
- rm -f $@.tmp
- $(MAKE) $(AM_MAKEFLAGS) point2d$(EXEEXT)
- ./$< >$@.tmp
- cp -f $@.tmp $@
- rm -f $@.tmp
-
-$(srcdir)/outputs/site_set_create.txt: examples/tuto4/site_set_create.cc
- rm -f $@.tmp
- $(MAKE) $(AM_MAKEFLAGS) site_set_create$(EXEEXT)
- ./$< >$@.tmp
- cp -f $@.tmp $@
- rm -f $@.tmp
-
-$(srcdir)/outputs/tuto4_genericity_and_algorithms.txt: examples/tuto4_genericity_and_algorithms.cc
- rm -f $@.tmp
+ ./tuto3_rw_image$(EXEEXT) >$(srcdir)/outputs/tuto3_rw_image.txt.tmp
+ mv $(srcdir)/outputs/tuto3_rw_image.txt.tmp $(srcdir)/outputs/tuto3_rw_image.txt
+ @mv -f $@.tmp $@
+EXTRA_DIST += $(srcdir)/examples/tuto3_rw_image.stamp
+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) $<; \
+ fi
+
+
+$(srcdir)/examples/tuto4/image.stamp: examples/tuto4/image.cc
+ @rm -f $@.tmp
+ @touch $@.tmp
+ $(MAKE) $(AM_MAKEFLAGS) tuto4_image$(EXEEXT)
+ ./tuto4_image$(EXEEXT) >$(srcdir)/outputs/tuto4_image.txt.tmp
+ mv $(srcdir)/outputs/tuto4_image.txt.tmp $(srcdir)/outputs/tuto4_image.txt
+ @mv -f $@.tmp $@
+EXTRA_DIST += $(srcdir)/examples/tuto4/image.stamp
+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) $<; \
+ fi
+
+
+$(srcdir)/examples/tuto4/point2d.stamp: examples/tuto4/point2d.cc
+ @rm -f $@.tmp
+ @touch $@.tmp
+ $(MAKE) $(AM_MAKEFLAGS) tuto4_point2d$(EXEEXT)
+ ./tuto4_point2d$(EXEEXT) >$(srcdir)/outputs/tuto4_point2d.txt.tmp
+ mv $(srcdir)/outputs/tuto4_point2d.txt.tmp $(srcdir)/outputs/tuto4_point2d.txt
+ @mv -f $@.tmp $@
+EXTRA_DIST += $(srcdir)/examples/tuto4/point2d.stamp
+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) $<; \
+ fi
+
+
+$(srcdir)/examples/tuto4/site_set_create.stamp: examples/tuto4/site_set_create.cc
+ @rm -f $@.tmp
+ @touch $@.tmp
+ $(MAKE) $(AM_MAKEFLAGS) tuto4_site_set_create$(EXEEXT)
+ ./tuto4_site_set_create$(EXEEXT) >$(srcdir)/outputs/tuto4_site_set_create.txt.tmp
+ mv $(srcdir)/outputs/tuto4_site_set_create.txt.tmp $(srcdir)/outputs/tuto4_site_set_create.txt
+ @mv -f $@.tmp $@
+EXTRA_DIST += $(srcdir)/examples/tuto4/site_set_create.stamp
+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) $<; \
+ fi
+
+
+$(srcdir)/examples/tuto4_genericity_and_algorithms.stamp: examples/tuto4_genericity_and_algorithms.cc
+ @rm -f $@.tmp
+ @touch $@.tmp
$(MAKE) $(AM_MAKEFLAGS) tuto4_genericity_and_algorithms$(EXEEXT)
- ./$< >$@.tmp
- cp -f $@.tmp $@
- rm -f $@.tmp
-
-$(srcdir)/outputs/win-create-1.txt: examples/win-create-1.cc
- rm -f $@.tmp
+ ./tuto4_genericity_and_algorithms$(EXEEXT) >$(srcdir)/outputs/tuto4_genericity_and_algorithms.txt.tmp
+ mv $(srcdir)/outputs/tuto4_genericity_and_algorithms.txt.tmp $(srcdir)/outputs/tuto4_genericity_and_algorithms.txt
+ @mv -f $@.tmp $@
+EXTRA_DIST += $(srcdir)/examples/tuto4_genericity_and_algorithms.stamp
+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) $<; \
+ fi
+
+
+$(srcdir)/examples/win-create-1.stamp: examples/win-create-1.cc
+ @rm -f $@.tmp
+ @touch $@.tmp
$(MAKE) $(AM_MAKEFLAGS) win-create-1$(EXEEXT)
- ./$< >$@.tmp
- cp -f $@.tmp $@
- rm -f $@.tmp
-
-$(srcdir)/outputs/win-create-2.txt: examples/win-create-2.cc
- rm -f $@.tmp
+ ./win-create-1$(EXEEXT) >$(srcdir)/outputs/win-create-1.txt.tmp
+ mv $(srcdir)/outputs/win-create-1.txt.tmp $(srcdir)/outputs/win-create-1.txt
+ @mv -f $@.tmp $@
+EXTRA_DIST += $(srcdir)/examples/win-create-1.stamp
+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) $<; \
+ fi
+
+
+$(srcdir)/examples/win-create-2.stamp: examples/win-create-2.cc
+ @rm -f $@.tmp
+ @touch $@.tmp
$(MAKE) $(AM_MAKEFLAGS) win-create-2$(EXEEXT)
- ./$< >$@.tmp
- cp -f $@.tmp $@
- rm -f $@.tmp
-
+ ./win-create-2$(EXEEXT) >$(srcdir)/outputs/win-create-2.txt.tmp
+ mv $(srcdir)/outputs/win-create-2.txt.tmp $(srcdir)/outputs/win-create-2.txt
+ @mv -f $@.tmp $@
+EXTRA_DIST += $(srcdir)/examples/win-create-2.stamp
+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) $<; \
+ fi
--
1.5.6.5
1
0
last-svn-commit-60-g530dab5 Prepare for the generation of multiple outputs from doc/ programs.
by Roland Levillain 17 Mar '10
by Roland Levillain 17 Mar '10
17 Mar '10
* doc/gen-examples-outputs-mk: Split generated rules in two so
that they produce a timestamp that outputs (and soon generated
figures) depend on.
---
milena/ChangeLog | 8 ++++++
milena/doc/gen-examples-outputs-mk | 48 +++++++++++++++++++++++++++--------
2 files changed, 45 insertions(+), 11 deletions(-)
diff --git a/milena/ChangeLog b/milena/ChangeLog
index 9f7f28b..536253c 100644
--- a/milena/ChangeLog
+++ b/milena/ChangeLog
@@ -1,5 +1,13 @@
2010-03-17 Roland Levillain <roland(a)lrde.epita.fr>
+ Prepare for the generation of multiple outputs from doc/ programs.
+
+ * doc/gen-examples-outputs-mk: Split generated rules in two so
+ that they produce a timestamp that outputs (and soon generated
+ figures) depend on.
+
+2010-03-17 Roland Levillain <roland(a)lrde.epita.fr>
+
Generate doc/examples-outputs.mk using sources in lieu of programs.
* doc/gen-examples-outputs-mk: Take sources as input instead of
diff --git a/milena/doc/gen-examples-outputs-mk b/milena/doc/gen-examples-outputs-mk
index 2580072..440d960 100755
--- a/milena/doc/gen-examples-outputs-mk
+++ b/milena/doc/gen-examples-outputs-mk
@@ -24,22 +24,48 @@ test $# -ne 0 || { echo "usage: $me SOURCES..."; exit 1; }
cat<<EOF
## Generated by $me. Do not edit by hand.
-
EOF
for source; do
- program=`basename "$source" .cc`
- # Have outputs depend on sources rather than programs, and recompile
- # the latter to regen the former only when needed. This way, we can
- # ship generated outputs without forcing the user of the
+ base=`basename "$source" .cc`
+ source_dir=`dirname "$source"`
+ timestamp="\$(srcdir)/$source_dir/$base.stamp"
+ # FIXME: Programs of which sources are located in a subdirectory of
+ # examples/ take the path as prefix of their name. This is a pain.
+ # It'd be much simpler to have all sources in the same directory.
+ canonical_name=`echo "$source" \
+ | sed -e 's,examples/,,' \
+ -e 'y,/,_,' \
+ -e 's,\.cc$,,'`
+ program="$canonical_name\$(EXEEXT)"
+ output="\$(srcdir)/outputs/$canonical_name.txt"
+
+ # Programs generate a textual output, and possibly one or several
+ # images (as a ``side effect''). Use a timestamp to keep track of
+ # these multiple outputs.
+ #
+ # Also, have outputs depend on sources rather than programs, and
+ # recompile the latter to regen the former only when needed. This
+ # way, we can ship generated outputs without forcing the user of the
# distribution to recompile the programs.
cat<<EOF
-\$(srcdir)/outputs/$program.txt: $source
- rm -f \$@.tmp
- \$(MAKE) \$(AM_MAKEFLAGS) $program\$(EXEEXT)
- ./\$< >\$@.tmp
- cp -f \$@.tmp \$@
- rm -f \$@.tmp
+
+$timestamp: $source
+ @rm -f \$@.tmp
+ @touch \$@.tmp
+ \$(MAKE) \$(AM_MAKEFLAGS) $program
+ ./$program >$output.tmp
+ mv $output.tmp $output
+ @mv -f \$@.tmp \$@
+EXTRA_DIST += $timestamp
+MAINTAINERCLEANFILES += $timestamp
+
+$output: $timestamp
+## Recover from the removal of \$@
+ @if test -f \$@; then :; else \\
+ rm -f \$<; \\
+ \$(MAKE) \$(AM_MAKEFLAGS) \$<; \\
+ fi
EOF
done
--
1.5.6.5
1
0
last-svn-commit-67-g365cdb4 Prepare for the generation of multiple outputs from doc/ programs.
by Roland Levillain 17 Mar '10
by Roland Levillain 17 Mar '10
17 Mar '10
* doc/gen-examples-outputs-mk: Split generated rules in two so
that they produce a timestamp that outputs (and soon generated
figures) depend on.
---
milena/ChangeLog | 8 ++++++
milena/doc/gen-examples-outputs-mk | 48 +++++++++++++++++++++++++++--------
2 files changed, 45 insertions(+), 11 deletions(-)
diff --git a/milena/ChangeLog b/milena/ChangeLog
index 2f4606f..19a77c3 100644
--- a/milena/ChangeLog
+++ b/milena/ChangeLog
@@ -1,5 +1,13 @@
2010-03-17 Roland Levillain <roland(a)lrde.epita.fr>
+ Prepare for the generation of multiple outputs from doc/ programs.
+
+ * doc/gen-examples-outputs-mk: Split generated rules in two so
+ that they produce a timestamp that outputs (and soon generated
+ figures) depend on.
+
+2010-03-17 Roland Levillain <roland(a)lrde.epita.fr>
+
Generate doc/examples-outputs.mk using sources in lieu of programs.
* doc/gen-examples-outputs-mk: Take sources as input instead of
diff --git a/milena/doc/gen-examples-outputs-mk b/milena/doc/gen-examples-outputs-mk
index 2580072..440d960 100755
--- a/milena/doc/gen-examples-outputs-mk
+++ b/milena/doc/gen-examples-outputs-mk
@@ -24,22 +24,48 @@ test $# -ne 0 || { echo "usage: $me SOURCES..."; exit 1; }
cat<<EOF
## Generated by $me. Do not edit by hand.
-
EOF
for source; do
- program=`basename "$source" .cc`
- # Have outputs depend on sources rather than programs, and recompile
- # the latter to regen the former only when needed. This way, we can
- # ship generated outputs without forcing the user of the
+ base=`basename "$source" .cc`
+ source_dir=`dirname "$source"`
+ timestamp="\$(srcdir)/$source_dir/$base.stamp"
+ # FIXME: Programs of which sources are located in a subdirectory of
+ # examples/ take the path as prefix of their name. This is a pain.
+ # It'd be much simpler to have all sources in the same directory.
+ canonical_name=`echo "$source" \
+ | sed -e 's,examples/,,' \
+ -e 'y,/,_,' \
+ -e 's,\.cc$,,'`
+ program="$canonical_name\$(EXEEXT)"
+ output="\$(srcdir)/outputs/$canonical_name.txt"
+
+ # Programs generate a textual output, and possibly one or several
+ # images (as a ``side effect''). Use a timestamp to keep track of
+ # these multiple outputs.
+ #
+ # Also, have outputs depend on sources rather than programs, and
+ # recompile the latter to regen the former only when needed. This
+ # way, we can ship generated outputs without forcing the user of the
# distribution to recompile the programs.
cat<<EOF
-\$(srcdir)/outputs/$program.txt: $source
- rm -f \$@.tmp
- \$(MAKE) \$(AM_MAKEFLAGS) $program\$(EXEEXT)
- ./\$< >\$@.tmp
- cp -f \$@.tmp \$@
- rm -f \$@.tmp
+
+$timestamp: $source
+ @rm -f \$@.tmp
+ @touch \$@.tmp
+ \$(MAKE) \$(AM_MAKEFLAGS) $program
+ ./$program >$output.tmp
+ mv $output.tmp $output
+ @mv -f \$@.tmp \$@
+EXTRA_DIST += $timestamp
+MAINTAINERCLEANFILES += $timestamp
+
+$output: $timestamp
+## Recover from the removal of \$@
+ @if test -f \$@; then :; else \\
+ rm -f \$<; \\
+ \$(MAKE) \$(AM_MAKEFLAGS) \$<; \\
+ fi
EOF
done
--
1.5.6.5
1
0
last-svn-commit-58-gef57579 Generate doc/examples-outputs.mk using sources in lieu of programs.
by Roland Levillain 17 Mar '10
by Roland Levillain 17 Mar '10
17 Mar '10
* doc/gen-examples-outputs-mk: Take sources as input instead of
programs.
* doc/examples-outputs.mk: Regen.
* doc/Makefile.am ($(DOC_SRCDIR)/examples-outputs.mk):
Adjust caller.
Use `find' to get inputs instead of relying on
$(PROGRAMS_examples).
Rename target as...
($(srcdir)/examples-outputs.mk): ...this.
Depend only on $(srcdir)/gen-examples-outputs-mk, and no longer on
$(srcdir)/Makefile.am.
(regen-examples-outputs-mk): Adjust as well.
* doc/programs-examples.mk: Adjust comments.
---
milena/ChangeLog | 18 ++++
milena/doc/Makefile.am | 25 ++++--
milena/doc/examples-outputs.mk | 161 +++++++++++++++++++++++++-----------
milena/doc/gen-examples-outputs-mk | 14 ++-
milena/doc/programs-examples.mk | 4 +-
5 files changed, 158 insertions(+), 64 deletions(-)
diff --git a/milena/ChangeLog b/milena/ChangeLog
index 0e52376..9f7f28b 100644
--- a/milena/ChangeLog
+++ b/milena/ChangeLog
@@ -1,5 +1,23 @@
2010-03-17 Roland Levillain <roland(a)lrde.epita.fr>
+ Generate doc/examples-outputs.mk using sources in lieu of programs.
+
+ * doc/gen-examples-outputs-mk: Take sources as input instead of
+ programs.
+ * doc/examples-outputs.mk: Regen.
+ * doc/Makefile.am ($(DOC_SRCDIR)/examples-outputs.mk):
+ Adjust caller.
+ Use `find' to get inputs instead of relying on
+ $(PROGRAMS_examples).
+ Rename target as...
+ ($(srcdir)/examples-outputs.mk): ...this.
+ Depend only on $(srcdir)/gen-examples-outputs-mk, and no longer on
+ $(srcdir)/Makefile.am.
+ (regen-examples-outputs-mk): Adjust as well.
+ * doc/programs-examples.mk: Adjust comments.
+
+2010-03-17 Roland Levillain <roland(a)lrde.epita.fr>
+
Move bits about programs out of doc/Makefile.am to improve readability.
* doc/Makefile.am (PROGRAMS_examples)
diff --git a/milena/doc/Makefile.am b/milena/doc/Makefile.am
index 303b97f..6e2822f 100644
--- a/milena/doc/Makefile.am
+++ b/milena/doc/Makefile.am
@@ -909,19 +909,28 @@ MORE_OUTPUTS = \
$(srcdir)/outputs/parray-display-1.txt \
$(srcdir)/outputs/win-create-1-display.txt
-$(DOC_SRCDIR)/examples-outputs.mk: $(DOC_SRCDIR)/gen-examples-outputs-mk $(srcdir)/Makefile.am
- $(DOC_SRCDIR)/gen-examples-outputs-mk $(PROGRAMS_examples) >$@.tmp
+$(srcdir)/examples-outputs.mk: $(srcdir)/gen-examples-outputs-mk
+ rm -f $@.tmp
+# Ignore sources in examples/trash/.
+ cd $(srcdir) && \
+ ./gen-examples-outputs-mk \
+ `find examples -name \*.cc -a \! -path examples/trash/\* \
+ | env LC_ALL=C sort` \
+ >examples-outputs.mk.tmp
mv -f $@.tmp $@
chmod -w $@
-include $(DOC_SRCDIR)/examples-outputs.mk
+include $(srcdir)/examples-outputs.mk
.PHONY: regen-examples-outputs-mk
regen-examples-outputs-mk:
- $(DOC_SRCDIR)/gen-examples-outputs-mk $(PROGRAMS_examples) \
- >$(DOC_SRCDIR)/examples-outputs.mk.tmp
- mv -f $(DOC_SRCDIR)/examples-outputs.mk.tmp \
- $(DOC_SRCDIR)/examples-outputs.mk
- chmod -w $(DOC_SRCDIR)/examples-outputs.mk
+ rm -f $(srcdir)/examples-outputs.mk.tmp
+ cd $(srcdir) && \
+ ./gen-examples-outputs-mk \
+ `find examples -name \*.cc -a \! -path examples/trash/\* \
+ | env LC_ALL=C sort` \
+ >examples-outputs.mk.tmp
+ mv -f $(srcdir)/examples-outputs.mk.tmp $(srcdir)/examples-outputs.mk
+ chmod -w $(srcdir)/examples-outputs.mk
MAINTAINERCLEANFILES += $(OUTPUTS)
diff --git a/milena/doc/examples-outputs.mk b/milena/doc/examples-outputs.mk
index 6fdb543..f70feca 100644
--- a/milena/doc/examples-outputs.mk
+++ b/milena/doc/examples-outputs.mk
@@ -1,295 +1,358 @@
## Generated by gen-examples-outputs-mk. Do not edit by hand.
-$(srcdir)/outputs/accu-right-instanciation.txt: accu-right-instanciation$(EXEEXT)
+$(srcdir)/outputs/accu-right-instanciation.txt: examples/accu-right-instanciation.cc
rm -f $@.tmp
+ $(MAKE) $(AM_MAKEFLAGS) accu-right-instanciation$(EXEEXT)
./$< >$@.tmp
cp -f $@.tmp $@
rm -f $@.tmp
-$(srcdir)/outputs/borderthickness.txt: borderthickness$(EXEEXT)
+$(srcdir)/outputs/borderthickness.txt: examples/borderthickness.cc
rm -f $@.tmp
+ $(MAKE) $(AM_MAKEFLAGS) borderthickness$(EXEEXT)
./$< >$@.tmp
cp -f $@.tmp $@
rm -f $@.tmp
-$(srcdir)/outputs/box2d-bbox.txt: box2d-bbox$(EXEEXT)
+$(srcdir)/outputs/box2d-bbox.txt: examples/box2d-bbox.cc
rm -f $@.tmp
+ $(MAKE) $(AM_MAKEFLAGS) box2d-bbox$(EXEEXT)
./$< >$@.tmp
cp -f $@.tmp $@
rm -f $@.tmp
-$(srcdir)/outputs/domain-display.txt: domain-display$(EXEEXT)
+$(srcdir)/outputs/domain-display.txt: examples/domain-display.cc
rm -f $@.tmp
+ $(MAKE) $(AM_MAKEFLAGS) domain-display$(EXEEXT)
./$< >$@.tmp
cp -f $@.tmp $@
rm -f $@.tmp
-$(srcdir)/outputs/dpoint-1.txt: dpoint-1$(EXEEXT)
+$(srcdir)/outputs/dpoint-1.txt: examples/dpoint-1.cc
rm -f $@.tmp
+ $(MAKE) $(AM_MAKEFLAGS) dpoint-1$(EXEEXT)
./$< >$@.tmp
cp -f $@.tmp $@
rm -f $@.tmp
-$(srcdir)/outputs/estim-sites.txt: estim-sites$(EXEEXT)
+$(srcdir)/outputs/estim-sites.txt: examples/estim-sites.cc
rm -f $@.tmp
+ $(MAKE) $(AM_MAKEFLAGS) estim-sites$(EXEEXT)
./$< >$@.tmp
cp -f $@.tmp $@
rm -f $@.tmp
-$(srcdir)/outputs/extend.txt: extend$(EXEEXT)
+$(srcdir)/outputs/extend.txt: examples/extend.cc
rm -f $@.tmp
+ $(MAKE) $(AM_MAKEFLAGS) extend$(EXEEXT)
./$< >$@.tmp
cp -f $@.tmp $@
rm -f $@.tmp
-$(srcdir)/outputs/extension-ignore.txt: extension-ignore$(EXEEXT)
+$(srcdir)/outputs/extension-ignore.txt: examples/extension-ignore.cc
rm -f $@.tmp
+ $(MAKE) $(AM_MAKEFLAGS) extension-ignore$(EXEEXT)
./$< >$@.tmp
cp -f $@.tmp $@
rm -f $@.tmp
-$(srcdir)/outputs/fill.txt: fill$(EXEEXT)
+$(srcdir)/outputs/fill-call-1.txt: examples/fill-call-1.cc
rm -f $@.tmp
+ $(MAKE) $(AM_MAKEFLAGS) fill-call-1$(EXEEXT)
./$< >$@.tmp
cp -f $@.tmp $@
rm -f $@.tmp
-$(srcdir)/outputs/fill-call-1.txt: fill-call-1$(EXEEXT)
+$(srcdir)/outputs/fill-imageif-cfun.txt: examples/fill-imageif-cfun.cc
rm -f $@.tmp
+ $(MAKE) $(AM_MAKEFLAGS) fill-imageif-cfun$(EXEEXT)
./$< >$@.tmp
cp -f $@.tmp $@
rm -f $@.tmp
-$(srcdir)/outputs/fill-imageif-cfun.txt: fill-imageif-cfun$(EXEEXT)
+$(srcdir)/outputs/fill-part-image.txt: examples/fill-part-image.cc
rm -f $@.tmp
+ $(MAKE) $(AM_MAKEFLAGS) fill-part-image$(EXEEXT)
./$< >$@.tmp
cp -f $@.tmp $@
rm -f $@.tmp
-$(srcdir)/outputs/fill-part-image.txt: fill-part-image$(EXEEXT)
+$(srcdir)/outputs/fill-subdomain-shorter.txt: examples/fill-subdomain-shorter.cc
rm -f $@.tmp
+ $(MAKE) $(AM_MAKEFLAGS) fill-subdomain-shorter$(EXEEXT)
./$< >$@.tmp
cp -f $@.tmp $@
rm -f $@.tmp
-$(srcdir)/outputs/fill-subdomain.txt: fill-subdomain$(EXEEXT)
+$(srcdir)/outputs/fill-subdomain.txt: examples/fill-subdomain.cc
rm -f $@.tmp
+ $(MAKE) $(AM_MAKEFLAGS) fill-subdomain$(EXEEXT)
./$< >$@.tmp
cp -f $@.tmp $@
rm -f $@.tmp
-$(srcdir)/outputs/fill-subdomain-shorter.txt: fill-subdomain-shorter$(EXEEXT)
+$(srcdir)/outputs/fill.txt: examples/fill.cc
rm -f $@.tmp
+ $(MAKE) $(AM_MAKEFLAGS) fill$(EXEEXT)
./$< >$@.tmp
cp -f $@.tmp $@
rm -f $@.tmp
-$(srcdir)/outputs/first_routine.txt: first_routine$(EXEEXT)
+$(srcdir)/outputs/forall-piter.txt: examples/forall-piter.cc
rm -f $@.tmp
+ $(MAKE) $(AM_MAKEFLAGS) forall-piter$(EXEEXT)
./$< >$@.tmp
cp -f $@.tmp $@
rm -f $@.tmp
-$(srcdir)/outputs/forall-piter.txt: forall-piter$(EXEEXT)
+$(srcdir)/outputs/fun-p2v-1.txt: examples/fun-p2v-1.cc
rm -f $@.tmp
+ $(MAKE) $(AM_MAKEFLAGS) fun-p2v-1$(EXEEXT)
./$< >$@.tmp
cp -f $@.tmp $@
rm -f $@.tmp
-$(srcdir)/outputs/fun-p2v-1.txt: fun-p2v-1$(EXEEXT)
+$(srcdir)/outputs/graph-data.txt: examples/graph-data.cc
rm -f $@.tmp
+ $(MAKE) $(AM_MAKEFLAGS) graph-data$(EXEEXT)
./$< >$@.tmp
cp -f $@.tmp $@
rm -f $@.tmp
-$(srcdir)/outputs/graph-data.txt: graph-data$(EXEEXT)
+$(srcdir)/outputs/graph-iter.txt: examples/graph-iter.cc
rm -f $@.tmp
+ $(MAKE) $(AM_MAKEFLAGS) graph-iter$(EXEEXT)
./$< >$@.tmp
cp -f $@.tmp $@
rm -f $@.tmp
-$(srcdir)/outputs/graph-iter.txt: graph-iter$(EXEEXT)
+$(srcdir)/outputs/ima-has.txt: examples/ima-has.cc
rm -f $@.tmp
+ $(MAKE) $(AM_MAKEFLAGS) ima-has$(EXEEXT)
./$< >$@.tmp
cp -f $@.tmp $@
rm -f $@.tmp
-$(srcdir)/outputs/ima-has.txt: ima-has$(EXEEXT)
+$(srcdir)/outputs/ima-load.txt: examples/ima-load.cc
rm -f $@.tmp
+ $(MAKE) $(AM_MAKEFLAGS) ima-load$(EXEEXT)
./$< >$@.tmp
cp -f $@.tmp $@
rm -f $@.tmp
-$(srcdir)/outputs/ima-save.txt: ima-save$(EXEEXT)
+$(srcdir)/outputs/ima-save.txt: examples/ima-save.cc
rm -f $@.tmp
+ $(MAKE) $(AM_MAKEFLAGS) ima-save$(EXEEXT)
./$< >$@.tmp
cp -f $@.tmp $@
rm -f $@.tmp
-$(srcdir)/outputs/ima-size.txt: ima-size$(EXEEXT)
+$(srcdir)/outputs/ima-size.txt: examples/ima-size.cc
rm -f $@.tmp
+ $(MAKE) $(AM_MAKEFLAGS) ima-size$(EXEEXT)
./$< >$@.tmp
cp -f $@.tmp $@
rm -f $@.tmp
-$(srcdir)/outputs/ima2d-1.txt: ima2d-1$(EXEEXT)
+$(srcdir)/outputs/ima2d-1.txt: examples/ima2d-1.cc
rm -f $@.tmp
+ $(MAKE) $(AM_MAKEFLAGS) ima2d-1$(EXEEXT)
./$< >$@.tmp
cp -f $@.tmp $@
rm -f $@.tmp
-$(srcdir)/outputs/ima2d-2.txt: ima2d-2$(EXEEXT)
+$(srcdir)/outputs/ima2d-2.txt: examples/ima2d-2.cc
rm -f $@.tmp
+ $(MAKE) $(AM_MAKEFLAGS) ima2d-2$(EXEEXT)
./$< >$@.tmp
cp -f $@.tmp $@
rm -f $@.tmp
-$(srcdir)/outputs/ima2d-3.txt: ima2d-3$(EXEEXT)
+$(srcdir)/outputs/ima2d-3.txt: examples/ima2d-3.cc
rm -f $@.tmp
+ $(MAKE) $(AM_MAKEFLAGS) ima2d-3$(EXEEXT)
./$< >$@.tmp
cp -f $@.tmp $@
rm -f $@.tmp
-$(srcdir)/outputs/ima2d-4.txt: ima2d-4$(EXEEXT)
+$(srcdir)/outputs/ima2d-4.txt: examples/ima2d-4.cc
rm -f $@.tmp
+ $(MAKE) $(AM_MAKEFLAGS) ima2d-4$(EXEEXT)
./$< >$@.tmp
cp -f $@.tmp $@
rm -f $@.tmp
-$(srcdir)/outputs/ima2d-5.txt: ima2d-5$(EXEEXT)
+$(srcdir)/outputs/ima2d-5.txt: examples/ima2d-5.cc
rm -f $@.tmp
+ $(MAKE) $(AM_MAKEFLAGS) ima2d-5$(EXEEXT)
./$< >$@.tmp
cp -f $@.tmp $@
rm -f $@.tmp
-$(srcdir)/outputs/ima2d-6-clone.txt: ima2d-6-clone$(EXEEXT)
+$(srcdir)/outputs/ima2d-6-clone.txt: examples/ima2d-6-clone.cc
rm -f $@.tmp
+ $(MAKE) $(AM_MAKEFLAGS) ima2d-6-clone$(EXEEXT)
./$< >$@.tmp
cp -f $@.tmp $@
rm -f $@.tmp
-$(srcdir)/outputs/ima2d-7.txt: ima2d-7$(EXEEXT)
+$(srcdir)/outputs/ima2d-7.txt: examples/ima2d-7.cc
rm -f $@.tmp
+ $(MAKE) $(AM_MAKEFLAGS) ima2d-7$(EXEEXT)
./$< >$@.tmp
cp -f $@.tmp $@
rm -f $@.tmp
-$(srcdir)/outputs/ima2d-rot.txt: ima2d-rot$(EXEEXT)
+$(srcdir)/outputs/ima2d-rot.txt: examples/ima2d-rot.cc
rm -f $@.tmp
+ $(MAKE) $(AM_MAKEFLAGS) ima2d-rot$(EXEEXT)
./$< >$@.tmp
cp -f $@.tmp $@
rm -f $@.tmp
-$(srcdir)/outputs/labeling-compute.txt: labeling-compute$(EXEEXT)
+$(srcdir)/outputs/labeling-compute.txt: examples/labeling-compute.cc
rm -f $@.tmp
+ $(MAKE) $(AM_MAKEFLAGS) labeling-compute$(EXEEXT)
./$< >$@.tmp
cp -f $@.tmp $@
rm -f $@.tmp
-$(srcdir)/outputs/logical-not.txt: logical-not$(EXEEXT)
+$(srcdir)/outputs/logical-not.txt: examples/logical-not.cc
rm -f $@.tmp
+ $(MAKE) $(AM_MAKEFLAGS) logical-not$(EXEEXT)
./$< >$@.tmp
cp -f $@.tmp $@
rm -f $@.tmp
-$(srcdir)/outputs/mln_var.txt: mln_var$(EXEEXT)
+$(srcdir)/outputs/mln_var.txt: examples/mln_var.cc
rm -f $@.tmp
+ $(MAKE) $(AM_MAKEFLAGS) mln_var$(EXEEXT)
./$< >$@.tmp
cp -f $@.tmp $@
rm -f $@.tmp
-$(srcdir)/outputs/parray-append.txt: parray-append$(EXEEXT)
+$(srcdir)/outputs/parray-append.txt: examples/parray-append.cc
rm -f $@.tmp
+ $(MAKE) $(AM_MAKEFLAGS) parray-append$(EXEEXT)
./$< >$@.tmp
cp -f $@.tmp $@
rm -f $@.tmp
-$(srcdir)/outputs/parray-bbox.txt: parray-bbox$(EXEEXT)
+$(srcdir)/outputs/parray-bbox.txt: examples/parray-bbox.cc
rm -f $@.tmp
+ $(MAKE) $(AM_MAKEFLAGS) parray-bbox$(EXEEXT)
./$< >$@.tmp
cp -f $@.tmp $@
rm -f $@.tmp
-$(srcdir)/outputs/paste.txt: paste$(EXEEXT)
+$(srcdir)/outputs/paste-call-1.txt: examples/paste-call-1.cc
rm -f $@.tmp
+ $(MAKE) $(AM_MAKEFLAGS) paste-call-1$(EXEEXT)
./$< >$@.tmp
cp -f $@.tmp $@
rm -f $@.tmp
-$(srcdir)/outputs/paste-call-1.txt: paste-call-1$(EXEEXT)
+$(srcdir)/outputs/paste.txt: examples/paste.cc
rm -f $@.tmp
+ $(MAKE) $(AM_MAKEFLAGS) paste$(EXEEXT)
./$< >$@.tmp
cp -f $@.tmp $@
rm -f $@.tmp
-$(srcdir)/outputs/point-1.txt: point-1$(EXEEXT)
+$(srcdir)/outputs/point-1.txt: examples/point-1.cc
rm -f $@.tmp
+ $(MAKE) $(AM_MAKEFLAGS) point-1$(EXEEXT)
./$< >$@.tmp
cp -f $@.tmp $@
rm -f $@.tmp
-$(srcdir)/outputs/predicate-1.txt: predicate-1$(EXEEXT)
+$(srcdir)/outputs/predicate-1.txt: examples/predicate-1.cc
rm -f $@.tmp
+ $(MAKE) $(AM_MAKEFLAGS) predicate-1$(EXEEXT)
./$< >$@.tmp
cp -f $@.tmp $@
rm -f $@.tmp
-$(srcdir)/outputs/win-create-1.txt: win-create-1$(EXEEXT)
+$(srcdir)/outputs/tuto2_first_image.txt: examples/tuto2_first_image.cc
rm -f $@.tmp
+ $(MAKE) $(AM_MAKEFLAGS) tuto2_first_image$(EXEEXT)
./$< >$@.tmp
cp -f $@.tmp $@
rm -f $@.tmp
-$(srcdir)/outputs/win-create-2.txt: win-create-2$(EXEEXT)
+$(srcdir)/outputs/colorize.txt: examples/tuto3/colorize.cc
rm -f $@.tmp
+ $(MAKE) $(AM_MAKEFLAGS) colorize$(EXEEXT)
./$< >$@.tmp
cp -f $@.tmp $@
rm -f $@.tmp
-$(srcdir)/outputs/tuto2_first_image.txt: tuto2_first_image$(EXEEXT)
+$(srcdir)/outputs/first_routine.txt: examples/tuto3/first_routine.cc
rm -f $@.tmp
+ $(MAKE) $(AM_MAKEFLAGS) first_routine$(EXEEXT)
./$< >$@.tmp
cp -f $@.tmp $@
rm -f $@.tmp
-$(srcdir)/outputs/tuto3_rw_image.txt: tuto3_rw_image$(EXEEXT)
+$(srcdir)/outputs/println.txt: examples/tuto3/println.cc
rm -f $@.tmp
+ $(MAKE) $(AM_MAKEFLAGS) println$(EXEEXT)
./$< >$@.tmp
cp -f $@.tmp $@
rm -f $@.tmp
-$(srcdir)/outputs/tuto4_genericity_and_algorithms.txt: tuto4_genericity_and_algorithms$(EXEEXT)
+$(srcdir)/outputs/trace.txt: examples/tuto3/trace.cc
rm -f $@.tmp
+ $(MAKE) $(AM_MAKEFLAGS) trace$(EXEEXT)
./$< >$@.tmp
cp -f $@.tmp $@
rm -f $@.tmp
-$(srcdir)/outputs/tuto3_colorize.txt: tuto3_colorize$(EXEEXT)
+$(srcdir)/outputs/tuto3_rw_image.txt: examples/tuto3_rw_image.cc
rm -f $@.tmp
+ $(MAKE) $(AM_MAKEFLAGS) tuto3_rw_image$(EXEEXT)
./$< >$@.tmp
cp -f $@.tmp $@
rm -f $@.tmp
-$(srcdir)/outputs/tuto3_println.txt: tuto3_println$(EXEEXT)
+$(srcdir)/outputs/image.txt: examples/tuto4/image.cc
rm -f $@.tmp
+ $(MAKE) $(AM_MAKEFLAGS) image$(EXEEXT)
./$< >$@.tmp
cp -f $@.tmp $@
rm -f $@.tmp
-$(srcdir)/outputs/tuto3_trace.txt: tuto3_trace$(EXEEXT)
+$(srcdir)/outputs/point2d.txt: examples/tuto4/point2d.cc
rm -f $@.tmp
+ $(MAKE) $(AM_MAKEFLAGS) point2d$(EXEEXT)
./$< >$@.tmp
cp -f $@.tmp $@
rm -f $@.tmp
-$(srcdir)/outputs/tuto4_point2d.txt: tuto4_point2d$(EXEEXT)
+$(srcdir)/outputs/site_set_create.txt: examples/tuto4/site_set_create.cc
rm -f $@.tmp
+ $(MAKE) $(AM_MAKEFLAGS) site_set_create$(EXEEXT)
./$< >$@.tmp
cp -f $@.tmp $@
rm -f $@.tmp
-$(srcdir)/outputs/tuto4_site_set_create.txt: tuto4_site_set_create$(EXEEXT)
+$(srcdir)/outputs/tuto4_genericity_and_algorithms.txt: examples/tuto4_genericity_and_algorithms.cc
rm -f $@.tmp
+ $(MAKE) $(AM_MAKEFLAGS) tuto4_genericity_and_algorithms$(EXEEXT)
+ ./$< >$@.tmp
+ cp -f $@.tmp $@
+ rm -f $@.tmp
+
+$(srcdir)/outputs/win-create-1.txt: examples/win-create-1.cc
+ rm -f $@.tmp
+ $(MAKE) $(AM_MAKEFLAGS) win-create-1$(EXEEXT)
+ ./$< >$@.tmp
+ cp -f $@.tmp $@
+ rm -f $@.tmp
+
+$(srcdir)/outputs/win-create-2.txt: examples/win-create-2.cc
+ rm -f $@.tmp
+ $(MAKE) $(AM_MAKEFLAGS) win-create-2$(EXEEXT)
./$< >$@.tmp
cp -f $@.tmp $@
rm -f $@.tmp
diff --git a/milena/doc/gen-examples-outputs-mk b/milena/doc/gen-examples-outputs-mk
index 10692a1..2580072 100755
--- a/milena/doc/gen-examples-outputs-mk
+++ b/milena/doc/gen-examples-outputs-mk
@@ -20,17 +20,23 @@
me=`basename $0`
-test $# -ne 0 || { echo "usage: $me PROGRAMS..."; exit 1; }
+test $# -ne 0 || { echo "usage: $me SOURCES..."; exit 1; }
cat<<EOF
## Generated by $me. Do not edit by hand.
EOF
-for program; do
-cat<<EOF
-\$(srcdir)/outputs/$program.txt: $program\$(EXEEXT)
+for source; do
+ program=`basename "$source" .cc`
+ # Have outputs depend on sources rather than programs, and recompile
+ # the latter to regen the former only when needed. This way, we can
+ # ship generated outputs without forcing the user of the
+ # distribution to recompile the programs.
+ cat<<EOF
+\$(srcdir)/outputs/$program.txt: $source
rm -f \$@.tmp
+ \$(MAKE) \$(AM_MAKEFLAGS) $program\$(EXEEXT)
./\$< >\$@.tmp
cp -f \$@.tmp \$@
rm -f \$@.tmp
diff --git a/milena/doc/programs-examples.mk b/milena/doc/programs-examples.mk
index b75152b..4a38dd3 100644
--- a/milena/doc/programs-examples.mk
+++ b/milena/doc/programs-examples.mk
@@ -20,9 +20,7 @@
## generation of examples-outputs.mk depends only on this file, instead
## of Makefile.am.
-## FIXME: Generate this file? Probably a good idea. If so, we
-## probably won't need to have examples-outputs.mk depend on it (which
-## will simplify the regen calling sequence in bootstrap as well).
+## FIXME: Generate this file? Probably a good idea.
##
## If generated, merge examples-outputs.mk and outputs.mk?
--
1.5.6.5
1
0
last-svn-commit-65-g3b9b30f Generate doc/examples-outputs.mk using sources in lieu of programs.
by Roland Levillain 17 Mar '10
by Roland Levillain 17 Mar '10
17 Mar '10
* doc/gen-examples-outputs-mk: Take sources as input instead of
programs.
* doc/examples-outputs.mk: Regen.
* doc/Makefile.am ($(DOC_SRCDIR)/examples-outputs.mk):
Adjust caller.
Use `find' to get inputs instead of relying on
$(PROGRAMS_examples).
Rename target as...
($(srcdir)/examples-outputs.mk): ...this.
Depend only on $(srcdir)/gen-examples-outputs-mk, and no longer on
$(srcdir)/Makefile.am.
(regen-examples-outputs-mk): Adjust as well.
* doc/programs-examples.mk: Adjust comments.
---
milena/ChangeLog | 18 ++++
milena/doc/Makefile.am | 25 ++++--
milena/doc/examples-outputs.mk | 161 +++++++++++++++++++++++++-----------
milena/doc/gen-examples-outputs-mk | 14 ++-
milena/doc/programs-examples.mk | 4 +-
5 files changed, 158 insertions(+), 64 deletions(-)
diff --git a/milena/ChangeLog b/milena/ChangeLog
index 7d50a30..2f4606f 100644
--- a/milena/ChangeLog
+++ b/milena/ChangeLog
@@ -1,5 +1,23 @@
2010-03-17 Roland Levillain <roland(a)lrde.epita.fr>
+ Generate doc/examples-outputs.mk using sources in lieu of programs.
+
+ * doc/gen-examples-outputs-mk: Take sources as input instead of
+ programs.
+ * doc/examples-outputs.mk: Regen.
+ * doc/Makefile.am ($(DOC_SRCDIR)/examples-outputs.mk):
+ Adjust caller.
+ Use `find' to get inputs instead of relying on
+ $(PROGRAMS_examples).
+ Rename target as...
+ ($(srcdir)/examples-outputs.mk): ...this.
+ Depend only on $(srcdir)/gen-examples-outputs-mk, and no longer on
+ $(srcdir)/Makefile.am.
+ (regen-examples-outputs-mk): Adjust as well.
+ * doc/programs-examples.mk: Adjust comments.
+
+2010-03-17 Roland Levillain <roland(a)lrde.epita.fr>
+
Move bits about programs out of doc/Makefile.am to improve readability.
* doc/Makefile.am (PROGRAMS_examples)
diff --git a/milena/doc/Makefile.am b/milena/doc/Makefile.am
index 303b97f..6e2822f 100644
--- a/milena/doc/Makefile.am
+++ b/milena/doc/Makefile.am
@@ -909,19 +909,28 @@ MORE_OUTPUTS = \
$(srcdir)/outputs/parray-display-1.txt \
$(srcdir)/outputs/win-create-1-display.txt
-$(DOC_SRCDIR)/examples-outputs.mk: $(DOC_SRCDIR)/gen-examples-outputs-mk $(srcdir)/Makefile.am
- $(DOC_SRCDIR)/gen-examples-outputs-mk $(PROGRAMS_examples) >$@.tmp
+$(srcdir)/examples-outputs.mk: $(srcdir)/gen-examples-outputs-mk
+ rm -f $@.tmp
+# Ignore sources in examples/trash/.
+ cd $(srcdir) && \
+ ./gen-examples-outputs-mk \
+ `find examples -name \*.cc -a \! -path examples/trash/\* \
+ | env LC_ALL=C sort` \
+ >examples-outputs.mk.tmp
mv -f $@.tmp $@
chmod -w $@
-include $(DOC_SRCDIR)/examples-outputs.mk
+include $(srcdir)/examples-outputs.mk
.PHONY: regen-examples-outputs-mk
regen-examples-outputs-mk:
- $(DOC_SRCDIR)/gen-examples-outputs-mk $(PROGRAMS_examples) \
- >$(DOC_SRCDIR)/examples-outputs.mk.tmp
- mv -f $(DOC_SRCDIR)/examples-outputs.mk.tmp \
- $(DOC_SRCDIR)/examples-outputs.mk
- chmod -w $(DOC_SRCDIR)/examples-outputs.mk
+ rm -f $(srcdir)/examples-outputs.mk.tmp
+ cd $(srcdir) && \
+ ./gen-examples-outputs-mk \
+ `find examples -name \*.cc -a \! -path examples/trash/\* \
+ | env LC_ALL=C sort` \
+ >examples-outputs.mk.tmp
+ mv -f $(srcdir)/examples-outputs.mk.tmp $(srcdir)/examples-outputs.mk
+ chmod -w $(srcdir)/examples-outputs.mk
MAINTAINERCLEANFILES += $(OUTPUTS)
diff --git a/milena/doc/examples-outputs.mk b/milena/doc/examples-outputs.mk
index 6fdb543..f70feca 100644
--- a/milena/doc/examples-outputs.mk
+++ b/milena/doc/examples-outputs.mk
@@ -1,295 +1,358 @@
## Generated by gen-examples-outputs-mk. Do not edit by hand.
-$(srcdir)/outputs/accu-right-instanciation.txt: accu-right-instanciation$(EXEEXT)
+$(srcdir)/outputs/accu-right-instanciation.txt: examples/accu-right-instanciation.cc
rm -f $@.tmp
+ $(MAKE) $(AM_MAKEFLAGS) accu-right-instanciation$(EXEEXT)
./$< >$@.tmp
cp -f $@.tmp $@
rm -f $@.tmp
-$(srcdir)/outputs/borderthickness.txt: borderthickness$(EXEEXT)
+$(srcdir)/outputs/borderthickness.txt: examples/borderthickness.cc
rm -f $@.tmp
+ $(MAKE) $(AM_MAKEFLAGS) borderthickness$(EXEEXT)
./$< >$@.tmp
cp -f $@.tmp $@
rm -f $@.tmp
-$(srcdir)/outputs/box2d-bbox.txt: box2d-bbox$(EXEEXT)
+$(srcdir)/outputs/box2d-bbox.txt: examples/box2d-bbox.cc
rm -f $@.tmp
+ $(MAKE) $(AM_MAKEFLAGS) box2d-bbox$(EXEEXT)
./$< >$@.tmp
cp -f $@.tmp $@
rm -f $@.tmp
-$(srcdir)/outputs/domain-display.txt: domain-display$(EXEEXT)
+$(srcdir)/outputs/domain-display.txt: examples/domain-display.cc
rm -f $@.tmp
+ $(MAKE) $(AM_MAKEFLAGS) domain-display$(EXEEXT)
./$< >$@.tmp
cp -f $@.tmp $@
rm -f $@.tmp
-$(srcdir)/outputs/dpoint-1.txt: dpoint-1$(EXEEXT)
+$(srcdir)/outputs/dpoint-1.txt: examples/dpoint-1.cc
rm -f $@.tmp
+ $(MAKE) $(AM_MAKEFLAGS) dpoint-1$(EXEEXT)
./$< >$@.tmp
cp -f $@.tmp $@
rm -f $@.tmp
-$(srcdir)/outputs/estim-sites.txt: estim-sites$(EXEEXT)
+$(srcdir)/outputs/estim-sites.txt: examples/estim-sites.cc
rm -f $@.tmp
+ $(MAKE) $(AM_MAKEFLAGS) estim-sites$(EXEEXT)
./$< >$@.tmp
cp -f $@.tmp $@
rm -f $@.tmp
-$(srcdir)/outputs/extend.txt: extend$(EXEEXT)
+$(srcdir)/outputs/extend.txt: examples/extend.cc
rm -f $@.tmp
+ $(MAKE) $(AM_MAKEFLAGS) extend$(EXEEXT)
./$< >$@.tmp
cp -f $@.tmp $@
rm -f $@.tmp
-$(srcdir)/outputs/extension-ignore.txt: extension-ignore$(EXEEXT)
+$(srcdir)/outputs/extension-ignore.txt: examples/extension-ignore.cc
rm -f $@.tmp
+ $(MAKE) $(AM_MAKEFLAGS) extension-ignore$(EXEEXT)
./$< >$@.tmp
cp -f $@.tmp $@
rm -f $@.tmp
-$(srcdir)/outputs/fill.txt: fill$(EXEEXT)
+$(srcdir)/outputs/fill-call-1.txt: examples/fill-call-1.cc
rm -f $@.tmp
+ $(MAKE) $(AM_MAKEFLAGS) fill-call-1$(EXEEXT)
./$< >$@.tmp
cp -f $@.tmp $@
rm -f $@.tmp
-$(srcdir)/outputs/fill-call-1.txt: fill-call-1$(EXEEXT)
+$(srcdir)/outputs/fill-imageif-cfun.txt: examples/fill-imageif-cfun.cc
rm -f $@.tmp
+ $(MAKE) $(AM_MAKEFLAGS) fill-imageif-cfun$(EXEEXT)
./$< >$@.tmp
cp -f $@.tmp $@
rm -f $@.tmp
-$(srcdir)/outputs/fill-imageif-cfun.txt: fill-imageif-cfun$(EXEEXT)
+$(srcdir)/outputs/fill-part-image.txt: examples/fill-part-image.cc
rm -f $@.tmp
+ $(MAKE) $(AM_MAKEFLAGS) fill-part-image$(EXEEXT)
./$< >$@.tmp
cp -f $@.tmp $@
rm -f $@.tmp
-$(srcdir)/outputs/fill-part-image.txt: fill-part-image$(EXEEXT)
+$(srcdir)/outputs/fill-subdomain-shorter.txt: examples/fill-subdomain-shorter.cc
rm -f $@.tmp
+ $(MAKE) $(AM_MAKEFLAGS) fill-subdomain-shorter$(EXEEXT)
./$< >$@.tmp
cp -f $@.tmp $@
rm -f $@.tmp
-$(srcdir)/outputs/fill-subdomain.txt: fill-subdomain$(EXEEXT)
+$(srcdir)/outputs/fill-subdomain.txt: examples/fill-subdomain.cc
rm -f $@.tmp
+ $(MAKE) $(AM_MAKEFLAGS) fill-subdomain$(EXEEXT)
./$< >$@.tmp
cp -f $@.tmp $@
rm -f $@.tmp
-$(srcdir)/outputs/fill-subdomain-shorter.txt: fill-subdomain-shorter$(EXEEXT)
+$(srcdir)/outputs/fill.txt: examples/fill.cc
rm -f $@.tmp
+ $(MAKE) $(AM_MAKEFLAGS) fill$(EXEEXT)
./$< >$@.tmp
cp -f $@.tmp $@
rm -f $@.tmp
-$(srcdir)/outputs/first_routine.txt: first_routine$(EXEEXT)
+$(srcdir)/outputs/forall-piter.txt: examples/forall-piter.cc
rm -f $@.tmp
+ $(MAKE) $(AM_MAKEFLAGS) forall-piter$(EXEEXT)
./$< >$@.tmp
cp -f $@.tmp $@
rm -f $@.tmp
-$(srcdir)/outputs/forall-piter.txt: forall-piter$(EXEEXT)
+$(srcdir)/outputs/fun-p2v-1.txt: examples/fun-p2v-1.cc
rm -f $@.tmp
+ $(MAKE) $(AM_MAKEFLAGS) fun-p2v-1$(EXEEXT)
./$< >$@.tmp
cp -f $@.tmp $@
rm -f $@.tmp
-$(srcdir)/outputs/fun-p2v-1.txt: fun-p2v-1$(EXEEXT)
+$(srcdir)/outputs/graph-data.txt: examples/graph-data.cc
rm -f $@.tmp
+ $(MAKE) $(AM_MAKEFLAGS) graph-data$(EXEEXT)
./$< >$@.tmp
cp -f $@.tmp $@
rm -f $@.tmp
-$(srcdir)/outputs/graph-data.txt: graph-data$(EXEEXT)
+$(srcdir)/outputs/graph-iter.txt: examples/graph-iter.cc
rm -f $@.tmp
+ $(MAKE) $(AM_MAKEFLAGS) graph-iter$(EXEEXT)
./$< >$@.tmp
cp -f $@.tmp $@
rm -f $@.tmp
-$(srcdir)/outputs/graph-iter.txt: graph-iter$(EXEEXT)
+$(srcdir)/outputs/ima-has.txt: examples/ima-has.cc
rm -f $@.tmp
+ $(MAKE) $(AM_MAKEFLAGS) ima-has$(EXEEXT)
./$< >$@.tmp
cp -f $@.tmp $@
rm -f $@.tmp
-$(srcdir)/outputs/ima-has.txt: ima-has$(EXEEXT)
+$(srcdir)/outputs/ima-load.txt: examples/ima-load.cc
rm -f $@.tmp
+ $(MAKE) $(AM_MAKEFLAGS) ima-load$(EXEEXT)
./$< >$@.tmp
cp -f $@.tmp $@
rm -f $@.tmp
-$(srcdir)/outputs/ima-save.txt: ima-save$(EXEEXT)
+$(srcdir)/outputs/ima-save.txt: examples/ima-save.cc
rm -f $@.tmp
+ $(MAKE) $(AM_MAKEFLAGS) ima-save$(EXEEXT)
./$< >$@.tmp
cp -f $@.tmp $@
rm -f $@.tmp
-$(srcdir)/outputs/ima-size.txt: ima-size$(EXEEXT)
+$(srcdir)/outputs/ima-size.txt: examples/ima-size.cc
rm -f $@.tmp
+ $(MAKE) $(AM_MAKEFLAGS) ima-size$(EXEEXT)
./$< >$@.tmp
cp -f $@.tmp $@
rm -f $@.tmp
-$(srcdir)/outputs/ima2d-1.txt: ima2d-1$(EXEEXT)
+$(srcdir)/outputs/ima2d-1.txt: examples/ima2d-1.cc
rm -f $@.tmp
+ $(MAKE) $(AM_MAKEFLAGS) ima2d-1$(EXEEXT)
./$< >$@.tmp
cp -f $@.tmp $@
rm -f $@.tmp
-$(srcdir)/outputs/ima2d-2.txt: ima2d-2$(EXEEXT)
+$(srcdir)/outputs/ima2d-2.txt: examples/ima2d-2.cc
rm -f $@.tmp
+ $(MAKE) $(AM_MAKEFLAGS) ima2d-2$(EXEEXT)
./$< >$@.tmp
cp -f $@.tmp $@
rm -f $@.tmp
-$(srcdir)/outputs/ima2d-3.txt: ima2d-3$(EXEEXT)
+$(srcdir)/outputs/ima2d-3.txt: examples/ima2d-3.cc
rm -f $@.tmp
+ $(MAKE) $(AM_MAKEFLAGS) ima2d-3$(EXEEXT)
./$< >$@.tmp
cp -f $@.tmp $@
rm -f $@.tmp
-$(srcdir)/outputs/ima2d-4.txt: ima2d-4$(EXEEXT)
+$(srcdir)/outputs/ima2d-4.txt: examples/ima2d-4.cc
rm -f $@.tmp
+ $(MAKE) $(AM_MAKEFLAGS) ima2d-4$(EXEEXT)
./$< >$@.tmp
cp -f $@.tmp $@
rm -f $@.tmp
-$(srcdir)/outputs/ima2d-5.txt: ima2d-5$(EXEEXT)
+$(srcdir)/outputs/ima2d-5.txt: examples/ima2d-5.cc
rm -f $@.tmp
+ $(MAKE) $(AM_MAKEFLAGS) ima2d-5$(EXEEXT)
./$< >$@.tmp
cp -f $@.tmp $@
rm -f $@.tmp
-$(srcdir)/outputs/ima2d-6-clone.txt: ima2d-6-clone$(EXEEXT)
+$(srcdir)/outputs/ima2d-6-clone.txt: examples/ima2d-6-clone.cc
rm -f $@.tmp
+ $(MAKE) $(AM_MAKEFLAGS) ima2d-6-clone$(EXEEXT)
./$< >$@.tmp
cp -f $@.tmp $@
rm -f $@.tmp
-$(srcdir)/outputs/ima2d-7.txt: ima2d-7$(EXEEXT)
+$(srcdir)/outputs/ima2d-7.txt: examples/ima2d-7.cc
rm -f $@.tmp
+ $(MAKE) $(AM_MAKEFLAGS) ima2d-7$(EXEEXT)
./$< >$@.tmp
cp -f $@.tmp $@
rm -f $@.tmp
-$(srcdir)/outputs/ima2d-rot.txt: ima2d-rot$(EXEEXT)
+$(srcdir)/outputs/ima2d-rot.txt: examples/ima2d-rot.cc
rm -f $@.tmp
+ $(MAKE) $(AM_MAKEFLAGS) ima2d-rot$(EXEEXT)
./$< >$@.tmp
cp -f $@.tmp $@
rm -f $@.tmp
-$(srcdir)/outputs/labeling-compute.txt: labeling-compute$(EXEEXT)
+$(srcdir)/outputs/labeling-compute.txt: examples/labeling-compute.cc
rm -f $@.tmp
+ $(MAKE) $(AM_MAKEFLAGS) labeling-compute$(EXEEXT)
./$< >$@.tmp
cp -f $@.tmp $@
rm -f $@.tmp
-$(srcdir)/outputs/logical-not.txt: logical-not$(EXEEXT)
+$(srcdir)/outputs/logical-not.txt: examples/logical-not.cc
rm -f $@.tmp
+ $(MAKE) $(AM_MAKEFLAGS) logical-not$(EXEEXT)
./$< >$@.tmp
cp -f $@.tmp $@
rm -f $@.tmp
-$(srcdir)/outputs/mln_var.txt: mln_var$(EXEEXT)
+$(srcdir)/outputs/mln_var.txt: examples/mln_var.cc
rm -f $@.tmp
+ $(MAKE) $(AM_MAKEFLAGS) mln_var$(EXEEXT)
./$< >$@.tmp
cp -f $@.tmp $@
rm -f $@.tmp
-$(srcdir)/outputs/parray-append.txt: parray-append$(EXEEXT)
+$(srcdir)/outputs/parray-append.txt: examples/parray-append.cc
rm -f $@.tmp
+ $(MAKE) $(AM_MAKEFLAGS) parray-append$(EXEEXT)
./$< >$@.tmp
cp -f $@.tmp $@
rm -f $@.tmp
-$(srcdir)/outputs/parray-bbox.txt: parray-bbox$(EXEEXT)
+$(srcdir)/outputs/parray-bbox.txt: examples/parray-bbox.cc
rm -f $@.tmp
+ $(MAKE) $(AM_MAKEFLAGS) parray-bbox$(EXEEXT)
./$< >$@.tmp
cp -f $@.tmp $@
rm -f $@.tmp
-$(srcdir)/outputs/paste.txt: paste$(EXEEXT)
+$(srcdir)/outputs/paste-call-1.txt: examples/paste-call-1.cc
rm -f $@.tmp
+ $(MAKE) $(AM_MAKEFLAGS) paste-call-1$(EXEEXT)
./$< >$@.tmp
cp -f $@.tmp $@
rm -f $@.tmp
-$(srcdir)/outputs/paste-call-1.txt: paste-call-1$(EXEEXT)
+$(srcdir)/outputs/paste.txt: examples/paste.cc
rm -f $@.tmp
+ $(MAKE) $(AM_MAKEFLAGS) paste$(EXEEXT)
./$< >$@.tmp
cp -f $@.tmp $@
rm -f $@.tmp
-$(srcdir)/outputs/point-1.txt: point-1$(EXEEXT)
+$(srcdir)/outputs/point-1.txt: examples/point-1.cc
rm -f $@.tmp
+ $(MAKE) $(AM_MAKEFLAGS) point-1$(EXEEXT)
./$< >$@.tmp
cp -f $@.tmp $@
rm -f $@.tmp
-$(srcdir)/outputs/predicate-1.txt: predicate-1$(EXEEXT)
+$(srcdir)/outputs/predicate-1.txt: examples/predicate-1.cc
rm -f $@.tmp
+ $(MAKE) $(AM_MAKEFLAGS) predicate-1$(EXEEXT)
./$< >$@.tmp
cp -f $@.tmp $@
rm -f $@.tmp
-$(srcdir)/outputs/win-create-1.txt: win-create-1$(EXEEXT)
+$(srcdir)/outputs/tuto2_first_image.txt: examples/tuto2_first_image.cc
rm -f $@.tmp
+ $(MAKE) $(AM_MAKEFLAGS) tuto2_first_image$(EXEEXT)
./$< >$@.tmp
cp -f $@.tmp $@
rm -f $@.tmp
-$(srcdir)/outputs/win-create-2.txt: win-create-2$(EXEEXT)
+$(srcdir)/outputs/colorize.txt: examples/tuto3/colorize.cc
rm -f $@.tmp
+ $(MAKE) $(AM_MAKEFLAGS) colorize$(EXEEXT)
./$< >$@.tmp
cp -f $@.tmp $@
rm -f $@.tmp
-$(srcdir)/outputs/tuto2_first_image.txt: tuto2_first_image$(EXEEXT)
+$(srcdir)/outputs/first_routine.txt: examples/tuto3/first_routine.cc
rm -f $@.tmp
+ $(MAKE) $(AM_MAKEFLAGS) first_routine$(EXEEXT)
./$< >$@.tmp
cp -f $@.tmp $@
rm -f $@.tmp
-$(srcdir)/outputs/tuto3_rw_image.txt: tuto3_rw_image$(EXEEXT)
+$(srcdir)/outputs/println.txt: examples/tuto3/println.cc
rm -f $@.tmp
+ $(MAKE) $(AM_MAKEFLAGS) println$(EXEEXT)
./$< >$@.tmp
cp -f $@.tmp $@
rm -f $@.tmp
-$(srcdir)/outputs/tuto4_genericity_and_algorithms.txt: tuto4_genericity_and_algorithms$(EXEEXT)
+$(srcdir)/outputs/trace.txt: examples/tuto3/trace.cc
rm -f $@.tmp
+ $(MAKE) $(AM_MAKEFLAGS) trace$(EXEEXT)
./$< >$@.tmp
cp -f $@.tmp $@
rm -f $@.tmp
-$(srcdir)/outputs/tuto3_colorize.txt: tuto3_colorize$(EXEEXT)
+$(srcdir)/outputs/tuto3_rw_image.txt: examples/tuto3_rw_image.cc
rm -f $@.tmp
+ $(MAKE) $(AM_MAKEFLAGS) tuto3_rw_image$(EXEEXT)
./$< >$@.tmp
cp -f $@.tmp $@
rm -f $@.tmp
-$(srcdir)/outputs/tuto3_println.txt: tuto3_println$(EXEEXT)
+$(srcdir)/outputs/image.txt: examples/tuto4/image.cc
rm -f $@.tmp
+ $(MAKE) $(AM_MAKEFLAGS) image$(EXEEXT)
./$< >$@.tmp
cp -f $@.tmp $@
rm -f $@.tmp
-$(srcdir)/outputs/tuto3_trace.txt: tuto3_trace$(EXEEXT)
+$(srcdir)/outputs/point2d.txt: examples/tuto4/point2d.cc
rm -f $@.tmp
+ $(MAKE) $(AM_MAKEFLAGS) point2d$(EXEEXT)
./$< >$@.tmp
cp -f $@.tmp $@
rm -f $@.tmp
-$(srcdir)/outputs/tuto4_point2d.txt: tuto4_point2d$(EXEEXT)
+$(srcdir)/outputs/site_set_create.txt: examples/tuto4/site_set_create.cc
rm -f $@.tmp
+ $(MAKE) $(AM_MAKEFLAGS) site_set_create$(EXEEXT)
./$< >$@.tmp
cp -f $@.tmp $@
rm -f $@.tmp
-$(srcdir)/outputs/tuto4_site_set_create.txt: tuto4_site_set_create$(EXEEXT)
+$(srcdir)/outputs/tuto4_genericity_and_algorithms.txt: examples/tuto4_genericity_and_algorithms.cc
rm -f $@.tmp
+ $(MAKE) $(AM_MAKEFLAGS) tuto4_genericity_and_algorithms$(EXEEXT)
+ ./$< >$@.tmp
+ cp -f $@.tmp $@
+ rm -f $@.tmp
+
+$(srcdir)/outputs/win-create-1.txt: examples/win-create-1.cc
+ rm -f $@.tmp
+ $(MAKE) $(AM_MAKEFLAGS) win-create-1$(EXEEXT)
+ ./$< >$@.tmp
+ cp -f $@.tmp $@
+ rm -f $@.tmp
+
+$(srcdir)/outputs/win-create-2.txt: examples/win-create-2.cc
+ rm -f $@.tmp
+ $(MAKE) $(AM_MAKEFLAGS) win-create-2$(EXEEXT)
./$< >$@.tmp
cp -f $@.tmp $@
rm -f $@.tmp
diff --git a/milena/doc/gen-examples-outputs-mk b/milena/doc/gen-examples-outputs-mk
index 10692a1..2580072 100755
--- a/milena/doc/gen-examples-outputs-mk
+++ b/milena/doc/gen-examples-outputs-mk
@@ -20,17 +20,23 @@
me=`basename $0`
-test $# -ne 0 || { echo "usage: $me PROGRAMS..."; exit 1; }
+test $# -ne 0 || { echo "usage: $me SOURCES..."; exit 1; }
cat<<EOF
## Generated by $me. Do not edit by hand.
EOF
-for program; do
-cat<<EOF
-\$(srcdir)/outputs/$program.txt: $program\$(EXEEXT)
+for source; do
+ program=`basename "$source" .cc`
+ # Have outputs depend on sources rather than programs, and recompile
+ # the latter to regen the former only when needed. This way, we can
+ # ship generated outputs without forcing the user of the
+ # distribution to recompile the programs.
+ cat<<EOF
+\$(srcdir)/outputs/$program.txt: $source
rm -f \$@.tmp
+ \$(MAKE) \$(AM_MAKEFLAGS) $program\$(EXEEXT)
./\$< >\$@.tmp
cp -f \$@.tmp \$@
rm -f \$@.tmp
diff --git a/milena/doc/programs-examples.mk b/milena/doc/programs-examples.mk
index b75152b..4a38dd3 100644
--- a/milena/doc/programs-examples.mk
+++ b/milena/doc/programs-examples.mk
@@ -20,9 +20,7 @@
## generation of examples-outputs.mk depends only on this file, instead
## of Makefile.am.
-## FIXME: Generate this file? Probably a good idea. If so, we
-## probably won't need to have examples-outputs.mk depend on it (which
-## will simplify the regen calling sequence in bootstrap as well).
+## FIXME: Generate this file? Probably a good idea.
##
## If generated, merge examples-outputs.mk and outputs.mk?
--
1.5.6.5
1
0