[Olena-patches] last-svn-commit-480-g7aad3ee src/Makefile.am: Remove useless flags. Aesthetic changes.

--- scribo/ChangeLog | 4 ++++ scribo/src/Makefile.am | 21 +++++++++------------ 2 files changed, 13 insertions(+), 12 deletions(-) diff --git a/scribo/ChangeLog b/scribo/ChangeLog index 2dd5cb4..ebaa322 100644 --- a/scribo/ChangeLog +++ b/scribo/ChangeLog @@ -1,5 +1,9 @@ 2010-08-13 Guillaume Lazzara <z(a)lrde.epita.fr> + * src/Makefile.am: Remove useless flags. Aesthetic changes. + +2010-08-13 Guillaume Lazzara <z(a)lrde.epita.fr> + * scribo/debug/text_areas_image.hh: Add a typedef to help g++-3.3. 2010-08-12 Guillaume Lazzara <z(a)lrde.epita.fr> diff --git a/scribo/src/Makefile.am b/scribo/src/Makefile.am index b1a29e8..52df66d 100644 --- a/scribo/src/Makefile.am +++ b/scribo/src/Makefile.am @@ -37,35 +37,32 @@ bin_PROGRAMS = if HAVE_TESSERACT - bin_PROGRAMS += pbm_text_in_doc - pbm_text_in_doc_CPPFLAGS = $(AM_CPPFLAGS) -g -ggdb \ + bin_PROGRAMS += pbm_text_in_doc + pbm_text_in_doc_SOURCES = pbm_text_in_doc.cc + pbm_text_in_doc_CPPFLAGS = $(AM_CPPFLAGS) \ $(TESSERACT_CPPFLAGS) \ $(TIFF_CPPFLAGS) - pbm_text_in_doc_LDFLAGS = $(AM_LDFLAGS) -g -ggdb\ + pbm_text_in_doc_LDFLAGS = $(AM_LDFLAGS) \ $(TESSERACT_LDFLAGS) \ $(TIFF_LDFLAGS) \ -lpthread - pbm_text_in_doc_SOURCES = pbm_text_in_doc.cc - endif HAVE_TESSERACT if HAVE_MAGICKXX - bin_PROGRAMS += text_in_doc_preprocess + bin_PROGRAMS += text_in_doc_preprocess + text_in_doc_preprocess_SOURCES = text_in_doc_preprocess.cc text_in_doc_preprocess_CPPFLAGS = $(AM_CPPFLAGS) \ $(MAGICKXX_CPPFLAGS) text_in_doc_preprocess_LDFLAGS = $(AM_LDFLAGS) \ -lpthread \ $(MAGICKXX_LDFLAGS) - text_in_doc_preprocess_SOURCES = text_in_doc_preprocess.cc - - - bin_PROGRAMS += text_in_picture - text_in_picture_SOURCES = text_in_picture.cc + bin_PROGRAMS += text_in_picture + text_in_picture_SOURCES = text_in_picture.cc text_in_picture_CPPFLAGS = $(AM_CPPFLAGS) \ $(MAGICKXX_CPPFLAGS) text_in_picture_LDFLAGS = $(AM_LDFLAGS) \ @@ -74,7 +71,7 @@ if HAVE_MAGICKXX if HAVE_TESSERACT - bin_PROGRAMS += text_recognition_in_picture + bin_PROGRAMS += text_recognition_in_picture text_recognition_in_picture_SOURCES = text_recognition_in_picture.cc text_recognition_in_picture_CPPFLAGS = $(AM_CPPFLAGS) \ $(TESSERACT_CPPFLAGS) \ -- 1.5.6.5