summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarcel Hollerbach <marcel@osg.samsung.com>2018-02-12 18:38:34 +0100
committerMarcel Hollerbach <marcel@osg.samsung.com>2018-02-17 21:17:58 +0100
commit8448d7d2158fc50dbe0ca015e135867ddcf23216 (patch)
tree554b866d68fff4651a7674d35356e17d9fc892c0
parent64d671873432d2c99637f46963c16a0233e45746 (diff)
emotion: use new bs static lib
-rw-r--r--src/Makefile_Emotion.am5
-rw-r--r--src/lib/emotion/emotion_modules.c5
2 files changed, 6 insertions, 4 deletions
diff --git a/src/Makefile_Emotion.am b/src/Makefile_Emotion.am
index 8c31f41..c1dcd7b 100644
--- a/src/Makefile_Emotion.am
+++ b/src/Makefile_Emotion.am
@@ -36,13 +36,16 @@ lib/emotion/emotion_private.h \
36lib/emotion/emotion_smart.c \ 36lib/emotion/emotion_smart.c \
37lib/emotion/emotion_webcam.c \ 37lib/emotion/emotion_webcam.c \
38lib/emotion/emotion_modules.c \ 38lib/emotion/emotion_modules.c \
39lib/emotion/emotion_main.c 39lib/emotion/emotion_main.c \
40static_libs/buildsystem/buildsystem.h \
41static_libs/buildsystem/buildsystem_autotools.c
40 42
41lib_emotion_libemotion_la_CPPFLAGS = -I$(top_builddir)/src/lib/efl \ 43lib_emotion_libemotion_la_CPPFLAGS = -I$(top_builddir)/src/lib/efl \
42-DPACKAGE_BIN_DIR=\"$(bindir)\" \ 44-DPACKAGE_BIN_DIR=\"$(bindir)\" \
43-DPACKAGE_LIB_DIR=\"$(libdir)\" \ 45-DPACKAGE_LIB_DIR=\"$(libdir)\" \
44-DPACKAGE_DATA_DIR=\"$(datadir)/emotion\" \ 46-DPACKAGE_DATA_DIR=\"$(datadir)/emotion\" \
45-DPACKAGE_BUILD_DIR=\"$(abs_top_builddir)\" \ 47-DPACKAGE_BUILD_DIR=\"$(abs_top_builddir)\" \
48-DPACKAGE_SRC_DIR=\"$(abs_top_srcdir)\" \
46@EMOTION_CFLAGS@ 49@EMOTION_CFLAGS@
47lib_emotion_libemotion_la_LIBADD = @EMOTION_LIBS@ 50lib_emotion_libemotion_la_LIBADD = @EMOTION_LIBS@
48lib_emotion_libemotion_la_DEPENDENCIES = @EMOTION_INTERNAL_LIBS@ 51lib_emotion_libemotion_la_DEPENDENCIES = @EMOTION_INTERNAL_LIBS@
diff --git a/src/lib/emotion/emotion_modules.c b/src/lib/emotion/emotion_modules.c
index 3aa0f06..a746f1d 100644
--- a/src/lib/emotion/emotion_modules.c
+++ b/src/lib/emotion/emotion_modules.c
@@ -3,6 +3,7 @@
3#endif 3#endif
4 4
5#include "emotion_private.h" 5#include "emotion_private.h"
6#include "../../static_libs/buildsystem/buildsystem.h"
6#include <unistd.h> 7#include <unistd.h>
7 8
8#ifdef EMOTION_STATIC_BUILD_XINE 9#ifdef EMOTION_STATIC_BUILD_XINE
@@ -92,9 +93,7 @@ _emotion_modules_load(void)
92 const char **itr; 93 const char **itr;
93 for (itr = built_modules; *itr != NULL; itr++) 94 for (itr = built_modules; *itr != NULL; itr++)
94 { 95 {
95 snprintf(buf, sizeof(buf), 96 bs_mod_get(buf, sizeof(buf), "emotion", *itr);
96 "%s/src/modules/emotion/%s/.libs",
97 PACKAGE_BUILD_DIR, *itr);
98 _emotion_modules = eina_module_list_get(_emotion_modules, buf, 97 _emotion_modules = eina_module_list_get(_emotion_modules, buf,
99 EINA_FALSE, NULL, NULL); 98 EINA_FALSE, NULL, NULL);
100 } 99 }