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

15 files changed, 8 insertions, 9 deletions

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
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
index 40e45469..40e45469 100644
--- a/kfile-plugins/pdf/poppler-qt/poppler-document.cc
+++ b/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
index c0e777a7..c0e777a7 100644
--- a/kfile-plugins/pdf/poppler-qt/poppler-fontinfo.cc
+++ b/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
index fc22d8ed..fc22d8ed 100644
--- a/kfile-plugins/pdf/poppler-qt/poppler-link-qt3.h
+++ b/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
index 72db1fff..72db1fff 100644
--- a/kfile-plugins/pdf/poppler-qt/poppler-link.cc
+++ b/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
index 8bc70825..8bc70825 100644
--- a/kfile-plugins/pdf/poppler-qt/poppler-page-transition-private.h
+++ b/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
index 9998f738..9998f738 100644
--- a/kfile-plugins/pdf/poppler-qt/poppler-page-transition.cc
+++ b/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
index f33a014c..f33a014c 100644
--- a/kfile-plugins/pdf/poppler-qt/poppler-page-transition.h
+++ b/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
index b6be9bd1..b6be9bd1 100644
--- a/kfile-plugins/pdf/poppler-qt/poppler-page.cc
+++ b/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
index 6d209c2b..6d209c2b 100644
--- a/kfile-plugins/pdf/poppler-qt/poppler-private.cc
+++ b/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
index b1b79084..b1b79084 100644
--- a/kfile-plugins/pdf/poppler-qt/poppler-private.h
+++ b/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
index 9150ee3b..9150ee3b 100644
--- a/kfile-plugins/pdf/poppler-qt/poppler-qt.h
+++ b/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
index d616290d..d616290d 100644
--- a/kfile-plugins/pdf/poppler-qt/test-poppler-qt.cpp
+++ b/kfile-plugins/dependencies/poppler-tqt/test-poppler-qt.cpp