From 1d7b0b33265b1ff0fc9f131a732f5e1e009b98ee 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 5f15f7c..356621a 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 ed600ba..7e97e48 100755 --- 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 180f986..40c618b 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 eb2bf36..2b31c9b 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 eabf440..a302794 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