Move poppler-qt to poppler-tqt and fix build sequence

git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdegraphics@1237558 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
v3.5.13-sru
tpearson 13 years ago
parent e69e8b1d09
commit 546886fdcc

@ -10,5 +10,5 @@ if include_PDF
KFILE_PDF_SUBDIR=pdf
endif
SUBDIRS=dvi png ps jpeg xbm xpm bmp tga rgb ico pcx $(KFILE_TIFF_SUBDIR) pnm \
SUBDIRS=dependencies dvi png ps jpeg xbm xpm bmp tga rgb ico pcx $(KFILE_TIFF_SUBDIR) pnm \
$(KFILE_EXR_SUBDIR) $(KFILE_PDF_SUBDIR) dds gif raw

@ -13,8 +13,8 @@ poppler_include_HEADERS = \
poppler-page-transition.h \
poppler-link-qt3.h
lib_LTLIBRARIES = libpoppler-qt.la
libpoppler_qt_la_SOURCES = \
lib_LTLIBRARIES = libpoppler-tqt.la
libpoppler_tqt_la_SOURCES = \
poppler-document.cc \
poppler-fontinfo.cc \
poppler-link.cc \
@ -24,19 +24,17 @@ libpoppler_qt_la_SOURCES = \
poppler-private.cc \
poppler-private.h
libpoppler_qt_la_LIBADD = \
libpoppler_tqt_la_LIBADD = \
-lpoppler \
$(QT_LIBS) \
$(FREETYPE_LIBS) \
$(FONTCONFIG_LIBS)
# libpoppler_qt_la_LDFLAGS = -version-info 2:0:0 @create_shared_lib@
test_poppler_qt_SOURCES = \
test_poppler_tqt_SOURCES = \
test-poppler-qt.cpp
test_poppler_qt_LDADD = \
test_poppler_tqt_LDADD = \
$(top_builddir)/poppler/libpoppler.la \
libpoppler-qt.la \
libpoppler-tqt.la \
$(QT_LIBS) \
$(FREETYPE_LIBS)
Loading…
Cancel
Save