2 files changed, 34 insertions, 38 deletions
diff --git a/recipes-isdn/dahdi-tools/dahdi-tools.inc b/recipes-isdn/dahdi-tools/dahdi-tools.inc
deleted file mode 100644
index 06ef35c..0000000
--- a/recipes-isdn/dahdi-tools/dahdi-tools.inc
+++ /dev/null
@@ -1,36 +0,0 @@
-DESCRITOPN = "Utilities for the DAHDI Asterisk Linux kernel drivers"
-DEPENDS = "dahdi-linux libnewt libpcap"
-RDEPENDS_${PN} += "perl perl-module-strict perl-module-file-basename perl-module-config \
-             perl-module-warnings perl-module-getopt perl-module-getopt-std \
-             perl-module-file perl-module-file-glob perl-module-xsloader \
-             perl-module-dynaloader perl-module-carp perl-module-errno"
-
-HOMEPAGE = "http://www.asterisk.org"
-LICENSE = "GPLv2"
-
-SRC_URI = "http://downloads.asterisk.org/pub/telephony/dahdi-tools/releases/dahdi-tools-${PV}.tar.gz \
-           file://perl_install.patch "
-
-INC_PR="r19"
-
-LIC_FILES_CHKSUM = "file://LICENSE;md5=ea5bed2f60d357618ca161ad539f7c0a \
-		    file://LICENSE.LGPL;md5=fb504b67c50331fc78734fed90fb0e09"
-
-FILES_${PN} += "${datadir}/dahdi"
-
-inherit autotools_stage pkgconfig perlnative cpan-base
-
-do_configure() {
-	oe_runconf
-}
-
-do_compile() {
-	base_do_compile
-	oe_runmake dahdi_pcap
-}
-
-export DAHDI_PERLLIBDIR="${PERLLIBDIRS}/${@get_perl_version(d)}"
-do_install() {
-	autotools_do_install
-	install -m 755 ${S}/dahdi_pcap ${D}${sbindir}/
-}
diff --git a/recipes-isdn/dahdi-tools/dahdi-tools_2.6.0.bb b/recipes-isdn/dahdi-tools/dahdi-tools_2.6.0.bb
index 35132e4..06ef35c 100644
--- a/recipes-isdn/dahdi-tools/dahdi-tools_2.6.0.bb
+++ b/recipes-isdn/dahdi-tools/dahdi-tools_2.6.0.bb
@@ -1,4 +1,36 @@
-require ${PN}.inc
+DESCRITOPN = "Utilities for the DAHDI Asterisk Linux kernel drivers"
+DEPENDS = "dahdi-linux libnewt libpcap"
+RDEPENDS_${PN} += "perl perl-module-strict perl-module-file-basename perl-module-config \
+             perl-module-warnings perl-module-getopt perl-module-getopt-std \
+             perl-module-file perl-module-file-glob perl-module-xsloader \
+             perl-module-dynaloader perl-module-carp perl-module-errno"
 
-PR = "${INC_PR}.2"
+HOMEPAGE = "http://www.asterisk.org"
+LICENSE = "GPLv2"
 
+SRC_URI = "http://downloads.asterisk.org/pub/telephony/dahdi-tools/releases/dahdi-tools-${PV}.tar.gz \
+           file://perl_install.patch "
+
+INC_PR="r19"
+
+LIC_FILES_CHKSUM = "file://LICENSE;md5=ea5bed2f60d357618ca161ad539f7c0a \
+		    file://LICENSE.LGPL;md5=fb504b67c50331fc78734fed90fb0e09"
+
+FILES_${PN} += "${datadir}/dahdi"
+
+inherit autotools_stage pkgconfig perlnative cpan-base
+
+do_configure() {
+	oe_runconf
+}
+
+do_compile() {
+	base_do_compile
+	oe_runmake dahdi_pcap
+}
+
+export DAHDI_PERLLIBDIR="${PERLLIBDIRS}/${@get_perl_version(d)}"
+do_install() {
+	autotools_do_install
+	install -m 755 ${S}/dahdi_pcap ${D}${sbindir}/
+}