From 3253026a76cd935fdb55d066b66b2ac76eb530d7 Mon Sep 17 00:00:00 2001
From: Jonas Bengtsson <jonas.l.bengtsson@stericsson.com>
Date: Mon, 28 Jun 2010 15:42:10 +0200
Subject: makefile update

Change-Id: I7ce56a8da2d50dbf3bd84c430b883a7c4b9987e1
Component: linux_b2r2lib:1.0.3:src
Published-by:
Published-on: Sat, 12 Jun 2010 08:08:04 +0200
Rodos: rodos 7.2.11
---
 CHANGESETS              | 32 --------------------------------
 COMPONENT/component.xml | 13 -------------
 COMPONENT/packaging.xml | 23 -----------------------
 Makefile                |  9 ++++++---
 include/blt_api.h       |  9 +++++++++
 src/blt_b2r2.c          |  4 ++--
 6 files changed, 17 insertions(+), 73 deletions(-)
 delete mode 100644 CHANGESETS
 delete mode 100644 COMPONENT/component.xml
 delete mode 100644 COMPONENT/packaging.xml
 mode change 100644 => 100755 Makefile

diff --git a/CHANGESETS b/CHANGESETS
deleted file mode 100644
index bfaf951..0000000
--- a/CHANGESETS
+++ /dev/null
@@ -1,32 +0,0 @@
-------------------------------------------------------
-               SVNBRANCH CHANGESET
-------------------------------------------------------
-	Date  :    Tue Nov 17 09:40:08 IST 2009
-	Author:    psen
-	Parent:    http://codex.cro.st.com/svnroot/mmdlinux/linux_b2r2lib/trunk
-	Branch:    http://codex.cro.st.com/svnroot/mmdlinux/linux_b2r2lib/branches/releases/0.0/trunk
-
-Description:
-------------
-	* updating changes to parent
-
-
-Modified Files:
----------------
-	M       COMPONENT/component.xml
-
-
-Diff command:
--------------------------
-"svn diff --old=http://codex.cro.st.com/svnroot/mmdlinux/linux_b2r2lib/trunk@4826 --new=http://codex.cro.st.com/svnroot/mmdlinux/linux_b2r2lib/branches/releases/0.0/trunk@4832 --diff-cmd tkdiff" 
-
-
-Merge command:
--------------------------
-"svn merge http://codex.cro.st.com/svnroot/mmdlinux/linux_b2r2lib/trunk@4826 http://codex.cro.st.com/svnroot/mmdlinux/linux_b2r2lib/branches/releases/0.0/trunk@4832" 
-
-Diff links to modified files:
------------------------------
-COMPONENT/component.xml	http://codex.cro.st.com/svn/viewvc.php/linux_b2r2lib/trunk/COMPONENT/component.xml?p2=linux_b2r2lib/branches/releases/0.0/trunk/COMPONENT/component.xml&r1=4826&r2=4832&roottype=svn&root=mmdlinux&diff_format=h
-
-
diff --git a/COMPONENT/component.xml b/COMPONENT/component.xml
deleted file mode 100644
index eaf39a7..0000000
--- a/COMPONENT/component.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="0.0"?>
-<component name="linux_b2r2lib">
-  <abstract>Linux B2R2 lib</abstract>
-
-    <!-- component dependency list -->
-    <dependency name="makefiles" />
-    <dependency name="mmenv"/>
-
-    <!-- list of supported platforms -->
-    <property name="tag" value="mop500_ed-linux" />
-</component>
-
-
diff --git a/COMPONENT/packaging.xml b/COMPONENT/packaging.xml
deleted file mode 100644
index 99cea9c..0000000
--- a/COMPONENT/packaging.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" ?>
-                
-<packages>                           
-
-  <package name="bin">                 
-    <fileset>                            
-      <include name="COMPONENT/**" />      
-      <include name="src/*.c" />
-      <include name="src/*.h" />
-      <include name="include/*.h" />
-      <include name="Makefile" />          
-      <include name="lib/**" />        
-      
-      <exclude name="bin" />            
-      <exclude name="bin/**" />         
-      <exclude name="dep" />            
-      <exclude name="dep/**" />         
-      <exclude name="obj" />            
-      <exclude name="obj/**" />         
-    </fileset>                           
-  </package>                           
-  
-</packages>                          
diff --git a/Makefile b/Makefile
old mode 100644
new mode 100755
index 9153e43..04f2724
--- a/Makefile
+++ b/Makefile
@@ -13,12 +13,15 @@ include $(MMROOT)/shared/makefiles/Make.config
 ifeq ($(DEBUG),1)
 CPPFLAGS     += -DDEBUG
 endif
-LIBOBJ        = blt_b2r2
-INSTALL_LIB   = libblt_hw.so
+
+SOLIBNAMES    += blt_hw
+LIBOBJ_blt_hw  = blt_b2r2
+INSTALL_SOLIB  = blt_hw
+
 INSTALL_HEADER = blt_api.h
-LIBNAME       = blt_hw
 
 todo: solib
+
 #-------------------------------
 # Generic Rules
 #-------------------------------
diff --git a/include/blt_api.h b/include/blt_api.h
index d4444b5..980b067 100755
--- a/include/blt_api.h
+++ b/include/blt_api.h
@@ -9,6 +9,11 @@
  *
  */
 
+
+#ifdef __cplusplus
+extern "C" {
+#endif 
+
 #ifndef _BLT_API_H
 #define _BLT_API_H
 
@@ -615,3 +620,7 @@ int blt_query_cap(int blt_handle,
 		uint32_t *cap);
 
 #endif /* #ifdef _BLT_API_H */
+
+#ifdef __cplusplus
+}
+#endif
diff --git a/src/blt_b2r2.c b/src/blt_b2r2.c
index 7e17d04..0b62240 100644
--- a/src/blt_b2r2.c
+++ b/src/blt_b2r2.c
@@ -19,20 +19,20 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
+#include <unistd.h>
 
 #include "b2r2_blt.h"
 
 #define LOG_TAG "libblt_hw"
 
 #ifdef ANDROID
-#  define LOG_TAG "libblt_hw"
 #  include <cutils/log.h>
 #  define LOGE2(...) LOGE(__VA_ARGS__)
 #  define LOGI2(...) LOGI(__VA_ARGS__)
 #else
 #  define LOGE(format) fprintf(stderr, LOG_TAG format "\n")
 #  define LOGE2(format, ...) fprintf(stderr, LOG_TAG format "\n", __VA_ARGS__)
-#  define LOGI2(...) printf(LOG_TAG format "\n", __VA_ARGS__)
+#  define LOGI2(format, ...) printf(LOG_TAG format "\n", __VA_ARGS__)
 #endif
 
 #define B2R2_BLT_DEV "/dev/b2r2_blt"
-- 
cgit v1.2.3