diff options
| -rw-r--r-- | ChangeLog | 6 | ||||
| -rw-r--r-- | poppler/Makefile.am | 11 | ||||
| -rw-r--r-- | qt4/src/Makefile.am | 1 |
3 files changed, 12 insertions, 6 deletions
@@ -1,3 +1,9 @@ +2006-04-08 Albert Astals Cid <aacid@kde.org> + + * poppler/Makefile.am: + * qt4/src/Makefile.am: Don't link Qt4 in libpoppler when using Qt4 frontend + Patch by Stefan Schweizer + 2006-04-05 Albert Astals Cid <aacid@kde.org> * poppler/JBIG2Stream.cc: Fix for some buggy JBIG2 documents, patch by diff --git a/poppler/Makefile.am b/poppler/Makefile.am index abb0dd24..b54eb139 100644 --- a/poppler/Makefile.am +++ b/poppler/Makefile.am @@ -17,10 +17,10 @@ endif if BUILD_POPPLER_QT4 -arthur_headers = \ - ArthurOutputDev.h +poppler_arthur = libpoppler-arthur.la -arthur_sources = \ +libpoppler_arthur_la_SOURCES = \ + ArthurOutputDev.h \ ArthurOutputDev.cc arthur_includes = \ @@ -79,13 +79,13 @@ INCLUDES = \ lib_LTLIBRARIES = libpoppler.la -noinst_LTLIBRARIES = $(poppler_cairo) +noinst_LTLIBRARIES = $(poppler_cairo) \ + $(poppler_arthur) libpoppler_la_LIBADD = \ $(top_builddir)/goo/libgoo.la \ $(top_builddir)/fofi/libfofi.la \ $(splash_libs) \ - $(arthur_libs) \ $(libjpeg_libs) \ $(zlib_libs) \ $(FREETYPE_LIBS) @@ -97,7 +97,6 @@ if ENABLE_XPDF_HEADERS poppler_includedir = $(includedir)/poppler poppler_include_HEADERS = \ $(splash_headers) \ - $(arthur_headers) \ Annot.h \ Array.h \ BaseFile.h \ diff --git a/qt4/src/Makefile.am b/qt4/src/Makefile.am index b9d9ee47..2554c3d3 100644 --- a/qt4/src/Makefile.am +++ b/qt4/src/Makefile.am @@ -25,6 +25,7 @@ libpoppler_qt4_la_SOURCES = \ libpoppler_qt4_la_LIBADD = \ $(top_builddir)/poppler/libpoppler.la \ + $(top_builddir)/poppler/libpoppler-arthur.la \ $(POPPLER_QT4_LIBS) libpoppler_qt4_la_LDFLAGS = -version-info 1:0:0 |