summaryrefslogtreecommitdiffstats
path: root/kfile-plugins
diff options
context:
space:
mode:
authortpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-06-19 20:14:09 +0000
committertpearson <tpearson@283d02a7-25f6-0310-bc7c-ecb5cbfe19da>2011-06-19 20:14:09 +0000
commit11a83c466cf96c7b6ac8de1673ae4a8402b38324 (patch)
tree5a9a49d6cca3deb36329275f65db452a75ee609c /kfile-plugins
parent546886fdccdc2bc112e6f9eaf99a34aac1d2234e (diff)
downloadtdegraphics-11a83c466cf96c7b6ac8de1673ae4a8402b38324.tar.gz
tdegraphics-11a83c466cf96c7b6ac8de1673ae4a8402b38324.zip
Fix kdegraphics FTBFS
git-svn-id: svn://anonsvn.kde.org/home/kde/branches/trinity/kdegraphics@1237560 283d02a7-25f6-0310-bc7c-ecb5cbfe19da
Diffstat (limited to 'kfile-plugins')
-rw-r--r--kfile-plugins/pdf/Makefile.am7
-rw-r--r--kfile-plugins/ps/Makefile.am2
2 files changed, 3 insertions, 6 deletions
diff --git a/kfile-plugins/pdf/Makefile.am b/kfile-plugins/pdf/Makefile.am
index 65a7742b..0b5bf202 100644
--- a/kfile-plugins/pdf/Makefile.am
+++ b/kfile-plugins/pdf/Makefile.am
@@ -1,19 +1,16 @@
## Makefile.am for the pdf file meta info plugin
-subdirs=poppler-qt
-
# set the include path for X, qt and KDE
-INCLUDES = $(all_includes) -I$(top_srcdir)/kfile-plugins/pdf/poppler-qt
+INCLUDES = $(all_includes) -I$(top_srcdir)/kfile-plugins/dependencies/poppler-tqt
# these are the headers for your project
noinst_HEADERS = kfile_pdf.h
kde_module_LTLIBRARIES = kfile_pdf.la
-kfile_pdf_la_COMPILE_FIRST = poppler-qt
kfile_pdf_la_SOURCES = kfile_pdf.cpp
kfile_pdf_la_LDFLAGS = $(all_libraries) -module $(KDE_PLUGIN)
-kfile_pdf_la_LIBADD = $(LIB_KIO) -L$(top_builddir)/kfile-plugins/pdf/poppler-qt/ -lpoppler-qt
+kfile_pdf_la_LIBADD = $(LIB_KIO) -L$(top_builddir)/kfile-plugins/dependencies/poppler-tqt/ -lpoppler-tqt
# let automoc handle all of the meta source files (moc)
METASOURCES = AUTO
diff --git a/kfile-plugins/ps/Makefile.am b/kfile-plugins/ps/Makefile.am
index 9c5b20a3..b374ebc1 100644
--- a/kfile-plugins/ps/Makefile.am
+++ b/kfile-plugins/ps/Makefile.am
@@ -1,7 +1,7 @@
## Makefile.am for the ps file meta info plugin
# set the include path for X, qt and KDE
-INCLUDES = -I$(top_srcdir)/kghostview $(all_includes)
+INCLUDES = -I$(top_srcdir)/kghostview/dscparse $(all_includes)
# these are the headers for your project
noinst_HEADERS = kfile_ps.h gscreator.h