From 7d91336a8894dff81cf5b3dbd7bcf9f636bf3929 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Jos=C3=A9=20Bollo?= Date: Tue, 23 Sep 2014 12:16:29 +0200 Subject: [PATCH] Improving build dependency to libtzplatform-config MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Replacement of the hard coded version of the library with a dynamic version computed from pkg-config. Change-Id: I9e30a9ff01ce6326fa37df4729798f2427af9885 Signed-off-by: José Bollo --- framework/Makefile | 2 +- framework/Makefile_TPCSSerDaemon | 2 +- framework/Makefile_TWPSerDaemon | 2 +- framework/Makefile_channel_client | 2 +- framework/Makefile_channel_server | 2 +- 5 files changed, 5 insertions(+), 5 deletions(-) diff --git a/framework/Makefile b/framework/Makefile index bcc86e9..c0a14dd 100644 --- a/framework/Makefile +++ b/framework/Makefile @@ -33,7 +33,7 @@ OUTDIR = lib TARGET = $(OUTDIR)/libsecfw.so SRCDIR = . INCLUDE = -I. $(TCS_INC) -I../plugin -LD_FLAGS := $(LD_FLAGS) -ldl -lpthread -ltzplatform-config-1.0 +LD_FLAGS := $(LD_FLAGS) -ldl -lpthread $(shell pkg-config --libs libtzplatform-config) ifeq ($(TCS_CC), ) CC = gcc diff --git a/framework/Makefile_TPCSSerDaemon b/framework/Makefile_TPCSSerDaemon index 0d3d67f..4e1f4f1 100644 --- a/framework/Makefile_TPCSSerDaemon +++ b/framework/Makefile_TPCSSerDaemon @@ -32,7 +32,7 @@ OUTDIR = bin TARGET = $(OUTDIR)/TPCSSerDaemon SRCDIR = . -LD_FLAGS := $(LD_FLAGS) -ldl -ltzplatform-config-1.0 +LD_FLAGS := $(LD_FLAGS) -ldl $(shell pkg-config --libs libtzplatform-config) ifeq ($(TCS_CC), ) CC = gcc diff --git a/framework/Makefile_TWPSerDaemon b/framework/Makefile_TWPSerDaemon index 6019ea8..f1b896a 100644 --- a/framework/Makefile_TWPSerDaemon +++ b/framework/Makefile_TWPSerDaemon @@ -33,7 +33,7 @@ OUTDIR = bin TARGET = $(OUTDIR)/TWPSerDaemon SRCDIR = . INCLUDE = -I. $(TCS_INC) -I../plugin -LD_FLAGS := $(LD_FLAGS) -ldl -lpthread -lsecfw -lscserver -lm -Llib -ltzplatform-config-1.0 +LD_FLAGS := $(LD_FLAGS) -ldl -lpthread -lsecfw -lscserver -lm -Llib $(shell pkg-config --libs libtzplatform-config) ifeq ($(TCS_CC), ) CC = gcc diff --git a/framework/Makefile_channel_client b/framework/Makefile_channel_client index d95fc01..a625adf 100644 --- a/framework/Makefile_channel_client +++ b/framework/Makefile_channel_client @@ -32,7 +32,7 @@ OUTDIR = lib TARGET = $(OUTDIR)/libscclient.so SRCDIR = . -LD_FLAGS := $(LD_FLAGS) -ldl -lpthread -ltzplatform-config-1.0 +LD_FLAGS := $(LD_FLAGS) -ldl -lpthread $(shell pkg-config --libs libtzplatform-config) ifeq ($(TCS_CC), ) CC = gcc diff --git a/framework/Makefile_channel_server b/framework/Makefile_channel_server index 906e5c1..eb78fb1 100644 --- a/framework/Makefile_channel_server +++ b/framework/Makefile_channel_server @@ -32,7 +32,7 @@ OUTDIR = lib TARGET = $(OUTDIR)/libscserver.so SRCDIR = . -LD_FLAGS := $(LD_FLAGS) -ldl -lpthread -ltzplatform-config-1.0 +LD_FLAGS := $(LD_FLAGS) -ldl -lpthread $(shell pkg-config --libs libtzplatform-config) ifeq ($(TCS_CC), ) CC = gcc -- 2.7.4