4 files changed, 21 insertions, 27 deletions
diff --git a/packages/expat/expat.inc b/packages/expat/expat.inc
new file mode 100644
index 0000000000..3318efb6aa
--- /dev/null
+++ b/packages/expat/expat.inc
@@ -0,0 +1,13 @@
+DESCRIPTION = "Jim Clarkes XML parser library."
+HOMEPAGE = "http://expat.sf.net/"
+SECTION = "libs"
+LICENSE = "MIT"
+
+SRC_URI = "${SOURCEFORGE_MIRROR}/expat/expat-${PV}.tar.gz \
+	   file://autotools.patch;patch=1"
+S = "${WORKDIR}/expat-${PV}"
+
+export LTCC = "${CC}"
+
+inherit autotools
+
diff --git a/packages/expat/expat_1.95.6.bb b/packages/expat/expat_1.95.6.bb
index a6ac0f5b00..576ad76a55 100644
--- a/packages/expat/expat_1.95.6.bb
+++ b/packages/expat/expat_1.95.6.bb
@@ -1,13 +1,6 @@
-SECTION = "libs"
-DESCRIPTION = "Jim Clarkes XML parser library."
-LICENSE = "MIT"
-PR = "r1"
-
-SRC_URI = "${SOURCEFORGE_MIRROR}/expat/expat-${PV}.tar.gz"
-S = "${WORKDIR}/expat-${PV}"
+require expat.inc
 
-inherit autotools 
-export LTCC = "${CC}"
+PR = "r1"
 
 do_stage () {
 	install -m 0644 ${S}/lib/expat.h ${STAGING_INCDIR}/
diff --git a/packages/expat/expat_1.95.7.bb b/packages/expat/expat_1.95.7.bb
index c3bbb8981b..a4dda4dcb6 100644
--- a/packages/expat/expat_1.95.7.bb
+++ b/packages/expat/expat_1.95.7.bb
@@ -1,15 +1,9 @@
-SECTION = "libs"
-DESCRIPTION = "Jim Clarkes XML parser library."
-HOMEPAGE = "http://expat.sourceforge.net/"
-LICENSE = "MIT"
+require expat.inc
 PR = "r1"
 
-SRC_URI = "${SOURCEFORGE_MIRROR}/expat/expat-${PV}.tar.gz \
-	   file://autotools.patch;patch=1"
-S = "${WORKDIR}/expat-${PV}"
+SRC_URI += "file://autotools.patch;patch=1"
 
-inherit autotools lib_package
-export LTCC = "${CC}"
+inherit lib_package
 
 do_configure () {
 	rm -f ${S}/conftools/libtool.m4
diff --git a/packages/expat/expat_2.0.0.bb b/packages/expat/expat_2.0.0.bb
index 4f98d3cde9..48b2b4eb7d 100644
--- a/packages/expat/expat_2.0.0.bb
+++ b/packages/expat/expat_2.0.0.bb
@@ -1,15 +1,9 @@
-DESCRIPTION = "Jim Clarkes XML parser library."
-HOMEPAGE = "http://expat.sourceforge.net/"
-SECTION = "libs"
-LICENSE = "MIT"
+require expat.inc
 PR = "r2"
 
-SRC_URI = "${SOURCEFORGE_MIRROR}/expat/expat-${PV}.tar.gz \
-	   file://autotools.patch;patch=1"
-S = "${WORKDIR}/expat-${PV}"
+SRC_URI = "file://autotools.patch;patch=1"
 
-inherit autotools lib_package
-export LTCC = "${CC}"
+inherit lib_package
 
 do_configure() {
 	rm -f ${S}/conftools/libtool.m4