@@ -240,6 +240,7 @@ endif
source "package/fbv/Config.in"
source "package/freerdp/Config.in"
source "package/imagemagick/Config.in"
+ source "package/libelementary/Config.in"
source "package/linux-fusion/Config.in"
source "package/lite/Config.in"
source "package/mesa3d/Config.in"
@@ -20,7 +20,6 @@ source "package/efl/libevas-generic-loaders/Config.in"
source "package/efl/libembryo/Config.in"
source "package/efl/libedje/Config.in"
source "package/efl/libethumb/Config.in"
-source "package/efl/libelementary/Config.in"
source "package/efl/libedbus/Config.in"
endif # BR2_PACKAGE_EFL
deleted file mode 100644
@@ -1,17 +0,0 @@
-comment "libelementary needs a toolchain w/ threads, dynamic library"
- depends on !BR2_TOOLCHAIN_HAS_THREADS || BR2_STATIC_LIBS
-
-config BR2_PACKAGE_LIBELEMENTARY
- bool "libelementary"
- select BR2_PACKAGE_LIBEINA
- select BR2_PACKAGE_LIBEVAS
- select BR2_PACKAGE_LIBECORE
- select BR2_PACKAGE_LIBEDJE
- depends on BR2_TOOLCHAIN_HAS_THREADS # libevas
- depends on !BR2_STATIC_LIBS
- help
- Elementary is a widget toolkit and EFL wrapper and convenience
- library to make it easy to build applications and tools with UIs
- with less code.
-
- http://trac.enlightenment.org/e/wiki/Elementary
deleted file mode 100644
@@ -1,32 +0,0 @@
-################################################################################
-#
-# libelementary
-#
-################################################################################
-
-LIBELEMENTARY_VERSION = 1.7.10
-LIBELEMENTARY_SOURCE = elementary-$(LIBELEMENTARY_VERSION).tar.bz2
-LIBELEMENTARY_SITE = http://download.enlightenment.org/releases
-LIBELEMENTARY_LICENSE = LGPLv2.1
-LIBELEMENTARY_LICENSE_FILES = COPYING
-
-LIBELEMENTARY_INSTALL_STAGING = YES
-
-LIBELEMENTARY_DEPENDENCIES = \
- libeina libevas libecore libedje host-libedje \
- host-libeet
-
-LIBELEMENTARY_CONF_OPTS = \
- --with-edje-cc=$(HOST_DIR)/usr/bin/edje_cc \
- --with-eet-eet=$(HOST_DIR)/usr/bin/eet
-
-# libethumb_client is only built when ethumbd is built.
-# ethumbd is only built if edbus is built.
-ifeq ($(BR2_PACKAGE_LIBETHUMB)$(BR2_PACKAGE_LIBEDBUS),yy)
-LIBELEMENTARY_DEPENDENCIES += libethumb
-LIBELEMENTARY_CONF_OPTS += --enable-ethumb
-else
-LIBELEMENTARY_CONF_OPTS += --disable-ethumb
-endif
-
-$(eval $(autotools-package))
new file mode 100644
@@ -0,0 +1,19 @@
+comment "libelementary needs a toolchain w/ threads, dynamic library, wchar"
+ depends on !BR2_TOOLCHAIN_HAS_THREADS || BR2_STATIC_LIBS || !BR2_USE_WCHAR
+
+config BR2_PACKAGE_LIBELEMENTARY
+ bool "libelementary"
+ select BR2_PACKAGE_LIBEINA
+ select BR2_PACKAGE_LIBEVAS
+ select BR2_PACKAGE_LIBECORE
+ select BR2_PACKAGE_LIBEDJE
+ depends on BR2_TOOLCHAIN_HAS_THREADS # libevas
+ depends on BR2_USE_MMU # efl
+ depends on BR2_USE_WCHAR # efl
+ depends on !BR2_STATIC_LIBS
+ help
+ Elementary is a widget toolkit and EFL wrapper and convenience
+ library to make it easy to build applications and tools with UIs
+ with less code.
+
+ http://trac.enlightenment.org/e/wiki/Elementary
new file mode 100644
@@ -0,0 +1,32 @@
+################################################################################
+#
+# libelementary
+#
+################################################################################
+
+LIBELEMENTARY_VERSION = 1.7.10
+LIBELEMENTARY_SOURCE = elementary-$(LIBELEMENTARY_VERSION).tar.bz2
+LIBELEMENTARY_SITE = http://download.enlightenment.org/releases
+LIBELEMENTARY_LICENSE = LGPLv2.1
+LIBELEMENTARY_LICENSE_FILES = COPYING
+
+LIBELEMENTARY_INSTALL_STAGING = YES
+
+LIBELEMENTARY_DEPENDENCIES = \
+ libeina libevas libecore libedje host-libedje \
+ host-libeet
+
+LIBELEMENTARY_CONF_OPTS = \
+ --with-edje-cc=$(HOST_DIR)/usr/bin/edje_cc \
+ --with-eet-eet=$(HOST_DIR)/usr/bin/eet
+
+# libethumb_client is only built when ethumbd is built.
+# ethumbd is only built if edbus is built.
+ifeq ($(BR2_PACKAGE_LIBETHUMB)$(BR2_PACKAGE_LIBEDBUS),yy)
+LIBELEMENTARY_DEPENDENCIES += libethumb
+LIBELEMENTARY_CONF_OPTS += --enable-ethumb
+else
+LIBELEMENTARY_CONF_OPTS += --disable-ethumb
+endif
+
+$(eval $(autotools-package))
Add efl reverse dependencies. Signed-off-by: Romain Naour <romain.naour@openwide.fr> --- package/Config.in | 1 + package/efl/Config.in | 1 - package/efl/libelementary/Config.in | 17 ---------------- package/efl/libelementary/libelementary.mk | 32 ------------------------------ package/libelementary/Config.in | 19 ++++++++++++++++++ package/libelementary/libelementary.mk | 32 ++++++++++++++++++++++++++++++ 6 files changed, 52 insertions(+), 50 deletions(-) delete mode 100644 package/efl/libelementary/Config.in delete mode 100644 package/efl/libelementary/libelementary.mk create mode 100644 package/libelementary/Config.in create mode 100644 package/libelementary/libelementary.mk