* demo/Makefile.am: Enabled demos only if QT is configured. * src/Makefile.am: Make use of MAGICKCXX flags. --- scribo/ChangeLog | 8 ++++++++ scribo/demo/Makefile.am | 4 ++++ scribo/src/Makefile.am | 12 +++++++----- 3 files changed, 19 insertions(+), 5 deletions(-) diff --git a/scribo/ChangeLog b/scribo/ChangeLog index f4fce54..cbd813f 100644 --- a/scribo/ChangeLog +++ b/scribo/ChangeLog @@ -1,5 +1,13 @@ 2010-06-25 Guillaume Lazzara <z(a)lrde.epita.fr> + Small Fixes in Scribo build system. + + * demo/Makefile.am: Enabled demos only if QT is configured. + + * src/Makefile.am: Make use of MAGICKCXX flags. + +2010-06-25 Guillaume Lazzara <z(a)lrde.epita.fr> + Improve text recognition. * text/clean.hh: Use upsampling::eagle. diff --git a/scribo/demo/Makefile.am b/scribo/demo/Makefile.am index 4db20cd..365260d 100644 --- a/scribo/demo/Makefile.am +++ b/scribo/demo/Makefile.am @@ -16,5 +16,9 @@ ## Process this file through Automake to create Makefile.in. +if HAVE_QT + SUBDIRS = review viewer +endif HAVE_QT + diff --git a/scribo/src/Makefile.am b/scribo/src/Makefile.am index 774740a..6321089 100644 --- a/scribo/src/Makefile.am +++ b/scribo/src/Makefile.am @@ -59,9 +59,11 @@ if HAVE_MAGICKXX bin_PROGRAMS += text_in_doc_preprocess text_in_doc_preprocess_CPPFLAGS = $(AM_CPPFLAGS) \ - `Magick++-config --cppflags` + $(MAGICKXX_CPPFLAGS) text_in_doc_preprocess_LDFLAGS = $(AM_LDFLAGS) \ - -lpthread `Magick++-config --libs` + -lpthread \ + $(MAGICKXX_LDFLAGS) + text_in_doc_preprocess_SOURCES = text_in_doc_preprocess.cc @@ -69,9 +71,9 @@ if HAVE_MAGICKXX bin_PROGRAMS += text_in_picture text_in_picture_SOURCES = text_in_picture.cc text_in_picture_CPPFLAGS = $(AM_CPPFLAGS) \ - `Magick++-config --cppflags` - + $(MAGICKXX_CPPFLAGS) text_in_picture_LDFLAGS = $(AM_LDFLAGS) \ - -lpthread `Magick++-config --libs` + -lpthread \ + $(MAGICKXX_LDFLAGS) endif HAVE_MAGICKXX -- 1.5.6.5