forked from enlightenment/efl
eeze: install module under MODULE_ARCH like the rest of EFL
SVN revision: 82479
This commit is contained in:
parent
bc20101994
commit
be30200a50
|
@ -80,32 +80,28 @@ $(EEZE_COMMON_CPPFLAGS) \
|
|||
lib_eeze_libeeze_la_LIBADD = $(EEZE_COMMON_LIBADD)
|
||||
lib_eeze_libeeze_la_LDFLAGS = @EFL_LTLIBRARY_FLAGS@
|
||||
|
||||
eezemodulesensordir = $(libdir)/eeze/sensor
|
||||
eezemodulesensor_LTLIBRARIES =
|
||||
|
||||
if HAVE_EEZE_TIZEN
|
||||
eezemodulesensor_LTLIBRARIES += \
|
||||
modules/eeze/eeze-sensor-tizen.la
|
||||
modules_eeze_eeze_sensor_tizen_la_SOURCES = \
|
||||
eezemodulesensortizendir = $(libdir)/eeze/modules/sensor/tizen/$(MODULE_ARCH)
|
||||
eezemodulesensortizen_LTLIBRARIES = modules/eeze/sensor/tizen/module.la
|
||||
modules_eeze_sensor_tizen_module_la_SOURCES = \
|
||||
modules/eeze/eeze_sensor_tizen.c
|
||||
modules_eeze_eeze_sensor_tizen_la_CPPFLAGS = \
|
||||
modules_eeze_sensor_tizen_module_la_CPPFLAGS = \
|
||||
$(EEZE_COMMON_CPPFLAGS) \
|
||||
@TIZEN_SENSOR_CFLAGS@
|
||||
modules_eeze_eeze_sensor_tizen_la_LIBADD = \
|
||||
modules_eeze_sensor_tizen_module_la_LIBADD = \
|
||||
$(EEZE_COMMON_USER_LIBADD) \
|
||||
@TIZEN_SENSOR_LIBS@
|
||||
modules_eeze_eeze_sensor_tizen_la_LDFLAGS = -module @EFL_LTMODULE_FLAGS@
|
||||
modules_eeze_eeze_sensor_tizen_la_LIBTOOLFLAGS = --tag=disable-static
|
||||
modules_eeze_sensor_tizen_module_la_LDFLAGS = -module @EFL_LTMODULE_FLAGS@
|
||||
modules_eeze_sensor_tizen_module_la_LIBTOOLFLAGS = --tag=disable-static
|
||||
else
|
||||
|
||||
eezemodulesensor_LTLIBRARIES += \
|
||||
modules/eeze/eeze-sensor-fake.la
|
||||
modules_eeze_eeze_sensor_fake_la_SOURCES = \
|
||||
eezemodulesensorfakedir = $(libdir)/eeze/modules/sensor/fake/$(MODULE_ARCH)
|
||||
eezemodulesensorfake_LTLIBRARIES = modules/eeze/sensor/fake/module.la
|
||||
modules_eeze_sensor_fake_module_la_SOURCES = \
|
||||
modules/eeze/eeze_sensor_fake.c
|
||||
modules_eeze_eeze_sensor_fake_la_CPPFLAGS = $(EEZE_COMMON_CPPFLAGS)
|
||||
modules_eeze_eeze_sensor_fake_la_LIBADD = $(EEZE_COMMON_USER_LIBADD)
|
||||
modules_eeze_eeze_sensor_fake_la_LDFLAGS = -module @EFL_LTMODULE_FLAGS@
|
||||
modules_eeze_eeze_sensor_fake_la_LIBTOOLFLAGS = --tag=disable-static
|
||||
modules_eeze_sensor_fake_module_la_CPPFLAGS = $(EEZE_COMMON_CPPFLAGS)
|
||||
modules_eeze_sensor_fake_module_la_LIBADD = $(EEZE_COMMON_USER_LIBADD)
|
||||
modules_eeze_sensor_fake_module_la_LDFLAGS = -module @EFL_LTMODULE_FLAGS@
|
||||
modules_eeze_sensor_fake_module_la_LIBTOOLFLAGS = --tag=disable-static
|
||||
endif
|
||||
|
||||
### Binary
|
||||
|
|
|
@ -73,18 +73,33 @@ eeze_sensor_obj_get(Eeze_Sensor_Type sensor_type)
|
|||
static void
|
||||
eeze_sensor_modules_load(void)
|
||||
{
|
||||
char buf[PATH_MAX];
|
||||
|
||||
/* Check for available runtime modules and load them. In some cases the
|
||||
* un-installed modules to be used from the local build dir. Coverage check
|
||||
* is one of these items. We do load the modules from the builddir if the
|
||||
* environment is set. Normal case is to use installed modules from system
|
||||
*/
|
||||
if (getenv("EFL_RUN_IN_TREE"))
|
||||
g_handle->modules_array = eina_module_list_get(NULL, PACKAGE_BUILD_DIR "/src/modules/eeze/.libs/", 0, NULL, NULL);
|
||||
{
|
||||
const char *modules[] = { "tizen", "fake", NULL };
|
||||
const char **itr;
|
||||
|
||||
for (itr = modules; *itr != NULL; itr++)
|
||||
{
|
||||
snprintf(buf, sizeof(buf),
|
||||
PACKAGE_BUILD_DIR "/src/modules/eeze/sensor/%s/.libs",
|
||||
*itr);
|
||||
g_handle->modules_array = eina_module_list_get(
|
||||
g_handle->modules_array, buf, EINA_FALSE, NULL, NULL);
|
||||
}
|
||||
}
|
||||
else
|
||||
{
|
||||
char buf[PATH_MAX];
|
||||
snprintf(buf, sizeof(buf), "%s/eeze/sensor/", eina_prefix_lib_get(pfx));
|
||||
g_handle->modules_array = eina_module_list_get(NULL, buf, 0, NULL, NULL);
|
||||
snprintf(buf, sizeof(buf), "%s/eeze/modules/sensor",
|
||||
eina_prefix_lib_get(pfx));
|
||||
g_handle->modules_array = eina_module_arch_list_get(NULL, buf,
|
||||
MODULE_ARCH);
|
||||
}
|
||||
|
||||
if (!g_handle->modules_array)
|
||||
|
|
Loading…
Reference in New Issue