summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarcel Hollerbach <marcel@osg.samsung.com>2018-02-12 20:52:06 +0100
committerMarcel Hollerbach <marcel@osg.samsung.com>2018-02-17 21:17:58 +0100
commitc3f466c9ead47bc8ecae2019f0c6d08fa337a6f6 (patch)
tree3ea4c8954715578762a7d94c688689920d3b7c4f
parent8448d7d2158fc50dbe0ca015e135867ddcf23216 (diff)
ethumb: use new bs static lib
-rw-r--r--src/Makefile_Ethumb.am5
-rw-r--r--src/lib/ethumb/ethumb.c5
2 files changed, 6 insertions, 4 deletions
diff --git a/src/Makefile_Ethumb.am b/src/Makefile_Ethumb.am
index a73e7a9a0f..7e3897447f 100644
--- a/src/Makefile_Ethumb.am
+++ b/src/Makefile_Ethumb.am
@@ -12,13 +12,16 @@ lib/ethumb/Ethumb_Plugin.h \
12lib/ethumb/ethumb_private.h \ 12lib/ethumb/ethumb_private.h \
13lib/ethumb/md5.h \ 13lib/ethumb/md5.h \
14lib/ethumb/ethumb.c \ 14lib/ethumb/ethumb.c \
15lib/ethumb/md5.c 15lib/ethumb/md5.c \
16static_libs/buildsystem/buildsystem.h \
17static_libs/buildsystem/buildsystem_autotools.c
16 18
17lib_ethumb_libethumb_la_CPPFLAGS = -I$(top_builddir)/src/lib/efl \ 19lib_ethumb_libethumb_la_CPPFLAGS = -I$(top_builddir)/src/lib/efl \
18-DPACKAGE_BIN_DIR=\"$(bindir)\" \ 20-DPACKAGE_BIN_DIR=\"$(bindir)\" \
19-DPACKAGE_LIB_DIR=\"$(libdir)\" \ 21-DPACKAGE_LIB_DIR=\"$(libdir)\" \
20-DPACKAGE_DATA_DIR=\"$(datadir)/ethumb\" \ 22-DPACKAGE_DATA_DIR=\"$(datadir)/ethumb\" \
21-DPACKAGE_BUILD_DIR=\"$(abs_top_builddir)\" \ 23-DPACKAGE_BUILD_DIR=\"$(abs_top_builddir)\" \
24-DPACKAGE_SRC_DIR=\"$(abs_top_srcdir)\" \
22@ETHUMB_CFLAGS@ 25@ETHUMB_CFLAGS@
23lib_ethumb_libethumb_la_LIBADD = @ETHUMB_LIBS@ 26lib_ethumb_libethumb_la_LIBADD = @ETHUMB_LIBS@
24lib_ethumb_libethumb_la_DEPENDENCIES = @ETHUMB_INTERNAL_LIBS@ 27lib_ethumb_libethumb_la_DEPENDENCIES = @ETHUMB_INTERNAL_LIBS@
diff --git a/src/lib/ethumb/ethumb.c b/src/lib/ethumb/ethumb.c
index f6ddf9eace..436088e9b2 100644
--- a/src/lib/ethumb/ethumb.c
+++ b/src/lib/ethumb/ethumb.c
@@ -67,6 +67,7 @@
67#include "ethumb_private.h" 67#include "ethumb_private.h"
68#include "Ethumb_Plugin.h" 68#include "Ethumb_Plugin.h"
69#include "md5.h" 69#include "md5.h"
70#include "../../static_libs/buildsystem/buildsystem.h"
70 71
71static Ethumb_Version _version = { VMAJ, VMIN, VMIC, VREV }; 72static Ethumb_Version _version = { VMAJ, VMIN, VMIC, VREV };
72EAPI Ethumb_Version *ethumb_version = &_version; 73EAPI Ethumb_Version *ethumb_version = &_version;
@@ -172,9 +173,7 @@ _ethumb_plugins_load(void)
172 const char **itr; 173 const char **itr;
173 for (itr = built_modules; *itr != NULL; itr++) 174 for (itr = built_modules; *itr != NULL; itr++)
174 { 175 {
175 snprintf(buf, sizeof(buf), 176 bs_mod_get(buf, sizeof(buf), "ethumb", *itr);
176 "%s/src/modules/ethumb/%s/.libs",
177 PACKAGE_BUILD_DIR, *itr);
178 _plugins = eina_module_list_get(_plugins, buf, 177 _plugins = eina_module_list_get(_plugins, buf,
179 EINA_FALSE, NULL, NULL); 178 EINA_FALSE, NULL, NULL);
180 } 179 }