* 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@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@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>