[Olena-patches] olena: olena-2.0-774-ga40ac76 Simplify even more Scribo Makefiles thanks to AM_DEFAULT_SOURCE_EXT.

* src/Makefile.am, * src/binarization/Makefile.am: Here. --- scribo/ChangeLog | 8 ++++++++ scribo/src/Makefile.am | 1 - scribo/src/binarization/Makefile.am | 5 ----- 3 files changed, 8 insertions(+), 6 deletions(-) diff --git a/scribo/ChangeLog b/scribo/ChangeLog index 77ca627..62a4083 100644 --- a/scribo/ChangeLog +++ b/scribo/ChangeLog @@ -1,3 +1,11 @@ +2013-08-30 Roland Levillain <roland(a)lrde.epita.fr> + + Simplify even more Scribo Makefiles thanks to AM_DEFAULT_SOURCE_EXT. + + * src/Makefile.am, + * src/binarization/Makefile.am: + Here. + 2013-08-29 Roland Levillain <roland(a)lrde.epita.fr> Fix inclusion paths in Scribo. diff --git a/scribo/src/Makefile.am b/scribo/src/Makefile.am index eea9134..1b6da73 100644 --- a/scribo/src/Makefile.am +++ b/scribo/src/Makefile.am @@ -71,7 +71,6 @@ endif HAVE_TESSERACT utilexec_PROGRAMS += text_in_picture_dual - text_in_picture_dual_SOURCES = text_in_picture_dual.cc text_in_picture_dual_CPPFLAGS = $(AM_CPPFLAGS) \ $(MAGICKXX_CPPFLAGS) text_in_picture_dual_LDFLAGS = $(AM_LDFLAGS) \ diff --git a/scribo/src/binarization/Makefile.am b/scribo/src/binarization/Makefile.am index 5bcc49f..24f151a 100644 --- a/scribo/src/binarization/Makefile.am +++ b/scribo/src/binarization/Makefile.am @@ -58,31 +58,26 @@ if HAVE_MAGICKXX sauvola_ms_fg_LDFLAGS = $(AM_LDFLAGS) \ $(MAGICKXX_LDFLAGS) - kim_SOURCES = kim.cc kim_CPPFLAGS = $(AM_CPPFLAGS) \ $(MAGICKXX_CPPFLAGS) kim_LDFLAGS = $(AM_LDFLAGS) \ $(MAGICKXX_LDFLAGS) - sauvola_SOURCES = sauvola.cc sauvola_CPPFLAGS = $(AM_CPPFLAGS) \ $(MAGICKXX_CPPFLAGS) sauvola_LDFLAGS = $(AM_LDFLAGS) \ $(MAGICKXX_LDFLAGS) - singh_SOURCES = singh.cc singh_CPPFLAGS = $(AM_CPPFLAGS) \ $(MAGICKXX_CPPFLAGS) singh_LDFLAGS = $(AM_LDFLAGS) \ $(MAGICKXX_LDFLAGS) - wolf_SOURCES = wolf.cc wolf_CPPFLAGS = $(AM_CPPFLAGS) \ $(MAGICKXX_CPPFLAGS) wolf_LDFLAGS = $(AM_LDFLAGS) \ $(MAGICKXX_LDFLAGS) - sauvola_debug_SOURCES = sauvola_debug.cc sauvola_debug_CPPFLAGS = $(AM_CPPFLAGS) \ -DSCRIBO_LOCAL_THRESHOLD_DEBUG \ $(MAGICKXX_CPPFLAGS) -- 1.7.10.4