From a2500c271b3837a55cf2166bfcc212993875ea63 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Jos=C3=A9=20Bollo?= <jose.bollo@iot.bzh>
Date: Thu, 19 May 2016 14:04:38 +0200
Subject: [PATCH] setting version and removing afm-main-plugin
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

Change-Id: I282918e281d5c442b7259ffcd46b4ba0098fefe0
Signed-off-by: José Bollo <jose.bollo@iot.bzh>
---
 CMakeLists.txt         | 15 +++++++++------
 afb-daemon.pc.in       | 10 +++++++---
 plugins/CMakeLists.txt |  2 +-
 3 files changed, 17 insertions(+), 10 deletions(-)

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 2e12ec37..373a60e0 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -7,7 +7,7 @@ SET(CMAKE_POSITION_INDEPENDENT_CODE ON)
 SET(PROJECT_NAME "AFB Daemon")
 SET(PROJECT_PRETTY_NAME "Application Framework Binder Daemon")
 SET(PROJECT_DESCRIPTION "Secured binder of API for clients of the Application framework")
-SET(PROJECT_VERSION "0.4")
+SET(PROJECT_VERSION "0.5")
 SET(PROJECT_URL "https://github.com/iotbzh/afb-daemon")
 
 INCLUDE(FindPkgConfig)
@@ -17,13 +17,15 @@ INCLUDE(GNUInstallDirs)
 
 ###########################################################################
 
+link_libraries(-Wl,--as-needed -Wl,--gc-sections)
+
 add_compile_options(-Wall -Wextra -Wconversion)
 add_compile_options(-Wno-unused-parameter) # frankly not using a parameter does it care?
 add_compile_options(-Wno-sign-compare -Wno-sign-conversion)
 add_compile_options(-Werror=maybe-uninitialized)
 add_compile_options(-Werror=implicit-function-declaration)
 add_compile_options(-ffunction-sections -fdata-sections)
-add_compile_options(-Wl,--gc-sections)
+add_compile_options(-Wl,--as-needed -Wl,--gc-sections)
 add_compile_options(-fPIC)
 add_compile_options(-g)
 
@@ -51,17 +53,18 @@ SET(include_dirs
 	${INCLUDE_DIRS}
 	${CMAKE_SOURCE_DIR}/include
 	${json-c_INCLUDE_DIRS}
-)
+	)
 
 SET(link_libraries
 	${libefence_LIBRARIES}
 	${CMAKE_THREAD_LIBS_INIT}
 	${json-c_LIBRARIES}
-)
+	)
 
-SET(plugin_install_dir ${CMAKE_INSTALL_FULL_LIBDIR}/afb)
+SET(plugin_install_dir ${CMAKE_INSTALL_LIBDIR}/afb)
+SET(plugin_full_install_dir ${CMAKE_INSTALL_PREFIX}/${plugin_install_dir})
 
-ADD_DEFINITIONS(-DPLUGIN_INSTALL_DIR="${plugin_install_dir}")
+ADD_DEFINITIONS(-DPLUGIN_INSTALL_DIR="${plugin_full_install_dir}")
 
 ADD_SUBDIRECTORY(src)
 ADD_SUBDIRECTORY(include)
diff --git a/afb-daemon.pc.in b/afb-daemon.pc.in
index 9faaa920..ada05afe 100644
--- a/afb-daemon.pc.in
+++ b/afb-daemon.pc.in
@@ -17,12 +17,16 @@
 ## limitations under the License.
 ##
 
+prefix=@CMAKE_INSTALL_PREFIX@
+libdir=${prefix}/@CMAKE_INSTALL_LIBDIR@
+includedir=${prefix}/@CMAKE_INSTALL_INCLUDEDIR@
+plugin_install_dir=${prefix}/@plugin_install_dir@
+
 Name: @PROJECT_PRETTY_NAME@
 Description: @PROJECT_DESCRIPTION@
 Version: @PROJECT_VERSION@
 URL: @PROJECT_URL@
-Requires: json-c
-Cflags: -DPLUGIN_INSTALL_DIR=\"@plugin_install_dir@\"
-
 
+Requires: json-c
+Cflags: -DPLUGIN_INSTALL_DIR=\"${plugin_install_dir}\" -I${includedir}
 
diff --git a/plugins/CMakeLists.txt b/plugins/CMakeLists.txt
index ba3432b4..21592ebf 100644
--- a/plugins/CMakeLists.txt
+++ b/plugins/CMakeLists.txt
@@ -1,4 +1,4 @@
-ADD_SUBDIRECTORY(afm-main-plugin)
+#ADD_SUBDIRECTORY(afm-main-plugin)
 ADD_SUBDIRECTORY(session)
 ADD_SUBDIRECTORY(samples)
 ADD_SUBDIRECTORY(audio)
-- 
2.16.6