1. 13 Sep, 2013 1 commit
    • Roland Levillain's avatar
      Milena: Factor Makefiles a bit more using file inclusion. · 83c98751
      Roland Levillain authored
      	* tests/tests.mk (AM_CPPFLAGS): Move general flags...
      	* common.mk (AM_CPPFLAGS): ...here.
      	Include it...
      	* doc/Makefile.am: ...here, to factor common parts.
      	* milena/apps/apps.mk: New file.
      	Include it...
      	* apps/constrained-connectivity/Makefile.am,
      	* apps/generic-skel/Makefile.am,
      	* apps/graph-morpho/Makefile.am,
      	* apps/morphers/Makefile.am,
      	* apps/papers/levillain.09.ismm/Makefile.am:
      	...here, to factor common parts.
      	* apps/mesh-segm-skel/Makefile.am: Likewise.
      	(noinst_HEADERS): Add save_bin_alt.hh.
      	(mesh_complex_skel_SOURCES)
      	(mesh_complex_max_curv_skel_SOURCES)
      	(mesh_complex_pinv_curv_skel_SOURCES):
      	Remove.
      	* tools/tools.mk: Remove this file and move its contents...
      	* tools/Makefile.am: ...here.
      83c98751
  2. 12 Sep, 2013 4 commits
  3. 11 Sep, 2013 5 commits
  4. 10 Sep, 2013 3 commits
  5. 09 Sep, 2013 6 commits
    • Roland Levillain's avatar
      Swilena: Remove Milena's build dir from the file inclusion path. · 8699ea5d
      Roland Levillain authored
      	* python/Makefile.am (AM_CPPFLAGS): Here.
      8699ea5d
    • Roland Levillain's avatar
      Scribo: Do not look for headers in the build tree uselessly. · e61d93d2
      Roland Levillain authored
      	* doc/Makefile.am (AM_CPPFLAGS): Remove Scribo's build dir from
      	the file inclusion path.
      	* src/Makefile.am
      	(pbm_text_in_doc_CPPFLAGS, text_recognition_in_picture_CPPFLAGS)
      	* src/contest/DAE-2011/Makefile.am
      	(content_in_hdoc_dae_CPPFLAGS, content_in_hdoc_dae_CPPFLAGS)
      	* src/contest/hbr-2013/Makefile.am (content_in_hdoc_hbr_CPPFLAGS)
      	* src/contest/hdlac-2011/Makefile.am (content_in_hdoc_hdlac_CPPFLAGS)
      	* src/contest/hnla-2013/Makefile.am (content_in_hdoc_hnla_CPPFLAGS)
      	* src/text/Makefile.am
      	(pbm_lines_recognition_CPPFLAGS, pbm_recognition_CPPFLAGS)
      	* src/toolchain/nepomuk/Makefile.am (text_extraction_CPPFLAGS)
      	* tests/toolchain/nepomuk/Makefile.am (text_extraction_CPPFLAGS):
      	Remove -I$(top_builddir).
      	* src/pbm_text_in_doc.cc,
      	* src/text/pbm_lines_recognition.cc
      	* src/text/pbm_recognition.cc
      	* src/text_recognition_in_picture.cc
      	* src/toolchain/nepomuk/text_extraction.cc
      	* tests/toolchain/nepomuk/text_extraction.cc
      	[HAVE_CONFIG_H]: Do not include config.h.
      e61d93d2
    • Roland Levillain's avatar
      Milena: Do not look for headers in the build tree uselessly. · 9c2f117f
      Roland Levillain authored
      	* tools/tools.mk (AM_CPPFLAGS): Remove Milena's build dir from the
      	file inclusion path.
      	Remove outdated FIXMEs.
      	* apps/constrained-connectivity/Makefile.am,
      	* apps/graph-morpho/Makefile.am,
      	* apps/mesh-segm-skel/Makefile.am,
      	* apps/morphers/Makefile.am,
      	* apps/papers/levillain.09.ismm/Makefile.am
      	(AM_CPPFLAGS): Explain why $(top_builddir)/milena is part of the
      	file inclusion path.
      	* apps/generic-skel/Makefile.am,
      	* doc/Makefile.am,
      	* tests/tests.mk
      	(AM_CPPFLAGS): Uniformity changes.
      9c2f117f
    • Roland Levillain's avatar
      Olena: Remove Milena's build dir from the file inclusion path. · 9d5b6b6c
      Roland Levillain authored
      	* doc/Makefile.am (AM_CPPFLAGS): Here.
      9d5b6b6c
    • Roland Levillain's avatar
      Force make to regen Milena's mln/version.hh before other files. · c9517b92
      Roland Levillain authored
      	* Makefile.am (SUBDIRS): Prepend `.' to the list of subdirectories
      	to force make to honor this Makefile's targets before recursing in
      	Milena's subdirectories.
      c9517b92
    • Roland Levillain's avatar
      Have `make regen' also regenerate Milena's mln/version.hh. · b8bc67ae
      Roland Levillain authored
      	* Makefile.am (regen-am): Here.
      b8bc67ae
  6. 06 Sep, 2013 4 commits
  7. 05 Sep, 2013 1 commit
  8. 02 Sep, 2013 2 commits
    • Roland Levillain's avatar
      Add parentheses around complex operands of operator `|'. · bb6ddb7e
      Roland Levillain authored
      	* apps/mesh-segm-skel/mesh-complex-max-curv-1-collapse.cc,
      	* apps/mesh-segm-skel/mesh-complex-max-curv-2-collapse.cc:
      	Here, as suggested by g++ 4.7.
      bb6ddb7e
    • Roland Levillain's avatar
      Do not run test-mixed in Milena apps with the `check' target. · abdd5eb7
      Roland Levillain authored
      	* apps/generic-skel/test-mixed.in,
      	* apps/mesh-segm-skel/test-mixed.in:
      	Add a `-wadgmm-2010' suffix to saved images to distinguish them
      	from outputs of other tests.
      	* apps/generic-skel/Makefile.am,
      	* apps/mesh-segm-skel/Makefile.am
      	(MOSTLYCLEANFILES): Adjust.
      	Add files generated by disabled test cases.
      	(generated_checked_tests): New.
      	Contain all generated checked tests.
      	(generated_tests): Set it to contain all test (checked
      	automatically and run manually).
      	(TESTS): Set it to $(generated_checked_tests).
      	Aesthetic changes.
      abdd5eb7
  9. 31 Aug, 2013 6 commits
  10. 30 Aug, 2013 8 commits
    • Roland Levillain's avatar
      0774f862
    • Roland Levillain's avatar
      configure.ac: Untabify. · 346ed701
      Roland Levillain authored
      346ed701
    • Roland Levillain's avatar
      Simplify even more Scribo Makefiles thanks to AM_DEFAULT_SOURCE_EXT. · a40ac76c
      Roland Levillain authored
      	* src/Makefile.am,
      	* src/binarization/Makefile.am:
      	Here.
      a40ac76c
    • Roland Levillain's avatar
      Simplify even more Milena Makefiles thanks to AM_DEFAULT_SOURCE_EXT. · f8090ed8
      Roland Levillain authored
      	* apps/generic-skel/Makefile.am,
      	* apps/mesh-segm-skel/Makefile.am,
      	* tests/io/vtk/Makefile.am,
      	* tests/transform/Makefile.am,
      	* tools/Makefile.am:
      	Here.
      f8090ed8
    • Roland Levillain's avatar
      Regen images of the Milena documentation. · 32fe23ae
      Roland Levillain authored
      	* doc/figures/extend-1.ppm,
      	* doc/figures/extend-2.ppm,
      	* doc/figures/extend-3.ppm,
      	* doc/figures/extend-4.ppm,
      	* doc/figures/extend-5.ppm,
      	* doc/figures/fill-1.ppm,
      	* doc/figures/fill-2.ppm,
      	* doc/figures/fill-imageif-cfun-1.ppm,
      	* doc/figures/fill-subdomain-1.pbm,
      	* doc/figures/fill-subdomain-2.ppm,
      	* doc/figures/fill-subdomain-3.ppm,
      	* doc/figures/fill-subdomain-4.ppm,
      	* doc/figures/ima2d-rot-1.ppm,
      	* doc/figures/ima2d-rot-2.ppm,
      	* doc/figures/ima_save.pbm,
      	* doc/figures/labeling-compute-1.pbm,
      	* doc/figures/labeling-compute-2.ppm,
      	* doc/figures/logical-not-1.pbm,
      	* doc/figures/logical-not-2.pbm,
      	* doc/figures/logical-not-3.pbm,
      	* doc/figures/tuto2_first_image-1.pbm,
      	* doc/figures/tuto3_colorize-1.pgm,
      	* doc/figures/tuto3_colorize-2.ppm,
      	* doc/figures/tuto3_rw_image-1.ppm,
      	* doc/figures/tuto3_rw_image-2.ppm,
      	* doc/figures/tuto3_rw_image-3.ppm,
      	* doc/figures/tuto4_genericity_and_algorithms-1.ppm,
      	* doc/figures/tuto4_genericity_and_algorithms-2.ppm,
      	* doc/figures/tuto4_genericity_and_algorithms-3.pbm,
      	* doc/figures/tuto4_genericity_and_algorithms-4.ppm,
      	* doc/figures/tuto4_genericity_and_algorithms-5.ppm,
      	* doc/figures/tuto4_genericity_and_algorithms-6.ppm:
      	Regen.
      32fe23ae
    • Roland Levillain's avatar
      Make remaining Milena copyright headers uniform. · 917fa3dc
      Roland Levillain authored
      	* apps/generic-skel/image2d-skel-unconstrained.cc,
      	* apps/generic-skel/image2d-skel-with-end-points.cc,
      	* apps/mesh-segm-skel/mesh-complex-2-collapse.cc,
      	* apps/mesh-segm-skel/mesh-complex-max-curv-1-collapse.cc,
      	* apps/mesh-segm-skel/mesh-complex-max-curv-2-collapse.cc,
      	* apps/mesh-segm-skel/mesh-complex-max-curv-extrema.cc,
      	* apps/mesh-segm-skel/mesh-complex-max-curv-skel.cc,
      	* apps/mesh-segm-skel/mesh-complex-pinv-curv-segm.cc,
      	* apps/mesh-segm-skel/mesh-complex-pinv-curv-skel.cc,
      	* apps/mesh-segm-skel/off-to-vtk-bin.cc,
      	* mln/topo/is_not_1d_isthmus.hh,
      	* mln/topo/is_not_end_point.hh:
      	Here.
      917fa3dc
    • Roland Levillain's avatar
      Disable tests/value/int_u32 in Milena. · 7c470abe
      Roland Levillain authored
      	* tests/value/Makefile.am: Here.
      7c470abe
    • Roland Levillain's avatar
      Fix 3D simple point generators in Milena tools. · 2cbfa7dc
      Roland Levillain authored
      	* tools/Makefile.am: Fix build rules of optional programs.
      	* tools/simple_point3d_lut_tbb.cc: Rename as...
      	* tools/simple_point_3d_lut_tbb.cc: ...this.
      	s/point_3d/point3d/.
      2cbfa7dc