From 546886fdccdc2bc112e6f9eaf99a34aac1d2234e Mon Sep 17 00:00:00 2001 From: tpearson Date: Sun, 19 Jun 2011 19:11:56 +0000 Subject: [PATCH] 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 --- kfile-plugins/Makefile.am | 2 +- kfile-plugins/dependencies/Makefile.am | 1 + .../poppler-tqt}/Makefile.am | 14 ++++++-------- .../poppler-tqt}/poppler-document.cc | 0 .../poppler-tqt}/poppler-fontinfo.cc | 0 .../poppler-tqt}/poppler-link-qt3.h | 0 .../poppler-tqt}/poppler-link.cc | 0 .../poppler-tqt}/poppler-page-transition-private.h | 0 .../poppler-tqt}/poppler-page-transition.cc | 0 .../poppler-tqt}/poppler-page-transition.h | 0 .../poppler-tqt}/poppler-page.cc | 0 .../poppler-tqt}/poppler-private.cc | 0 .../poppler-tqt}/poppler-private.h | 0 .../poppler-tqt}/poppler-qt.h | 0 .../poppler-tqt}/test-poppler-qt.cpp | 0 15 files changed, 8 insertions(+), 9 deletions(-) create mode 100644 kfile-plugins/dependencies/Makefile.am rename kfile-plugins/{pdf/poppler-qt => dependencies/poppler-tqt}/Makefile.am (74%) rename kfile-plugins/{pdf/poppler-qt => dependencies/poppler-tqt}/poppler-document.cc (100%) rename kfile-plugins/{pdf/poppler-qt => dependencies/poppler-tqt}/poppler-fontinfo.cc (100%) rename kfile-plugins/{pdf/poppler-qt => dependencies/poppler-tqt}/poppler-link-qt3.h (100%) rename kfile-plugins/{pdf/poppler-qt => dependencies/poppler-tqt}/poppler-link.cc (100%) rename kfile-plugins/{pdf/poppler-qt => dependencies/poppler-tqt}/poppler-page-transition-private.h (100%) rename kfile-plugins/{pdf/poppler-qt => dependencies/poppler-tqt}/poppler-page-transition.cc (100%) rename kfile-plugins/{pdf/poppler-qt => dependencies/poppler-tqt}/poppler-page-transition.h (100%) rename kfile-plugins/{pdf/poppler-qt => dependencies/poppler-tqt}/poppler-page.cc (100%) rename kfile-plugins/{pdf/poppler-qt => dependencies/poppler-tqt}/poppler-private.cc (100%) rename kfile-plugins/{pdf/poppler-qt => dependencies/poppler-tqt}/poppler-private.h (100%) rename kfile-plugins/{pdf/poppler-qt => dependencies/poppler-tqt}/poppler-qt.h (100%) rename kfile-plugins/{pdf/poppler-qt => dependencies/poppler-tqt}/test-poppler-qt.cpp (100%) diff --git a/kfile-plugins/Makefile.am b/kfile-plugins/Makefile.am index 92a6e911..bc15008f 100644 --- a/kfile-plugins/Makefile.am +++ b/kfile-plugins/Makefile.am @@ -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 diff --git a/kfile-plugins/dependencies/Makefile.am b/kfile-plugins/dependencies/Makefile.am new file mode 100644 index 00000000..1c8d5d88 --- /dev/null +++ b/kfile-plugins/dependencies/Makefile.am @@ -0,0 +1 @@ +SUBDIRS=poppler-tqt diff --git a/kfile-plugins/pdf/poppler-qt/Makefile.am b/kfile-plugins/dependencies/poppler-tqt/Makefile.am similarity index 74% rename from kfile-plugins/pdf/poppler-qt/Makefile.am rename to kfile-plugins/dependencies/poppler-tqt/Makefile.am index f23d0307..435f15e1 100644 --- a/kfile-plugins/pdf/poppler-qt/Makefile.am +++ b/kfile-plugins/dependencies/poppler-tqt/Makefile.am @@ -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) diff --git a/kfile-plugins/pdf/poppler-qt/poppler-document.cc b/kfile-plugins/dependencies/poppler-tqt/poppler-document.cc similarity index 100% rename from kfile-plugins/pdf/poppler-qt/poppler-document.cc rename to kfile-plugins/dependencies/poppler-tqt/poppler-document.cc diff --git a/kfile-plugins/pdf/poppler-qt/poppler-fontinfo.cc b/kfile-plugins/dependencies/poppler-tqt/poppler-fontinfo.cc similarity index 100% rename from kfile-plugins/pdf/poppler-qt/poppler-fontinfo.cc rename to kfile-plugins/dependencies/poppler-tqt/poppler-fontinfo.cc diff --git a/kfile-plugins/pdf/poppler-qt/poppler-link-qt3.h b/kfile-plugins/dependencies/poppler-tqt/poppler-link-qt3.h similarity index 100% rename from kfile-plugins/pdf/poppler-qt/poppler-link-qt3.h rename to kfile-plugins/dependencies/poppler-tqt/poppler-link-qt3.h diff --git a/kfile-plugins/pdf/poppler-qt/poppler-link.cc b/kfile-plugins/dependencies/poppler-tqt/poppler-link.cc similarity index 100% rename from kfile-plugins/pdf/poppler-qt/poppler-link.cc rename to kfile-plugins/dependencies/poppler-tqt/poppler-link.cc diff --git a/kfile-plugins/pdf/poppler-qt/poppler-page-transition-private.h b/kfile-plugins/dependencies/poppler-tqt/poppler-page-transition-private.h similarity index 100% rename from kfile-plugins/pdf/poppler-qt/poppler-page-transition-private.h rename to kfile-plugins/dependencies/poppler-tqt/poppler-page-transition-private.h diff --git a/kfile-plugins/pdf/poppler-qt/poppler-page-transition.cc b/kfile-plugins/dependencies/poppler-tqt/poppler-page-transition.cc similarity index 100% rename from kfile-plugins/pdf/poppler-qt/poppler-page-transition.cc rename to kfile-plugins/dependencies/poppler-tqt/poppler-page-transition.cc diff --git a/kfile-plugins/pdf/poppler-qt/poppler-page-transition.h b/kfile-plugins/dependencies/poppler-tqt/poppler-page-transition.h similarity index 100% rename from kfile-plugins/pdf/poppler-qt/poppler-page-transition.h rename to kfile-plugins/dependencies/poppler-tqt/poppler-page-transition.h diff --git a/kfile-plugins/pdf/poppler-qt/poppler-page.cc b/kfile-plugins/dependencies/poppler-tqt/poppler-page.cc similarity index 100% rename from kfile-plugins/pdf/poppler-qt/poppler-page.cc rename to kfile-plugins/dependencies/poppler-tqt/poppler-page.cc diff --git a/kfile-plugins/pdf/poppler-qt/poppler-private.cc b/kfile-plugins/dependencies/poppler-tqt/poppler-private.cc similarity index 100% rename from kfile-plugins/pdf/poppler-qt/poppler-private.cc rename to kfile-plugins/dependencies/poppler-tqt/poppler-private.cc diff --git a/kfile-plugins/pdf/poppler-qt/poppler-private.h b/kfile-plugins/dependencies/poppler-tqt/poppler-private.h similarity index 100% rename from kfile-plugins/pdf/poppler-qt/poppler-private.h rename to kfile-plugins/dependencies/poppler-tqt/poppler-private.h diff --git a/kfile-plugins/pdf/poppler-qt/poppler-qt.h b/kfile-plugins/dependencies/poppler-tqt/poppler-qt.h similarity index 100% rename from kfile-plugins/pdf/poppler-qt/poppler-qt.h rename to kfile-plugins/dependencies/poppler-tqt/poppler-qt.h diff --git a/kfile-plugins/pdf/poppler-qt/test-poppler-qt.cpp b/kfile-plugins/dependencies/poppler-tqt/test-poppler-qt.cpp similarity index 100% rename from kfile-plugins/pdf/poppler-qt/test-poppler-qt.cpp rename to kfile-plugins/dependencies/poppler-tqt/test-poppler-qt.cpp