September 2013 - Olena-patches

olena: olena-2.0-795-g8699ea5 Swilena: Remove Milena's build dir from the file inclusion path.
by Roland Levillain 09 Sep '13

09 Sep '13

* python/Makefile.am (AM_CPPFLAGS): Here. --- swilena/ChangeLog | 6 ++++++ swilena/python/Makefile.am | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/swilena/ChangeLog b/swilena/ChangeLog index 38ccc2b..e84f1f9 100644 --- a/swilena/ChangeLog +++ b/swilena/ChangeLog @@ -1,3 +1,9 @@ +2013-09-09 Roland Levillain <roland(a)lrde.epita.fr> + + Swilena: Remove Milena's build dir from the file inclusion path. + + * python/Makefile.am (AM_CPPFLAGS): Here. + 2013-08-29 Roland Levillain <roland(a)lrde.epita.fr> Fix inclusion paths in Swilena. diff --git a/swilena/python/Makefile.am b/swilena/python/Makefile.am index 66630b9..2d8dfa7 100644 --- a/swilena/python/Makefile.am +++ b/swilena/python/Makefile.am @@ -22,7 +22,7 @@ ## FIXME: Factor as much as possible. See how we handled this in TC. -AM_CPPFLAGS = -I$(PYTHONINC) -I$(top_srcdir)/milena -I$(top_builddir)/milena +AM_CPPFLAGS = -I$(PYTHONINC) -I$(top_srcdir)/milena TOOLS_CXXFLAGS = @TOOLS_CXXFLAGS@ AM_CXXFLAGS = $(TOOLS_CXXFLAGS) AM_SWIGFLAGS = -Wall -c++ -python -I$(top_srcdir)/milena -- 1.7.10.4

1 0

olena: olena-2.0-793-g9c2f117 Milena: Do not look for headers in the build tree uselessly.
by Roland Levillain 09 Sep '13

09 Sep '13

* 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. --- milena/ChangeLog | 19 +++++++++++++++++++ milena/apps/constrained-connectivity/Makefile.am | 7 +++++-- milena/apps/generic-skel/Makefile.am | 4 ++-- milena/apps/graph-morpho/Makefile.am | 7 +++++-- milena/apps/mesh-segm-skel/Makefile.am | 4 +++- milena/apps/morphers/Makefile.am | 4 +++- milena/apps/papers/levillain.09.ismm/Makefile.am | 6 ++++-- milena/doc/Makefile.am | 7 ++++--- milena/tests/tests.mk | 9 +++++---- milena/tools/tools.mk | 14 ++------------ 10 files changed, 52 insertions(+), 29 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index 05aa014..c27a410 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,3 +1,22 @@ +2013-09-09 Roland Levillain <roland(a)lrde.epita.fr> + + Milena: Do not look for headers in the build tree uselessly. + + * 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. + 2013-09-06 Roland Levillain <roland(a)lrde.epita.fr> Force make to regen Milena's mln/version.hh before other files. diff --git a/milena/apps/constrained-connectivity/Makefile.am b/milena/apps/constrained-connectivity/Makefile.am index 6b3d3f3..1141317 100644 --- a/milena/apps/constrained-connectivity/Makefile.am +++ b/milena/apps/constrained-connectivity/Makefile.am @@ -1,4 +1,5 @@ -# Copyright (C) 2009, 2010 EPITA Research and Development Laboratory (LRDE) +# Copyright (C) 2009, 2010, 2013 EPITA Research and Development +# Laboratory (LRDE) # # This file is part of Olena. # @@ -17,7 +18,9 @@ include $(top_srcdir)/milena/common.mk # Find Milena headers. -AM_CPPFLAGS = -I$(top_srcdir)/milena -I$(top_builddir)/milena +AM_CPPFLAGS = -I$(top_srcdir)/milena +# Find apps/data.hh (generated header). +AM_CPPFLAGS += -I$(top_builddir)/milena # Produce fast code. APPS_CXXFLAGS = @APPS_CXXFLAGS@ AM_CXXFLAGS = $(APPS_CXXFLAGS) diff --git a/milena/apps/generic-skel/Makefile.am b/milena/apps/generic-skel/Makefile.am index eb4f8ba..44fc0dd 100644 --- a/milena/apps/generic-skel/Makefile.am +++ b/milena/apps/generic-skel/Makefile.am @@ -16,9 +16,9 @@ include $(top_srcdir)/milena/common.mk -# Find Milena and trimesh headers. +# Find Milena headers. AM_CPPFLAGS = -I$(top_srcdir)/milena -# Find apps/data.hh (generated file). +# Find apps/data.hh (generated header). AM_CPPFLAGS += -I$(top_builddir)/milena # Produce fast code. APPS_CXXFLAGS = @APPS_CXXFLAGS@ diff --git a/milena/apps/graph-morpho/Makefile.am b/milena/apps/graph-morpho/Makefile.am index d85a9ca..61eede8 100644 --- a/milena/apps/graph-morpho/Makefile.am +++ b/milena/apps/graph-morpho/Makefile.am @@ -1,4 +1,5 @@ -# Copyright (C) 2009, 2010 EPITA Research and Development Laboratory (LRDE) +# Copyright (C) 2009, 2010, 2013 EPITA Research and Development +# Laboratory (LRDE) # # This file is part of Olena. # @@ -17,7 +18,9 @@ include $(top_srcdir)/milena/common.mk # Find Milena headers. -AM_CPPFLAGS = -I$(top_srcdir)/milena -I$(top_builddir)/milena +AM_CPPFLAGS = -I$(top_srcdir)/milena +# Find apps/data.hh (generated header). +AM_CPPFLAGS += -I$(top_builddir)/milena # Produce fast code. APPS_CXXFLAGS = @APPS_CXXFLAGS@ AM_CXXFLAGS = $(APPS_CXXFLAGS) diff --git a/milena/apps/mesh-segm-skel/Makefile.am b/milena/apps/mesh-segm-skel/Makefile.am index afde381..90af4ee 100644 --- a/milena/apps/mesh-segm-skel/Makefile.am +++ b/milena/apps/mesh-segm-skel/Makefile.am @@ -18,7 +18,9 @@ include $(top_srcdir)/milena/common.mk # Find Milena headers. -AM_CPPFLAGS = -I$(top_srcdir)/milena -I$(top_builddir)/milena +AM_CPPFLAGS = -I$(top_srcdir)/milena +# Find apps/data.hh (generated header). +AM_CPPFLAGS += -I$(top_builddir)/milena # Produce fast code. APPS_CXXFLAGS = @APPS_CXXFLAGS@ AM_CXXFLAGS = $(APPS_CXXFLAGS) diff --git a/milena/apps/morphers/Makefile.am b/milena/apps/morphers/Makefile.am index ae8e3ff..f874601 100644 --- a/milena/apps/morphers/Makefile.am +++ b/milena/apps/morphers/Makefile.am @@ -20,7 +20,9 @@ include $(top_srcdir)/milena/common.mk # Find Milena headers. -AM_CPPFLAGS = -I$(top_srcdir)/milena -I$(top_builddir)/milena +AM_CPPFLAGS = -I$(top_srcdir)/milena +# Find apps/data.hh (generated header). +AM_CPPFLAGS += -I$(top_builddir)/milena # Produce fast code. APPS_CXXFLAGS = @APPS_CXXFLAGS@ AM_CXXFLAGS = $(APPS_CXXFLAGS) diff --git a/milena/apps/papers/levillain.09.ismm/Makefile.am b/milena/apps/papers/levillain.09.ismm/Makefile.am index f9f3808..fbc3567 100644 --- a/milena/apps/papers/levillain.09.ismm/Makefile.am +++ b/milena/apps/papers/levillain.09.ismm/Makefile.am @@ -1,4 +1,4 @@ -# Copyright (C) 2008, 2009, 2010, 2011 EPITA Research and Development +# Copyright (C) 2008, 2009, 2010, 2011, 2013 EPITA Research and Development # Laboratory (LRDE). # # This file is part of Olena. @@ -20,7 +20,9 @@ include $(top_srcdir)/milena/common.mk # Find Milena headers. -AM_CPPFLAGS = -I$(top_srcdir)/milena -I$(top_builddir)/milena +AM_CPPFLAGS = -I$(top_srcdir)/milena +# Find apps/data.hh (generated header). +AM_CPPFLAGS += -I$(top_builddir)/milena # Produce fast code. APPS_CXXFLAGS = @APPS_CXXFLAGS@ AM_CXXFLAGS = $(APPS_CXXFLAGS) diff --git a/milena/doc/Makefile.am b/milena/doc/Makefile.am index 8ba4971..f0532a2 100644 --- a/milena/doc/Makefile.am +++ b/milena/doc/Makefile.am @@ -16,9 +16,10 @@ # along with Olena. If not, see <http://www.gnu.org/licenses/>. -# Look for Milena headers in srcdir and for (generated) test headers -# (like data.hh) in builddir. -AM_CPPFLAGS = -I$(top_srcdir)/milena -I$(top_builddir)/milena +# Find Milena headers. +AM_CPPFLAGS = -I$(top_srcdir)/milena +# Find tests/data.hh and doc/tools/data.hh (generated headers). +AM_CPPFLAGS += -I$(top_builddir)/milena DOXYGEN = doxygen diff --git a/milena/tests/tests.mk b/milena/tests/tests.mk index 304b46e..9a41031 100644 --- a/milena/tests/tests.mk +++ b/milena/tests/tests.mk @@ -2,7 +2,7 @@ ## Shared configuration for tests. -## Copyright (C) 2007, 2008, 2009, 2010 EPITA Research and Development +## Copyright (C) 2007, 2008, 2009, 2010, 2013 EPITA Research and Development ## Laboratory (LRDE) ## ## This file is part of Olena. @@ -21,9 +21,10 @@ include $(top_srcdir)/milena/common.mk -# Look for Milena header in srcdir and for (generated) test headers -# (like data.hh) in builddir. -AM_CPPFLAGS = -I$(top_srcdir)/milena -I$(top_builddir)/milena +# Find Milena headers. +AM_CPPFLAGS = -I$(top_srcdir)/milena +# Find test/data.hh (generated header). +AM_CPPFLAGS += -I$(top_builddir)/milena TESTS_CXXFLAGS = @TESTS_CXXFLAGS@ AM_CXXFLAGS = $(TESTS_CXXFLAGS) diff --git a/milena/tools/tools.mk b/milena/tools/tools.mk index 9704d04..f75daa2 100644 --- a/milena/tools/tools.mk +++ b/milena/tools/tools.mk @@ -1,4 +1,4 @@ -# Copyright (C) 2009, 2010, 2011 EPITA Research and Development +# Copyright (C) 2009, 2010, 2011, 2013 EPITA Research and Development # Laboratory (LRDE) # # This file is part of Olena. @@ -17,18 +17,8 @@ include $(top_srcdir)/milena/common.mk -## FIXME: Revamp (see Olena 0.11's test suite). - -# Look for Milena headers in srcdir. +# Find Milena headers. AM_CPPFLAGS = -I$(top_srcdir)/milena -# Look for Milena headers in builddir. -AM_CPPFLAGS += -I$(top_builddir)/milena -# FIXME: Add -# -# AM_CXXFLAGS = $(CXXFLAGS_STRICT) $(CXXFLAGS_DEBUG) -# -# when oln.m4 (or just a part of it) is available in the distribution, -# instead of using the hand-made TOOLS_CXXFLAGS. TOOLS_CXXFLAGS = @TOOLS_CXXFLAGS@ AM_CXXFLAGS = $(TOOLS_CXXFLAGS) -- 1.7.10.4

1 0

olena: olena-2.0-794-ge61d93d Scribo: Do not look for headers in the build tree uselessly.
by Roland Levillain 09 Sep '13

09 Sep '13

* 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. --- scribo/ChangeLog | 26 +++++++++++++++++++++ scribo/doc/Makefile.am | 5 ++-- scribo/src/Makefile.am | 6 ++--- scribo/src/contest/DAE-2011/Makefile.am | 6 ++--- scribo/src/contest/hbr-2013/Makefile.am | 3 +-- scribo/src/contest/hdlac-2011/Makefile.am | 3 +-- scribo/src/contest/hnla-2013/Makefile.am | 3 +-- scribo/src/pbm_text_in_doc.cc | 6 +---- scribo/src/text/Makefile.am | 8 +++---- scribo/src/text/pbm_lines_recognition.cc | 6 +---- scribo/src/text/pbm_recognition.cc | 6 +---- scribo/src/text_recognition_in_picture.cc | 4 ---- scribo/src/toolchain/nepomuk/Makefile.am | 3 +-- scribo/src/toolchain/nepomuk/text_extraction.cc | 6 +---- scribo/tests/toolchain/nepomuk/Makefile.am | 3 +-- scribo/tests/toolchain/nepomuk/text_extraction.cc | 6 +---- 16 files changed, 45 insertions(+), 55 deletions(-) diff --git a/scribo/ChangeLog b/scribo/ChangeLog index 62a4083..4b9d587 100644 --- a/scribo/ChangeLog +++ b/scribo/ChangeLog @@ -1,3 +1,29 @@ +2013-09-09 Roland Levillain <roland(a)lrde.epita.fr> + + Scribo: Do not look for headers in the build tree uselessly. + + * 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. + 2013-08-30 Roland Levillain <roland(a)lrde.epita.fr> Simplify even more Scribo Makefiles thanks to AM_DEFAULT_SOURCE_EXT. diff --git a/scribo/doc/Makefile.am b/scribo/doc/Makefile.am index 5264ddf..18df048 100644 --- a/scribo/doc/Makefile.am +++ b/scribo/doc/Makefile.am @@ -16,9 +16,8 @@ # along with Olena. If not, see <http://www.gnu.org/licenses/>. -# Look for Scribo headers in srcdir and for (generated) test headers -# (like data.hh) in builddir. -AM_CPPFLAGS = -I$(top_srcdir)/scribo -I$(top_builddir)/scribo +# Find Scribo headers. +AM_CPPFLAGS = -I$(top_srcdir)/scribo DOXYGEN = doxygen diff --git a/scribo/src/Makefile.am b/scribo/src/Makefile.am index 1b6da73..827771c 100644 --- a/scribo/src/Makefile.am +++ b/scribo/src/Makefile.am @@ -44,8 +44,7 @@ if HAVE_TESSERACT pbm_text_in_doc_CPPFLAGS = $(AM_CPPFLAGS) \ $(TESSERACT_CPPFLAGS) \ $(TIFF_CPPFLAGS) \ - $(MAGICKXX_CPPFLAGS) \ - -I$(top_builddir) + $(MAGICKXX_CPPFLAGS) pbm_text_in_doc_LDFLAGS = $(AM_LDFLAGS) \ $(TESSERACT_LDFLAGS) \ $(TIFF_LDFLAGS) \ @@ -84,8 +83,7 @@ if HAVE_TESSERACT text_recognition_in_picture_CPPFLAGS = $(AM_CPPFLAGS) \ $(TESSERACT_CPPFLAGS) \ $(TIFF_CPPFLAGS) \ - $(MAGICKXX_CPPFLAGS) \ - -I$(top_builddir) + $(MAGICKXX_CPPFLAGS) text_recognition_in_picture_LDFLAGS = $(AM_LDFLAGS) \ $(TESSERACT_LDFLAGS) \ $(TIFF_LDFLAGS) \ diff --git a/scribo/src/contest/DAE-2011/Makefile.am b/scribo/src/contest/DAE-2011/Makefile.am index d5c9147..fc0413a 100644 --- a/scribo/src/contest/DAE-2011/Makefile.am +++ b/scribo/src/contest/DAE-2011/Makefile.am @@ -24,15 +24,13 @@ if HAVE_MAGICKXX noinst_PROGRAMS += content_in_hdoc_dae content_in_doc_dae content_in_hdoc_dae_CPPFLAGS = $(AM_CPPFLAGS) \ - $(MAGICKXX_CPPFLAGS) \ - -I$(top_builddir) + $(MAGICKXX_CPPFLAGS) content_in_hdoc_dae_LDFLAGS = $(AM_LDFLAGS) \ -lpthread \ $(MAGICKXX_LDFLAGS) content_in_doc_dae_CPPFLAGS = $(AM_CPPFLAGS) \ - $(MAGICKXX_CPPFLAGS) \ - -I$(top_builddir) + $(MAGICKXX_CPPFLAGS) content_in_doc_dae_LDFLAGS = $(AM_LDFLAGS) \ -lpthread \ $(MAGICKXX_LDFLAGS) diff --git a/scribo/src/contest/hbr-2013/Makefile.am b/scribo/src/contest/hbr-2013/Makefile.am index 7c8e80e..234d584 100644 --- a/scribo/src/contest/hbr-2013/Makefile.am +++ b/scribo/src/contest/hbr-2013/Makefile.am @@ -24,8 +24,7 @@ if HAVE_MAGICKXX noinst_PROGRAMS += content_in_hdoc_hbr content_in_hdoc_hbr_CPPFLAGS = $(AM_CPPFLAGS) \ - $(MAGICKXX_CPPFLAGS) \ - -I$(top_builddir) + $(MAGICKXX_CPPFLAGS) content_in_hdoc_hbr_LDFLAGS = $(AM_LDFLAGS) \ -lpthread \ $(MAGICKXX_LDFLAGS) diff --git a/scribo/src/contest/hdlac-2011/Makefile.am b/scribo/src/contest/hdlac-2011/Makefile.am index 84e3224..21a6ac7 100644 --- a/scribo/src/contest/hdlac-2011/Makefile.am +++ b/scribo/src/contest/hdlac-2011/Makefile.am @@ -24,8 +24,7 @@ if HAVE_MAGICKXX noinst_PROGRAMS += content_in_hdoc_hdlac content_in_hdoc_hdlac_CPPFLAGS = $(AM_CPPFLAGS) \ - $(MAGICKXX_CPPFLAGS) \ - -I$(top_builddir) + $(MAGICKXX_CPPFLAGS) content_in_hdoc_hdlac_LDFLAGS = $(AM_LDFLAGS) \ -lpthread \ $(MAGICKXX_LDFLAGS) diff --git a/scribo/src/contest/hnla-2013/Makefile.am b/scribo/src/contest/hnla-2013/Makefile.am index 439bfb6..d7376f8 100644 --- a/scribo/src/contest/hnla-2013/Makefile.am +++ b/scribo/src/contest/hnla-2013/Makefile.am @@ -24,8 +24,7 @@ if HAVE_MAGICKXX noinst_PROGRAMS += content_in_hdoc_hnla content_in_hdoc_hnla_CPPFLAGS = $(AM_CPPFLAGS) \ - $(MAGICKXX_CPPFLAGS) \ - -I$(top_builddir) + $(MAGICKXX_CPPFLAGS) content_in_hdoc_hnla_LDFLAGS = $(AM_LDFLAGS) \ -lpthread \ $(MAGICKXX_LDFLAGS) diff --git a/scribo/src/pbm_text_in_doc.cc b/scribo/src/pbm_text_in_doc.cc index d6889ea..8a5fea3 100644 --- a/scribo/src/pbm_text_in_doc.cc +++ b/scribo/src/pbm_text_in_doc.cc @@ -1,4 +1,4 @@ -// Copyright (C) 2009, 2010, 2011 EPITA Research and Development +// Copyright (C) 2009, 2010, 2011, 2013 EPITA Research and Development // Laboratory (LRDE) // // This file is part of Olena. @@ -24,10 +24,6 @@ // exception does not however invalidate any other reasons why the // executable file might be covered by the GNU General Public License. -#ifdef HAVE_CONFIG_H -# include <config.h> -#endif - #include <libgen.h> #include <fstream> #include <iostream> diff --git a/scribo/src/text/Makefile.am b/scribo/src/text/Makefile.am index fe97399..0ae4af5 100644 --- a/scribo/src/text/Makefile.am +++ b/scribo/src/text/Makefile.am @@ -1,4 +1,4 @@ -# Copyright (C) 2009, 2010 EPITA Research and Development Laboratory +# Copyright (C) 2009, 2010, 2013 EPITA Research and Development Laboratory # (LRDE). # # This file is part of Olena. @@ -27,8 +27,7 @@ if HAVE_TIFF noinst_PROGRAMS += pbm_lines_recognition pbm_lines_recognition_CPPFLAGS = $(AM_CPPFLAGS) \ $(TESSERACT_CPPFLAGS) \ - $(TIFF_CPPFLAGS) \ - -I$(top_builddir) + $(TIFF_CPPFLAGS) pbm_lines_recognition_LDFLAGS = $(AM_LDFLAGS) \ $(TESSERACT_LDFLAGS) \ $(TIFF_LDFLAGS) \ @@ -37,8 +36,7 @@ if HAVE_TIFF noinst_PROGRAMS += pbm_recognition pbm_recognition_CPPFLAGS = $(AM_CPPFLAGS) \ $(TESSERACT_CPPFLAGS) \ - $(TIFF_CPPFLAGS) \ - -I$(top_builddir) + $(TIFF_CPPFLAGS) pbm_recognition_LDFLAGS = $(AM_LDFLAGS) \ $(TESSERACT_LDFLAGS) \ $(TIFF_LDFLAGS) \ diff --git a/scribo/src/text/pbm_lines_recognition.cc b/scribo/src/text/pbm_lines_recognition.cc index 902e488..a206b0c 100644 --- a/scribo/src/text/pbm_lines_recognition.cc +++ b/scribo/src/text/pbm_lines_recognition.cc @@ -1,4 +1,4 @@ -// Copyright (C) 2010 EPITA Research and Development Laboratory (LRDE) +// Copyright (C) 2010, 2013 EPITA Research and Development Laboratory (LRDE) // // This file is part of Olena. // @@ -23,10 +23,6 @@ // exception does not however invalidate any other reasons why the // executable file might be covered by the GNU General Public License. -#ifdef HAVE_CONFIG_H -# include <config.h> -#endif - #include <iostream> #include <mln/core/image/image2d.hh> diff --git a/scribo/src/text/pbm_recognition.cc b/scribo/src/text/pbm_recognition.cc index c0debe9..72bd41d 100644 --- a/scribo/src/text/pbm_recognition.cc +++ b/scribo/src/text/pbm_recognition.cc @@ -1,4 +1,4 @@ -// Copyright (C) 2010 EPITA Research and Development Laboratory (LRDE) +// Copyright (C) 2010, 2013 EPITA Research and Development Laboratory (LRDE) // // This file is part of Olena. // @@ -23,10 +23,6 @@ // exception does not however invalidate any other reasons why the // executable file might be covered by the GNU General Public License. -#ifdef HAVE_CONFIG_H -# include <config.h> -#endif - #include <iostream> #include <mln/core/image/image2d.hh> diff --git a/scribo/src/text_recognition_in_picture.cc b/scribo/src/text_recognition_in_picture.cc index fcbe5bf..0a4b62c 100644 --- a/scribo/src/text_recognition_in_picture.cc +++ b/scribo/src/text_recognition_in_picture.cc @@ -24,10 +24,6 @@ // exception does not however invalidate any other reasons why the // executable file might be covered by the GNU General Public License. -#ifdef HAVE_CONFIG_H -# include <config.h> -#endif - #include <libgen.h> #include <iostream> diff --git a/scribo/src/toolchain/nepomuk/Makefile.am b/scribo/src/toolchain/nepomuk/Makefile.am index 03f0e01..5d3b252 100644 --- a/scribo/src/toolchain/nepomuk/Makefile.am +++ b/scribo/src/toolchain/nepomuk/Makefile.am @@ -30,8 +30,7 @@ text_extraction_CPPFLAGS = $(AM_CPPFLAGS) \ $(MAGICKXX_CPPFLAGS) \ $(TESSERACT_CPPFLAGS) \ $(TIFF_CPPFLAGS) \ - $(QT_CPPFLAGS) \ - -I$(top_builddir) + $(QT_CPPFLAGS) text_extraction_LDFLAGS = $(AM_LDFLAGS) \ $(MAGICKXX_LDFLAGS) \ $(TESSERACT_LDFLAGS) \ diff --git a/scribo/src/toolchain/nepomuk/text_extraction.cc b/scribo/src/toolchain/nepomuk/text_extraction.cc index 41e843a..581510f 100644 --- a/scribo/src/toolchain/nepomuk/text_extraction.cc +++ b/scribo/src/toolchain/nepomuk/text_extraction.cc @@ -1,4 +1,4 @@ -// Copyright (C) 2010 EPITA Research and Development Laboratory (LRDE) +// Copyright (C) 2010, 2013 EPITA Research and Development Laboratory (LRDE) // // This file is part of Olena. // @@ -23,10 +23,6 @@ // exception does not however invalidate any other reasons why the // executable file might be covered by the GNU General Public License. -#ifdef HAVE_CONFIG_H -# include <config.h> -#endif - #include <libgen.h> #include <iostream> #include <QtCore/QDebug> diff --git a/scribo/tests/toolchain/nepomuk/Makefile.am b/scribo/tests/toolchain/nepomuk/Makefile.am index 1e3c513..2ea9c10 100644 --- a/scribo/tests/toolchain/nepomuk/Makefile.am +++ b/scribo/tests/toolchain/nepomuk/Makefile.am @@ -30,8 +30,7 @@ text_extraction_CXXFLAGS = $(QT_CXXFLAGS) $(AM_CXXFLAGS) text_extraction_CPPFLAGS = $(QT_CPPFLAGS) $(AM_CPPFLAGS) \ $(TESSERACT_CPPFLAGS) \ $(TIFF_CPPFLAGS) \ - $(MAGICKXX_CPPFLAGS) \ - -I$(top_builddir) + $(MAGICKXX_CPPFLAGS) text_extraction_LDFLAGS = $(QT_LDFLAGS) $(LDFLAGS) \ $(TESSERACT_LDFLAGS) \ $(TIFF_LDFLAGS) \ diff --git a/scribo/tests/toolchain/nepomuk/text_extraction.cc b/scribo/tests/toolchain/nepomuk/text_extraction.cc index eeafd6b..6aa6205 100644 --- a/scribo/tests/toolchain/nepomuk/text_extraction.cc +++ b/scribo/tests/toolchain/nepomuk/text_extraction.cc @@ -1,4 +1,4 @@ -// Copyright (C) 2010, 2011 EPITA Research and Development Laboratory +// Copyright (C) 2010, 2011, 2013 EPITA Research and Development Laboratory // (LRDE) // // This file is part of Olena. @@ -28,10 +28,6 @@ /// /// Test of scribo::toolchain::nepomuk::text_extraction -#ifdef HAVE_CONFIG_H -# include <config.h> -#endif - #include <QtGui/QImage> #include <QtCore> #include <scribo/toolchain/nepomuk/text_extraction.hh> -- 1.7.10.4

1 0

olena: olena-2.0-792-g9d5b6b6 Olena: Remove Milena's build dir from the file inclusion path.
by Roland Levillain 09 Sep '13

09 Sep '13

* doc/Makefile.am (AM_CPPFLAGS): Here. --- ChangeLog | 6 ++++++ doc/Makefile.am | 5 ++--- 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/ChangeLog b/ChangeLog index e454d84..ba84a7b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2013-09-09 Roland Levillain <roland(a)lrde.epita.fr> + + Olena: Remove Milena's build dir from the file inclusion path. + + * doc/Makefile.am (AM_CPPFLAGS): Here. + 2013-09-06 Roland Levillain <roland(a)lrde.epita.fr> Define PACKAGE_AUTHORS in configure.ac. diff --git a/doc/Makefile.am b/doc/Makefile.am index 878f7ce..7775b5c 100644 --- a/doc/Makefile.am +++ b/doc/Makefile.am @@ -16,9 +16,8 @@ # along with Olena. If not, see <http://www.gnu.org/licenses/>. -# Look for Milena headers in srcdir and for (generated) test headers -# (like data.hh) in builddir. -AM_CPPFLAGS = -I$(top_srcdir)/milena -I$(top_builddir)/milena +# Find Milena headers. +AM_CPPFLAGS = -I$(top_srcdir)/milena DOXYGEN = doxygen -- 1.7.10.4

1 0

olena: branch version.hh created: olena-2.0-791-g2a2dbc6
by git＠lrde.epita.fr 06 Sep '13

06 Sep '13

This is an automated email from the git hooks/post-receive script. It was generated because a ref change was pushed to the repository containing the project "Olena, a generic and efficient image processing platform". The branch version.hh has been created at 2a2dbc6c5881dab17ccee633d5391fa20538f8ee (commit) - Log ----------------------------------------------------------------- 2a2dbc6 Force make to regen Milena's mln/version.hh before other files. 6cc1347 Have `make regen- also regenerate Milena's mln/version.hh. 9c00054 Do not harcode OLN_PACKAGE_AUTHORS in Milena's mln/version.hh.in. b19aab2 Define PACKAGE_AUTHORS in configure.ac. fad39ca Stop generating milena/mln/version.hh in the build tree with configure. 5158238 Generate Milena's mln/version.hh in the source tree. ----------------------------------------------------------------------- hooks/post-receive -- Olena, a generic and efficient image processing platform

1 0

olena: olena-2.0-791-gc9517b9 Force make to regen Milena's mln/version.hh before other files.
by Roland Levillain 06 Sep '13

06 Sep '13

* Makefile.am (SUBDIRS): Prepend `.' to the list of subdirectories to force make to honor this Makefile's targets before recursing in Milena's subdirectories. --- milena/ChangeLog | 8 ++++++++ milena/Makefile.am | 5 +---- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index 3d80dcb..05aa014 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,5 +1,13 @@ 2013-09-06 Roland Levillain <roland(a)lrde.epita.fr> + Force make to regen Milena's mln/version.hh before other files. + + * Makefile.am (SUBDIRS): Prepend `.' to the list of subdirectories + to force make to honor this Makefile's targets before recursing in + Milena's subdirectories. + +2013-09-06 Roland Levillain <roland(a)lrde.epita.fr> + Have `make regen' also regenerate Milena's mln/version.hh. * Makefile.am (regen-am): Here. diff --git a/milena/Makefile.am b/milena/Makefile.am index da3b91b..436fe54 100644 --- a/milena/Makefile.am +++ b/milena/Makefile.am @@ -15,10 +15,7 @@ # You should have received a copy of the GNU General Public License # along with Olena. If not, see <http://www.gnu.org/licenses/>. -SUBDIRS = \ - doc \ - mesh \ - tests +SUBDIRS = . doc mesh tests if ENABLE_APPS SUBDIRS += apps -- 1.7.10.4

1 0

olena: olena-2.0-791-g2a2dbc6 Force make to regen Milena's mln/version.hh before other files.
by Roland Levillain 06 Sep '13

06 Sep '13

* Makefile.am (SUBDIRS): Prepend `.' to the list of subdirectories to force make to honor this Makefile's targets before recursing in Milena's subdirectories. --- milena/ChangeLog | 8 ++++++++ milena/Makefile.am | 5 +---- 2 files changed, 9 insertions(+), 4 deletions(-) diff --git a/milena/ChangeLog b/milena/ChangeLog index b7a2eb0..462f751 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,5 +1,13 @@ 2013-09-06 Roland Levillain <roland(a)lrde.epita.fr> + Force make to regen Milena's mln/version.hh before other files. + + * Makefile.am (SUBDIRS): Prepend `.' to the list of subdirectories + to force make to honor this Makefile's targets before recursing in + Milena's subdirectories. + +2013-09-06 Roland Levillain <roland(a)lrde.epita.fr> + Have `make regen- also regenerate Milena's mln/version.hh. * Makefile.am (regen-am): Here. diff --git a/milena/Makefile.am b/milena/Makefile.am index da3b91b..436fe54 100644 --- a/milena/Makefile.am +++ b/milena/Makefile.am @@ -15,10 +15,7 @@ # You should have received a copy of the GNU General Public License # along with Olena. If not, see <http://www.gnu.org/licenses/>. -SUBDIRS = \ - doc \ - mesh \ - tests +SUBDIRS = . doc mesh tests if ENABLE_APPS SUBDIRS += apps -- 1.7.10.4

1 0

olena: olena-2.0-790-gb8bc67a Have `make regen' also regenerate Milena's mln/version.hh.
by Roland Levillain 06 Sep '13

06 Sep '13

* Makefile.am (regen-am): Here. --- milena/ChangeLog | 6 ++++++ milena/Makefile.am | 10 ++++++++++ 2 files changed, 16 insertions(+) diff --git a/milena/ChangeLog b/milena/ChangeLog index c6be167..3d80dcb 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,5 +1,11 @@ 2013-09-06 Roland Levillain <roland(a)lrde.epita.fr> + Have `make regen' also regenerate Milena's mln/version.hh. + + * Makefile.am (regen-am): Here. + +2013-09-06 Roland Levillain <roland(a)lrde.epita.fr> + Do not harcode OLN_PACKAGE_AUTHORS in Milena's mln/version.hh.in. * mln/version.hh.in (OLN_PACKAGE_AUTHORS): Set it to diff --git a/milena/Makefile.am b/milena/Makefile.am index 058cadd..da3b91b 100644 --- a/milena/Makefile.am +++ b/milena/Makefile.am @@ -64,6 +64,16 @@ regen-am: cd $(srcdir) \ && $(abs_top_srcdir)/build-aux/generate_dist_headers.sh \ mln headers.mk +# Also regenerate mln/version.hh. Again, the action is duplicated +# (see target $(srcdir)/mln/version.hh below). There's probably a +# (portable) way to factor this. + rm -f $(srcdir)/mln/version.hh $(srcdir)/mln/version.hh.tmp + srcdir=''; \ + test -f ./$(srcdir)/mln/version.hh.in || srcdir=$(srcdir)/; \ + $(edit) $${srcdir}$(srcdir)/mln/version.hh.in \ + >$(srcdir)/mln/version.hh.tmp + chmod a-w $(srcdir)/mln/version.hh.tmp + mv $(srcdir)/mln/version.hh.tmp $(srcdir)/mln/version.hh # FIXME: Change generate_dist_headers.sh so that the action looks like this: # -- 1.7.10.4

1 0

olena: olena-2.0-790-g6cc1347 Have `make regen- also regenerate Milena's mln/version.hh.
by Roland Levillain 06 Sep '13

06 Sep '13

* Makefile.am (regen-am): Here. --- milena/ChangeLog | 6 ++++++ milena/Makefile.am | 10 ++++++++++ 2 files changed, 16 insertions(+) diff --git a/milena/ChangeLog b/milena/ChangeLog index c6be167..b7a2eb0 100644 --- a/milena/ChangeLog +++ b/milena/ChangeLog @@ -1,5 +1,11 @@ 2013-09-06 Roland Levillain <roland(a)lrde.epita.fr> + Have `make regen- also regenerate Milena's mln/version.hh. + + * Makefile.am (regen-am): Here. + +2013-09-06 Roland Levillain <roland(a)lrde.epita.fr> + Do not harcode OLN_PACKAGE_AUTHORS in Milena's mln/version.hh.in. * mln/version.hh.in (OLN_PACKAGE_AUTHORS): Set it to diff --git a/milena/Makefile.am b/milena/Makefile.am index 058cadd..da3b91b 100644 --- a/milena/Makefile.am +++ b/milena/Makefile.am @@ -64,6 +64,16 @@ regen-am: cd $(srcdir) \ && $(abs_top_srcdir)/build-aux/generate_dist_headers.sh \ mln headers.mk +# Also regenerate mln/version.hh. Again, the action is duplicated +# (see target $(srcdir)/mln/version.hh below). There's probably a +# (portable) way to factor this. + rm -f $(srcdir)/mln/version.hh $(srcdir)/mln/version.hh.tmp + srcdir=''; \ + test -f ./$(srcdir)/mln/version.hh.in || srcdir=$(srcdir)/; \ + $(edit) $${srcdir}$(srcdir)/mln/version.hh.in \ + >$(srcdir)/mln/version.hh.tmp + chmod a-w $(srcdir)/mln/version.hh.tmp + mv $(srcdir)/mln/version.hh.tmp $(srcdir)/mln/version.hh # FIXME: Change generate_dist_headers.sh so that the action looks like this: # -- 1.7.10.4

1 0

[Olena] #199: Stop using recursive Makefiles in milena/tests/?
by Olena Trac 06 Sep '13

06 Sep '13

#199: Stop using recursive Makefiles in milena/tests/? ----------------------+----------------------------------------------------- Reporter: levill_r | Owner: Olena Team Type: proposal | Status: new Priority: trivial | Milestone: Olena 1.1 Component: Milena | Version: 1.0 Keywords: | ----------------------+----------------------------------------------------- This is an open debate, not a well-defined task. As of r3946, there are more than a hundred `Makefile`s under source:trunk/milena/tests/. This has a huge impact on configuration and build times. Akim suggests we use `Makefile` inclusions instead of `Makefile` recursion to speed up things. This also means losing the possibility to invoke `make` in a specific subdirectory of `milena/tests/`, which is very handy. Akim says we can substitute the feature by using scripts relying on the control version program (http://lists.gnu.org/archive/html/automake- patches/2009-03/msg00079.html). Let's discuss this, and see what we can do after the 1.0 release. -- Ticket URL: <https://trac.lrde.org/olena/ticket/199> Olena <http://olena.lrde.epita.fr> Olena, a generic and efficient C++ image processing library.

1 2