* src/toolchain/nepomuk/Makefile.am (text_extraction_LDFLAGS): Move $(QT_LIBS)... (text_extraction_LDADD): ...here. Add $(LDADD). --- scribo/ChangeLog | 9 +++++++++ scribo/src/toolchain/nepomuk/Makefile.am | 2 +- 2 files changed, 10 insertions(+), 1 deletion(-) diff --git a/scribo/ChangeLog b/scribo/ChangeLog index 5536677..4f33ead 100644 --- a/scribo/ChangeLog +++ b/scribo/ChangeLog @@ -1,5 +1,14 @@ 2013-09-11 Roland Levillain <roland@lrde.epita.fr> + Scribo: Fix the use of QT_LIBS. + + * src/toolchain/nepomuk/Makefile.am + (text_extraction_LDFLAGS): Move $(QT_LIBS)... + (text_extraction_LDADD): ...here. + Add $(LDADD). + +2013-09-11 Roland Levillain <roland@lrde.epita.fr> + Regen Scribo's unit-tests.mk. * tests/unit_test/unit-tests.mk: Regen. diff --git a/scribo/src/toolchain/nepomuk/Makefile.am b/scribo/src/toolchain/nepomuk/Makefile.am index 5d3b252..4d0d942 100644 --- a/scribo/src/toolchain/nepomuk/Makefile.am +++ b/scribo/src/toolchain/nepomuk/Makefile.am @@ -36,8 +36,8 @@ text_extraction_LDFLAGS = $(AM_LDFLAGS) \ $(TESSERACT_LDFLAGS) \ $(TIFF_LDFLAGS) \ $(QT_LDFLAGS) \ - $(QT_LIBS) \ -lpthread +text_extraction_LDADD = $(QT_LIBS) $(LDADD) endif HAVE_TESSERACT endif HAVE_MAGICKXX -- 1.7.10.4