--- scribo/ChangeLog | 4 ++++ scribo/tests/toolchain/nepomuk/Makefile.am | 5 ++++- 2 files changed, 8 insertions(+), 1 deletions(-) diff --git a/scribo/ChangeLog b/scribo/ChangeLog index df9110d..6298fec 100644 --- a/scribo/ChangeLog +++ b/scribo/ChangeLog @@ -1,5 +1,9 @@ 2011-03-14 Guillaume Lazzara &lt;z(a)lrde.epita.fr&gt; + * tests/toolchain/nepomuk/Makefile.am: Add MAGICKXX flags. + +2011-03-14 Guillaume Lazzara &lt;z(a)lrde.epita.fr&gt; + * scribo/core/def/lbl_type.hh: Use int_u<n> as label type. 2011-03-14 Guillaume Lazzara &lt;z(a)lrde.epita.fr&gt; diff --git a/scribo/tests/toolchain/nepomuk/Makefile.am b/scribo/tests/toolchain/nepomuk/Makefile.am index 67a594b..331fb6f 100644 --- a/scribo/tests/toolchain/nepomuk/Makefile.am +++ b/scribo/tests/toolchain/nepomuk/Makefile.am @@ -1,4 +1,5 @@ -# Copyright (C) 2010 EPITA Research and Development Laboratory (LRDE). +# Copyright (C) 2010, 2011 EPITA Research and Development Laboratory +# (LRDE). # # This file is part of Olena. # @@ -32,10 +33,12 @@ text_extraction_CXXFLAGS = $(QT_CXXFLAGS) $(AM_CXXFLAGS) text_extraction_CPPFLAGS = $(QT_CPPFLAGS) $(AM_CPPFLAGS) \ $(TESSERACT_CPPFLAGS) \ $(TIFF_CPPFLAGS) \ + $(MAGICKXX_CPPFLAGS) \ -I$(top_builddir) text_extraction_LDFLAGS = $(QT_LDFLAGS) $(LDFLAGS) \ $(TESSERACT_LDFLAGS) \ $(TIFF_LDFLAGS) \ + $(MAGICKXX_LDFLAGS) \ -lpthread text_extraction_LDADD = $(QT_LIBS) $(LDADD) -- 1.5.6.5