Browse Source

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
tags/v3.5.13
tpearson 8 years ago
parent
commit
546886fdcc
15 changed files with 8 additions and 9 deletions
  1. +1
    -1
      kfile-plugins/Makefile.am
  2. +1
    -0
      kfile-plugins/dependencies/Makefile.am
  3. +6
    -8
      kfile-plugins/dependencies/poppler-tqt/Makefile.am
  4. +0
    -0
      kfile-plugins/dependencies/poppler-tqt/poppler-document.cc
  5. +0
    -0
      kfile-plugins/dependencies/poppler-tqt/poppler-fontinfo.cc
  6. +0
    -0
      kfile-plugins/dependencies/poppler-tqt/poppler-link-qt3.h
  7. +0
    -0
      kfile-plugins/dependencies/poppler-tqt/poppler-link.cc
  8. +0
    -0
      kfile-plugins/dependencies/poppler-tqt/poppler-page-transition-private.h
  9. +0
    -0
      kfile-plugins/dependencies/poppler-tqt/poppler-page-transition.cc
  10. +0
    -0
      kfile-plugins/dependencies/poppler-tqt/poppler-page-transition.h
  11. +0
    -0
      kfile-plugins/dependencies/poppler-tqt/poppler-page.cc
  12. +0
    -0
      kfile-plugins/dependencies/poppler-tqt/poppler-private.cc
  13. +0
    -0
      kfile-plugins/dependencies/poppler-tqt/poppler-private.h
  14. +0
    -0
      kfile-plugins/dependencies/poppler-tqt/poppler-qt.h
  15. +0
    -0
      kfile-plugins/dependencies/poppler-tqt/test-poppler-qt.cpp

+ 1
- 1
kfile-plugins/Makefile.am View File

@@ -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

+ 1
- 0
kfile-plugins/dependencies/Makefile.am View File

@@ -0,0 +1 @@
SUBDIRS=poppler-tqt

kfile-plugins/pdf/poppler-qt/Makefile.am → kfile-plugins/dependencies/poppler-tqt/Makefile.am View File

@@ -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)

kfile-plugins/pdf/poppler-qt/poppler-document.cc → kfile-plugins/dependencies/poppler-tqt/poppler-document.cc View File


kfile-plugins/pdf/poppler-qt/poppler-fontinfo.cc → kfile-plugins/dependencies/poppler-tqt/poppler-fontinfo.cc View File


kfile-plugins/pdf/poppler-qt/poppler-link-qt3.h → kfile-plugins/dependencies/poppler-tqt/poppler-link-qt3.h View File


kfile-plugins/pdf/poppler-qt/poppler-link.cc → kfile-plugins/dependencies/poppler-tqt/poppler-link.cc View File


kfile-plugins/pdf/poppler-qt/poppler-page-transition-private.h → kfile-plugins/dependencies/poppler-tqt/poppler-page-transition-private.h View File


kfile-plugins/pdf/poppler-qt/poppler-page-transition.cc → kfile-plugins/dependencies/poppler-tqt/poppler-page-transition.cc View File


kfile-plugins/pdf/poppler-qt/poppler-page-transition.h → kfile-plugins/dependencies/poppler-tqt/poppler-page-transition.h View File


kfile-plugins/pdf/poppler-qt/poppler-page.cc → kfile-plugins/dependencies/poppler-tqt/poppler-page.cc View File


kfile-plugins/pdf/poppler-qt/poppler-private.cc → kfile-plugins/dependencies/poppler-tqt/poppler-private.cc View File


kfile-plugins/pdf/poppler-qt/poppler-private.h → kfile-plugins/dependencies/poppler-tqt/poppler-private.h View File


kfile-plugins/pdf/poppler-qt/poppler-qt.h → kfile-plugins/dependencies/poppler-tqt/poppler-qt.h View File


kfile-plugins/pdf/poppler-qt/test-poppler-qt.cpp → kfile-plugins/dependencies/poppler-tqt/test-poppler-qt.cpp View File


Loading…
Cancel
Save