[Olena-patches] last-svn-commit-167-ga32f582 Clean up a bit Scribo's Makefiles.

* Makefile.am, * demo/Makefile.am, * src/Makefile.am, * src/binarization/Makefile.am, * src/debug/Makefile.am, * src/filter/Makefile.am, * src/misc/Makefile.am, * src/multi_scale/Makefile.am, * src/preprocessing/Makefile.am, * src/primitive/Makefile.am, * src/primitive/extract/Makefile.am, * src/primitive/find/Makefile.am, * src/primitive/group/Makefile.am, * src/table/Makefile.am, * src/text/Makefile.am, * tests/Makefile.am, * tests/filter/Makefile.am, * tests/preprocessing/Makefile.am, * tests/table/Makefile.am, * tests/text/Makefile.am, * tests/unit_test/Makefile.am: Here. --- scribo/ChangeLog | 27 +++++++++++++++++++++++++++ scribo/Makefile.am | 2 -- scribo/demo/Makefile.am | 2 -- scribo/src/Makefile.am | 3 --- scribo/src/binarization/Makefile.am | 4 ---- scribo/src/debug/Makefile.am | 3 --- scribo/src/filter/Makefile.am | 3 --- scribo/src/misc/Makefile.am | 4 ---- scribo/src/multi_scale/Makefile.am | 4 ---- scribo/src/preprocessing/Makefile.am | 3 --- scribo/src/primitive/Makefile.am | 3 --- scribo/src/primitive/extract/Makefile.am | 4 ---- scribo/src/primitive/find/Makefile.am | 5 ----- scribo/src/primitive/group/Makefile.am | 3 --- scribo/src/table/Makefile.am | 3 --- scribo/src/text/Makefile.am | 3 --- scribo/tests/Makefile.am | 2 -- scribo/tests/filter/Makefile.am | 3 --- scribo/tests/preprocessing/Makefile.am | 3 --- scribo/tests/table/Makefile.am | 3 --- scribo/tests/text/Makefile.am | 3 --- scribo/tests/unit_test/Makefile.am | 3 --- 22 files changed, 27 insertions(+), 66 deletions(-) diff --git a/scribo/ChangeLog b/scribo/ChangeLog index 0627bc3..3c7fe21 100644 --- a/scribo/ChangeLog +++ b/scribo/ChangeLog @@ -1,3 +1,30 @@ +2010-06-03 Roland Levillain &lt;roland(a)lrde.epita.fr&gt; + + Clean up a bit Scribo's Makefiles. + + * Makefile.am, + * demo/Makefile.am, + * src/Makefile.am, + * src/binarization/Makefile.am, + * src/debug/Makefile.am, + * src/filter/Makefile.am, + * src/misc/Makefile.am, + * src/multi_scale/Makefile.am, + * src/preprocessing/Makefile.am, + * src/primitive/Makefile.am, + * src/primitive/extract/Makefile.am, + * src/primitive/find/Makefile.am, + * src/primitive/group/Makefile.am, + * src/table/Makefile.am, + * src/text/Makefile.am, + * tests/Makefile.am, + * tests/filter/Makefile.am, + * tests/preprocessing/Makefile.am, + * tests/table/Makefile.am, + * tests/text/Makefile.am, + * tests/unit_test/Makefile.am: + Here. + 2010-05-12 Roland Levillain &lt;roland(a)lrde.epita.fr&gt; Add missing copyright headers in Scribo. diff --git a/scribo/Makefile.am b/scribo/Makefile.am index 3fb05fd..0f98de6 100644 --- a/scribo/Makefile.am +++ b/scribo/Makefile.am @@ -14,8 +14,6 @@ # You should have received a copy of the GNU General Public License # along with Olena. If not, see <http://www.gnu.org/licenses/>. -## Process this file through Automake to create Makefile.in. - SUBDIRS = tests src .PHONY: bin diff --git a/scribo/demo/Makefile.am b/scribo/demo/Makefile.am index bab9f0f..9fcd083 100644 --- a/scribo/demo/Makefile.am +++ b/scribo/demo/Makefile.am @@ -14,8 +14,6 @@ # You should have received a copy of the GNU General Public License # along with Olena. If not, see <http://www.gnu.org/licenses/>. -## Process this file through Automake to create Makefile.in. - include $(top_srcdir)/scribo/scribo.mk .PHONY : demo diff --git a/scribo/src/Makefile.am b/scribo/src/Makefile.am index 6cc4229..5f2367f 100644 --- a/scribo/src/Makefile.am +++ b/scribo/src/Makefile.am @@ -13,9 +13,6 @@ # # You should have received a copy of the GNU General Public License # along with Olena. If not, see <http://www.gnu.org/licenses/>. -# - -## Process this file through Automake to create Makefile.in. include $(top_srcdir)/scribo/scribo.mk diff --git a/scribo/src/binarization/Makefile.am b/scribo/src/binarization/Makefile.am index 531d4cf..4adf1a6 100644 --- a/scribo/src/binarization/Makefile.am +++ b/scribo/src/binarization/Makefile.am @@ -13,9 +13,6 @@ # # You should have received a copy of the GNU General Public License # along with Olena. If not, see <http://www.gnu.org/licenses/>. -# - -## Process this file through Automake to create Makefile.in. include $(top_srcdir)/scribo/scribo.mk @@ -29,4 +26,3 @@ sauvola_SOURCES = sauvola.cc sauvola_ms_SOURCES = sauvola_ms.cc sauvola_pgm_SOURCES = sauvola_pgm.cc simple_SOURCES = simple.cc - diff --git a/scribo/src/debug/Makefile.am b/scribo/src/debug/Makefile.am index 36bbfcb..7ec5669 100644 --- a/scribo/src/debug/Makefile.am +++ b/scribo/src/debug/Makefile.am @@ -13,9 +13,6 @@ # # You should have received a copy of the GNU General Public License # along with Olena. If not, see <http://www.gnu.org/licenses/>. -# - -## Process this file through Automake to create Makefile.in. include $(top_srcdir)/scribo/scribo.mk diff --git a/scribo/src/filter/Makefile.am b/scribo/src/filter/Makefile.am index e8a2b9c..5074b49 100644 --- a/scribo/src/filter/Makefile.am +++ b/scribo/src/filter/Makefile.am @@ -13,9 +13,6 @@ # # You should have received a copy of the GNU General Public License # along with Olena. If not, see <http://www.gnu.org/licenses/>. -# - -## Process this file through Automake to create Makefile.in. include $(top_srcdir)/scribo/scribo.mk diff --git a/scribo/src/misc/Makefile.am b/scribo/src/misc/Makefile.am index dc64bb9..693b579 100644 --- a/scribo/src/misc/Makefile.am +++ b/scribo/src/misc/Makefile.am @@ -13,9 +13,6 @@ # # You should have received a copy of the GNU General Public License # along with Olena. If not, see <http://www.gnu.org/licenses/>. -# - -## Process this file through Automake to create Makefile.in. include $(top_srcdir)/scribo/scribo.mk @@ -31,4 +28,3 @@ morpho_SOURCES = morpho.cc negate_SOURCES = negate.cc rectangularity_SOURCES = rectangularity.cc superpose_SOURCES = superpose.cc - diff --git a/scribo/src/multi_scale/Makefile.am b/scribo/src/multi_scale/Makefile.am index f3dfb42..9964153 100644 --- a/scribo/src/multi_scale/Makefile.am +++ b/scribo/src/multi_scale/Makefile.am @@ -13,9 +13,6 @@ # # You should have received a copy of the GNU General Public License # along with Olena. If not, see <http://www.gnu.org/licenses/>. -# - -## Process this file through Automake to create Makefile.in. include $(top_srcdir)/scribo/scribo.mk @@ -23,4 +20,3 @@ bin_PROGRAMS = \ find_lines find_lines_SOURCES = find_lines.cc - diff --git a/scribo/src/preprocessing/Makefile.am b/scribo/src/preprocessing/Makefile.am index 8c1cd80..4f1195d 100644 --- a/scribo/src/preprocessing/Makefile.am +++ b/scribo/src/preprocessing/Makefile.am @@ -13,9 +13,6 @@ # # You should have received a copy of the GNU General Public License # along with Olena. If not, see <http://www.gnu.org/licenses/>. -# - -## Process this file through Automake to create Makefile.in. include $(top_srcdir)/scribo/scribo.mk diff --git a/scribo/src/primitive/Makefile.am b/scribo/src/primitive/Makefile.am index 44d9434..7e46a66 100644 --- a/scribo/src/primitive/Makefile.am +++ b/scribo/src/primitive/Makefile.am @@ -13,9 +13,6 @@ # # You should have received a copy of the GNU General Public License # along with Olena. If not, see <http://www.gnu.org/licenses/>. -# - -## Process this file through Automake to create Makefile.in. include $(top_srcdir)/scribo/scribo.mk diff --git a/scribo/src/primitive/extract/Makefile.am b/scribo/src/primitive/extract/Makefile.am index 7e1ea78..6f20ea3 100644 --- a/scribo/src/primitive/extract/Makefile.am +++ b/scribo/src/primitive/extract/Makefile.am @@ -13,9 +13,6 @@ # # You should have received a copy of the GNU General Public License # along with Olena. If not, see <http://www.gnu.org/licenses/>. -# - -## Process this file through Automake to create Makefile.in. include $(top_srcdir)/scribo/scribo.mk @@ -34,4 +31,3 @@ extract_discontinued_hlines_SOURCES = extract_discontinued_hlines.cc extract_thick_vlines_SOURCES = extract_thick_vlines.cc extract_thick_hlines_SOURCES = extract_thick_hlines.cc lines_pattern_SOURCES = lines_pattern.cc - diff --git a/scribo/src/primitive/find/Makefile.am b/scribo/src/primitive/find/Makefile.am index 93a3920..3b5dbd2 100644 --- a/scribo/src/primitive/find/Makefile.am +++ b/scribo/src/primitive/find/Makefile.am @@ -13,9 +13,6 @@ # # You should have received a copy of the GNU General Public License # along with Olena. If not, see <http://www.gnu.org/licenses/>. -# - -## Process this file through Automake to create Makefile.in. include $(top_srcdir)/scribo/scribo.mk @@ -32,5 +29,3 @@ find_pattern_lines_SOURCES = find_pattern_lines.cc find_single_lines_SOURCES = find_single_lines.cc find_thick_lines_SOURCES = find_thick_lines.cc find_thick_and_single_lines_SOURCES = find_thick_and_single_lines.cc - - diff --git a/scribo/src/primitive/group/Makefile.am b/scribo/src/primitive/group/Makefile.am index e52e373..92a81fc 100644 --- a/scribo/src/primitive/group/Makefile.am +++ b/scribo/src/primitive/group/Makefile.am @@ -13,9 +13,6 @@ # # You should have received a copy of the GNU General Public License # along with Olena. If not, see <http://www.gnu.org/licenses/>. -# - -## Process this file through Automake to create Makefile.in. include $(top_srcdir)/scribo/scribo.mk diff --git a/scribo/src/table/Makefile.am b/scribo/src/table/Makefile.am index 334d5f9..7fc7008 100644 --- a/scribo/src/table/Makefile.am +++ b/scribo/src/table/Makefile.am @@ -13,9 +13,6 @@ # # You should have received a copy of the GNU General Public License # along with Olena. If not, see <http://www.gnu.org/licenses/>. -# - -## Process this file through Automake to create Makefile.in. include $(top_srcdir)/scribo/scribo.mk diff --git a/scribo/src/text/Makefile.am b/scribo/src/text/Makefile.am index b84e0dd..39c7811 100644 --- a/scribo/src/text/Makefile.am +++ b/scribo/src/text/Makefile.am @@ -13,9 +13,6 @@ # # You should have received a copy of the GNU General Public License # along with Olena. If not, see <http://www.gnu.org/licenses/>. -# - -## Process this file through Automake to create Makefile.in. include $(top_srcdir)/scribo/scribo.mk diff --git a/scribo/tests/Makefile.am b/scribo/tests/Makefile.am index e36d250..163ecae 100644 --- a/scribo/tests/Makefile.am +++ b/scribo/tests/Makefile.am @@ -16,8 +16,6 @@ include $(srcdir)/tests.mk -## Process this file through Automake to create Makefile.in. - SUBDIRS = \ filter \ preprocessing \ diff --git a/scribo/tests/filter/Makefile.am b/scribo/tests/filter/Makefile.am index fd3299e..e466523 100644 --- a/scribo/tests/filter/Makefile.am +++ b/scribo/tests/filter/Makefile.am @@ -13,9 +13,6 @@ # # You should have received a copy of the GNU General Public License # along with Olena. If not, see <http://www.gnu.org/licenses/>. -# - -## Process this file through Automake to create Makefile.in. include $(top_srcdir)/scribo/tests/tests.mk diff --git a/scribo/tests/preprocessing/Makefile.am b/scribo/tests/preprocessing/Makefile.am index 5182bc0..dc139fa 100644 --- a/scribo/tests/preprocessing/Makefile.am +++ b/scribo/tests/preprocessing/Makefile.am @@ -13,9 +13,6 @@ # # You should have received a copy of the GNU General Public License # along with Olena. If not, see <http://www.gnu.org/licenses/>. -# - -## Process this file through Automake to create Makefile.in. include $(top_srcdir)/scribo/tests/tests.mk diff --git a/scribo/tests/table/Makefile.am b/scribo/tests/table/Makefile.am index 0c15a63..3427e6b 100644 --- a/scribo/tests/table/Makefile.am +++ b/scribo/tests/table/Makefile.am @@ -13,9 +13,6 @@ # # You should have received a copy of the GNU General Public License # along with Olena. If not, see <http://www.gnu.org/licenses/>. -# - -## Process this file through Automake to create Makefile.in. include $(top_srcdir)/scribo/tests/tests.mk diff --git a/scribo/tests/text/Makefile.am b/scribo/tests/text/Makefile.am index f6cb0e5..0d48025 100644 --- a/scribo/tests/text/Makefile.am +++ b/scribo/tests/text/Makefile.am @@ -13,9 +13,6 @@ # # You should have received a copy of the GNU General Public License # along with Olena. If not, see <http://www.gnu.org/licenses/>. -# - -## Process this file through Automake to create Makefile.in. include $(top_srcdir)/scribo/tests/tests.mk diff --git a/scribo/tests/unit_test/Makefile.am b/scribo/tests/unit_test/Makefile.am index 0d3a591..8b3e47f 100644 --- a/scribo/tests/unit_test/Makefile.am +++ b/scribo/tests/unit_test/Makefile.am @@ -13,9 +13,6 @@ # # You should have received a copy of the GNU General Public License # along with Olena. If not, see <http://www.gnu.org/licenses/>. -# - -## Process this file through Automake to create Makefile.in. include $(top_srcdir)/scribo/tests/tests.mk -- 1.5.6.5