* src/binarization/Makefile.am, * src/contest/DAE-2011/Makefile.am, * src/contest/hdibco-2010/Makefile.am, * src/contest/hdlac-2011/Makefile.am, * src/postprocessing/Makefile.am, * src/primitive/remove/Makefile.am, * src/toolchain/nepomuk/Makefile.am, * src/util/Makefile.am, * tests/binarization/Makefile.am, * tests/convert/Makefile.am, * tests/core/Makefile.am, * tests/estim/Makefile.am, * tests/primitive/extract/Makefile.am, * tests/primitive/link/Makefile.am, * tests/toolchain/nepomuk/Makefile.am, * tests/util/Makefile.am: Here. --- scribo/ChangeLog | 22 ++++++++++++++++++++++ scribo/src/binarization/Makefile.am | 3 +-- scribo/src/contest/DAE-2011/Makefile.am | 4 +--- scribo/src/contest/hdibco-2010/Makefile.am | 3 +-- scribo/src/contest/hdlac-2011/Makefile.am | 3 +-- scribo/src/postprocessing/Makefile.am | 3 +-- scribo/src/primitive/remove/Makefile.am | 3 +-- scribo/src/toolchain/nepomuk/Makefile.am | 3 +-- scribo/src/util/Makefile.am | 3 +-- scribo/tests/binarization/Makefile.am | 6 +----- scribo/tests/convert/Makefile.am | 3 +-- scribo/tests/core/Makefile.am | 4 +--- scribo/tests/estim/Makefile.am | 4 +--- scribo/tests/primitive/extract/Makefile.am | 3 +-- scribo/tests/primitive/link/Makefile.am | 3 +-- scribo/tests/toolchain/nepomuk/Makefile.am | 3 +-- scribo/tests/util/Makefile.am | 5 +---- 17 files changed, 38 insertions(+), 40 deletions(-) diff --git a/scribo/ChangeLog b/scribo/ChangeLog index b00d8d9..d7f779c 100644 --- a/scribo/ChangeLog +++ b/scribo/ChangeLog @@ -1,3 +1,25 @@ +2013-02-13 Roland Levillain <roland@lrde.epita.fr> + + Simplify more Scribo Makefiles thanks to AM_DEFAULT_SOURCE_EXT. + + * src/binarization/Makefile.am, + * src/contest/DAE-2011/Makefile.am, + * src/contest/hdibco-2010/Makefile.am, + * src/contest/hdlac-2011/Makefile.am, + * src/postprocessing/Makefile.am, + * src/primitive/remove/Makefile.am, + * src/toolchain/nepomuk/Makefile.am, + * src/util/Makefile.am, + * tests/binarization/Makefile.am, + * tests/convert/Makefile.am, + * tests/core/Makefile.am, + * tests/estim/Makefile.am, + * tests/primitive/extract/Makefile.am, + * tests/primitive/link/Makefile.am, + * tests/toolchain/nepomuk/Makefile.am, + * tests/util/Makefile.am: + Here. + 2010-04-22 Roland Levillain <roland@lrde.epita.fr> Factor Makefiles' helpers. diff --git a/scribo/src/binarization/Makefile.am b/scribo/src/binarization/Makefile.am index a5449d5..5099ed9 100644 --- a/scribo/src/binarization/Makefile.am +++ b/scribo/src/binarization/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. @@ -28,7 +28,6 @@ noinst_PROGRAMS = \ ppm_sauvola_ms_split -pgm_global_threshold_auto_SOURCES = pgm_global_threshold_auto.cc if HAVE_MAGICKXX diff --git a/scribo/src/contest/DAE-2011/Makefile.am b/scribo/src/contest/DAE-2011/Makefile.am index f3dde1c..d5c9147 100644 --- a/scribo/src/contest/DAE-2011/Makefile.am +++ b/scribo/src/contest/DAE-2011/Makefile.am @@ -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. # @@ -23,7 +23,6 @@ if HAVE_MAGICKXX noinst_PROGRAMS += content_in_hdoc_dae content_in_doc_dae -content_in_hdoc_dae_SOURCES = content_in_hdoc_dae.cc content_in_hdoc_dae_CPPFLAGS = $(AM_CPPFLAGS) \ $(MAGICKXX_CPPFLAGS) \ -I$(top_builddir) @@ -31,7 +30,6 @@ content_in_hdoc_dae_LDFLAGS = $(AM_LDFLAGS) \ -lpthread \ $(MAGICKXX_LDFLAGS) -content_in_doc_dae_SOURCES = content_in_doc_dae.cc content_in_doc_dae_CPPFLAGS = $(AM_CPPFLAGS) \ $(MAGICKXX_CPPFLAGS) \ -I$(top_builddir) diff --git a/scribo/src/contest/hdibco-2010/Makefile.am b/scribo/src/contest/hdibco-2010/Makefile.am index 13e92df..dceb4b9 100644 --- a/scribo/src/contest/hdibco-2010/Makefile.am +++ b/scribo/src/contest/hdibco-2010/Makefile.am @@ -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. # @@ -18,5 +18,4 @@ include $(top_srcdir)/scribo/scribo.mk noinst_PROGRAMS = sauvola_ms_hdibco -sauvola_ms_hdibco_SOURCES = sauvola_ms_hdibco.cc diff --git a/scribo/src/contest/hdlac-2011/Makefile.am b/scribo/src/contest/hdlac-2011/Makefile.am index 53b8931..84e3224 100644 --- a/scribo/src/contest/hdlac-2011/Makefile.am +++ b/scribo/src/contest/hdlac-2011/Makefile.am @@ -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. # @@ -23,7 +23,6 @@ if HAVE_MAGICKXX noinst_PROGRAMS += content_in_hdoc_hdlac -content_in_hdoc_hdlac_SOURCES = content_in_hdoc_hdlac.cc content_in_hdoc_hdlac_CPPFLAGS = $(AM_CPPFLAGS) \ $(MAGICKXX_CPPFLAGS) \ -I$(top_builddir) diff --git a/scribo/src/postprocessing/Makefile.am b/scribo/src/postprocessing/Makefile.am index b24af78..b42c873 100644 --- a/scribo/src/postprocessing/Makefile.am +++ b/scribo/src/postprocessing/Makefile.am @@ -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. # @@ -20,4 +20,3 @@ noinst_PROGRAMS = \ fill_object_holes -fill_object_holes_SOURCES = fill_object_holes.cc diff --git a/scribo/src/primitive/remove/Makefile.am b/scribo/src/primitive/remove/Makefile.am index a673886..6236d95 100644 --- a/scribo/src/primitive/remove/Makefile.am +++ b/scribo/src/primitive/remove/Makefile.am @@ -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. # @@ -20,4 +20,3 @@ include $(top_srcdir)/scribo/scribo.mk noinst_PROGRAMS = \ separators -separators_SOURCES = separators.cc diff --git a/scribo/src/toolchain/nepomuk/Makefile.am b/scribo/src/toolchain/nepomuk/Makefile.am index 62a7fdb..03f0e01 100644 --- a/scribo/src/toolchain/nepomuk/Makefile.am +++ b/scribo/src/toolchain/nepomuk/Makefile.am @@ -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. @@ -26,7 +26,6 @@ if HAVE_TESSERACT noinst_PROGRAMS += \ text_extraction -text_extraction_SOURCES = text_extraction.cc text_extraction_CPPFLAGS = $(AM_CPPFLAGS) \ $(MAGICKXX_CPPFLAGS) \ $(TESSERACT_CPPFLAGS) \ diff --git a/scribo/src/util/Makefile.am b/scribo/src/util/Makefile.am index 729a7c0..c0c2205 100644 --- a/scribo/src/util/Makefile.am +++ b/scribo/src/util/Makefile.am @@ -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. # @@ -20,4 +20,3 @@ noinst_PROGRAMS = \ component_precise_outline -component_precise_outline_SOURCES = component_precise_outline.cc diff --git a/scribo/tests/binarization/Makefile.am b/scribo/tests/binarization/Makefile.am index 80525ac..25dcd32 100644 --- a/scribo/tests/binarization/Makefile.am +++ b/scribo/tests/binarization/Makefile.am @@ -1,4 +1,4 @@ -# Copyright (C) 2009, 2011 EPITA Research and Development Laboratory +# Copyright (C) 2009, 2011, 2013 EPITA Research and Development Laboratory # (LRDE). # # This file is part of Olena. @@ -28,10 +28,6 @@ check_PROGRAMS = \ sauvola_ms -global_threshold_SOURCES = global_threshold.cc -local_threshold_SOURCES = local_threshold.cc -sauvola_SOURCES = sauvola.cc -sauvola_ms_SOURCES = sauvola_ms.cc TESTS = $(check_PROGRAMS) diff --git a/scribo/tests/convert/Makefile.am b/scribo/tests/convert/Makefile.am index c62c067..544e198 100644 --- a/scribo/tests/convert/Makefile.am +++ b/scribo/tests/convert/Makefile.am @@ -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. # @@ -19,6 +19,5 @@ include $(top_srcdir)/scribo/tests/tests.mk check_PROGRAMS = \ base64 -base64_SOURCES = base64.cc TESTS = $(check_PROGRAMS) diff --git a/scribo/tests/core/Makefile.am b/scribo/tests/core/Makefile.am index 580ccdf..b2bb809 100644 --- a/scribo/tests/core/Makefile.am +++ b/scribo/tests/core/Makefile.am @@ -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. @@ -20,7 +20,5 @@ include $(top_srcdir)/scribo/tests/tests.mk check_PROGRAMS = line_info \ object_groups -line_info_SOURCES = line_info.cc -object_groups_SOURCES = object_groups.cc TESTS = $(check_PROGRAMS) diff --git a/scribo/tests/estim/Makefile.am b/scribo/tests/estim/Makefile.am index c2eef8c..bb1c08d 100644 --- a/scribo/tests/estim/Makefile.am +++ b/scribo/tests/estim/Makefile.am @@ -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. # @@ -20,7 +20,5 @@ check_PROGRAMS = \ font_color \ font_boldness -font_color_SOURCES = font_color.cc -font_boldness_SOURCES = font_boldness.cc TESTS = $(check_PROGRAMS) diff --git a/scribo/tests/primitive/extract/Makefile.am b/scribo/tests/primitive/extract/Makefile.am index 0a9df60..2d8c094 100644 --- a/scribo/tests/primitive/extract/Makefile.am +++ b/scribo/tests/primitive/extract/Makefile.am @@ -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. # @@ -27,7 +27,6 @@ check_PROGRAMS = if HAVE_MAGICKXX check_PROGRAMS += alignments -alignments_SOURCES = alignments.cc alignments_CPPFLAGS = $(AM_CPPFLAGS) \ $(MAGICKXX_CPPFLAGS) \ -DSCRIBO_NDEBUG diff --git a/scribo/tests/primitive/link/Makefile.am b/scribo/tests/primitive/link/Makefile.am index a42f7f5..605e77c 100644 --- a/scribo/tests/primitive/link/Makefile.am +++ b/scribo/tests/primitive/link/Makefile.am @@ -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. # @@ -20,6 +20,5 @@ check_PROGRAMS = \ merge_double_link -merge_double_link_SOURCES = merge_double_link.cc TESTS = $(check_PROGRAMS) diff --git a/scribo/tests/toolchain/nepomuk/Makefile.am b/scribo/tests/toolchain/nepomuk/Makefile.am index 0df924b..1e3c513 100644 --- a/scribo/tests/toolchain/nepomuk/Makefile.am +++ b/scribo/tests/toolchain/nepomuk/Makefile.am @@ -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. @@ -26,7 +26,6 @@ if HAVE_TESSERACT if HAVE_MAGICKXX check_PROGRAMS += text_extraction -text_extraction_SOURCES = text_extraction.cc text_extraction_CXXFLAGS = $(QT_CXXFLAGS) $(AM_CXXFLAGS) text_extraction_CPPFLAGS = $(QT_CPPFLAGS) $(AM_CPPFLAGS) \ $(TESSERACT_CPPFLAGS) \ diff --git a/scribo/tests/util/Makefile.am b/scribo/tests/util/Makefile.am index 9792ee3..1c6ea3a 100644 --- a/scribo/tests/util/Makefile.am +++ b/scribo/tests/util/Makefile.am @@ -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. # @@ -21,8 +21,5 @@ check_PROGRAMS = \ hex_to_color \ component_precise_outline -color_to_hex_SOURCES = color_to_hex.cc -hex_to_color_SOURCES = hex_to_color.cc -component_precise_outline_SOURCES = component_precise_outline.cc TESTS = $(check_PROGRAMS) -- 1.7.2.5