From f6234c4d326ec622456ddbc55c6d57e53e87da6c Mon Sep 17 00:00:00 2001
From: Fabio Berton <fabio.berton@ossystems.com.br>
Date: Mon, 26 Oct 2015 13:12:01 -0200
Subject: [PATCH] libgsm: Drop libgsm.inc

Move all code to bb file.

Signed-off-by: Fabio Berton <fabio.berton@ossystems.com.br>
---
 recipes-isdn/libgsm/libgsm.inc       | 34 ----------------------------
 recipes-isdn/libgsm/libgsm_1.0.13.bb | 34 ++++++++++++++++++++++++++--
 2 files changed, 32 insertions(+), 36 deletions(-)
 delete mode 100644 recipes-isdn/libgsm/libgsm.inc

diff --git a/recipes-isdn/libgsm/libgsm.inc b/recipes-isdn/libgsm/libgsm.inc
deleted file mode 100644
index aa0386c31c..0000000000
--- a/recipes-isdn/libgsm/libgsm.inc
+++ /dev/null
@@ -1,34 +0,0 @@
-DESCRIPTION = "GSM Audio Library"
-SECTION = "libs"
-PRIORITY = "optional"
-LICENSE = "libgsm"
-LIC_FILES_CHKSUM = "file://COPYRIGHT;md5=fc1372895b173aaf543a122db37e04f5"
-
-INC_PR = "r2"
-
-SRC_URI = "http://www.quut.com/gsm/gsm-${PV}.tar.gz \
-	   file://01_makefile.patch \
-           file://02_cplusplus.patch \
-           file://03_config.patch \
-           file://04_includes.patch \
-           file://05_compiler_warnings.patch \
-	  "
-
-CFLAGS += "-c -g -fPIC -Wall -D_GNU_SOURCE -D_REENTRANT -DNeedFunctionPrototypes=1 -DWAV49 -I./inc"
-
-PARALLEL_MAKE = ""
-
-do_compile() {
-	unset LD
-	oe_runmake CCFLAGS="${CFLAGS}"
-}
-
-do_install() {
-	oe_libinstall -a -C lib libgsm ${D}${libdir}
-        oe_libinstall -so -C lib libgsm ${D}${libdir}
-        install -d ${D}${includedir}/gsm
-        install -m 0644 ${S}/inc/gsm.h ${D}${includedir}/gsm/
-	cd ${D}${includedir}
-	ln -s gsm/gsm.h gsm.h
-}
-
diff --git a/recipes-isdn/libgsm/libgsm_1.0.13.bb b/recipes-isdn/libgsm/libgsm_1.0.13.bb
index e6bf9baf60..38e7e1134e 100644
--- a/recipes-isdn/libgsm/libgsm_1.0.13.bb
+++ b/recipes-isdn/libgsm/libgsm_1.0.13.bb
@@ -1,8 +1,38 @@
-require libgsm.inc
+DESCRIPTION = "GSM Audio Library"
+SECTION = "libs"
+PRIORITY = "optional"
+LICENSE = "libgsm"
+LIC_FILES_CHKSUM = "file://COPYRIGHT;md5=fc1372895b173aaf543a122db37e04f5"
 
-PR = "${INC_PR}.0"
+INC_PR = "r2"
+
+SRC_URI = "http://www.quut.com/gsm/gsm-${PV}.tar.gz \
+	   file://01_makefile.patch \
+           file://02_cplusplus.patch \
+           file://03_config.patch \
+           file://04_includes.patch \
+           file://05_compiler_warnings.patch \
+	  "
 
 S = "${WORKDIR}/gsm-1.0-pl13/"
 
 SRC_URI[md5sum] = "c1ba392ce61dc4aff1c29ea4e92f6df4"
 SRC_URI[sha256sum] = "52c518244d428c2e56c543b98c9135f4a76ff780c32455580b793f60a0a092ad"
+
+CFLAGS += "-c -g -fPIC -Wall -D_GNU_SOURCE -D_REENTRANT -DNeedFunctionPrototypes=1 -DWAV49 -I./inc"
+
+PARALLEL_MAKE = ""
+
+do_compile() {
+	unset LD
+	oe_runmake CCFLAGS="${CFLAGS}"
+}
+
+do_install() {
+	oe_libinstall -a -C lib libgsm ${D}${libdir}
+        oe_libinstall -so -C lib libgsm ${D}${libdir}
+        install -d ${D}${includedir}/gsm
+        install -m 0644 ${S}/inc/gsm.h ${D}${includedir}/gsm/
+	cd ${D}${includedir}
+	ln -s gsm/gsm.h gsm.h
+}