From 8448d7d2158fc50dbe0ca015e135867ddcf23216 Mon Sep 17 00:00:00 2001 From: Marcel Hollerbach Date: Mon, 12 Feb 2018 18:38:34 +0100 Subject: [PATCH] emotion: use new bs static lib --- src/Makefile_Emotion.am | 5 ++++- src/lib/emotion/emotion_modules.c | 5 ++--- 2 files changed, 6 insertions(+), 4 deletions(-) diff --git a/src/Makefile_Emotion.am b/src/Makefile_Emotion.am index 8c31f41c62..c1dcd7beba 100644 --- a/src/Makefile_Emotion.am +++ b/src/Makefile_Emotion.am @@ -36,13 +36,16 @@ lib/emotion/emotion_private.h \ lib/emotion/emotion_smart.c \ lib/emotion/emotion_webcam.c \ lib/emotion/emotion_modules.c \ -lib/emotion/emotion_main.c +lib/emotion/emotion_main.c \ +static_libs/buildsystem/buildsystem.h \ +static_libs/buildsystem/buildsystem_autotools.c lib_emotion_libemotion_la_CPPFLAGS = -I$(top_builddir)/src/lib/efl \ -DPACKAGE_BIN_DIR=\"$(bindir)\" \ -DPACKAGE_LIB_DIR=\"$(libdir)\" \ -DPACKAGE_DATA_DIR=\"$(datadir)/emotion\" \ -DPACKAGE_BUILD_DIR=\"$(abs_top_builddir)\" \ +-DPACKAGE_SRC_DIR=\"$(abs_top_srcdir)\" \ @EMOTION_CFLAGS@ lib_emotion_libemotion_la_LIBADD = @EMOTION_LIBS@ lib_emotion_libemotion_la_DEPENDENCIES = @EMOTION_INTERNAL_LIBS@ diff --git a/src/lib/emotion/emotion_modules.c b/src/lib/emotion/emotion_modules.c index 3aa0f0643f..a746f1d5dd 100644 --- a/src/lib/emotion/emotion_modules.c +++ b/src/lib/emotion/emotion_modules.c @@ -3,6 +3,7 @@ #endif #include "emotion_private.h" +#include "../../static_libs/buildsystem/buildsystem.h" #include #ifdef EMOTION_STATIC_BUILD_XINE @@ -92,9 +93,7 @@ _emotion_modules_load(void) const char **itr; for (itr = built_modules; *itr != NULL; itr++) { - snprintf(buf, sizeof(buf), - "%s/src/modules/emotion/%s/.libs", - PACKAGE_BUILD_DIR, *itr); + bs_mod_get(buf, sizeof(buf), "emotion", *itr); _emotion_modules = eina_module_list_get(_emotion_modules, buf, EINA_FALSE, NULL, NULL); }