Commit e0ecffb4 authored by Roland Levillain's avatar Roland Levillain
Browse files

Stop make from recurring in doc/examples.

	* doc/Makefile.am: Include
	$(top_srcdir)/milena/doc/examples/make.mk.
	(SUBDIRS): Remove variable.
	(examples, data-regen, fig-convert): Remove (phony) targets.
	* doc/examples/Makefile.am: Rename as...
	* doc/examples/make.mk: ...this.
	Adjust.
	* doc/examples/ima-save.cc,
	* doc/tools/sample_utils.hh:
	Adjust as well.
	* milena/doc/examples/split/ima-save-1.cc.raw: Regen.
parent 69c0a1da
2010-03-03 Roland Levillain <roland@lrde.epita.fr>
Stop make from recurring in doc/examples.
* doc/Makefile.am: Include
$(top_srcdir)/milena/doc/examples/make.mk.
(SUBDIRS): Remove variable.
(examples, data-regen, fig-convert): Remove (phony) targets.
* doc/examples/Makefile.am: Rename as...
* doc/examples/make.mk: ...this.
Adjust.
* doc/examples/ima-save.cc,
* doc/tools/sample_utils.hh:
Adjust as well.
* milena/doc/examples/split/ima-save-1.cc.raw: Regen.
2010-03-03 Roland Levillain <roland@lrde.epita.fr> 2010-03-03 Roland Levillain <roland@lrde.epita.fr>
   
Stop make from recurring in doc/white_paper. Stop make from recurring in doc/white_paper.
...@@ -20,9 +20,6 @@ ...@@ -20,9 +20,6 @@
include $(top_srcdir)/milena/doc/doc.mk include $(top_srcdir)/milena/doc/doc.mk
SUBDIRS = \
examples
DOXYGEN = doxygen DOXYGEN = doxygen
# Initialiaze variables. # Initialiaze variables.
...@@ -35,9 +32,7 @@ CLEANFILES = ...@@ -35,9 +32,7 @@ CLEANFILES =
doc-user doc-devel \ doc-user doc-devel \
doc-pdf doc-html doc-devel-pdf doc-devel-html \ doc-pdf doc-html doc-devel-pdf doc-devel-html \
ref-doc-pdf ref-doc-html \ ref-doc-pdf ref-doc-html \
ref-doc-devel-pdf ref-doc-devel-html \ ref-doc-devel-pdf ref-doc-devel-html
examples data-regen fig-convert
doc: doc-user doc-devel doc: doc-user doc-devel
...@@ -136,14 +131,6 @@ include $(srcdir)/white_paper/white_paper.mk ...@@ -136,14 +131,6 @@ include $(srcdir)/white_paper/white_paper.mk
include $(srcdir)/ref_guide/ref_guide.mk include $(srcdir)/ref_guide/ref_guide.mk
# FIXME: Adress the construction of examples (see examples/Makefile.am).
data-regen:
cd examples && $(MAKE) $(AM_MAKEFLAGS) $@
fix-refdata:
cd examples && $(MAKE) $(AM_MAKEFLAGS) $@
# Make sure the figures are the first files in EXTRA_DIST. # Make sure the figures are the first files in EXTRA_DIST.
# Make the 'fake-doc' rule works correctly. # Make the 'fake-doc' rule works correctly.
...@@ -201,6 +188,12 @@ edit_user = sed \ ...@@ -201,6 +188,12 @@ edit_user = sed \
-e 's,EXCLUDE_SYMBOLS =,EXCLUDE_SYMBOLS = *::internal* *_ mln::trait::*,g' -e 's,EXCLUDE_SYMBOLS =,EXCLUDE_SYMBOLS = *::internal* *_ mln::trait::*,g'
## ---------- ##
## Examples. ##
## ---------- ##
include $(top_srcdir)/milena/doc/examples/make.mk
# Regen files. # Regen files.
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
......
...@@ -15,6 +15,8 @@ int main() ...@@ -15,6 +15,8 @@ int main()
image2d<bool> ima = make::image(vals); image2d<bool> ima = make::image(vals);
// \{ // \{
io::pbm::save(ima, "../figures/ima_save.pbm"); /* FIXME: Hard-coded paths are bad! Use something like
milena/tests/data.hh.in instead. */
io::pbm::save(ima, "figures/ima_save.pbm");
// \} // \}
} }
# Copyright (C) 2009 EPITA Research and Development Laboratory (LRDE). # -*- Automake -*-
# Copyright (C) 2009, 2010 EPITA Research and Development Laboratory (LRDE).
# #
# This file is part of Olena. # This file is part of Olena.
# #
...@@ -17,9 +19,9 @@ ...@@ -17,9 +19,9 @@
## Process this file through Automake to create Makefile.in. ## Process this file through Automake to create Makefile.in.
include $(top_srcdir)/milena/doc/doc.mk examples_dir = $(doc_dir)/examples
EXTRA_PROGRAMS = \ PROGRAMS_examples = \
accu-right-instanciation \ accu-right-instanciation \
borderthickness \ borderthickness \
box2d-bbox \ box2d-bbox \
...@@ -63,90 +65,93 @@ EXTRA_PROGRAMS = \ ...@@ -63,90 +65,93 @@ EXTRA_PROGRAMS = \
win-create-1 \ win-create-1 \
win-create-2 win-create-2
EXTRA_PROGRAMS += \ PROGRAMS_examples += \
tuto2_first_image \ tuto2_first_image \
tuto3_rw_image \ tuto3_rw_image \
tuto4_genericity_and_algorithms tuto4_genericity_and_algorithms
# Tuto3 # Tuto3
EXTRA_PROGRAMS += \ PROGRAMS_examples += \
tuto3_colorize \ tuto3_colorize \
tuto3_println \ tuto3_println \
tuto3_trace tuto3_trace
# Tuto4 # Tuto4
EXTRA_PROGRAMS += \ PROGRAMS_examples += \
tuto4_point2d \ tuto4_point2d \
tuto4_site_set_create tuto4_site_set_create
CLEANFILES = $(EXTRA_PROGRAMS) EXTRA_PROGRAMS = $(PROGRAMS_examples)
# FIXME: Is this really needed?
CLEANFILES += $(PROGRAMS_examples)
accu_right_instanciation_SOURCES = accu-right-instanciation.cc accu_right_instanciation_SOURCES = $(examples_dir)/accu-right-instanciation.cc
borderthickness_SOURCES = borderthickness.cc borderthickness_SOURCES = $(examples_dir)/borderthickness.cc
box2d_bbox_SOURCES = box2d-bbox.cc box2d_bbox_SOURCES = $(examples_dir)/box2d-bbox.cc
domain_display_SOURCES = domain-display.cc domain_display_SOURCES = $(examples_dir)/domain-display.cc
dpoint_1_SOURCES = dpoint-1.cc dpoint_1_SOURCES = $(examples_dir)/dpoint-1.cc
estim_sites_SOURCES = estim-sites.cc estim_sites_SOURCES = $(examples_dir)/estim-sites.cc
extend_SOURCES = extend.cc extend_SOURCES = $(examples_dir)/extend.cc
extension_ignore_SOURCES = extension-ignore.cc extension_ignore_SOURCES = $(examples_dir)/extension-ignore.cc
fill_SOURCES = fill.cc fill_SOURCES = $(examples_dir)/fill.cc
fill_call_1_SOURCES = fill-call-1.cc fill_call_1_SOURCES = $(examples_dir)/fill-call-1.cc
fill_part_image_SOURCES = fill-part-image.cc fill_part_image_SOURCES = $(examples_dir)/fill-part-image.cc
fill_subdomain_SOURCES = fill-subdomain.cc fill_subdomain_SOURCES = $(examples_dir)/fill-subdomain.cc
fill_subdomain_shorter_SOURCES = fill-subdomain-shorter.cc fill_subdomain_shorter_SOURCES = $(examples_dir)/fill-subdomain-shorter.cc
fill_imageif_cfun_SOURCES = fill-imageif-cfun.cc fill_imageif_cfun_SOURCES = $(examples_dir)/fill-imageif-cfun.cc
first_routine_SOURCES = tuto3/first_routine.cc first_routine_SOURCES = $(examples_dir)/tuto3/first_routine.cc
forall_piter_SOURCES = forall-piter.cc forall_piter_SOURCES = $(examples_dir)/forall-piter.cc
fun_p2v_1_SOURCES = fun-p2v-1.cc fun_p2v_1_SOURCES = $(examples_dir)/fun-p2v-1.cc
graph_data_SOURCES = graph-data.cc graph_data_SOURCES = $(examples_dir)/graph-data.cc
graph_iter_SOURCES = graph-iter.cc graph_iter_SOURCES = $(examples_dir)/graph-iter.cc
ima_has_SOURCES = ima-has.cc ima_has_SOURCES = $(examples_dir)/ima-has.cc
ima_save_SOURCES = ima-save.cc ima_save_SOURCES = $(examples_dir)/ima-save.cc
ima_size_SOURCES = ima-size.cc ima_size_SOURCES = $(examples_dir)/ima-size.cc
ima2d_1_SOURCES = ima2d-1.cc ima2d_1_SOURCES = $(examples_dir)/ima2d-1.cc
ima2d_2_SOURCES = ima2d-2.cc ima2d_2_SOURCES = $(examples_dir)/ima2d-2.cc
ima2d_3_SOURCES = ima2d-3.cc ima2d_3_SOURCES = $(examples_dir)/ima2d-3.cc
ima2d_4_SOURCES = ima2d-4.cc ima2d_4_SOURCES = $(examples_dir)/ima2d-4.cc
ima2d_5_SOURCES = ima2d-5.cc ima2d_5_SOURCES = $(examples_dir)/ima2d-5.cc
ima2d_6_clone_SOURCES = ima2d-6-clone.cc ima2d_6_clone_SOURCES = $(examples_dir)/ima2d-6-clone.cc
ima2d_7_SOURCES = ima2d-7.cc ima2d_7_SOURCES = $(examples_dir)/ima2d-7.cc
ima2d_rot_SOURCES = ima2d-rot.cc ima2d_rot_SOURCES = $(examples_dir)/ima2d-rot.cc
labeling_compute_SOURCES = labeling-compute.cc labeling_compute_SOURCES = $(examples_dir)/labeling-compute.cc
logical_not_SOURCES = logical-not.cc logical_not_SOURCES = $(examples_dir)/logical-not.cc
mln_var_SOURCES = mln_var.cc mln_var_SOURCES = $(examples_dir)/mln_var.cc
paste_SOURCES = paste.cc paste_SOURCES = $(examples_dir)/paste.cc
paste_call_1_SOURCES = paste-call-1.cc paste_call_1_SOURCES = $(examples_dir)/paste-call-1.cc
parray_append_SOURCES = parray-append.cc parray_append_SOURCES = $(examples_dir)/parray-append.cc
parray_bbox_SOURCES = parray-bbox.cc parray_bbox_SOURCES = $(examples_dir)/parray-bbox.cc
point_1_SOURCES = point-1.cc point_1_SOURCES = $(examples_dir)/point-1.cc
predicate_1_SOURCES = predicate-1.cc predicate_1_SOURCES = $(examples_dir)/predicate-1.cc
win_create_1_SOURCES = win-create-1.cc win_create_1_SOURCES = $(examples_dir)/win-create-1.cc
win_create_2_SOURCES = win-create-2.cc win_create_2_SOURCES = $(examples_dir)/win-create-2.cc
tuto2_first_image_SOURCES = tuto2_first_image.cc tuto2_first_image_SOURCES = $(examples_dir)/tuto2_first_image.cc
tuto3_rw_image_SOURCES = tuto3_rw_image.cc tuto3_rw_image_SOURCES = $(examples_dir)/tuto3_rw_image.cc
tuto4_genericity_and_algorithms_SOURCES = tuto4_genericity_and_algorithms.cc tuto4_genericity_and_algorithms_SOURCES = $(examples_dir)/tuto4_genericity_and_algorithms.cc
# Tuto 3 # Tuto 3
tuto3_colorize_SOURCES = tuto3/colorize.cc tuto3_colorize_SOURCES = $(examples_dir)/tuto3/colorize.cc
tuto3_println_SOURCES = tuto3/println.cc tuto3_println_SOURCES = $(examples_dir)/tuto3/println.cc
tuto3_trace_SOURCES = tuto3/trace.cc tuto3_trace_SOURCES = $(examples_dir)/tuto3/trace.cc
# Tuto 4 # Tuto 4
tuto4_site_set_create_SOURCES = tuto4/site_set_create.cc tuto4_site_set_create_SOURCES = $(examples_dir)/tuto4/site_set_create.cc
tuto4_point2d_SOURCES = tuto4/point2d.cc tuto4_point2d_SOURCES = $(examples_dir)/tuto4/point2d.cc
.PHONY : examples run-examples diff-data fix-refdata \ .PHONY : examples run-examples diff-data fix-refdata \
split-examples split-outputs split-examples split-outputs
examples: $(EXTRA_PROGRAMS) examples: $(PROGRAMS_examples)
run-examples: examples run-examples: examples
test -d $(top_builddir)/milena/doc/figures \ test -d $(top_builddir)/milena/doc/figures \
|| mkdir $(top_builddir)/milena/doc/figures; \ || mkdir $(top_builddir)/milena/doc/figures; \
@failcom='exit 1'; \ failcom='exit 1'; \
list='$(EXTRA_PROGRAMS)'; for bin in $$list; do \ list='$(PROGRAMS_examples)'; for bin in $$list; do \
echo "Running $$bin"; \ echo "Running $$bin"; \
./$$bin > $(OUTPUTS_SRCDIR)/$$bin.txt || eval $$failcom; \ ./$$bin > $(OUTPUTS_SRCDIR)/$$bin.txt || eval $$failcom; \
done done
......
io::pbm::save(ima, "../figures/ima_save.pbm"); /* FIXME: Hard-coded paths are bad! Use something like
milena/tests/data.hh.in instead. */
io::pbm::save(ima, "figures/ima_save.pbm");
...@@ -43,7 +43,9 @@ namespace doc ...@@ -43,7 +43,9 @@ namespace doc
static int file_id = 1; static int file_id = 1;
std::ostringstream os; std::ostringstream os;
os << "../figures/" /* FIXME: Hard-coded paths are bad! Use something like
milena/tests/data.hh.in instead. */
os << "figures/"
<< name << name
<< "-" << "-"
<< file_id++ << file_id++
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment