diff options
author | Shuhei AKETA <shuhei.aketa@woven-planet.global> | 2021-01-24 10:24:30 +0900 |
---|---|---|
committer | Shuhei AKETA <shuhei.aketa@woven-planet.global> | 2021-01-24 10:24:30 +0900 |
commit | e9c50e0578cd045617f898e01cb51ec05ec7b014 (patch) | |
tree | 2de8f4a7d7e21305640830ba0d72832430eafe11 /service/system/resource_manager | |
parent | 326b7ba9dbf2762925551e7970836a2964107ec1 (diff) |
Resolve libev.so conflicts
service/other/event_library/library/Makefile generates libev.so.
libev.so is existing by meta-openembedded/meta-oe/recipes-connectivity/libev.
Therefore, I renamed the libev.so generated by the Makefile to libbs_ev.so.
Signed-off-by: Shuhei AKETA <shuhei.aketa@woven-planet.global>
Change-Id: I5af26f44947ed1f0cdd170bd5dc0f9c3b2d71ad9
Diffstat (limited to 'service/system/resource_manager')
-rwxr-xr-x | service/system/resource_manager/client/Makefile | 2 | ||||
-rwxr-xr-x | service/system/resource_manager/server/Makefile | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/service/system/resource_manager/client/Makefile b/service/system/resource_manager/client/Makefile index a2bde46..54bcbb6 100755 --- a/service/system/resource_manager/client/Makefile +++ b/service/system/resource_manager/client/Makefile @@ -52,7 +52,7 @@ LDFLAGS += -Wl,--no-as-needed ######### linked library (dynamic) ############# LDLIBS += -lrpc -LDLIBS += -Wl,-Bdynamic -lev +LDLIBS += -Wl,-Bdynamic -lbs_ev LDLIBS += -Wl,-Bdynamic -lNS_FrameworkUnified include ../../system_service.mk diff --git a/service/system/resource_manager/server/Makefile b/service/system/resource_manager/server/Makefile index cae9191..f4ad5f4 100755 --- a/service/system/resource_manager/server/Makefile +++ b/service/system/resource_manager/server/Makefile @@ -50,6 +50,6 @@ LDLIBS += -Wl,-Bdynamic -lsoc_temperature_hal LDLIBS += -Wl,-Bdynamic -lcommon LDLIBS += -Wl,-Bdynamic -lrpc -LDLIBS += -Wl,-Bdynamic -lev +LDLIBS += -Wl,-Bdynamic -lbs_ev include ../../system_service.mk |