Merge Elementary into the EFL

Some things may still be broken, but Cedric will progressively fix
things as they pop. Default configuration works as expected.

.gitignore

@@ -72,3 +72,4 @@ tags
 /coverage
 /src/lib/ecore_x/ecore_x_vsync
 Session.vim
+/elm_intro.h

COPYING

@@ -33,6 +33,7 @@ emotion:         licenses/COPYING.BSD
 ethumb:          licenses/COPYING.LGPL
 eolian:          licenses/COPYING.BSD
 elua:            licenses/COPYING.BSD
+elementary:      licenses/COPYING.LGPL
 
 NOTE: If linked together, the result will be effectively be LGPL (or
 GPL if escape is used) due to license characteristics.

COPYING.images

@@ -0,0 +1,5 @@
+Gesture Layer 2:
+  Illustrations provided by GestureWorks® (www.gestureworks.com)
+  Creative Commons Attribution Sharealike license v 3.0.
+  http://gestureworks.com/icons-fonts
+  http://creativecommons.org/licenses/by-sa/3.0/us/

Makefile_Elm_Helpers.am

@@ -0,0 +1,10 @@
+if HAVE_ELM_PREFS_CC
+ELM_PREFS_CC = @elm_prefs_cc@
+else
+ELM_PREFS_CC = $(top_builddir)/src/bin/elementary/elm_prefs_cc
+endif
+
+AM_V_EPB = $(am__v_EPB_@AM_V@)
+am__v_EPB_ = $(am__v_EPB_@AM_DEFAULT_V@)
+am__v_EPB_0 = @echo "  EPB     " $@;
+

cmakeconfig/ElementaryConfig.cmake.in

@@ -0,0 +1,32 @@
+# - Try to find elementary
+# Once done this will define
+#  ELEMENTARY_FOUND - System has elementary
+#  ELEMENTARY_INCLUDE_DIRS - The elementary include directories
+#  ELEMENTARY_LIBRARIES - The libraries needed to use elementary
+#  ELEMENTARY_DEFINITIONS - Compiler switches required for using elementary
+
+set(MY_PKG elementary)
+
+find_package(PkgConfig)
+if ("${CMAKE_MAJOR_VERSION}.${CMAKE_MINOR_VERSION}.${CMAKE_PATCH_VERSION}" VERSION_GREATER "2.8.1")
+   # "QUIET" was introduced in 2.8.2
+   set(_QUIET QUIET)
+endif ()
+pkg_check_modules(PC_LIBELEMENTARY ${_QUIET} ${MY_PKG})
+
+find_library(ELEMENTARY_LIBRARY
+             NAMES ${PC_LIBELEMENTARY_LIBRARIES}
+             HINTS ${PC_LIBELEMENTARY_LIBDIR} ${PC_LIBELEMENTARY_LIBRARY_DIRS} )
+
+set(ELEMENTARY_DEFINITIONS ${PC_LIBELEMENTARY_CFLAGS_OTHER})
+set(ELEMENTARY_LIBRARIES ${ELEMENTARY_LIBRARY})
+set(ELEMENTARY_INCLUDE_DIRS ${PC_LIBELEMENTARY_INCLUDE_DIRS})
+
+include(FindPackageHandleStandardArgs)
+# handle the QUIETLY and REQUIRED arguments and set ELEMENTARY_FOUND to TRUE
+# if all listed variables are TRUE
+find_package_handle_standard_args(${MY_PKG} DEFAULT_MSG
+   ELEMENTARY_LIBRARIES ELEMENTARY_INCLUDE_DIRS)
+
+mark_as_advanced(ELEMENTARY_INCLUDE_DIRS ELEMENTARY_LIBRARY ELEMENTARY_LIBRARIES ELEMENTARY_DEFINITIONS)
+

cmakeconfig/ElementaryConfigVersion.cmake.in

@@ -0,0 +1,11 @@
+set(PACKAGE_VERSION "@VERSION@")
+
+# Check whether the requested PACKAGE_FIND_VERSION is compatible
+if ("${PACKAGE_VERSION}" VERSION_LESS "${PACKAGE_FIND_VERSION}")
+   set(PACKAGE_VERSION_COMPATIBLE FALSE)
+else ()
+   set(PACKAGE_VERSION_COMPATIBLE TRUE)
+   if ("${PACKAGE_VERSION}" VERSION_EQUAL "${PACKAGE_FIND_VERSION}")
+      set(PACKAGE_VERSION_EXACT TRUE)
+   endif ()
+endif ()

config/.gitignore

@@ -0,0 +1,5 @@
+/profile.cfg
+
+/default/base.cfg
+/mobile/base.cfg
+/standard/base.cfg

config/Makefile.am

@@ -0,0 +1,18 @@
+MAINTAINERCLEANFILES = Makefile.in
+SUBDIRS = default standard mobile
+
+EET_EET = @eet_eet@
+
+EXTRA_DIST = profile.src
+
+filesdir = $(datadir)/elementary/config
+
+files_DATA = profile.cfg
+
+%.cfg: %.src
+	$(EET_EET) -i \
+	$(top_builddir)/config/$@ config \
+	$< 0
+
+clean-local:
+	rm -rf *.cfg *~

config/default/Makefile.am

@@ -0,0 +1,23 @@
+MAINTAINERCLEANFILES = Makefile.in
+
+EET_EET = @eet_eet@
+
+EXTRA_DIST = \
+        profile.desktop \
+        icon.png \
+        base.src.in
+
+filesdir = $(datadir)/elementary/config/default
+files_DATA = \
+        profile.desktop \
+        icon.png \
+        base.cfg
+
+%.cfg: %.src
+	$(EET_EET) -e \
+	$(top_builddir)/config/default/$@ config \
+	$< 1
+
+clean-local:
+	rm -rf *.cfg *~
+

config/default/profile.desktop

@@ -0,0 +1,46 @@
+[Desktop Entry]
+Encoding=UTF-8
+Type=Link
+Name=Default
+Name[ab]=默认
+Name[ca]=Predeterminat
+Name[cs]=Výchozí
+Name[de]=Vorgabe
+Name[el]=Προκαθορισμένο
+Name[eo]=Pravaloroj
+Name[es]=Predefinido
+Name[fi]=Oletus
+Name[fr]=Prédéfini
+Name[gl]=Predefinido
+Name[hu]=Alapértelmezett
+Name[it]=Predefinito
+Name[ja]=デフォルト
+Name[ko]=기본
+Name[lt]=Įprastas
+Name[ms]=Lalai
+Name[pl]=Domyślne
+Name[pt]=Predefinições
+Name[ru]=Заново
+Name[sr]=Подразумевано
+Name[tr]=Öntanımlı
+Name[zh_CN]=默认
+Comment=Select this to begin the initial setup again.
+Comment[ca]=Seleccioni aquí per carregar la configuració inicial de nou.
+Comment[cs]=Vyberte pro znovuspuštění tohoto průvodce.
+Comment[de]=Dieses auswählen, um mit der Ersteinrichtung erneut zu beginnen.
+Comment[el]=Επιλέξτε αυτό για να ξεκινήσετε την αρχική ρύθμιση ξανά.
+Comment[eo]=Elektu tion por restartigi la pravalorizan agordon.
+Comment[es]=Seleccione esto para reestablecer la configuración inicial.
+Comment[fi]=Valitse tämä käynnistääksesi alkuasetusvelhon.
+Comment[fr]=Sélectionnez ceci pour retrouver la configuration par défaut et reprendre le paramétrage initial.
+Comment[gl]=Seleccione isto para volverr á configuración inicial.
+Comment[hu]=Válaszd ezt az alap beállítáok megismétléséhez.
+Comment[it]=Selezionare questo per riprendere la configurazione iniziale.
+Comment[ko]=초기 설정을 사용하려면 이것을 선택하세요.
+Comment[ms]=Pilih ini untuk mulakan persediaan awalan lagi.
+Comment[pt]=Escolha isto para executar novamente a configuração inicial
+Comment[ru]=Выберите это для запуска инициализации настроек (сброс).
+Comment[sr]=Изаберите ово да би поново подесили подразумеване поставке.
+Comment[tr]=Açılış ayarlarına geri dönmek için bu profili seçin.
+Comment[zh_CN]=点击这里重新进行初始化设置主题。
+Icon=icon.png

config/mobile/Makefile.am

@@ -0,0 +1,22 @@
+MAINTAINERCLEANFILES = Makefile.in
+
+EET_EET = @eet_eet@
+
+EXTRA_DIST = \
+        profile.desktop \
+        icon.png \
+        base.src.in
+
+filesdir = $(datadir)/elementary/config/mobile
+files_DATA = \
+        profile.desktop \
+        icon.png \
+        base.cfg
+
+%.cfg: %.src
+	$(EET_EET) -e \
+	$(top_builddir)/config/mobile/$@ config \
+	$< 1
+
+clean-local:
+	rm -rf *.cfg *~

config/mobile/profile.desktop

@@ -0,0 +1,35 @@
+[Desktop Entry]
+Encoding=UTF-8
+Type=Link
+Name=Mobile
+Name[ca]=Mòbil
+Name[de]=Mobil
+Name[el]=Κινητό
+Name[eo]=Portebla
+Name[es]=Móvil
+Name[fi]=Mobiili
+Name[fr]=Écran tactile
+Name[gl]=Móbil
+Name[ja]=モバイル
+Name[ko]=터치스크린
+Name[lt]=Mobiliesiems įrenginiams
+Name[ms]=Bimbit
+Name[pt]=Ecrã tátil
+Name[ru]=Мобильные устройства
+Name[sr]=Покретни
+Name[tr]=Mobil
+Comment=Configuration set up to work best with touchscreen phones, tablets and similar devices.
+Comment[ca]=Configuració configurada per funcionar millor amb telèfons amb pantalla tàctil, tablets i altres dispositius similars.
+Comment[de]=Die Konfiguration ist eingerichtet, um am besten mit einem Brührungsbildschirm, Handys, Tablets und ähnlichen Geräten zu arbeiten.
+Comment[eo]=Agordoj kongruas plej kun tuŝekranaj telefonoj, tabulkomputiloj aŭ similaj aparatoj.
+Comment[es]=Configuración adaptada para el uso de pantallas táctiles como la de los móviles, tablets y dispositivos similares.
+Comment[fi]=Kosketusnäytöllisissä puhelimissa, taulutietokoneissa sekä vastaavissa laitteissa parhaiten toimivat asetukset.
+Comment[fr]=Configuration adaptée aux écrans tactiles des téléphones, tablettes et apparentés.
+Comment[gl]=Configuración adaptada para o uso de pantallas táctiles como a dos móbiles, tablets e dispositivos similares.
+Comment[it]=Configurazione adatta per l'uso in smartphone con interfaccia tattile, tablets e similari.
+Comment[ko]=터치스크린 기반의 휴대폰, 태블릿 등과 같은 장치에 맞는 설정.
+Comment[ms]=Persediaan konfigurasi untuk berfungsi  baik dengan telefon skrin sentuh, tablet dan lain-lain peranti yang serupa.
+Comment[pt]=Configuração de ecrãs táteis como os dos telefones, tablets e similares.
+Comment[sr]=Поставке које су најбоље за рад са екраном на додир телефона, таблица и сличних уређаја.
+Comment[tr]=Yapılandırma dokunmatik ekranlı telefon ve tablet benzeri cihazlarda en iyi çalışacak şekilde ayarlanır.
+Icon=icon.png

config/profile.src

@@ -0,0 +1 @@
+standard

config/standard/Makefile.am

@@ -0,0 +1,23 @@
+MAINTAINERCLEANFILES = Makefile.in
+
+EET_EET = @eet_eet@
+
+EXTRA_DIST = \
+        profile.desktop \
+        icon.png \
+        base.src.in
+
+filesdir = $(datadir)/elementary/config/standard
+files_DATA = \
+        profile.desktop \
+        icon.png \
+        base.cfg
+
+%.cfg: %.src
+	$(EET_EET) -e \
+	$(top_builddir)/config/standard/$@ config \
+	$< 1
+
+clean-local:
+	rm -rf *.cfg *~
+

config/standard/profile.desktop

@@ -0,0 +1,44 @@
+[Desktop Entry]
+Encoding=UTF-8
+Type=Link
+Name=Standard
+Name[ab]=标准
+Name[ca]=Estàndard
+Name[cs]=Standartní
+Name[de]=Vorgabe
+Name[el]=Κανονικό
+Name[eo]=Kutima
+Name[es]=Estándar
+Name[fi]=Vakio
+Name[fr]=Standard
+Name[gl]=Estándar
+Name[hu]=Általános
+Name[ja]=標準
+Name[ko]=표준
+Name[lt]=Standartinis
+Name[ms]=Piawai
+Name[pl]=Standardowe
+Name[pt]=Padrão
+Name[ru]=Стандартный
+Name[sr]=Уобичајено
+Name[tr]=Standart
+Name[zh_CN]=标准
+Comment=This is the standard profile that is universal for most desktop and laptop systems. Choose this if you are not sure what to choose.
+Comment[ca]=Aquest és el perfil estàndard que és universal per a la majoria dels sistemes d'escriptori i portàtils. Escolliu aquest si no sabeu què triar.
+Comment[cs]=Toto je standartní univerzální profil pro většinu stolních a přenosných počítačů. Vyberte pokud si nejste jisti co vybrat.
+Comment[el]=Αυτό είναι το κανονικό προφίλ που είναι κοινό για τα περισσότερα συστήματα. Επιλέξτε αυτό αν δεν είστε σίγουροι για  την επιλογή σας.
+Comment[eo]=Tio estas la kutima profilo taŭga por preskaŭ ĉiuj oficejaj sistemoj kaj porteblaj sistemoj. Elektu ĝin se vi ne certas.
+Comment[es]=Este es el perfil estándar y universal para la mayoría de ordenadores de escritorio y portátiles. Escójalo si no está seguro de cual elegir.
+Comment[fi]=Tämä on vakioprofiili jota voidaan yleisesti käyttää työasemissa ja kannettavissa tietokoneissa. Valitse tämä jos et ole varma minkä valitsisit.
+Comment[fr]=Le profil standard adapté à la quasi totalité des systèmes de bureau et ordinateurs portables. Choisissez ce profil si vous êtes indécis.
+Comment[gl]=Este é o perfil estándar e universal para a maioría de ordenadores de escritorio e portátiles. Escóllao se non está seguro de cal elexir.
+Comment[hu]=Ez az általános, alap beállítás, amely megfelelő a legtöbb laptop és asztali gép számára.
+Comment[it]=Questo è il profilo standard, universale per la maggior parte dei sistemi desktop e portatili. Scegliete questo se non siete sicuri di cosa scegliere.
+Comment[ko]=이 표준 프로파일은 대부분의 데스크톱과 랩톱 컴퓨터 시스템을 위한 보편적인 프로파일입니다. 무엇을 선택할지 확실하지 않다면 이것을 선택하세요.
+Comment[ms]=Ini adalah profil piawai yang universal untuk kebanyakan sistem komputer desktop dan riba. Pilih ini jika anda tidak pasti apa yang hendak dipilih.
+Comment[pt]=O perfil de configuração padrão utilizado para a maioria dos computadores e portáteis. Escolha-o se não souber o que escolher.
+Comment[ru]=Этот стандартный профиль универсален для большинства стационарных и переносных систем. Выберите его если вы не знаете что надо выбрать.
+Comment[sr]=Уобичајени начин рада за већину радних станица и преклопних рачунара. Ако нисте сигурни шта треба изабрати, означите ово.
+Comment[tr]=Bu pek çok masaüstü ve dizüstü sistem için genelde uygun standart bir profildir. Hangisini seçeceğinizden emin değilseniz bunu seçin.
+Comment[zh_CN]=适用于大多数台式机和笔记本的设置主题，如果您不清楚如何选择则请使用这个。
+Icon=icon.png

configure.ac

@@ -154,10 +154,15 @@ AC_ARG_WITH([dbus-services],
 AC_SUBST(dbusservicedir)
 
 efl_deprecated_option="no"
+EFL_WITH_BIN([eet], [eet-eet], [eet])
 EFL_WITH_BIN([edje], [edje-cc])
 EFL_WITH_BIN([eolian], [eolian-gen])
 EFL_WITH_BIN([eolian_cxx], [eolian-cxx])
+EFL_WITH_BIN([eolian-js], [eolian-js], [eolian_js])
 EFL_WITH_BIN_SUFFIX([elua], [elua], [_bin])
+EFL_WITH_BIN([eldbus], [eldbus_codegen], [eldbus-codegen])
+EFL_WITH_BIN([elementary], [elementary-codegen], [elementary_codegen])
+EFL_WITH_BIN([elementary], [elm-prefs-cc], [elm_prefs_cc])
 
 #### Default values
 
@@ -199,6 +204,9 @@ EFL_VERSION_MINOR="v_min"
 AC_SUBST(EFL_VERSION_MAJOR)
 AC_SUBST(EFL_VERSION_MINOR)
 
+ELM_UNIX_DEF="#undef"
+ELM_WIN32_DEF="#undef"
+
 have_systemd_pkg="no"
 have_win32="no"
 have_windows="no"
@@ -211,18 +219,25 @@ case "$host_os" in
       # TODO: check cygwin* here
       have_win32="yes"
       have_windows="yes"
+      ELM_WIN32_DEF="#define"
       EFLALL_CFLAGS="${EFLALL_CFLAGS} -D__USE_MINGW_ANSI_STDIO"
    ;;
    freebsd*)
       have_freebsd="yes"
+      ELM_UNIX_DEF="#define"
    ;;
    darwin*)
       have_darwin="yes"
+      ELM_UNIX_DEF="#define"
    ;;
    linux*)
       have_linux="yes"
       have_systemd_pkg="auto"
+      ELM_UNIX_DEF="#define"
    ;;
+   *)
+      ELM_UNIX_DEF="#define"
+      ;;
 esac
 
 case "$host_vendor" in
@@ -245,6 +260,9 @@ AM_CONDITIONAL([HAVE_FREEBSD], [test "x${have_freebsd}" = "xyes"])
 AM_CONDITIONAL([HAVE_OSX], [test "x${have_darwin}" = "xyes"])
 AM_CONDITIONAL([HAVE_X86_64], [test "x${host_cpu}" = "xx86_64"])
 
+AC_SUBST([ELM_UNIX_DEF])
+AC_SUBST([ELM_WIN32_DEF])
+
 #### Checks for programs
 
 ### libtool
@@ -256,6 +274,9 @@ m4_ifdef([AM_PROG_AR], [AM_PROG_AR])
 LT_INIT([win32-dll disable-static pic-only])
 EFL_INIT
 
+CXXFLAGS="${CXXFLAGS} -fPIC -DPIC"
+LDFLAGS="${LDFLAGS} -fPIC -DPIC"
+
 ### gettext
 
 AM_GNU_GETTEXT_VERSION([0.18])
@@ -5063,6 +5084,277 @@ AM_CONDITIONAL([BUILD_ECORE_BUFFER_X11_DRI3], [test "${build_ecore_buffer_x11_dr
 
 #### End of Ecore_Buffer
 
+
+#### Elementary
+
+EFL_LIB_START([Elementary])
+
+### Default values
+
+### Additional options to configure
+
+## Elementary base dir
+
+AC_ARG_WITH([elementary-base-dir],
+   [AS_HELP_STRING([--with-elementary-base-dir=PATH], [specify the subdirectory for all elementary data @<:@default=${elementary_base_dir}@:>@])],
+   [elementary_base_dir=${withval}],
+   [elementary_base_dir=".elementary"])
+
+AC_MSG_NOTICE([ELEMENTARY_BASE_DIR set to ${elementary_base_dir}])
+AC_DEFINE_UNQUOTED([ELEMENTARY_BASE_DIR], ["${elementary_base_dir}"], ["subdirectory for all elementary data"])
+
+## Debug mode
+
+AC_ARG_ENABLE([debug],
+   [AS_HELP_STRING([--enable-debug], [enable elementary debug support. @<:@default=disabled@:>@])],
+   [want_elementary_debug=$enableval],
+   [want_elementary_debug="no"])
+
+ELM_DEBUG_DEF="#undef"
+if test "x$want_elementary_debug" = "xyes"; then
+   AC_DEFINE([HAVE_ELEMENTARY_DEBUG], [1], [Elementary debug.])
+   ELM_DEBUG_DEF="#define"
+fi
+AC_SUBST([ELM_DEBUG_DEF])
+
+## quicklaunch support
+
+AC_ARG_ENABLE([quick-launch],
+   [AS_HELP_STRING([--disable-quick-launch], [disable quick-launch support, @<:@default=detect@:>@])],
+   [want_quicklaunch=$enableval],
+   [want_quicklaunch="auto"])
+
+### Checks for programs
+
+### Checks for libraries
+
+## Compatibility layers
+
+EFL_PLATFORM_DEPEND([ELEMENTARY], [evil])
+
+EFL_INTERNAL_DEPEND_PKG([ELEMENTARY], [eina])
+EFL_INTERNAL_DEPEND_PKG([ELEMENTARY], [emile])
+EFL_INTERNAL_DEPEND_PKG([ELEMENTARY], [eet])
+EFL_INTERNAL_DEPEND_PKG([ELEMENTARY], [eo])
+EFL_INTERNAL_DEPEND_PKG([ELEMENTARY], [efl])
+EFL_INTERNAL_DEPEND_PKG([ELEMENTARY], [evas])
+EFL_INTERNAL_DEPEND_PKG([ELEMENTARY], [ecore])
+EFL_OPTIONAL_INTERNAL_DEPEND_PKG([ELEMENTARY], [${want_x11_any}], [ecore_x])
+EFL_OPTIONAL_INTERNAL_DEPEND_PKG([ELEMENTARY], [${want_drm}], [ecore_drm])
+EFL_INTERNAL_DEPEND_PKG([ELEMENTARY], [ecore-evas])
+EFL_INTERNAL_DEPEND_PKG([ELEMENTARY], [ecore-file])
+EFL_INTERNAL_DEPEND_PKG([ELEMENTARY], [ecore-input])
+EFL_INTERNAL_DEPEND_PKG([ELEMENTARY], [edje])
+EFL_INTERNAL_DEPEND_PKG([ELEMENTARY], [ethumb])
+EFL_INTERNAL_DEPEND_PKG([ELEMENTARY], [ethumb_client])
+EFL_INTERNAL_DEPEND_PKG([ELEMENTARY], [emotion])
+EFL_INTERNAL_DEPEND_PKG([ELEMENTARY], [ecore-imf])
+EFL_INTERNAL_DEPEND_PKG([ELEMENTARY], [ecore-con])
+EFL_INTERNAL_DEPEND_PKG([ELEMENTARY], [eio])
+EFL_INTERNAL_DEPEND_PKG([ELEMENTARY], [eldbus])
+EFL_INTERNAL_DEPEND_PKG([ELEMENTARY], [efreet])
+EFL_INTERNAL_DEPEND_PKG([ELEMENTARY], [efreet-mime])
+EFL_INTERNAL_DEPEND_PKG([ELEMENTARY], [efreet-trash])
+EFL_INTERNAL_DEPEND_PKG([ELEMENTARY], [elocation])
+
+EFL_ADD_LIBS([ELEMENTARY], [-lm])
+
+ELM_CHECK_BACKEND([X], [${want_x11_any}])
+ELM_CHECK_BACKEND([FB], [${want_fb}])
+ELM_CHECK_BACKEND([PSL1GHT], [${have_ps3}])
+ELM_CHECK_BACKEND([SDL], [${want_sdl}])
+ELM_CHECK_BACKEND([Cocoa], [${want_ecore_evas_gl_cocoa}])
+ELM_CHECK_BACKEND([Win32], [${build_ecore_evas_win32}])
+ELM_CHECK_BACKEND([Wl2], [${build_ecore_evas_wayland}])
+ELM_CHECK_BACKEND([DRM], [${want_drm}])
+
+EFL_EVAL_PKGS([ELEMENTARY])
+
+### Checks for header files
+
+ELM_ALLOCA_H_DEF="#undef"
+AC_CHECK_HEADER([alloca.h], [ELM_ALLOCA_H_DEF="#define"])
+AC_SUBST([ELM_ALLOCA_H_DEF])
+
+ELM_LIBINTL_H_DEF="#undef"
+AC_CHECK_HEADER([libintl.h], [ELM_LIBINTL_H_DEF="#define"])
+AC_SUBST([ELM_LIBINTL_H_DEF])
+
+ELM_DIRENT_H_DEF="#undef"
+AC_CHECK_HEADER([dirent.h], [ELM_DIRENT_H_DEF="#define"])
+AC_SUBST([ELM_DIRENT_H_DEF])
+
+AC_CHECK_HEADER([sys/mman.h], [have_mman="yes"], [have_mman="no"])
+if test "x${have_mman}" = "xyes"; then
+   AC_DEFINE([HAVE_MMAN_H], [1], [Have sys/mman.h header file])
+fi
+
+AC_CHECK_HEADERS([locale.h langinfo.h sys/times.h])
+
+case "$host_os" in
+   darwin*)
+      AC_CHECK_HEADERS([crt_externs.h])
+      ;;
+esac
+
+### Checks for types
+
+### Checks for structures
+
+### Checks for compiler characteristics
+
+### Checks for linker characteristics
+
+# sockets
+
+case "$host_os" in
+   mingw*)
+      have_socket="no"
+      ;;
+   *solaris*)
+      AC_CHECK_LIB([socket], [connect],
+         [
+          have_socket="yes"
+          requirement_elm_libs="-lsocket ${requirement_elm_libs}"
+         ],
+         [have_socket="no"])
+      ;;
+   darwin*)
+      have_socket="yes"
+      ;;
+   *)
+      have_socket="yes"
+      ;;
+esac
+
+AM_CONDITIONAL([BUILD_RUN], [test "x$have_socket" = "xyes"])
+
+# Check if we can build binary with quicklaunch support
+ELM_QUICKLAUNCH
+
+### Checks for library functions
+
+EFL_CHECK_FUNCS([ELEMENTARY], [dlopen])
+
+AC_FUNC_ALLOCA
+
+AC_CHECK_FUNCS([geteuid getuid getpwent])
+
+if test "x${want_quicklaunch}" != "xno"; then
+   AC_CHECK_FUNCS([fork clearenv])
+fi
+
+build_quicklaunch="no"
+if test "x${ac_cv_func_fork}" = "xyes" -a "x${efl_func_dlopen}" = "xyes"; then
+   build_quicklaunch="yes"
+fi
+echo ${build_quicklaunch}
+
+AM_CONDITIONAL([BUILD_QUICKLAUNCH], [test "x${build_quicklaunch}" = "xyes"])
+EFL_ADD_FEATURE([ELEMENTARY], [quicklaunch], [${build_quicklaunch}])
+
+# environ variable
+
+AC_COMPILE_IFELSE(
+   [AC_LANG_PROGRAM(
+      [[
+# define _GNU_SOURCE 1
+#include <unistd.h>
+      ]],
+      [[
+extern char **environ;
+      ]])
+   ],
+   [AC_DEFINE([HAVE_ENVIRON], [1], [extern environ exists])])
+
+case "$host_os" in
+   darwin*)
+      AC_DEFINE([environ], [(*_NSGetEnviron())], ["apple doesn't follow POSIX in this case."])
+      ;;
+esac
+
+### Check availability
+
+EFL_LIB_END([Elementary])
+
+#### End of Elementary
+
+
+#### Elementary CXX
+EFL_LIB_START([Elementary_Cxx])
+
+EFL_INTERNAL_DEPEND_PKG([ELEMENTARY_CXX], [Eina_Cxx])
+EFL_INTERNAL_DEPEND_PKG([ELEMENTARY_CXX], [Eet_Cxx])
+EFL_INTERNAL_DEPEND_PKG([ELEMENTARY_CXX], [Ecore_Cxx])
+EFL_INTERNAL_DEPEND_PKG([ELEMENTARY_CXX], [Ecore])
+EFL_INTERNAL_DEPEND_PKG([ELEMENTARY_CXX], [Eina])
+EFL_INTERNAL_DEPEND_PKG([ELEMENTARY_CXX], [Eo])
+EFL_INTERNAL_DEPEND_PKG([ELEMENTARY_CXX], [Efl])
+EFL_INTERNAL_DEPEND_PKG([ELEMENTARY_CXX], [Elementary])
+
+EFL_EVAL_PKGS([ELEMENTARY_CXX])
+
+EFL_LIB_END([Elementary_Cxx])
+#### End of Ecore CXX
+
+
+#### Elementary_Js
+EFL_LIB_START_OPTIONAL([Elementary_Js], [test "x${have_js}" = "xyes"])
+
+### Default values
+
+### Additional options to configure
+
+### Checks for programs
+
+### Checks for libraries
+EFL_INTERNAL_DEPEND_PKG([ELEMENTARY_JS], [Eina])
+EFL_INTERNAL_DEPEND_PKG([ELEMENTARY_JS], [Eo])
+EFL_INTERNAL_DEPEND_PKG([ELEMENTARY_JS], [Ecore])
+EFL_INTERNAL_DEPEND_PKG([ELEMENTARY_JS], [Eet])
+EFL_INTERNAL_DEPEND_PKG([ELEMENTARY_JS], [Ecore_Evas])
+EFL_INTERNAL_DEPEND_PKG([ELEMENTARY_JS], [Ecore_Con])
+EFL_INTERNAL_DEPEND_PKG([ELEMENTARY_JS], [Ecore_Audio])
+EFL_INTERNAL_DEPEND_PKG([ELEMENTARY_JS], [Efl])
+EFL_INTERNAL_DEPEND_PKG([ELEMENTARY_JS], [Evas])
+EFL_INTERNAL_DEPEND_PKG([ELEMENTARY_JS], [Edje])
+EFL_INTERNAL_DEPEND_PKG([ELEMENTARY_JS], [Emotion])
+EFL_INTERNAL_DEPEND_PKG([ELEMENTARY_JS], [Eldbus])
+EFL_INTERNAL_DEPEND_PKG([ELEMENTARY_JS], [Emile])
+EFL_INTERNAL_DEPEND_PKG([ELEMENTARY_JS], [Ethumb_Client])
+EFL_INTERNAL_DEPEND_PKG([ELEMENTARY_JS], [Eio])
+EFL_INTERNAL_DEPEND_PKG([ELEMENTARY_JS], [Elementary])
+EFL_INTERNAL_DEPEND_PKG([ELEMENTARY_JS], [Efl_Js])
+
+AM_COND_IF([HAVE_NODEJS], [], [ EFL_ADD_LIBS([ELEMENTARY_JS], [-lv8]) ])
+
+EFL_EVAL_PKGS([ELEMENTARY_JS])
+
+AM_COND_IF([HAVE_NODEJS], [ELEMENTARYJS_CXXFLAGS="$ELEMENTARYJS_CXXFLAGS -DHAVE_NODEJS"], [])
+AM_COND_IF([HAVE_LIBUV], [ELEMENTARYJS_CXXFLAGS="$ELEMENTARYJS_CXXFLAGS -DHAVE_LIBUV"], [])
+AM_COND_IF([HAVE_JS], [ELEMENTARYJS_CXXFLAGS="$ELEMENTARYJS_CXXFLAGS -DHAVE_JS"], [])
+
+AM_COND_IF([HAVE_V8_CREATE_PARAMS], [ELEMENTARYJS_CXXFLAGS="$ELEMENTARYJS_CXXFLAGS -DHAVE_V8_CREATE_PARAMS"], [])
+AM_COND_IF([HAVE_V8_GLOBAL], [ELEMENTARYJS_CXXFLAGS="$ELEMENTARYJS_CXXFLAGS -DHAVE_V8_GLOBAL"], [])
+AC_SUBST([ELEMENTARYJS_CXXFLAGS])
+
+### Checks for header files
+
+### Checks for types
+
+### Checks for structures
+
+### Checks for compiler characteristics
+
+### Checks for linker characteristics
+
+### Checks for library functions
+
+### Check availability
+
+EFL_LIB_END_OPTIONAL([ELEMENTARY_JS])
+#### End of Efl_Js
+
 AC_CONFIG_FILES([
 Makefile
 data/Makefile
@@ -5092,6 +5384,8 @@ src/examples/elocation/Makefile
 src/lib/eina/eina_config.h
 src/lib/ecore_x/ecore_x_version.h
 src/lib/efl/Efl_Config.h
+src/lib/elementary/Elementary.h
+elm_intro.h
 spec/efl.spec
 pc/evil.pc
 pc/escape.pc
@@ -5340,6 +5634,11 @@ echo "Emotion.........: yes (${features_emotion})"
 echo "Ethumb..........: yes"
 echo "Ethumb_Client...: yes"
 echo "Elua............: $have_elua"
+echo "Elementary......: yes (${features_elementary})"
+echo 
+
+echo
+
 if test "${build_tests}" = "none"; then
 echo "Tests...........: no"
 elif test "${build_tests}" = "auto"; then

data/Makefile.am

@@ -116,3 +116,131 @@ EXTRA_DIST += $(ethumb_clientfiles_DATA)
 eluafilesdir = $(datadir)/elua
 eluafiles_DATA = elua/checkme
 EXTRA_DIST += $(eluafiles_DATA)
+
+#######################################################################
+# Elementary
+
+# themes
+
+elementaryfilesdir = $(datadir)/elementary/themes
+elementaryfiles_DATA = elementary/themes/default.edj
+CLEANFILES += elementary/themes/default.edj
+
+include elementary/themes/Makefile.am
+
+elementary/themes/default.edj: elementary/themes/default.edc
+	$(AM_V_EDJ) \
+	$(MKDIR_P) elementary/themes/; \
+	$(EDJE_CC) $(EDJE_CC_FLAGS) $(EDJE_CC_ELM_FLAGS) $< $@
+
+# desktop files
+
+elementarydesktopdir = $(datadir)/elementary/applications
+elementarydesktop_DATA = elementary/desktop/elementary_test.desktop elementary/desktop/elementary_config.desktop
+
+elementaryicondir = $(datadir)/elementary/icons
+elementaryicon_DATA = elementary/desktop/elementary.png
+
+EXTRA_DIST += $(elementarydesktop_DATA) $(elementaryicon_DATA)
+
+# edje_externals
+
+elementaryedje_externalsdir = $(datadir)/elementary/edje_externals
+elementaryedje_externals_DATA = elementary/edje_externals/icons.edj
+CLEANFILES += $(elementaryedje_externals_DATA)
+
+include elementary/edje_externals/Makefile.am
+
+elementary/edje_externals/icons.edj: elementary/edje_externals/icons.edc
+	$(AM_V_EDJ) \
+	$(MKDIR_P) elementary/edje_externals/; \
+	$(EDJE_CC) $(EDJE_CC_FLAGS) $< $@
+
+# images
+
+include elementary/images/Makefile.am
+
+elementaryimagesdir = $(datadir)/elementary/images
+elementaryimages_DATA = $(elementary_images_files)
+
+elementaryimages_glayerdir = $(datadir)/elementary/images
+elementaryimages_glayer_DATA = $(elementary_images_glayer_files)
+
+EXTRA_DIST += $(elementary_images_files) $(elementary_images_glayer_files)
+
+# objects
+
+include ../Makefile_Elm_Helpers.am
+
+elementaryobjectsdir = $(datadir)/elementary/object
+elementaryobjects_DATA = \
+elementary/objects/test.edj \
+elementary/objects/test_external.edj \
+elementary/objects/multip.edj \
+elementary/objects/cursors.edj \
+elementary/objects/combobox_multiple.edj \
+elementary/objects/font_preview.edj \
+elementary/objects/postit_ent.edj \
+elementary/objects/multibuttonentry.edj \
+elementary/objects/test_prefs.edj \
+elementary/objects/test_prefs.epb \
+elementary/objects/test_focus_style.edj
+CLEANFILES += $(elementaryobjects_DATA)
+
+include elementary/objects/Makefile.am
+
+elementary/objects/test.edj: elementary/objects/test.edc
+	$(AM_V_EDJ) \
+	$(MKDIR_P) elementary/objects/; \
+	$(EDJE_CC) $(EDJE_CC_FLAGS) $< $@
+
+elementary/objects/test_external.edj: elementary/objects/test_external.edc
+	$(AM_V_EDJ) \
+	$(MKDIR_P) elementary/objects/; \
+	$(EDJE_CC) $(EDJE_CC_FLAGS) $< $@
+
+elementary/objects/multip.edj: elementary/objects/test_external.edc
+	$(AM_V_EDJ) \
+	$(MKDIR_P) elementary/objects/; \
+	$(EDJE_CC) $(EDJE_CC_FLAGS) $< $@
+
+elementary/objects/cursors.edj: elementary/objects/cursors.edc
+	$(AM_V_EDJ) \
+	$(MKDIR_P) elementary/objects/; \
+	$(EDJE_CC) $(EDJE_CC_FLAGS) $< $@
+
+elementary/objects/combobox_multiple.edj: elementary/objects/combobox_multiple.edc
+	$(AM_V_EDJ) \
+	$(MKDIR_P) elementary/objects/; \
+	$(EDJE_CC) $(EDJE_CC_FLAGS) $< $@
+
+elementary/objects/font_preview.edj: elementary/objects/font_preview.edc
+	$(AM_V_EDJ) \
+	$(MKDIR_P) elementary/objects/; \
+	$(EDJE_CC) $(EDJE_CC_FLAGS) $< $@
+
+elementary/objects/postit_ent.edj: elementary/objects/postit_ent.edc
+	$(AM_V_EDJ) \
+	$(MKDIR_P) elementary/objects/; \
+	$(EDJE_CC) $(EDJE_CC_FLAGS) $< $@
+
+elementary/objects/multibuttonentry.edj: elementary/objects/multibuttonentry.edc
+	$(AM_V_EDJ) \
+	$(MKDIR_P) elementary/objects/; \
+	$(EDJE_CC) $(EDJE_CC_FLAGS) $< $@
+
+elementary/objects/test_prefs.edj: elementary/objects/test_prefs.edc
+	$(AM_V_EDJ) \
+	$(MKDIR_P) elementary/objects/; \
+	$(EDJE_CC) $(EDJE_CC_FLAGS) $< $@
+
+elementary/objects/test_focus_style.edj: elementary/objects/test_focus_style.edc
+	$(AM_V_EDJ) \
+	$(MKDIR_P) elementary/objects/; \
+	$(EDJE_CC) $(EDJE_CC_FLAGS) -id $(top_srcdir)/data/elementary/themes/img $< $@
+
+elementary/objects/test_prefs.epb: elementary/objects/test_prefs.epc
+	$(AM_V_EPB) \
+	$(MKDIR_P) elementary/objects/; \
+	$(ELM_PREFS_CC) $(ELM_PREFS_FLAGS) $< $@
+

data/elementary/.gitignore

@@ -0,0 +1 @@
+/objects/test_prefs.epb

data/elementary/Makefile.am

@@ -0,0 +1,3 @@
+AUTOMAKE_OPTIONS     = 1.4 foreign
+MAINTAINERCLEANFILES = Makefile.in
+SUBDIRS              = themes images objects desktop edje_externals

data/elementary/desktop/Makefile.am

@@ -0,0 +1,10 @@
+AUTOMAKE_OPTIONS     = 1.4 foreign
+MAINTAINERCLEANFILES = Makefile.in
+
+desktopdir = $(datadir)/applications
+desktop_DATA = elementary_test.desktop elementary_config.desktop
+
+icondir = $(datadir)/icons
+icon_DATA = elementary.png
+
+EXTRA_DIST = $(desktop_DATA) $(icon_DATA)

data/elementary/desktop/elementary_config.desktop

@@ -0,0 +1,43 @@
+[Desktop Entry]
+Encoding=UTF-8
+Type=Application
+Name=Elementary Configuration
+Name[ca]=Configuració Elementary
+Name[cs]=Konfigurace Elementary
+Name[de]=Elementary-Konfiguration
+Name[eo]=Agordi Elementary
+Name[es]=Configure Elementary
+Name[fi]=Elementaryn asetukset
+Name[fr]=Configuration pour Elementary
+Name[gl]=Configure Elementary
+Name[it]=Configurazione di Elementary
+Name[ja]=Elementary 設定
+Name[lt]=Elementary nustatymai
+Name[ms]=Konfigurasi Elementary
+Name[pl]=Podstawowa konfiguracja
+Name[pt]=Configure o Elementary
+Name[ru]=Параметры Elementary
+Name[sr]=Поставке Еламентарија
+Name[tr]=Elementary Yapılandırması
+Comment=Elementary Configuration
+Comment[ca]=Configuració Elementary
+Comment[cs]=Konfigurace Elementary
+Comment[de]=Elementary-Konfiguration
+Comment[eo]=Agordi Elementary
+Comment[es]=Configure Elementary
+Comment[fi]=Elementaryn asetukset
+Comment[fr]=Configuration pour Elementary
+Comment[gl]=Configure Elementary
+Comment[it]=Configurazione di Elementary
+Comment[ja]=Elementary 設定
+Comment[lt]=Elementary nustatymai
+Comment[ms]=Konfigurasi Elementary
+Comment[pl]=Podstawowa konfiguracja
+Comment[pt]=Configure o Elementary
+Comment[ru]=Параметры Elementary
+Comment[sr]=Поставке Еламентарија
+Comment[tr]=Elementary Yapılandırması
+Icon=elementary
+Exec=elementary_config
+Terminal=false
+Categories=Settings;DesktopSettings;

data/elementary/desktop/elementary_test.desktop

@@ -0,0 +1,37 @@
+[Desktop Entry]
+Encoding=UTF-8
+Type=Application
+Name=Elementary Test
+Name[ca]=Test bàsic
+Name[de]=Elementary-Test
+Name[el]=Elementary Test
+Name[eo]=Provo de Elementary
+Name[fi]=Elementary-testiohjema
+Name[fr]=Test Elementary
+Name[gl]=Proba do Elementary
+Name[it]=Test per Elementary
+Name[ja]=Elementary テスト
+Name[ms]=Uji Elementary
+Name[pt]=Testes Elementary
+Name[ru]=Тест Elementary
+Name[tr]=Elementary testi
+Comment=Elementary Test Application
+Comment[ca]=Aplicació de prova bàsica
+Comment[cs]=Testovací aplikace Elementary
+Comment[de]=Elementary-Testanwendung
+Comment[eo]=Provoversia aplikaĵo de Elementary
+Comment[es]=Aplicación de pruebas para Elementary
+Comment[fi]=Elementaryn testisovellus
+Comment[fr]=Programme de tests pour Elementary
+Comment[gl]=Aplicativo de probas para Elementary
+Comment[it]=Applicazione di test per Elementary
+Comment[ja]=Elementary テストアプリケーション
+Comment[ms]=Aplikasi Uji Elementary
+Comment[pt]=Aplicação de testes do Elementary
+Comment[ru]=Приложение для тестирования Elementary
+Comment[sr]=Пробач програма Елементарија
+Comment[tr]=Elementary Test Uygulaması
+Icon=elementary
+Exec=elementary_test
+Terminal=false
+Categories=Development;Utility;

data/elementary/edje_externals/Makefile.am

@@ -0,0 +1,26 @@
+EDJE_CC_FLAGS += -id $(top_srcdir)/data/elementary/edje_externals -fd $(top_srcdir)/data/elementary/edje_externals
+
+EXTRA_DIST += \
+	elementary/edje_externals/icons.edc \
+	elementary/edje_externals/ico_anchorblock.png \
+	elementary/edje_externals/ico_anchorview.png \
+	elementary/edje_externals/ico_bubble.png \
+	elementary/edje_externals/ico_button.png \
+	elementary/edje_externals/ico_check.png \
+	elementary/edje_externals/ico_clock.png \
+	elementary/edje_externals/ico_fileselector.png \
+	elementary/edje_externals/ico_fileselector_button.png \
+	elementary/edje_externals/ico_genlist.png \
+	elementary/edje_externals/ico_hoversel.png \
+	elementary/edje_externals/ico_list.png \
+	elementary/edje_externals/ico_map.png \
+	elementary/edje_externals/ico_notepad.png \
+	elementary/edje_externals/ico_photocam.png \
+	elementary/edje_externals/ico_progressbar.png \
+	elementary/edje_externals/ico_radio.png \
+	elementary/edje_externals/ico_scrolled_entry.png \
+	elementary/edje_externals/ico_slider.png \
+	elementary/edje_externals/ico_slideshow.png \
+	elementary/edje_externals/ico_spinner.png \
+	elementary/edje_externals/ico_thumb.png \
+	elementary/edje_externals/ico_toolbar.png

data/elementary/edje_externals/icons.edc

@@ -0,0 +1,35 @@
+#define ICON(_name)                                         \
+images { image: "ico_"_name".png" COMP; }                   \
+collections { group { name: "ico_"_name;                    \
+      parts { part { name: "icon";                          \
+            type: IMAGE; mouse_events: 0;                   \
+            description { state: "default" 0.0;             \
+               align: 0.5 0.5;                              \
+               aspect: 1.0 1.0;                             \
+               aspect_preference: VERTICAL;                 \
+               image.normal: "ico_"_name".png";             \
+}}}}}
+
+ICON("anchorblock")
+ICON("anchorview")
+ICON("bubble")
+ICON("button")
+ICON("check")
+ICON("clock")
+ICON("fileselector")
+ICON("fileselector_button")
+ICON("genlist")
+ICON("hoversel")
+ICON("list")
+ICON("map")
+ICON("notepad")
+ICON("photocam")
+ICON("progressbar")
+ICON("radio")
+ICON("scrolled_entry")
+ICON("slider")
+ICON("slideshow")
+ICON("spinner")
+ICON("thumb")
+ICON("toolbar")
+

data/elementary/images/Makefile.am

@@ -0,0 +1,92 @@
+elementary_images_files = \
+	elementary/images/insanely_huge_test_image.jpg \
+	elementary/images/panel_01.jpg \
+	elementary/images/plant_01.jpg \
+	elementary/images/pol_shadow.png \
+	elementary/images/pol_sky.png \
+	elementary/images/pol_twofish.png \
+	elementary/images/rock_01.jpg \
+	elementary/images/rock_02.jpg \
+	elementary/images/sky_01.jpg \
+	elementary/images/sky_02.jpg \
+	elementary/images/sky_03.jpg \
+	elementary/images/sky_04.jpg \
+	elementary/images/wood_01.jpg \
+	elementary/images/logo.png \
+	elementary/images/logo_small.png \
+	elementary/images/animated_logo.gif \
+	elementary/images/parking.png \
+	elementary/images/icon_00.png \
+	elementary/images/icon_01.png \
+	elementary/images/icon_02.png \
+	elementary/images/icon_03.png \
+	elementary/images/icon_04.png \
+	elementary/images/icon_05.png \
+	elementary/images/icon_06.png \
+	elementary/images/icon_07.png \
+	elementary/images/icon_08.png \
+	elementary/images/icon_09.png \
+	elementary/images/icon_10.png \
+	elementary/images/icon_11.png \
+	elementary/images/icon_12.png \
+	elementary/images/icon_13.png \
+	elementary/images/icon_14.png \
+	elementary/images/icon_15.png \
+	elementary/images/icon_16.png \
+	elementary/images/icon_17.png \
+	elementary/images/icon_18.png \
+	elementary/images/icon_19.png \
+	elementary/images/icon_20.png \
+	elementary/images/icon_21.png \
+	elementary/images/icon_22.png \
+	elementary/images/icon_23.png \
+	elementary/images/icon_right_arrow.png \
+	elementary/images/bubble.png \
+	elementary/images/bubble_sh.png \
+	elementary/images/mystrale.jpg \
+	elementary/images/mystrale_2.jpg \
+	elementary/images/twofish.jpg \
+	elementary/images/pt.png \
+	elementary/images/earth_normal.png \
+	elementary/images/space.png
+
+elementary_images_glayer_files = \
+	elementary/images/g_layer/double_tap_1.png \
+	elementary/images/g_layer/line_1.png \
+	elementary/images/g_layer/momentum_1.png \
+	elementary/images/g_layer/tap_5.png \
+	elementary/images/g_layer/double_tap_2.png \
+	elementary/images/g_layer/line_2.png \
+	elementary/images/g_layer/momentum_2.png \
+	elementary/images/g_layer/triple_tap_1.png \
+	elementary/images/g_layer/double_tap_3.png \
+	elementary/images/g_layer/line_3.png \
+	elementary/images/g_layer/momentum_3.png \
+	elementary/images/g_layer/triple_tap_2.png \
+	elementary/images/g_layer/double_tap_4.png \
+	elementary/images/g_layer/line_4.png \
+	elementary/images/g_layer/momentum_4.png \
+	elementary/images/g_layer/triple_tap_3.png \
+	elementary/images/g_layer/double_tap_5.png \
+	elementary/images/g_layer/line_5.png \
+	elementary/images/g_layer/momentum_5.png \
+	elementary/images/g_layer/triple_tap_4.png \
+	elementary/images/g_layer/flick_1.png \
+	elementary/images/g_layer/long_tap_1.png \
+	elementary/images/g_layer/rotate_1.png \
+	elementary/images/g_layer/triple_tap_5.png \
+	elementary/images/g_layer/flick_2.png \
+	elementary/images/g_layer/long_tap_2.png \
+	elementary/images/g_layer/tap_1.png \
+	elementary/images/g_layer/zoom_1.png \
+	elementary/images/g_layer/flick_3.png \
+	elementary/images/g_layer/long_tap_3.png \
+	elementary/images/g_layer/tap_2.png \
+	elementary/images/g_layer/flick_4.png \
+	elementary/images/g_layer/long_tap_4.png \
+	elementary/images/g_layer/tap_3.png \
+	elementary/images/g_layer/flick_5.png \
+	elementary/images/g_layer/long_tap_5.png \
+	elementary/images/g_layer/tap_4.png
+
+EXTRA_DIST += $(files_DATA) $(files_glayer_DATA)