poppler: merge include files into poppler - only poppler requires them

Signed-off-by: Andreas Müller <schnitzeltony@googlemail.com>
Signed-off-by: Martin Jansa <Martin.Jansa@gmail.com>

3 files changed, 31 insertions, 35 deletions

diff --git a/meta-oe/recipes-support/poppler/poppler-fpu.inc b/meta-oe/recipes-support/poppler/poppler-fpu.inc
deleted file mode 100644
index 67d97ca8e5..0000000000
--- a/meta-oe/recipes-support/poppler/poppler-fpu.inc
+++ /dev/null
@@ -1,6 +0,0 @@
-
-def get_poppler_fpu_setting(bb, d):
-    if d.getVar('TARGET_FPU', 1) in [ 'soft' ]:
-        return "--enable-fixedpoint"
-    return ""
-
diff --git a/meta-oe/recipes-support/poppler/poppler.inc b/meta-oe/recipes-support/poppler/poppler.inc
deleted file mode 100644
index 11286bc8cf..0000000000
--- a/meta-oe/recipes-support/poppler/poppler.inc
+++ /dev/null
@@ -1,24 +0,0 @@
-DESCRIPTION = "Poppler is a PDF rendering library based on the xpdf-3.0 code base."
-DEPENDS = "fontconfig jpeg zlib gtk+ cairo tiff"
-LICENSE = "GPLv2"
-LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe"
-
-SRC_URI = "http://poppler.freedesktop.org/${PN}-${PV}.tar.gz"
-
-inherit autotools pkgconfig
-
-EXTRA_OECONF = "\
-    --enable-xpdf-headers \
-    --disable-gtk-test \
-    --disable-poppler-qt \
-    --enable-zlib \
-"
-
-# check for TARGET_FPU=soft and inform configure of the result so it can disable some floating points
-require poppler-fpu.inc
-EXTRA_OECONF += "${@get_poppler_fpu_setting(bb, d)}"
-
-PACKAGES =+ "libpoppler libpoppler-glib"
-FILES_libpoppler = "${libdir}/libpoppler.so.*"
-FILES_libpoppler-glib = "${libdir}/libpoppler-glib.so.*"
-
diff --git a/meta-oe/recipes-support/poppler/poppler_0.18.4.bb b/meta-oe/recipes-support/poppler/poppler_0.18.4.bb
index 6a9dbbe8d6..df26c0331a 100644
--- a/meta-oe/recipes-support/poppler/poppler_0.18.4.bb
+++ b/meta-oe/recipes-support/poppler/poppler_0.18.4.bb
@@ -1,8 +1,34 @@
-require poppler.inc
-
-DEPENDS += "lcms"
-
-RDEPENDS_${PN} = "poppler-data"
+DESCRIPTION = "Poppler is a PDF rendering library based on the xpdf-3.0 code base."
+LICENSE = "GPLv2"
+LIC_FILES_CHKSUM = "file://COPYING;md5=751419260aa954499f7abaabaa882bbe"
 
+SRC_URI = "http://poppler.freedesktop.org/${PN}-${PV}.tar.gz"
 SRC_URI[md5sum] = "12658f3308597e57f3faff538cc73baf"
 SRC_URI[sha256sum] = "33421148cdc8e043da291dece2cce1cea6220d49a50c00c56d56d6435501d42e"
+
+DEPENDS = "fontconfig jpeg zlib gtk+ cairo tiff lcms"
+
+PR = "r1"
+
+inherit autotools pkgconfig
+
+EXTRA_OECONF = "\
+    --enable-xpdf-headers \
+    --disable-gtk-test \
+    --disable-poppler-qt \
+    --enable-zlib \
+"
+
+# check for TARGET_FPU=soft and inform configure of the result so it can disable some floating points
+def get_poppler_fpu_setting(bb, d):
+    if d.getVar('TARGET_FPU', 1) in [ 'soft' ]:
+        return "--enable-fixedpoint"
+    return ""
+
+EXTRA_OECONF += "${@get_poppler_fpu_setting(bb, d)}"
+
+PACKAGES =+ "libpoppler libpoppler-glib"
+FILES_libpoppler = "${libdir}/libpoppler.so.*"
+FILES_libpoppler-glib = "${libdir}/libpoppler-glib.so.*"
+
+RDEPENDS_${PN} = "poppler-data"