[Olena-patches] [PATCH 3/3] Regen Makefile helpers.

* doc/outputs/outputs.mk, * headers.mk, * tests/unit_test/unit-tests.mk: Regen. --- milena/ChangeLog | 9 +++++++++ milena/doc/outputs/outputs.mk | 6 ++++++ milena/headers.mk | 16 ++++++++++------ milena/tests/unit_test/unit-tests.mk | 32 ++++++++++++++++++++------------ 4 files changed, 45 insertions(+), 18 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index e9e4656..a059a09 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,3 +1,12 @@ +2009-06-12 Roland Levillain <roland(a)lrde.epita.fr> + + Regen Makefile helpers. + + * doc/outputs/outputs.mk, + * headers.mk, + * tests/unit_test/unit-tests.mk: + Regen. + 2009-06-12 Edwin Carlinet <carlinet(a)lrde.epita.fr> Move height, volume, bbox accus in shape directory. diff --git a/milena/doc/outputs/outputs.mk b/milena/doc/outputs/outputs.mk index 754db84..357d962 100644 --- a/milena/doc/outputs/outputs.mk +++ b/milena/doc/outputs/outputs.mk @@ -47,6 +47,12 @@ 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/tuto2_first_image.txt \ outputs/tuto3_colorize.txt \ outputs/tuto3_println.txt \ diff --git a/milena/headers.mk b/milena/headers.mk index c9de056..76725c1 100644 --- a/milena/headers.mk +++ b/milena/headers.mk @@ -3,15 +3,12 @@ nobase_include_HEADERS = \ mln/version.hh \ mln/accu/all.hh \ -mln/accu/bbox.hh \ mln/accu/center.hh \ mln/accu/compute.hh \ mln/accu/convolve.hh \ -mln/accu/count.hh \ mln/accu/count_adjacent_vertices.hh \ mln/accu/count_labels.hh \ mln/accu/essential.hh \ -mln/accu/height.hh \ mln/accu/histo.hh \ mln/accu/image/all.hh \ mln/accu/image/essential.hh \ @@ -33,8 +30,11 @@ mln/accu/logic/land_basic.hh \ mln/accu/logic/lor.hh \ mln/accu/logic/lor_basic.hh \ mln/accu/maj_h.hh \ +mln/accu/math/all.hh \ +mln/accu/math/count.hh \ +mln/accu/math/essential.hh \ +mln/accu/math/sum.hh \ mln/accu/max_site.hh \ -mln/accu/median_alt.hh \ mln/accu/nil.hh \ mln/accu/p.hh \ mln/accu/pair.hh \ @@ -42,6 +42,11 @@ mln/accu/rank.hh \ mln/accu/rank_bool.hh \ mln/accu/rank_high_quant.hh \ mln/accu/rms.hh \ +mln/accu/shape/all.hh \ +mln/accu/shape/bbox.hh \ +mln/accu/shape/essential.hh \ +mln/accu/shape/height.hh \ +mln/accu/shape/volume.hh \ mln/accu/site_set/all.hh \ mln/accu/site_set/essential.hh \ mln/accu/site_set/rectangularity.hh \ @@ -51,13 +56,13 @@ mln/accu/stat/essential.hh \ mln/accu/stat/max.hh \ mln/accu/stat/max_h.hh \ mln/accu/stat/mean.hh \ +mln/accu/stat/median_alt.hh \ mln/accu/stat/median_h.hh \ mln/accu/stat/min.hh \ mln/accu/stat/min_h.hh \ mln/accu/stat/min_max.hh \ mln/accu/stat/var.hh \ mln/accu/stat/variance.hh \ -mln/accu/sum.hh \ mln/accu/sup.hh \ mln/accu/take.hh \ mln/accu/transform.hh \ @@ -68,7 +73,6 @@ mln/accu/transform_snake.hh \ mln/accu/transform_stop.hh \ mln/accu/tuple.hh \ mln/accu/v.hh \ -mln/accu/volume.hh \ mln/algebra/all.hh \ mln/algebra/essential.hh \ mln/algebra/h_mat.hh \ diff --git a/milena/tests/unit_test/unit-tests.mk b/milena/tests/unit_test/unit-tests.mk index de60cc2..0f4fa00 100644 --- a/milena/tests/unit_test/unit-tests.mk +++ b/milena/tests/unit_test/unit-tests.mk @@ -2,15 +2,12 @@ check_PROGRAMS = \ mln_accu_all \ -mln_accu_bbox \ mln_accu_center \ mln_accu_compute \ mln_accu_convolve \ -mln_accu_count \ mln_accu_count_adjacent_vertices \ mln_accu_count_labels \ mln_accu_essential \ -mln_accu_height \ mln_accu_histo \ mln_accu_image_all \ mln_accu_image_essential \ @@ -32,8 +29,11 @@ mln_accu_logic_land_basic \ mln_accu_logic_lor \ mln_accu_logic_lor_basic \ mln_accu_maj_h \ +mln_accu_math_all \ +mln_accu_math_count \ +mln_accu_math_essential \ +mln_accu_math_sum \ mln_accu_max_site \ -mln_accu_median_alt \ mln_accu_nil \ mln_accu_p \ mln_accu_pair \ @@ -41,6 +41,11 @@ mln_accu_rank \ mln_accu_rank_bool \ mln_accu_rank_high_quant \ mln_accu_rms \ +mln_accu_shape_all \ +mln_accu_shape_bbox \ +mln_accu_shape_essential \ +mln_accu_shape_height \ +mln_accu_shape_volume \ mln_accu_site_set_all \ mln_accu_site_set_essential \ mln_accu_site_set_rectangularity \ @@ -50,13 +55,13 @@ mln_accu_stat_essential \ mln_accu_stat_max \ mln_accu_stat_max_h \ mln_accu_stat_mean \ +mln_accu_stat_median_alt \ mln_accu_stat_median_h \ mln_accu_stat_min \ mln_accu_stat_min_h \ mln_accu_stat_min_max \ mln_accu_stat_var \ mln_accu_stat_variance \ -mln_accu_sum \ mln_accu_sup \ mln_accu_take \ mln_accu_transform \ @@ -67,7 +72,6 @@ mln_accu_transform_snake \ mln_accu_transform_stop \ mln_accu_tuple \ mln_accu_v \ -mln_accu_volume \ mln_algebra_all \ mln_algebra_essential \ mln_algebra_h_mat \ @@ -1258,15 +1262,12 @@ mln_world_inter_pixel_neighb2d \ mln_world_inter_pixel_separator_to_pixels mln_accu_all_SOURCES = mln_accu_all.cc -mln_accu_bbox_SOURCES = mln_accu_bbox.cc mln_accu_center_SOURCES = mln_accu_center.cc mln_accu_compute_SOURCES = mln_accu_compute.cc mln_accu_convolve_SOURCES = mln_accu_convolve.cc -mln_accu_count_SOURCES = mln_accu_count.cc mln_accu_count_adjacent_vertices_SOURCES = mln_accu_count_adjacent_vertices.cc mln_accu_count_labels_SOURCES = mln_accu_count_labels.cc mln_accu_essential_SOURCES = mln_accu_essential.cc -mln_accu_height_SOURCES = mln_accu_height.cc mln_accu_histo_SOURCES = mln_accu_histo.cc mln_accu_image_all_SOURCES = mln_accu_image_all.cc mln_accu_image_essential_SOURCES = mln_accu_image_essential.cc @@ -1288,8 +1289,11 @@ mln_accu_logic_land_basic_SOURCES = mln_accu_logic_land_basic.cc mln_accu_logic_lor_SOURCES = mln_accu_logic_lor.cc mln_accu_logic_lor_basic_SOURCES = mln_accu_logic_lor_basic.cc mln_accu_maj_h_SOURCES = mln_accu_maj_h.cc +mln_accu_math_all_SOURCES = mln_accu_math_all.cc +mln_accu_math_count_SOURCES = mln_accu_math_count.cc +mln_accu_math_essential_SOURCES = mln_accu_math_essential.cc +mln_accu_math_sum_SOURCES = mln_accu_math_sum.cc mln_accu_max_site_SOURCES = mln_accu_max_site.cc -mln_accu_median_alt_SOURCES = mln_accu_median_alt.cc mln_accu_nil_SOURCES = mln_accu_nil.cc mln_accu_p_SOURCES = mln_accu_p.cc mln_accu_pair_SOURCES = mln_accu_pair.cc @@ -1297,6 +1301,11 @@ mln_accu_rank_SOURCES = mln_accu_rank.cc mln_accu_rank_bool_SOURCES = mln_accu_rank_bool.cc mln_accu_rank_high_quant_SOURCES = mln_accu_rank_high_quant.cc mln_accu_rms_SOURCES = mln_accu_rms.cc +mln_accu_shape_all_SOURCES = mln_accu_shape_all.cc +mln_accu_shape_bbox_SOURCES = mln_accu_shape_bbox.cc +mln_accu_shape_essential_SOURCES = mln_accu_shape_essential.cc +mln_accu_shape_height_SOURCES = mln_accu_shape_height.cc +mln_accu_shape_volume_SOURCES = mln_accu_shape_volume.cc mln_accu_site_set_all_SOURCES = mln_accu_site_set_all.cc mln_accu_site_set_essential_SOURCES = mln_accu_site_set_essential.cc mln_accu_site_set_rectangularity_SOURCES = mln_accu_site_set_rectangularity.cc @@ -1306,13 +1315,13 @@ mln_accu_stat_essential_SOURCES = mln_accu_stat_essential.cc mln_accu_stat_max_SOURCES = mln_accu_stat_max.cc mln_accu_stat_max_h_SOURCES = mln_accu_stat_max_h.cc mln_accu_stat_mean_SOURCES = mln_accu_stat_mean.cc +mln_accu_stat_median_alt_SOURCES = mln_accu_stat_median_alt.cc mln_accu_stat_median_h_SOURCES = mln_accu_stat_median_h.cc mln_accu_stat_min_SOURCES = mln_accu_stat_min.cc mln_accu_stat_min_h_SOURCES = mln_accu_stat_min_h.cc mln_accu_stat_min_max_SOURCES = mln_accu_stat_min_max.cc mln_accu_stat_var_SOURCES = mln_accu_stat_var.cc mln_accu_stat_variance_SOURCES = mln_accu_stat_variance.cc -mln_accu_sum_SOURCES = mln_accu_sum.cc mln_accu_sup_SOURCES = mln_accu_sup.cc mln_accu_take_SOURCES = mln_accu_take.cc mln_accu_transform_SOURCES = mln_accu_transform.cc @@ -1323,7 +1332,6 @@ mln_accu_transform_snake_SOURCES = mln_accu_transform_snake.cc mln_accu_transform_stop_SOURCES = mln_accu_transform_stop.cc mln_accu_tuple_SOURCES = mln_accu_tuple.cc mln_accu_v_SOURCES = mln_accu_v.cc -mln_accu_volume_SOURCES = mln_accu_volume.cc mln_algebra_all_SOURCES = mln_algebra_all.cc mln_algebra_essential_SOURCES = mln_algebra_essential.cc mln_algebra_h_mat_SOURCES = mln_algebra_h_mat.cc -- 1.6.2.4