Commit 40ff7438 authored by Roland Levillain's avatar Roland Levillain
Browse files

Revamp the Makefile machinery in milena/doc/examples/.

	* doc/gen-examples-outputs-mk: New script.
	* doc/examples/make.mk (PROGRAMS_examples):
	Sort and remove duplicates.
	(examples_dir): Remove variable.
	(accu_right_instanciation_SOURCES)
	(borderthickness_SOURCES)
	(box2d_bbox_SOURCES)
	(domain_display_SOURCES)
	(dpoint_1_SOURCES)
	(estim_sites_SOURCES)
	(extend_SOURCES)
	(extension_ignore_SOURCES)
	(fill_SOURCES)
	(fill_call_1_SOURCES)
	(fill_imageif_cfun_SOURCES)
	(fill_part_image_SOURCES)
	(fill_subdomain_SOURCES)
	(fill_subdomain_shorter_SOURCES)
	(first_routine_SOURCES)
	(forall_piter_SOURCES)
	(fun_p2v_1_SOURCES)
	(graph_data_SOURCES)
	(graph_iter_SOURCES)
	(ima2d_1_SOURCES)
	(ima2d_2_SOURCES)
	(ima2d_3_SOURCES)
	(ima2d_4_SOURCES)
	(ima2d_5_SOURCES)
	(ima2d_6_clone_SOURCES)
	(ima2d_7_SOURCES)
	(ima2d_rot_SOURCES)
	(ima_has_SOURCES)
	(ima_save_SOURCES)
	(ima_size_SOURCES)
	(labeling_compute_SOURCES)
	(logical_not_SOURCES)
	(mln_var_SOURCES)
	(parray_append_SOURCES)
	(parray_bbox_SOURCES)
	(paste_SOURCES)
	(paste_call_1_SOURCES)
	(point_1_SOURCES)
	(predicate_1_SOURCES)
	(win_create_1_SOURCES)
	(win_create_2_SOURCES)
	(tuto2_first_image_SOURCES)
	(tuto3_rw_image_SOURCES)
	(tuto4_genericity_and_algorithms_SOURCES)
	(tuto3_colorize_SOURCES)
	(tuto3_println_SOURCES)
	(tuto3_trace_SOURCES)
	(tuto4_point2d_SOURCES)
	(tuto4_site_set_create_SOURCES):
	Adjust.
	(data-regen, examples, run-examples)
	Remove (phony) targets.
	(split-examples, split-outputs):
	Likewise.
	Superseded by...
	($(srcdir)/split-examples.stamp, $(srcdir)/split-outputs.stamp):
	...these (new) targets.
	(OUTPUTS, EXAMPLES): New variable.
	($(DOC_SRCDIR)/examples-outputs.mk): New target.
	Include $(DOC_SRCDIR)/examples-outputs.mk.
	(MAINTAINERCLEANFILES): Ad $(OUTPUTS).
	(diff-data, fix-refdata): Remove these (phony) targets, as they
	duplicate services provided by the SCM (Git).
	(clean-local, clean-figures): Remove these targets and add their
	actions...
	* doc/Makefile.am (maintainer-clean-local): ...to this rule.
	(EXTRA_DEPS): Remove variable.
	Superseded by...
	(refman_dependencies): ...this (new) variable.
	($(srcdir)/user-refman.stamp)
	($(srcdir)/devel-refman.stamp):
	Adjust targets' dependencies.
	(fig-convert): Remove (phony) target.
	Clean up.
	* milena/doc/examples-outputs.mk: New (generated file).
parent 2e0e1ee3
2010-03-12 Roland Levillain <roland@lrde.epita.fr>
Revamp the Makefile machinery in milena/doc/examples/.
* doc/gen-examples-outputs-mk: New script.
* doc/examples/make.mk (PROGRAMS_examples):
Sort and remove duplicates.
(examples_dir): Remove variable.
(accu_right_instanciation_SOURCES)
(borderthickness_SOURCES)
(box2d_bbox_SOURCES)
(domain_display_SOURCES)
(dpoint_1_SOURCES)
(estim_sites_SOURCES)
(extend_SOURCES)
(extension_ignore_SOURCES)
(fill_SOURCES)
(fill_call_1_SOURCES)
(fill_imageif_cfun_SOURCES)
(fill_part_image_SOURCES)
(fill_subdomain_SOURCES)
(fill_subdomain_shorter_SOURCES)
(first_routine_SOURCES)
(forall_piter_SOURCES)
(fun_p2v_1_SOURCES)
(graph_data_SOURCES)
(graph_iter_SOURCES)
(ima2d_1_SOURCES)
(ima2d_2_SOURCES)
(ima2d_3_SOURCES)
(ima2d_4_SOURCES)
(ima2d_5_SOURCES)
(ima2d_6_clone_SOURCES)
(ima2d_7_SOURCES)
(ima2d_rot_SOURCES)
(ima_has_SOURCES)
(ima_save_SOURCES)
(ima_size_SOURCES)
(labeling_compute_SOURCES)
(logical_not_SOURCES)
(mln_var_SOURCES)
(parray_append_SOURCES)
(parray_bbox_SOURCES)
(paste_SOURCES)
(paste_call_1_SOURCES)
(point_1_SOURCES)
(predicate_1_SOURCES)
(win_create_1_SOURCES)
(win_create_2_SOURCES)
(tuto2_first_image_SOURCES)
(tuto3_rw_image_SOURCES)
(tuto4_genericity_and_algorithms_SOURCES)
(tuto3_colorize_SOURCES)
(tuto3_println_SOURCES)
(tuto3_trace_SOURCES)
(tuto4_point2d_SOURCES)
(tuto4_site_set_create_SOURCES):
Adjust.
(data-regen, examples, run-examples)
Remove (phony) targets.
(split-examples, split-outputs):
Likewise.
Superseded by...
($(srcdir)/split-examples.stamp, $(srcdir)/split-outputs.stamp):
...these (new) targets.
(OUTPUTS, EXAMPLES): New variable.
($(DOC_SRCDIR)/examples-outputs.mk): New target.
Include $(DOC_SRCDIR)/examples-outputs.mk.
(MAINTAINERCLEANFILES): Ad $(OUTPUTS).
(diff-data, fix-refdata): Remove these (phony) targets, as they
duplicate services provided by the SCM (Git).
(clean-local, clean-figures): Remove these targets and add their
actions...
* doc/Makefile.am (maintainer-clean-local): ...to this rule.
(EXTRA_DEPS): Remove variable.
Superseded by...
(refman_dependencies): ...this (new) variable.
($(srcdir)/user-refman.stamp)
($(srcdir)/devel-refman.stamp):
Adjust targets' dependencies.
(fig-convert): Remove (phony) target.
Clean up.
* milena/doc/examples-outputs.mk: New (generated file).
2010-03-12 Roland Levillain <roland@lrde.epita.fr> 2010-03-12 Roland Levillain <roland@lrde.epita.fr>
   
Have documentation's examples not depend on hard-coded paths. Have documentation's examples not depend on hard-coded paths.
...@@ -18,6 +18,9 @@ ...@@ -18,6 +18,9 @@
# FIXME: To be overhauled! (See ticket #134). # FIXME: To be overhauled! (See ticket #134).
# FIXME: Do not use includes if they're used only once: inline them
# instead.
include $(top_srcdir)/milena/doc/doc.mk include $(top_srcdir)/milena/doc/doc.mk
DOXYGEN = doxygen DOXYGEN = doxygen
...@@ -28,6 +31,7 @@ DOXYFILE = Doxyfile ...@@ -28,6 +31,7 @@ DOXYFILE = Doxyfile
EXTRA_DIST = EXTRA_DIST =
dist_doc_DATA = dist_doc_DATA =
CLEANFILES = CLEANFILES =
MAINTAINERCLEANFILES =
# FIXME: Simplify all of this. ``Devel'' targets are really # FIXME: Simplify all of this. ``Devel'' targets are really
# secondary. And we probably don't need so much target aliases! # secondary. And we probably don't need so much target aliases!
...@@ -53,18 +57,21 @@ doc-devel-html: tutorial-html ref-guide-html white-paper-html \ ...@@ -53,18 +57,21 @@ doc-devel-html: tutorial-html ref-guide-html white-paper-html \
ref-doc-devel ref-doc-devel
## -------------------------------------------------- ##
## Shared dependencies on the products of tutorial/. ##
## -------------------------------------------------- ##
# FIXME: Maintaining dependencies across directories is too
# complicated. Simplify.
EXTRA_DEPS = $(srcdir)/tutorial/tutorial.hh $(srcdir)/ref_guide/ref_guide.hh
## ----------------------- ## ## ----------------------- ##
## Doxygen documentation. ## ## Doxygen documentation. ##
## ----------------------- ## ## ----------------------- ##
# FIXME: Check these dependencies.
# 1. They might be redundant.
# 2. It'd be better to depend on actual files rather than timestamps
# correponding to a bunch of files.
refman_dependencies = \
$(srcdir)/split-examples.stamp \
$(srcdir)/split-outputs.stamp \
$(srcdir)/figures.stamp \
$(srcdir)/tutorial/tutorial.hh \
$(srcdir)/ref_guide/ref_guide.hh
# ----------------------- # # ----------------------- #
# User reference manual. # # User reference manual. #
# ----------------------- # # ----------------------- #
...@@ -113,11 +120,11 @@ $(srcdir)/$(USER_REFMAN_PDF): $(srcdir)/$(USER_REFMAN) ...@@ -113,11 +120,11 @@ $(srcdir)/$(USER_REFMAN_PDF): $(srcdir)/$(USER_REFMAN)
cd $(srcdir)/$(USER_REFMAN)/latex && $(MAKE) $(AM_MAKEFLAGS) pdf cd $(srcdir)/$(USER_REFMAN)/latex && $(MAKE) $(AM_MAKEFLAGS) pdf
cp -f $(srcdir)/$(USER_REFMAN)/latex/refman.pdf $@ cp -f $(srcdir)/$(USER_REFMAN)/latex/refman.pdf $@
## FIXME: Are dependencies $(srcdir)/figures.stamp $(EXTRA_DEPS) set ## FIXME: Are dependencies (`$(refman_dependencies)') set on the right
## on the right rule? Does Doxygen make a copy of figures, or does it ## rule? Does Doxygen make a copy of figures, or does it generate
## generate LaTeX inputs relying on the existence of such figures in ## LaTeX inputs relying on the existence of such figures in the
## the initial location? Investigate. ## initial location? Investigate.
$(srcdir)/user-refman.stamp: $(srcdir)/$(DOXYFILE).in $(srcdir)/figures.stamp $(EXTRA_DEPS) $(srcdir)/user-refman.stamp: $(srcdir)/$(DOXYFILE).in $(refman_dependencies)
@rm -f $@.tmp @rm -f $@.tmp
@touch $@.tmp @touch $@.tmp
-rm -rf $(USER_REFMAN).tmp -rm -rf $(USER_REFMAN).tmp
...@@ -193,11 +200,11 @@ $(srcdir)/$(DEVEL_REFMAN_PDF): $(srcdir)/$(DEVEL_REFMAN) ...@@ -193,11 +200,11 @@ $(srcdir)/$(DEVEL_REFMAN_PDF): $(srcdir)/$(DEVEL_REFMAN)
cd $(srcdir)/$(DEVEL_REFMAN)/latex && $(MAKE) $(AM_MAKEFLAGS) pdf cd $(srcdir)/$(DEVEL_REFMAN)/latex && $(MAKE) $(AM_MAKEFLAGS) pdf
cp -f $(srcdir)/$(DEVEL_REFMAN)/latex/refman.pdf $@ cp -f $(srcdir)/$(DEVEL_REFMAN)/latex/refman.pdf $@
## FIXME: Are dependencies $(srcdir)/figures.stamp $(EXTRA_DEPS) set ## FIXME: Are dependencies (`$(refman_dependencies)') set on the right
## on the right rule? Does Doxygen make a copy of figures, or does it ## rule? Does Doxygen make a copy of figures, or does it generate
## generate LaTeX inputs relying on the existence of such figures in ## LaTeX inputs relying on the existence of such figures in the
## the initial location? Investigate. ## initial location? Investigate.
$(srcdir)/devel-refman.stamp: $(srcdir)/$(DOXYFILE).in $(srcdir)/figures.stamp $(EXTRA_DEPS) $(srcdir)/devel-refman.stamp: $(srcdir)/$(DOXYFILE).in $(refman_dependencies)
@rm -f $@.tmp @rm -f $@.tmp
@touch $@.tmp @touch $@.tmp
-rm -rf $(DEVEL_REFMAN).tmp -rm -rf $(DEVEL_REFMAN).tmp
...@@ -223,6 +230,12 @@ $(srcdir)/$(DEVEL_REFMAN): $(srcdir)/devel-refman.stamp ...@@ -223,6 +230,12 @@ $(srcdir)/$(DEVEL_REFMAN): $(srcdir)/devel-refman.stamp
maintainer-clean-local: maintainer-clean-local:
-rm -rf $(USER_REFMAN).tmp $(srcdir)/$(USER_REFMAN) -rm -rf $(USER_REFMAN).tmp $(srcdir)/$(USER_REFMAN)
-rm -rf $(DEVEL_REFMAN).tmp $(srcdir)/$(DEVEL_REFMAN) -rm -rf $(DEVEL_REFMAN).tmp $(srcdir)/$(DEVEL_REFMAN)
-rm -f $(EXAMPLES_BUILDDIR)/*.cc
# FIXME: If we remove a *directory*, we are supposed to know how to
# recreate it later. I doubt our rules are all currently able to
# handle this. See how `make maintainer-clean all' behaves.
-rm -rf $(OUTPUTS_BUILDDIR)
-rm -rf $(FIGURES_BUILDDIR)
## ------------------------- ## ## ------------------------- ##
...@@ -257,15 +270,9 @@ include $(srcdir)/ref_guide/ref_guide.mk ...@@ -257,15 +270,9 @@ include $(srcdir)/ref_guide/ref_guide.mk
## Figures. ## ## Figures. ##
## --------- ## ## --------- ##
# Make sure the figures are the first files in EXTRA_DIST.
# Make the 'fake-doc' rule works correctly.
EXTRA_DIST +=
$(srcdir)/figures/figures.mk: $(srcdir)/headers.stamp $(srcdir)/figures/figures.mk: $(srcdir)/headers.stamp
include $(srcdir)/figures/figures.mk include $(srcdir)/figures/figures.mk
fig-convert: $(srcdir)/figures.stamp
EXTRA_DIST += figures.stamp EXTRA_DIST += figures.stamp
$(srcdir)/figures.stamp: $(FIGURES_SRCDIR)/*.p*m $(srcdir)/figures.stamp: $(FIGURES_SRCDIR)/*.p*m
rm -f $@.tmp rm -f $@.tmp
...@@ -288,9 +295,11 @@ $(srcdir)/figures.stamp: $(FIGURES_SRCDIR)/*.p*m ...@@ -288,9 +295,11 @@ $(srcdir)/figures.stamp: $(FIGURES_SRCDIR)/*.p*m
include $(top_srcdir)/milena/doc/examples/make.mk include $(top_srcdir)/milena/doc/examples/make.mk
# Regen files. # Regen Make helpers.
EXTRA_DIST += generate_dist_files.sh headers.stamp EXTRA_DIST += generate_dist_files.sh headers.stamp
include $(top_srcdir)/build-aux/regen-recursive.mk include $(top_srcdir)/build-aux/regen-recursive.mk
## FIXME: It'd probably be better to separate the rules generating
## examples/examples.mk, outputs/outputs.mk and figures/figures.mk.
regen-am: regen-am:
@rm -f $(srcdir)/headers.stamp.tmp @rm -f $(srcdir)/headers.stamp.tmp
@touch $(srcdir)/headers.stamp.tmp @touch $(srcdir)/headers.stamp.tmp
...@@ -369,6 +378,6 @@ EXTRA_DIST += \ ...@@ -369,6 +378,6 @@ EXTRA_DIST += \
tools/split_sample.sh \ tools/split_sample.sh \
tools/todoxygen.sh tools/todoxygen.sh
MAINTAINERCLEANFILES = \ MAINTAINERCLEANFILES += \
Doxyfile_user \ Doxyfile_user \
Doxyfile_devel Doxyfile_devel
## Generated by gen-examples-outputs-mk. Do not edit by hand.
$(srcdir)/outputs/accu-right-instanciation.txt: accu-right-instanciation$(EXEEXT)
rm -f $@.tmp
./$< >$@.tmp
cp -f $@.tmp $@
rm -f $@.tmp
$(srcdir)/outputs/borderthickness.txt: borderthickness$(EXEEXT)
rm -f $@.tmp
./$< >$@.tmp
cp -f $@.tmp $@
rm -f $@.tmp
$(srcdir)/outputs/box2d-bbox.txt: box2d-bbox$(EXEEXT)
rm -f $@.tmp
./$< >$@.tmp
cp -f $@.tmp $@
rm -f $@.tmp
$(srcdir)/outputs/domain-display.txt: domain-display$(EXEEXT)
rm -f $@.tmp
./$< >$@.tmp
cp -f $@.tmp $@
rm -f $@.tmp
$(srcdir)/outputs/dpoint-1.txt: dpoint-1$(EXEEXT)
rm -f $@.tmp
./$< >$@.tmp
cp -f $@.tmp $@
rm -f $@.tmp
$(srcdir)/outputs/estim-sites.txt: estim-sites$(EXEEXT)
rm -f $@.tmp
./$< >$@.tmp
cp -f $@.tmp $@
rm -f $@.tmp
$(srcdir)/outputs/extend.txt: extend$(EXEEXT)
rm -f $@.tmp
./$< >$@.tmp
cp -f $@.tmp $@
rm -f $@.tmp
$(srcdir)/outputs/extension-ignore.txt: extension-ignore$(EXEEXT)
rm -f $@.tmp
./$< >$@.tmp
cp -f $@.tmp $@
rm -f $@.tmp
$(srcdir)/outputs/fill.txt: fill$(EXEEXT)
rm -f $@.tmp
./$< >$@.tmp
cp -f $@.tmp $@
rm -f $@.tmp
$(srcdir)/outputs/fill-call-1.txt: fill-call-1$(EXEEXT)
rm -f $@.tmp
./$< >$@.tmp
cp -f $@.tmp $@
rm -f $@.tmp
$(srcdir)/outputs/fill-imageif-cfun.txt: fill-imageif-cfun$(EXEEXT)
rm -f $@.tmp
./$< >$@.tmp
cp -f $@.tmp $@
rm -f $@.tmp
$(srcdir)/outputs/fill-part-image.txt: fill-part-image$(EXEEXT)
rm -f $@.tmp
./$< >$@.tmp
cp -f $@.tmp $@
rm -f $@.tmp
$(srcdir)/outputs/fill-subdomain.txt: fill-subdomain$(EXEEXT)
rm -f $@.tmp
./$< >$@.tmp
cp -f $@.tmp $@
rm -f $@.tmp
$(srcdir)/outputs/fill-subdomain-shorter.txt: fill-subdomain-shorter$(EXEEXT)
rm -f $@.tmp
./$< >$@.tmp
cp -f $@.tmp $@
rm -f $@.tmp
$(srcdir)/outputs/first_routine.txt: first_routine$(EXEEXT)
rm -f $@.tmp
./$< >$@.tmp
cp -f $@.tmp $@
rm -f $@.tmp
$(srcdir)/outputs/forall-piter.txt: forall-piter$(EXEEXT)
rm -f $@.tmp
./$< >$@.tmp
cp -f $@.tmp $@
rm -f $@.tmp
$(srcdir)/outputs/fun-p2v-1.txt: fun-p2v-1$(EXEEXT)
rm -f $@.tmp
./$< >$@.tmp
cp -f $@.tmp $@
rm -f $@.tmp
$(srcdir)/outputs/graph-data.txt: graph-data$(EXEEXT)
rm -f $@.tmp
./$< >$@.tmp
cp -f $@.tmp $@
rm -f $@.tmp
$(srcdir)/outputs/graph-iter.txt: graph-iter$(EXEEXT)
rm -f $@.tmp
./$< >$@.tmp
cp -f $@.tmp $@
rm -f $@.tmp
$(srcdir)/outputs/ima-has.txt: ima-has$(EXEEXT)
rm -f $@.tmp
./$< >$@.tmp
cp -f $@.tmp $@
rm -f $@.tmp
$(srcdir)/outputs/ima-save.txt: ima-save$(EXEEXT)
rm -f $@.tmp
./$< >$@.tmp
cp -f $@.tmp $@
rm -f $@.tmp
$(srcdir)/outputs/ima-size.txt: ima-size$(EXEEXT)
rm -f $@.tmp
./$< >$@.tmp
cp -f $@.tmp $@
rm -f $@.tmp
$(srcdir)/outputs/ima2d-1.txt: ima2d-1$(EXEEXT)
rm -f $@.tmp
./$< >$@.tmp
cp -f $@.tmp $@
rm -f $@.tmp
$(srcdir)/outputs/ima2d-2.txt: ima2d-2$(EXEEXT)
rm -f $@.tmp
./$< >$@.tmp
cp -f $@.tmp $@
rm -f $@.tmp
$(srcdir)/outputs/ima2d-3.txt: ima2d-3$(EXEEXT)
rm -f $@.tmp
./$< >$@.tmp
cp -f $@.tmp $@
rm -f $@.tmp
$(srcdir)/outputs/ima2d-4.txt: ima2d-4$(EXEEXT)
rm -f $@.tmp
./$< >$@.tmp
cp -f $@.tmp $@
rm -f $@.tmp
$(srcdir)/outputs/ima2d-5.txt: ima2d-5$(EXEEXT)
rm -f $@.tmp
./$< >$@.tmp
cp -f $@.tmp $@
rm -f $@.tmp
$(srcdir)/outputs/ima2d-6-clone.txt: ima2d-6-clone$(EXEEXT)
rm -f $@.tmp
./$< >$@.tmp
cp -f $@.tmp $@
rm -f $@.tmp
$(srcdir)/outputs/ima2d-7.txt: ima2d-7$(EXEEXT)
rm -f $@.tmp
./$< >$@.tmp
cp -f $@.tmp $@
rm -f $@.tmp
$(srcdir)/outputs/ima2d-rot.txt: ima2d-rot$(EXEEXT)
rm -f $@.tmp
./$< >$@.tmp
cp -f $@.tmp $@
rm -f $@.tmp
$(srcdir)/outputs/labeling-compute.txt: labeling-compute$(EXEEXT)
rm -f $@.tmp
./$< >$@.tmp
cp -f $@.tmp $@
rm -f $@.tmp
$(srcdir)/outputs/logical-not.txt: logical-not$(EXEEXT)
rm -f $@.tmp
./$< >$@.tmp
cp -f $@.tmp $@
rm -f $@.tmp
$(srcdir)/outputs/mln_var.txt: mln_var$(EXEEXT)
rm -f $@.tmp
./$< >$@.tmp
cp -f $@.tmp $@
rm -f $@.tmp
$(srcdir)/outputs/parray-append.txt: parray-append$(EXEEXT)
rm -f $@.tmp
./$< >$@.tmp
cp -f $@.tmp $@
rm -f $@.tmp
$(srcdir)/outputs/parray-bbox.txt: parray-bbox$(EXEEXT)
rm -f $@.tmp
./$< >$@.tmp
cp -f $@.tmp $@
rm -f $@.tmp
$(srcdir)/outputs/paste.txt: paste$(EXEEXT)
rm -f $@.tmp
./$< >$@.tmp
cp -f $@.tmp $@
rm -f $@.tmp
$(srcdir)/outputs/paste-call-1.txt: paste-call-1$(EXEEXT)
rm -f $@.tmp
./$< >$@.tmp
cp -f $@.tmp $@
rm -f $@.tmp
$(srcdir)/outputs/point-1.txt: point-1$(EXEEXT)
rm -f $@.tmp
./$< >$@.tmp
cp -f $@.tmp $@
rm -f $@.tmp
$(srcdir)/outputs/predicate-1.txt: predicate-1$(EXEEXT)
rm -f $@.tmp
./$< >$@.tmp
cp -f $@.tmp $@
rm -f $@.tmp
$(srcdir)/outputs/win-create-1.txt: win-create-1$(EXEEXT)
rm -f $@.tmp
./$< >$@.tmp
cp -f $@.tmp $@
rm -f $@.tmp
$(srcdir)/outputs/win-create-2.txt: win-create-2$(EXEEXT)
rm -f $@.tmp
./$< >$@.tmp
cp -f $@.tmp $@
rm -f $@.tmp
$(srcdir)/outputs/tuto2_first_image.txt: tuto2_first_image$(EXEEXT)
rm -f $@.tmp
./$< >$@.tmp
cp -f $@.tmp $@
rm -f $@.tmp
$(srcdir)/outputs/tuto3_rw_image.txt: tuto3_rw_image$(EXEEXT)
rm -f $@.tmp
./$< >$@.tmp
cp -f $@.tmp $@
rm -f $@.tmp
$(srcdir)/outputs/tuto4_genericity_and_algorithms.txt: tuto4_genericity_and_algorithms$(EXEEXT)
rm -f $@.tmp
./$< >$@.tmp
cp -f $@.tmp $@
rm -f $@.tmp
$(srcdir)/outputs/tuto3_colorize.txt: tuto3_colorize$(EXEEXT)
rm -f $@.tmp
./$< >$@.tmp
cp -f $@.tmp $@
rm -f $@.tmp
$(srcdir)/outputs/tuto3_println.txt: tuto3_println$(EXEEXT)
rm -f $@.tmp
./$< >$@.tmp
cp -f $@.tmp $@
rm -f $@.tmp
$(srcdir)/outputs/tuto3_trace.txt: tuto3_trace$(EXEEXT)
rm -f $@.tmp
./$< >$@.tmp
cp -f $@.tmp $@
rm -f $@.tmp
$(srcdir)/outputs/tuto4_point2d.txt: tuto4_point2d$(EXEEXT)
rm -f $@.tmp
./$< >$@.tmp
cp -f $@.tmp $@
rm -f $@.tmp
$(srcdir)/outputs/tuto4_site_set_create.txt: tuto4_site_set_create$(EXEEXT)
rm -f $@.tmp
./$< >$@.tmp
cp -f $@.tmp $@
rm -f $@.tmp
...@@ -15,13 +15,8 @@ ...@@ -15,13 +15,8 @@
# #
# You should have received a copy of the GNU General Public License # You should have received a copy of the GNU General Public License
# along with Olena. If not, see <http://www.gnu.org/licenses/>. # along with Olena. If not, see <http://www.gnu.org/licenses/>.
#
## Process this file through Automake to create Makefile.in.
examples_dir = $(doc_dir)/examples PROGRAMS_examples = \
PROGRAMS_examples = \
accu-right-instanciation \ accu-right-instanciation \
borderthickness \ borderthickness \
box2d-bbox \ box2d-bbox \
...@@ -32,10 +27,10 @@ PROGRAMS_examples = \ ...@@ -32,10 +27,10 @@ PROGRAMS_examples = \
extension-ignore \ extension-ignore \
fill \ fill \
fill-call-1 \ fill-call-1 \
fill-imageif-cfun \
fill-part-image \ fill-part-image \
fill-subdomain \ fill-subdomain \
fill-subdomain-shorter \ fill-subdomain-shorter \
fill-imageif-cfun \
first_routine \ first_routine \
forall-piter \ forall-piter \
fun-p2v-1 \ fun-p2v-1 \
...@@ -52,14 +47,13 @@ PROGRAMS_examples = \ ...@@ -52,14 +47,13 @@ PROGRAMS_examples = \
ima2d-6-clone \ ima2d-6-clone \
ima2d-7 \ ima2d-7 \
ima2d-rot \ ima2d-rot \
ima-size \
labeling-compute \ labeling-compute \
logical-not \ logical-not \
mln_var \ mln_var \
parray-append \
parray-bbox \ parray-bbox \
paste \ paste \
paste-call-1 \ paste-call-1 \
parray-append \
point-1 \ point-1 \
predicate-1 \ predicate-1 \
win-create-1 \ win-create-1 \
...@@ -82,198 +76,262 @@ PROGRAMS_examples += \ ...@@ -82,198 +76,262 @@ PROGRAMS_examples += \
tuto4_site_set_create tuto4_site_set_create
EXTRA_PROGRAMS = $(PROGRAMS_examples) EXTRA_PROGRAMS = $(PROGRAMS_examples)
# FIXME: Is this really needed?
CLEANFILES += $(PROGRAMS_examples) CLEANFILES += $(PROGRAMS_examples)
accu_right_instanciation_SOURCES = $(examples_dir)/accu-right-instanciation.cc # FIXME: Careful, this will only work if this file is included by
borderthickness_SOURCES = $(examples_dir)/borderthickness.cc # `milena/doc/Makefile.am', since `examples/' is a subdirectory of
box2d_bbox_SOURCES = $(examples_dir)/box2d-bbox.cc # `milena/doc/'. Anyway, this file is to be eventually inlined in
domain_display_SOURCES = $(examples_dir)/domain-display.cc # `milena/doc/Makefile.am', so this is not a big deal.
dpoint_1_SOURCES = $(examples_dir)/dpoint-1.cc accu_right_instanciation_SOURCES = examples/accu-right-instanciation.cc
estim_sites_SOURCES = $(examples_dir)/estim-sites.cc