enlightenment/efl
enlightenment
/
efl
8
7
Fork 14
Code Issues 13 Pull Requests 1 Projects Releases Wiki Activity

emotion: use new bs static lib

This commit is contained in:
Marcel Hollerbach 2018-02-12 18:38:34 +01:00
parent 64d6718734
commit 8448d7d215
2 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/Makefile_Emotion.am
View File

@ -36,13 +36,16 @@ lib/emotion/emotion_private.h \
lib/emotion/emotion_smart.c \ lib/emotion/emotion_smart.c \
lib/emotion/emotion_webcam.c \ lib/emotion/emotion_webcam.c \
lib/emotion/emotion_modules.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 \ lib_emotion_libemotion_la_CPPFLAGS = -I$(top_builddir)/src/lib/efl \
-DPACKAGE_BIN_DIR=\"$(bindir)\" \ -DPACKAGE_BIN_DIR=\"$(bindir)\" \
-DPACKAGE_LIB_DIR=\"$(libdir)\" \ -DPACKAGE_LIB_DIR=\"$(libdir)\" \
-DPACKAGE_DATA_DIR=\"$(datadir)/emotion\" \ -DPACKAGE_DATA_DIR=\"$(datadir)/emotion\" \
-DPACKAGE_BUILD_DIR=\"$(abs_top_builddir)\" \ -DPACKAGE_BUILD_DIR=\"$(abs_top_builddir)\" \
-DPACKAGE_SRC_DIR=\"$(abs_top_srcdir)\" \
@EMOTION_CFLAGS@ @EMOTION_CFLAGS@
lib_emotion_libemotion_la_LIBADD = @EMOTION_LIBS@ lib_emotion_libemotion_la_LIBADD = @EMOTION_LIBS@
lib_emotion_libemotion_la_DEPENDENCIES = @EMOTION_INTERNAL_LIBS@ lib_emotion_libemotion_la_DEPENDENCIES = @EMOTION_INTERNAL_LIBS@

5
src/lib/emotion/emotion_modules.c
View File

@ -3,6 +3,7 @@
#endif #endif
#include "emotion_private.h" #include "emotion_private.h"
#include "../../static_libs/buildsystem/buildsystem.h"
#include <unistd.h> #include <unistd.h>
#ifdef EMOTION_STATIC_BUILD_XINE #ifdef EMOTION_STATIC_BUILD_XINE
@ -92,9 +93,7 @@ _emotion_modules_load(void)
const char **itr; const char **itr;
for (itr = built_modules; *itr != NULL; itr++) for (itr = built_modules; *itr != NULL; itr++)
{ {
snprintf(buf, sizeof(buf), bs_mod_get(buf, sizeof(buf), "emotion", *itr);
"%s/src/modules/emotion/%s/.libs",
PACKAGE_BUILD_DIR, *itr);
_emotion_modules = eina_module_list_get(_emotion_modules, buf, _emotion_modules = eina_module_list_get(_emotion_modules, buf,
EINA_FALSE, NULL, NULL); EINA_FALSE, NULL, NULL);
} }