* src/afp/components.hh,
* src/afp/link.hh,
* src/afp/regroup.hh:
Move files...
* scribo/afp/components.hh,
* scribo/afp/link.hh,
* scribo/afp/regroup.hh:
...here, as they are included by other files located under
scribo/, and therefore should be installed as well.
* scribo/toolchain/internal/text_in_picture_functor.hh,
* src/text_recognition_in_picture.cc:
Adjust.
* headers.mk,
* tests/unit_test/unit-tests.mk:
Regen.
---
scribo/ChangeLog | 20 ++++++++++++++++++++
scribo/headers.mk | 3 +++
scribo/{src => scribo}/afp/components.hh | 8 +++++---
scribo/{src => scribo}/afp/link.hh | 11 +++++++----
scribo/{src => scribo}/afp/regroup.hh | 9 ++++++---
.../toolchain/internal/text_in_picture_functor.hh | 8 ++++----
scribo/src/text_recognition_in_picture.cc | 4 ++--
scribo/tests/unit_test/unit-tests.mk | 3 +++
8 files changed, 50 insertions(+), 16 deletions(-)
rename scribo/{src => scribo}/afp/components.hh (96%)
rename scribo/{src => scribo}/afp/link.hh (94%)
rename scribo/{src => scribo}/afp/regroup.hh (94%)
diff --git a/scribo/ChangeLog b/scribo/ChangeLog
index 30a15af..0ea8ef9 100644
--- a/scribo/ChangeLog
+++ b/scribo/ChangeLog
@@ -1,3 +1,23 @@
+2013-07-30 Roland Levillain <roland(a)lrde.epita.fr>
+
+ Move to-be-installed header files from src/ to scribo/.
+
+ * src/afp/components.hh,
+ * src/afp/link.hh,
+ * src/afp/regroup.hh:
+ Move files...
+ * scribo/afp/components.hh,
+ * scribo/afp/link.hh,
+ * scribo/afp/regroup.hh:
+ ...here, as they are included by other files located under
+ scribo/, and therefore should be installed as well.
+ * scribo/toolchain/internal/text_in_picture_functor.hh,
+ * src/text_recognition_in_picture.cc:
+ Adjust.
+ * headers.mk,
+ * tests/unit_test/unit-tests.mk:
+ Regen.
+
2013-07-29 Roland Levillain <roland(a)lrde.epita.fr>
Lift scribo::document's dependency on Magick++.
diff --git a/scribo/headers.mk b/scribo/headers.mk
index 3160b85..82d3ade 100644
--- a/scribo/headers.mk
+++ b/scribo/headers.mk
@@ -1,6 +1,9 @@
## Generated by `generate_dist_headers.sh', do not edit by hand.
nobase_include_HEADERS = \
+scribo/afp/components.hh \
+scribo/afp/link.hh \
+scribo/afp/regroup.hh \
scribo/all.hh \
scribo/binarization/all.hh \
scribo/binarization/global_threshold.hh \
diff --git a/scribo/src/afp/components.hh b/scribo/scribo/afp/components.hh
similarity index 96%
rename from scribo/src/afp/components.hh
rename to scribo/scribo/afp/components.hh
index 7e4e102..e68a7c2 100644
--- a/scribo/src/afp/components.hh
+++ b/scribo/scribo/afp/components.hh
@@ -24,8 +24,8 @@
// exception does not however invalidate any other reasons why the
// executable file might be covered by the GNU General Public License.
-#ifndef SCRIBO_SRC_AFP_COMPONENTS_HH
-# define SCRIBO_SRC_AFP_COMPONENTS_HH
+#ifndef SCRIBO_AFP_COMPONENTS_HH
+# define SCRIBO_AFP_COMPONENTS_HH
/// \file
///
@@ -50,6 +50,8 @@
# include <mln/extension/fill.hh>
# include <mln/data/compare.hh>
+// FIXME: Move the contents of this file in the right namespace and/or
+// refactor.
namespace mln
{
@@ -225,4 +227,4 @@ namespace mln
} // mln
-#endif // ! SCRIBO_SRC_AFP_COMPONENTS_HH
+#endif // ! SCRIBO_AFP_COMPONENTS_HH
diff --git a/scribo/src/afp/link.hh b/scribo/scribo/afp/link.hh
similarity index 94%
rename from scribo/src/afp/link.hh
rename to scribo/scribo/afp/link.hh
index 2e2d474..12ea79e 100644
--- a/scribo/src/afp/link.hh
+++ b/scribo/scribo/afp/link.hh
@@ -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,8 +23,8 @@
// exception does not however invalidate any other reasons why the
// executable file might be covered by the GNU General Public License.
-#ifndef SCRIBO_SRC_AFP_LINK_HH
-# define SCRIBO_SRC_AFP_LINK_HH
+#ifndef SCRIBO_AFP_LINK_HH
+# define SCRIBO_AFP_LINK_HH
/// \file
///
@@ -39,6 +39,9 @@
# include <scribo/core/component_set.hh>
# include <scribo/core/macros.hh>
+// FIXME: Move the contents of this file in the right namespace and/or
+// refactor.
+
namespace scribo
{
@@ -175,4 +178,4 @@ namespace scribo
} // end of namespace scribo
-#endif // ! SCRIBO_SRC_AFP_LINK_HH
+#endif // ! SCRIBO_AFP_LINK_HH
diff --git a/scribo/src/afp/regroup.hh b/scribo/scribo/afp/regroup.hh
similarity index 94%
rename from scribo/src/afp/regroup.hh
rename to scribo/scribo/afp/regroup.hh
index 3b108ad..4dd4ea4 100644
--- a/scribo/src/afp/regroup.hh
+++ b/scribo/scribo/afp/regroup.hh
@@ -24,8 +24,8 @@
// exception does not however invalidate any other reasons why the
// executable file might be covered by the GNU General Public License.
-#ifndef SCRIBO_SRC_AFP_REGROUP_HH
-# define SCRIBO_SRC_AFP_REGROUP_HH
+#ifndef SCRIBO_AFP_REGROUP_HH
+# define SCRIBO_AFP_REGROUP_HH
/// \file
///
@@ -39,6 +39,9 @@
#include <scribo/core/component_set.hh>
#include <scribo/core/macros.hh>
+// FIXME: Move the contents of this file in the right namespace and/or
+// refactor.
+
namespace scribo
{
@@ -117,4 +120,4 @@ namespace scribo
} // end of namespace scribo
-#endif // ! SCRIBO_SRC_AFP_REGROUP_HH
+#endif // ! SCRIBO_AFP_REGROUP_HH
diff --git a/scribo/scribo/toolchain/internal/text_in_picture_functor.hh
b/scribo/scribo/toolchain/internal/text_in_picture_functor.hh
index cc7921f..7812cc6 100644
--- a/scribo/scribo/toolchain/internal/text_in_picture_functor.hh
+++ b/scribo/scribo/toolchain/internal/text_in_picture_functor.hh
@@ -1,4 +1,4 @@
-// Copyright (C) 2011 EPITA Research and Development Laboratory (LRDE)
+// Copyright (C) 2011, 2013 EPITA Research and Development Laboratory (LRDE)
//
// This file is part of Olena.
//
@@ -90,9 +90,9 @@
# include <scribo/toolchain/internal/toolchain_functor.hh>
-# include <src/afp/components.hh>
-# include <src/afp/link.hh>
-# include <src/afp/regroup.hh>
+# include <scribo/afp/components.hh>
+# include <scribo/afp/link.hh>
+# include <scribo/afp/regroup.hh>
namespace scribo
diff --git a/scribo/src/text_recognition_in_picture.cc
b/scribo/src/text_recognition_in_picture.cc
index b5448e5..fcbe5bf 100644
--- a/scribo/src/text_recognition_in_picture.cc
+++ b/scribo/src/text_recognition_in_picture.cc
@@ -105,8 +105,8 @@
#include <mln/core/var.hh>
-#include <src/afp/components.hh>
-#include <src/afp/link.hh>
+#include <scribo/afp/components.hh>
+#include <scribo/afp/link.hh>
#include <scribo/core/line_set.hh>
#include <scribo/text/recognition.hh>
diff --git a/scribo/tests/unit_test/unit-tests.mk b/scribo/tests/unit_test/unit-tests.mk
index 38946e1..82d7b99 100644
--- a/scribo/tests/unit_test/unit-tests.mk
+++ b/scribo/tests/unit_test/unit-tests.mk
@@ -182,6 +182,9 @@ endif HAVE_TESSERACT
# Starting non-conditional unit test list.
check_PROGRAMS += \
+scribo_afp_components \
+scribo_afp_link \
+scribo_afp_regroup \
scribo_all \
scribo_binarization_all \
scribo_binarization_global_threshold \
--
1.7.10.4