bu5hm4n
/
efl
forked from enlightenment/efl
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

elementary: remove build dependencie from old e_dbus. 

SVN revision: 82517
This commit is contained in:
Cedric BAIL 2013-01-10 07:50:14 +00:00
parent ae782f4d81
commit 951f944737
14 changed files with 25 additions and 59 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
legacy/elementary/ChangeLog
View File

@ -894,3 +894,8 @@
2013-01-06 Jaehyun Cho <jae_hyun_cho@naver.com>
* Fix omitting signal emission when customized text parts change the text.
2013-01-10 Cedric Bail
* Don't link anymore with E_DBus at build time.

1
legacy/elementary/NEWS
View File

@ -50,6 +50,7 @@ Improvements:
* Merged the file_entry and the path_entry in the fileselector and allowing typing the path.
* Setting the same font size of the others widgets for the dayselector.
* Added a separated spinner for year on calendar.
* Don't link anymore with E_DBus at build time.
Fixes:

30
legacy/elementary/configure.ac
View File

@ -472,34 +472,6 @@ if test "x$want_elementary_wayland" = "xyes" -a "x$have_elementary_wayland" = "x
AC_MSG_ERROR([ecore-wayland support requested, but not found by pkg-config.])
fi
ELM_EDBUS_DEF="#undef"
have_elementary_edbus="no"
want_elementary_edbus="no"
AC_ARG_ENABLE([edbus],
[AC_HELP_STRING([--enable-edbus], [enable edbus (v1) support. @<:@default=no@:>@])],
[want_elementary_edbus=$enableval], [])
if test "x$want_elementary_edbus" != "xno"; then
PKG_CHECK_MODULES([ELEMENTARY_EDBUS],
[
edbus >= 1.6.99
],
[
AC_DEFINE(HAVE_ELEMENTARY_EDBUS, 1, [EDBus support for Elementary])
have_elementary_edbus="yes"
ELM_EDBUS_DEF="#define"
requirement_elm="edbus >= 1.6.99 ${requirement_elm}"
],
[have_elementary_edbus="no"]
)
else
have_elementary_edbus="no"
fi
if test "x$want_elementary_edbus" = "xyes" -a "x$have_elementary_edbus" = "xno"; then
AC_MSG_ERROR([E_DBus support requested, but no e_dbus found by pkg-config.])
fi
AC_SUBST(ELM_EDBUS_DEF)
ELM_EDBUS2_DEF="#undef"
have_elementary_edbus2="no"
want_elementary_edbus2="auto"
@ -873,7 +845,7 @@ echo
echo " Features:"
echo " Ecore_IMF..............: ${have_ecore_imf}"
echo " Ecore_Con..............: ${have_ecore_con}"
echo " EDBus..................: v1=${have_elementary_edbus}, v2=${have_elementary_edbus2}"
echo " EDBus..................: v2=${have_elementary_edbus2}"
echo " EFreet.................: ${have_elementary_efreet}"
echo " EWeather...............: ${have_elementary_eweather}"
echo " EMap...................: ${have_elementary_emap}"

7
legacy/elementary/src/bin/Makefile.am
View File

@ -16,7 +16,6 @@ AM_CPPFLAGS = \
@ELEMENTARY_SDL_CFLAGS@ \
@ELEMENTARY_WIN32_CFLAGS@ \
@ELEMENTARY_WINCE_CFLAGS@ \
@ELEMENTARY_EDBUS_CFLAGS@ \
@ELEMENTARY_EDBUS2_CFLAGS@ \
@ELEMENTARY_EFREET_CFLAGS@ \
@ELEMENTARY_ELOCATION_CFLAGS@ \
@ -145,7 +144,6 @@ endif
elementary_test_LDADD = $(top_builddir)/src/lib/libelementary.la \
@ELEMENTARY_EWEATHER_LIBS@ \
@ELEMENTARY_EDBUS_LIBS@ \
@ELEMENTARY_EDBUS2_LIBS@ \
@ELEMENTARY_EFREET_LIBS@ \
@ELEMENTARY_ELOCATION_LIBS@ \
@ -161,7 +159,6 @@ config.c
elementary_config_LDADD = $(top_builddir)/src/lib/libelementary.la \
@ELEMENTARY_EWEATHER_LIBS@ \
@ELEMENTARY_EDBUS_LIBS@ \
@ELEMENTARY_EDBUS2_LIBS@ \
@ELEMENTARY_EFREET_LIBS@ \
@ELEMENTARY_ELOCATION_LIBS@ \
@ -178,7 +175,6 @@ elementary_codegen.c
elementary_codegen_LDADD = \
$(top_builddir)/src/lib/libelementary.la \
@ELEMENTARY_EWEATHER_LIBS@ \
@ELEMENTARY_EDBUS_LIBS@ \
@ELEMENTARY_EDBUS2_LIBS@ \
@ELEMENTARY_EFREET_LIBS@ \
@ELEMENTARY_ELOCATION_LIBS@ \
@ -209,7 +205,6 @@ if BUILD_QUICKLAUNCH
elementary_quicklaunch_SOURCES = quicklaunch.c
elementary_quicklaunch_LDADD = $(top_builddir)/src/lib/libelementary.la \
@ELEMENTARY_EWEATHER_LIBS@ \
@ELEMENTARY_EDBUS_LIBS@ \
@ELEMENTARY_EDBUS2_LIBS@ \
@ELEMENTARY_EFREET_LIBS@ \
@ELEMENTARY_ELOCATION_LIBS@ \
@ -236,7 +231,6 @@ elementary_testql_LTLIBRARIES = elementary_testql.la
elementary_testql_la_SOURCES = $(elementary_test_SOURCES)
elementary_testql_la_LIBADD = $(top_builddir)/src/lib/libelementary.la \
@ELEMENTARY_EWEATHER_LIBS@ \
@ELEMENTARY_EDBUS_LIBS@ \
@ELEMENTARY_EDBUS2_LIBS@ \
@ELEMENTARY_EFREET_LIBS@ \
@ELEMENTARY_ELOCATION_LIBS@ \
@ -251,7 +245,6 @@ elementary_testql_la_LDFLAGS = -module -avoid-version -no-undefined
elementary_testql_SOURCES = $(elementary_test_SOURCES)
elementary_testql_LDADD = $(top_builddir)/src/lib/libelementary.la \
@ELEMENTARY_EWEATHER_LIBS@ \
@ELEMENTARY_EDBUS_LIBS@ \
@ELEMENTARY_EDBUS2_LIBS@ \
@ELEMENTARY_EFREET_LIBS@ \
@ELEMENTARY_ELOCATION_LIBS@ \

1
legacy/elementary/src/edje_externals/Makefile.am
View File

@ -14,7 +14,6 @@ AM_CPPFLAGS = \
@ELEMENTARY_FB_CFLAGS@ \
@ELEMENTARY_WIN32_CFLAGS@ \
@ELEMENTARY_WINCE_CFLAGS@ \
@ELEMENTARY_EDBUS_CFLAGS@ \
@ELEMENTARY_EDBUS2_CFLAGS@ \
@ELEMENTARY_EFREET_CFLAGS@ \
@ELEMENTARY_ELOCATION_CFLAGS@ \

1
legacy/elementary/src/examples/Makefile.am
View File

@ -14,7 +14,6 @@ AM_CPPFLAGS = \
-DPACKAGE_DATA_DIR="\"$(pkgdatadir)\"" \
-DPACKAGE_BIN_DIR=\"$(bindir)\" \
-DPACKAGE_LIB_DIR=\"$(libdir)\" \
@ELEMENTARY_EDBUS_CFLAGS@ \
@ELEMENTARY_EDBUS2_CFLAGS@ \
@ELEMENTARY_EFREET_CFLAGS@ \
@ELEMENTARY_ELOCATION_CFLAGS@ \

4
legacy/elementary/src/lib/Elementary.h.in
View File

@ -10,7 +10,6 @@
@ELM_UNIX_DEF@ ELM_UNIX
@ELM_WIN32_DEF@ ELM_WIN32
@ELM_WINCE_DEF@ ELM_WINCE
@ELM_EDBUS_DEF@ ELM_EDBUS
@ELM_EDBUS2_DEF@ ELM_EDBUS2
@ELM_EFREET_DEF@ ELM_EFREET
@ELM_ELOCATION_DEF@ ELM_ELOCATION
@ -75,9 +74,6 @@
@ELEMENTARY_ECORE_CON_INC@
#include <Edje.h>
#ifdef ELM_EDBUS
#include <E_DBus.h>
#endif
#ifdef ELM_EDBUS2
#include <EDBus.h>
#endif

2
legacy/elementary/src/lib/Makefile.am
View File

@ -19,7 +19,6 @@ AM_CPPFLAGS = \
@ELEMENTARY_SDL_CFLAGS@ \
@ELEMENTARY_WIN32_CFLAGS@ \
@ELEMENTARY_WINCE_CFLAGS@ \
@ELEMENTARY_EDBUS_CFLAGS@ \
@ELEMENTARY_EDBUS2_CFLAGS@ \
@ELEMENTARY_EFREET_CFLAGS@ \
@ELEMENTARY_ELOCATION_CFLAGS@ \
@ -316,7 +315,6 @@ libelementary_la_LIBADD = \
@ELEMENTARY_SDL_LIBS@ \
@ELEMENTARY_WIN32_LIBS@ \
@ELEMENTARY_WINCE_LIBS@ \
@ELEMENTARY_EDBUS_LIBS@ \
@ELEMENTARY_EDBUS2_LIBS@ \
@ELEMENTARY_EFREET_LIBS@ \
@ELEMENTARY_ELOCATION_LIBS@ \

28
legacy/elementary/src/lib/elm_main.c
View File

@ -359,30 +359,38 @@ elm_app_locale_dir_get(void)
return app_locale_dir;
}
#ifdef ELM_EDBUS
static Eina_Bool _elm_need_e_dbus = EINA_FALSE;
#endif
static void *e_dbus_handle = NULL;
EAPI Eina_Bool
elm_need_e_dbus(void)
{
#ifdef ELM_EDBUS
int (*init_func)(void) = NULL;
if (_elm_need_e_dbus) return EINA_TRUE;
/* FIXME: Maybe we should use RTLD_NOLOAD */
if (!e_dbus_handle) dlopen("libedbus.so", RTLD_LAZY | RTLD_GLOBAL);
if (!e_dbus_handle) return EINA_FALSE;
init_func = dlsym(e_dbus_handle, "e_dbus_init");
if (!init_func) return EINA_FALSE;
_elm_need_e_dbus = EINA_TRUE;
e_dbus_init();
init_func();
return EINA_TRUE;
#else
return EINA_FALSE;
#endif
}
static void
_elm_unneed_e_dbus(void)
{
#ifdef ELM_EDBUS
int (*shutdown_func)(void) = NULL;
if (!_elm_need_e_dbus) return;
shutdown_func = dlsym(e_dbus_handle, "e_dbus_shutdown");
if (!shutdown_func) return;
_elm_need_e_dbus = EINA_FALSE;
e_dbus_shutdown();
#endif
shutdown_func();
dlclose(e_dbus_handle);
e_dbus_handle = NULL;
}
#ifdef ELM_EDBUS2

1
legacy/elementary/src/modules/access_output/Makefile.am
View File

@ -15,7 +15,6 @@ AM_CPPFLAGS = \
@ELEMENTARY_SDL_CFLAGS@ \
@ELEMENTARY_WIN32_CFLAGS@ \
@ELEMENTARY_WINCE_CFLAGS@ \
@ELEMENTARY_EDBUS_CFLAGS@ \
@ELEMENTARY_EDBUS2_CFLAGS@ \
@ELEMENTARY_EFREET_CFLAGS@ \
@ELEMENTARY_ELOCATION_CFLAGS@ \

1
legacy/elementary/src/modules/datetime_input_ctxpopup/Makefile.am
View File

@ -16,7 +16,6 @@ AM_CPPFLAGS = \
@ELEMENTARY_SDL_CFLAGS@ \
@ELEMENTARY_WIN32_CFLAGS@ \
@ELEMENTARY_WINCE_CFLAGS@ \
@ELEMENTARY_EDBUS_CFLAGS@ \
@ELEMENTARY_EDBUS2_CFLAGS@ \
@ELEMENTARY_EFREET_CFLAGS@ \
@ELEMENTARY_ELOCATION_CFLAGS@ \

1
legacy/elementary/src/modules/prefs/Makefile.am
View File

@ -32,7 +32,6 @@ AM_CPPFLAGS = \
@ELEMENTARY_SDL_CFLAGS@ \
@ELEMENTARY_WIN32_CFLAGS@ \
@ELEMENTARY_WINCE_CFLAGS@ \
@ELEMENTARY_EDBUS_CFLAGS@ \
@ELEMENTARY_EDBUS2_CFLAGS@ \
@ELEMENTARY_EFREET_CFLAGS@ \
@ELEMENTARY_ELOCATION_CFLAGS@ \

1
legacy/elementary/src/modules/test_entry/Makefile.am
View File

@ -15,7 +15,6 @@ AM_CPPFLAGS = \
@ELEMENTARY_SDL_CFLAGS@ \
@ELEMENTARY_WIN32_CFLAGS@ \
@ELEMENTARY_WINCE_CFLAGS@ \
@ELEMENTARY_EDBUS_CFLAGS@ \
@ELEMENTARY_EDBUS2_CFLAGS@ \
@ELEMENTARY_EFREET_CFLAGS@ \
@ELEMENTARY_ELOCATION_CFLAGS@ \

1
legacy/elementary/src/modules/test_map/Makefile.am
View File

@ -15,7 +15,6 @@ AM_CPPFLAGS = \
@ELEMENTARY_SDL_CFLAGS@ \
@ELEMENTARY_WIN32_CFLAGS@ \
@ELEMENTARY_WINCE_CFLAGS@ \
@ELEMENTARY_EDBUS_CFLAGS@ \
@ELEMENTARY_EDBUS2_CFLAGS@ \
@ELEMENTARY_EFREET_CFLAGS@ \
@ELEMENTARY_ELOCATION_CFLAGS@ \