elementary: initial compilation of the library only.

diff --git a/.gitignore b/.gitignore
index c779341..4d84a8c 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -72,3 +72,4 @@ tags
 /coverage
 /src/lib/ecore_x/ecore_x_vsync
 Session.vim
+/elm_intro.h
\ No newline at end of file

diff --git a/configure.ac b/configure.ac
index 5246c53..cfc4842 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -204,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"
@@ -216,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
@@ -250,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
@@ -261,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])
@@ -5117,15 +5133,19 @@ AC_ARG_ENABLE([quick-launch],
 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])
@@ -5364,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

diff --git a/doc/images.mk b/doc/images.mk
index 46b3f85..689d9b0 100644 (file)
--- a/doc/images.mk
+++ b/doc/images.mk
@@ -1,2 +1,2 @@
 EXTRA_DIST += \
-img/01_hash-table.eps img/01_hash-table.png img/alignment-hints.eps img/alignment-hints.png img/any-policy.eps img/any-policy.png img/aspect-control-both.eps img/aspect-control-both.png img/aspect-control-horizontal.eps img/aspect-control-horizontal.png img/aspect-control-none-neither.eps img/aspect-control-none-neither.png img/basic2final.eps img/basic2final.png img/border-effect.eps img/border-effect.png img/bouncing_ball.eps img/bouncing_ball.png img/bouncing_text.eps img/bouncing_text.png img/camera.eps img/camera.png img/camera_track.eps img/camera_track.png img/clipping.eps img/clipping.png img/collision_detection.eps img/collision_detection.png img/collision_filter.eps img/collision_filter.png img/diagram_ephysics.eps img/diagram_ephysics.png img/ecore-pos-map.eps img/ecore-pos-map.png img/ecore_con-client-server-example.eps img/ecore_con-client-server-example.png img/ecore_con-client-server-example2.eps img/ecore_con-client-server-example2.png img/ecore_con-client-server.eps img/ecore_con-client-server.png img/ecore_thread.eps img/ecore_thread.png img/ecore_thread_feedback.eps img/ecore_thread_feedback.png img/edje-animations.eps img/edje-animations.png img/edje-animations2.eps img/edje-animations2.png img/edje-basics-example.eps img/edje-basics-example.png img/edje-box-example.eps img/edje-box-example.png img/edje-box2-example.eps img/edje-box2-example.png img/edje-color-class-example.eps img/edje-color-class-example.png img/edje-color-class-example2.eps img/edje-color-class-example2.png img/edje-drag-example.eps img/edje-drag-example.png img/edje-nested.eps img/edje-nested.png img/edje-perspective-example.eps img/edje-perspective-example.png img/edje-signals-messages-example.eps img/edje-signals-messages-example.png img/edje-table-example.eps img/edje-table-example.png img/edje-text.eps img/edje-text.png img/eina-list-foreach-safe.eps img/eina-list-foreach-safe.png img/eina-list-foreach.eps img/eina-list-foreach.png img/eina-list-free.eps img/eina-list-free.png img/eina-list-reverse-foreach-safe.eps img/eina-list-reverse-foreach-safe.png img/eina-list-reverse-foreach.eps img/eina-list-reverse-foreach.png img/eina_array-growth.eps img/eina_array-growth.png img/eina_inlist-node.eps img/eina_inlist-node.png img/eina_inlist-node_eg1-inlist.eps img/eina_inlist-node_eg1-inlist.png img/eina_inlist-node_eg1-my-struct.eps img/eina_inlist-node_eg1-my-struct.png img/eina_inlist-node_eg2-list-inlist.eps img/eina_inlist-node_eg2-list-inlist.png img/eina_inlist-node_eg2-my-struct.eps img/eina_inlist-node_eg2-my-struct.png img/eina_inlist-node_eg3-my-struct.eps img/eina_inlist-node_eg3-my-struct.png img/eina_inlist-node_eg3-two-inlists.eps img/eina_inlist-node_eg3-two-inlists.png img/eina_list.eps img/eina_list.png img/eina_list_example_01_a.eps img/eina_list_example_01_a.png img/eina_list_example_01_b.eps img/eina_list_example_01_b.png img/eina_stringshare.eps img/eina_stringshare.png img/emotion_ratio.eps img/emotion_ratio.png img/evas-box-example-00.eps img/evas-box-example-00.png img/evas-box-example-01.eps img/evas-box-example-01.png img/evas-box-example-02.eps img/evas-box-example-02.png img/evas-box-example-03.eps img/evas-box-example-03.png img/evas-box-example-04.eps img/evas-box-example-04.png img/evas-box-example-05.eps img/evas-box-example-05.png img/evas-callbacks.eps img/evas-callbacks.png img/evas-stacking-example-00.eps img/evas-stacking-example-00.png img/evas-stacking-example-01.eps img/evas-stacking-example-01.png img/evas-stacking-example-02.eps img/evas-stacking-example-02.png img/evas-stacking-example-03.eps img/evas-stacking-example-03.png img/evas-stacking-example-04.eps img/evas-stacking-example-04.png img/evas-stacking-example-05.eps img/evas-stacking-example-05.png img/evas-stacking-example-06.eps img/evas-stacking-example-06.png img/evas-stacking-example-07.eps img/evas-stacking-example-07.png img/forces.eps img/forces.png img/growing_balls.eps img/growing_balls.png img/image-borders.eps img/image-borders.png img/image-fill.eps img/image-fill.png img/map-3d-basic-1.eps img/map-3d-basic-1.png img/map-3d-basic-2.eps img/map-3d-basic-2.png img/map-3d-basic-3.eps img/map-3d-basic-3.png img/map-light.eps img/map-light.png img/map-light2.eps img/map-light2.png img/map-light3.eps img/map-light3.png img/map-light4.eps img/map-light4.png img/map-light5.eps img/map-light5.png img/map-light6.eps img/map-light6.png img/map-light7.eps img/map-light7.png img/map-light8.eps img/map-light8.png img/map-point-order-back.eps img/map-point-order-back.png img/map-point-order-face.eps img/map-point-order-face.png img/map-rotation-2d-1.eps img/map-rotation-2d-1.png img/map-rotation-2d-2.eps img/map-rotation-2d-2.png img/map-rotation-2d-3.eps img/map-rotation-2d-3.png img/map-rotation-2d-4.eps img/map-rotation-2d-4.png img/map-set-map-points-1.eps img/map-set-map-points-1.png img/map-set-map-points-2.eps img/map-set-map-points-2.png img/map-set-map-points-3.eps img/map-set-map-points-3.png img/map-uv-mapping-1.eps img/map-uv-mapping-1.png img/map-uv-mapping-2.eps img/map-uv-mapping-2.png img/map-uv-mapping-3.eps img/map-uv-mapping-3.png img/map-uv-mapping-4.eps img/map-uv-mapping-4.png img/no_gravity.eps img/no_gravity.png img/padding-hints.eps img/padding-hints.png img/prog_flow.eps img/prog_flow.png img/shapes.eps img/shapes.png img/signal2final.eps img/signal2final.png img/slider.eps img/slider.png img/swallow2final.eps img/swallow2final.png img/text-styles.eps img/text-styles.png 
+img/01_hash-table.eps img/01_hash-table.png img/actionslider_inheritance_tree.eps img/actionslider_inheritance_tree.png img/alignment-hints.eps img/alignment-hints.png img/any-policy.eps img/any-policy.png img/aspect-control-both.eps img/aspect-control-both.png img/aspect-control-horizontal.eps img/aspect-control-horizontal.png img/aspect-control-none-neither.eps img/aspect-control-none-neither.png img/basic2final.eps img/basic2final.png img/bg_inheritance_tree.eps img/bg_inheritance_tree.png img/border-effect.eps img/border-effect.png img/bouncing_ball.eps img/bouncing_ball.png img/bouncing_text.eps img/bouncing_text.png img/box.eps img/box.png img/box_inheritance_tree.eps img/box_inheritance_tree.png img/bubble_inheritance_tree.eps img/bubble_inheritance_tree.png img/button_inheritance_tree.eps img/button_inheritance_tree.png img/calendar_inheritance_tree.eps img/calendar_inheritance_tree.png img/camera.eps img/camera.png img/camera_track.eps img/camera_track.png img/check_inheritance_tree.eps img/check_inheritance_tree.png img/clipping.eps img/clipping.png img/clock_inheritance_tree.eps img/clock_inheritance_tree.png img/collision_detection.eps img/collision_detection.png img/collision_filter.eps img/collision_filter.png img/colorselector_inheritance_tree.eps img/colorselector_inheritance_tree.png img/conformant.eps img/conformant.png img/conformant_inheritance_tree.eps img/conformant_inheritance_tree.png img/container_inheritance_tree.eps img/container_inheritance_tree.png img/ctxpopup_inheritance_tree.eps img/ctxpopup_inheritance_tree.png img/datetime_inheritance_tree.eps img/datetime_inheritance_tree.png img/dayselector_inheritance_tree.eps img/dayselector_inheritance_tree.png img/diagram_ephysics.eps img/diagram_ephysics.png img/diskselector_inheritance_tree.eps img/diskselector_inheritance_tree.png img/ecore-pos-map.eps img/ecore-pos-map.png img/ecore_con-client-server-example.eps img/ecore_con-client-server-example.png img/ecore_con-client-server-example2.eps img/ecore_con-client-server-example2.png img/ecore_con-client-server.eps img/ecore_con-client-server.png img/ecore_thread.eps img/ecore_thread.png img/ecore_thread_feedback.eps img/ecore_thread_feedback.png img/edje-animations.eps img/edje-animations.png img/edje-animations2.eps img/edje-animations2.png img/edje-basics-example.eps img/edje-basics-example.png img/edje-box-example.eps img/edje-box-example.png img/edje-box2-example.eps img/edje-box2-example.png img/edje-color-class-example.eps img/edje-color-class-example.png img/edje-color-class-example2.eps img/edje-color-class-example2.png img/edje-drag-example.eps img/edje-drag-example.png img/edje-nested.eps img/edje-nested.png img/edje-perspective-example.eps img/edje-perspective-example.png img/edje-signals-messages-example.eps img/edje-signals-messages-example.png img/edje-table-example.eps img/edje-table-example.png img/edje-text.eps img/edje-text.png img/eina-list-foreach-safe.eps img/eina-list-foreach-safe.png img/eina-list-foreach.eps img/eina-list-foreach.png img/eina-list-free.eps img/eina-list-free.png img/eina-list-reverse-foreach-safe.eps img/eina-list-reverse-foreach-safe.png img/eina-list-reverse-foreach.eps img/eina-list-reverse-foreach.png img/eina_array-growth.eps img/eina_array-growth.png img/eina_inlist-node.eps img/eina_inlist-node.png img/eina_inlist-node_eg1-inlist.eps img/eina_inlist-node_eg1-inlist.png img/eina_inlist-node_eg1-my-struct.eps img/eina_inlist-node_eg1-my-struct.png img/eina_inlist-node_eg2-list-inlist.eps img/eina_inlist-node_eg2-list-inlist.png img/eina_inlist-node_eg2-my-struct.eps img/eina_inlist-node_eg2-my-struct.png img/eina_inlist-node_eg3-my-struct.eps img/eina_inlist-node_eg3-my-struct.png img/eina_inlist-node_eg3-two-inlists.eps img/eina_inlist-node_eg3-two-inlists.png img/eina_list.eps img/eina_list.png img/eina_list_example_01_a.eps img/eina_list_example_01_a.png img/eina_list_example_01_b.eps img/eina_list_example_01_b.png img/eina_stringshare.eps img/eina_stringshare.png img/elementary.png img/elm-widget-hierarchy.eps img/elm-widget-hierarchy.png img/elm-widget-tree.eps img/elm-widget-tree.png img/elm_animator_curve_style.eps img/elm_animator_curve_style.png img/elm_flip.eps img/elm_flip.png img/elm_image_orient_set.eps img/elm_image_orient_set.png img/emotion_ratio.eps img/emotion_ratio.png img/entry_inheritance_tree.eps img/entry_inheritance_tree.png img/entry_item.eps img/entry_item.png img/entry_item_scale.eps img/entry_item_scale.png img/evas-box-example-00.eps img/evas-box-example-00.png img/evas-box-example-01.eps img/evas-box-example-01.png img/evas-box-example-02.eps img/evas-box-example-02.png img/evas-box-example-03.eps img/evas-box-example-03.png img/evas-box-example-04.eps img/evas-box-example-04.png img/evas-box-example-05.eps img/evas-box-example-05.png img/evas-callbacks.eps img/evas-callbacks.png img/evas-stacking-example-00.eps img/evas-stacking-example-00.png img/evas-stacking-example-01.eps img/evas-stacking-example-01.png img/evas-stacking-example-02.eps img/evas-stacking-example-02.png img/evas-stacking-example-03.eps img/evas-stacking-example-03.png img/evas-stacking-example-04.eps img/evas-stacking-example-04.png img/evas-stacking-example-05.eps img/evas-stacking-example-05.png img/evas-stacking-example-06.eps img/evas-stacking-example-06.png img/evas-stacking-example-07.eps img/evas-stacking-example-07.png img/fileselector_button_inheritance_tree.eps img/fileselector_button_inheritance_tree.png img/fileselector_entry_inheritance_tree.eps img/fileselector_entry_inheritance_tree.png img/fileselector_inheritance_tree.eps img/fileselector_inheritance_tree.png img/flip_inheritance_tree.eps img/flip_inheritance_tree.png img/flipselector_inheritance_tree.eps img/flipselector_inheritance_tree.png img/forces.eps img/forces.png img/frame_inheritance_tree.eps img/frame_inheritance_tree.png img/gengrid_inheritance_tree.eps img/gengrid_inheritance_tree.png img/genlist.eps img/genlist.png img/genlist_inheritance_tree.eps img/genlist_inheritance_tree.png img/gesture_layer_inheritance_tree.eps img/gesture_layer_inheritance_tree.png img/glview_inheritance_tree.eps img/glview_inheritance_tree.png img/grid_inheritance_tree.eps img/grid_inheritance_tree.png img/growing_balls.eps img/growing_balls.png img/hover_inheritance_tree.eps img/hover_inheritance_tree.png img/hoversel_inheritance_tree.eps img/hoversel_inheritance_tree.png img/icon_inheritance_tree.eps img/icon_inheritance_tree.png img/image-borders.eps img/image-borders.png img/image-fill.eps img/image-fill.png img/image_inheritance_tree.eps img/image_inheritance_tree.png img/index_inheritance_tree.eps img/index_inheritance_tree.png img/inwin_inheritance_tree.eps img/inwin_inheritance_tree.png img/label_inheritance_tree.eps img/label_inheritance_tree.png img/layout-predefined.eps img/layout-predefined.png img/layout_box.eps img/layout_box.png img/layout_colspan.eps img/layout_colspan.png img/layout_inheritance_tree.eps img/layout_inheritance_tree.png img/layout_swallow.eps img/layout_swallow.png img/layout_table.eps img/layout_table.png img/list.eps img/list.png img/list_inheritance_tree.eps img/list_inheritance_tree.png img/map-3d-basic-1.eps img/map-3d-basic-1.png img/map-3d-basic-2.eps img/map-3d-basic-2.png img/map-3d-basic-3.eps img/map-3d-basic-3.png img/map-light.eps img/map-light.png img/map-light2.eps img/map-light2.png img/map-light3.eps img/map-light3.png img/map-light4.eps img/map-light4.png img/map-light5.eps img/map-light5.png img/map-light6.eps img/map-light6.png img/map-light7.eps img/map-light7.png img/map-light8.eps img/map-light8.png img/map-point-order-back.eps img/map-point-order-back.png img/map-point-order-face.eps img/map-point-order-face.png img/map-rotation-2d-1.eps img/map-rotation-2d-1.png img/map-rotation-2d-2.eps img/map-rotation-2d-2.png img/map-rotation-2d-3.eps img/map-rotation-2d-3.png img/map-rotation-2d-4.eps img/map-rotation-2d-4.png img/map-set-map-points-1.eps img/map-set-map-points-1.png img/map-set-map-points-2.eps img/map-set-map-points-2.png img/map-set-map-points-3.eps img/map-set-map-points-3.png img/map-uv-mapping-1.eps img/map-uv-mapping-1.png img/map-uv-mapping-2.eps img/map-uv-mapping-2.png img/map-uv-mapping-3.eps img/map-uv-mapping-3.png img/map-uv-mapping-4.eps img/map-uv-mapping-4.png img/map_inheritance_tree.eps img/map_inheritance_tree.png img/mapbuf_inheritance_tree.eps img/mapbuf_inheritance_tree.png img/menu_inheritance_tree.eps img/menu_inheritance_tree.png img/multibuttonentry_inheritance_tree.eps img/multibuttonentry_inheritance_tree.png img/naviframe_inheritance_tree.eps img/naviframe_inheritance_tree.png img/no_gravity.eps img/no_gravity.png img/notify_inheritance_tree.eps img/notify_inheritance_tree.png img/padding-hints.eps img/padding-hints.png img/panel_inheritance_tree.eps img/panel_inheritance_tree.png img/panes.eps img/panes.png img/panes_inheritance_tree.eps img/panes_inheritance_tree.png img/photo_inheritance_tree.eps img/photo_inheritance_tree.png img/photocam_inheritance_tree.eps img/photocam_inheritance_tree.png img/player_inheritance_tree.eps img/player_inheritance_tree.png img/plug_inheritance_tree.eps img/plug_inheritance_tree.png img/popup_inheritance_tree.eps img/popup_inheritance_tree.png img/prefs.eps img/prefs.png img/prefs_inheritance_tree.eps img/prefs_inheritance_tree.png img/prog_flow.eps img/prog_flow.png img/progressbar_inheritance_tree.eps img/progressbar_inheritance_tree.png img/radio_inheritance_tree.eps img/radio_inheritance_tree.png img/route_inheritance_tree.eps img/route_inheritance_tree.png img/screenshots/anchorblock_01.eps img/screenshots/anchorblock_01.png img/screenshots/check_example_01.eps img/screenshots/check_example_01.png img/screenshots/ctxpopup_example_01.eps img/screenshots/ctxpopup_example_01.png img/screenshots/ctxpopup_example_01_a.eps img/screenshots/ctxpopup_example_01_a.png img/screenshots/ctxpopup_example_01_b.eps img/screenshots/ctxpopup_example_01_b.png img/screenshots/fileselector_button_example_00.eps img/screenshots/fileselector_button_example_00.png img/screenshots/fileselector_button_example_01.eps img/screenshots/fileselector_button_example_01.png img/screenshots/fileselector_button_example_02.eps img/screenshots/fileselector_button_example_02.png img/screenshots/fileselector_button_example_03.eps img/screenshots/fileselector_button_example_03.png img/screenshots/fileselector_entry_example_00.eps img/screenshots/fileselector_entry_example_00.png img/screenshots/fileselector_entry_example_01.eps img/screenshots/fileselector_entry_example_01.png img/screenshots/fileselector_entry_example_02.eps img/screenshots/fileselector_entry_example_02.png img/screenshots/fileselector_entry_example_03.eps img/screenshots/fileselector_entry_example_03.png img/screenshots/hover_example_01_a.eps img/screenshots/hover_example_01_a.png img/screenshots/hoversel_example_01_a.eps img/screenshots/hoversel_example_01_a.png img/screenshots/icon_example_01.eps img/screenshots/icon_example_01.png img/screenshots/index_example_00.eps img/screenshots/index_example_00.png img/screenshots/index_example_01.eps img/screenshots/index_example_01.png img/screenshots/layout_example_01.eps img/screenshots/layout_example_01.png img/screenshots/layout_example_02.eps img/screenshots/layout_example_02.png img/screenshots/layout_example_03.eps img/screenshots/layout_example_03.png img/scroller_inheritance_tree.eps img/scroller_inheritance_tree.png img/segment_control.eps img/segment_control.png img/segment_control_inheritance_tree.eps img/segment_control_inheritance_tree.png img/separator_inheritance_tree.eps img/separator_inheritance_tree.png img/shapes.eps img/shapes.png img/signal2final.eps img/signal2final.png img/slider.eps img/slider.png img/slider_inheritance_tree.eps img/slider_inheritance_tree.png img/slideshow_inheritance_tree.eps img/slideshow_inheritance_tree.png img/spinner_inheritance_tree.eps img/spinner_inheritance_tree.png img/swallow2final.eps img/swallow2final.png img/table_inheritance_tree.eps img/table_inheritance_tree.png img/text-styles.eps img/text-styles.png img/thumb_inheritance_tree.eps img/thumb_inheritance_tree.png img/toolbar.eps img/toolbar.png img/toolbar_inheritance_tree.eps img/toolbar_inheritance_tree.png img/video_inheritance_tree.eps img/video_inheritance_tree.png img/web_inheritance_tree.eps img/web_inheritance_tree.png img/win_inheritance_tree.eps img/win_inheritance_tree.png 

diff --git a/src/lib/elementary/elm_intro.h.in b/elm_intro.h.in
similarity index 100%
rename from src/lib/elementary/elm_intro.h.in
rename to elm_intro.h.in

diff --git a/m4/efl.m4 b/m4/efl.m4
index 3598ce7..ed0b0aa 100644 (file)
--- a/m4/efl.m4
+++ b/m4/efl.m4
@@ -150,6 +150,12 @@ case "m4_defn([DOWNOTHER])" in
    ethumb_client)
       depname="ethumb_client"
       ;;
+   efreet_mime)
+      libdirname="efreet"
+      ;;
+   efreet_trash)
+      libdirname="efreet"
+      ;;
 esac
 requirements_pc_[]m4_defn([DOWNEFL])="${depname} >= ${PACKAGE_VERSION} ${requirements_pc_[][]m4_defn([DOWNEFL])}"
 requirements_cflags_[]m4_defn([DOWNEFL])="-I\$(top_srcdir)/src/lib/${libdirname} -I\$(top_builddir)/src/lib/${libdirname} ${requirements_cflags_[][]m4_defn([DOWNEFL])}"

diff --git a/src/Makefile.am b/src/Makefile.am
index c03ffa5..171fba3 100644 (file)
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -62,6 +62,7 @@ include Makefile_Edje.am
 include Makefile_Emotion.am
 include Makefile_Ethumb.am
 include Makefile_Ethumb_Client.am
+include Makefile_Elementary.am
 
 include Makefile_Eina_Cxx.am
 include Makefile_Ecore_Cxx.am

diff --git a/src/Makefile_Elementary.am b/src/Makefile_Elementary.am
new file mode 100644 (file)
index 0000000..3fc1647
--- /dev/null
+++ b/src/Makefile_Elementary.am
@@ -0,0 +1,671 @@
+
+### Library
+
+elm_eolian_files = \
+       lib/elementary/elm_access.eo \
+       lib/elementary/elm_actionslider.eo \
+       lib/elementary/elm_atspi_bridge.eo \
+       lib/elementary/elm_app_client.eo \
+       lib/elementary/elm_app_client_view.eo \
+       lib/elementary/elm_app_server.eo \
+       lib/elementary/elm_app_server_view.eo \
+       lib/elementary/elm_atspi_app_object.eo \
+       lib/elementary/elm_bg.eo \
+       lib/elementary/elm_box.eo \
+       lib/elementary/elm_bubble.eo \
+       lib/elementary/elm_button.eo \
+       lib/elementary/elm_calendar.eo \
+       lib/elementary/elm_check.eo \
+       lib/elementary/elm_clock.eo \
+       lib/elementary/elm_colorselector.eo \
+       lib/elementary/elm_combobox.eo \
+       lib/elementary/elm_conformant.eo \
+       lib/elementary/elm_container.eo \
+       lib/elementary/elm_ctxpopup.eo \
+       lib/elementary/elm_datetime.eo \
+       lib/elementary/elm_dayselector.eo \
+       lib/elementary/elm_diskselector.eo \
+       lib/elementary/elm_entry.eo \
+       lib/elementary/elm_fileselector.eo \
+       lib/elementary/elm_fileselector_button.eo \
+       lib/elementary/elm_fileselector_entry.eo \
+       lib/elementary/elm_flip.eo \
+       lib/elementary/elm_flipselector.eo \
+       lib/elementary/elm_frame.eo \
+       lib/elementary/elm_gengrid.eo \
+       lib/elementary/elm_gengrid_pan.eo \
+       lib/elementary/elm_genlist.eo \
+       lib/elementary/elm_genlist_pan.eo \
+       lib/elementary/elm_gesture_layer.eo \
+       lib/elementary/elm_glview.eo \
+       lib/elementary/elm_grid.eo \
+       lib/elementary/elm_hover.eo \
+       lib/elementary/elm_hoversel.eo \
+       lib/elementary/elm_icon.eo \
+       lib/elementary/elm_image.eo \
+       lib/elementary/elm_index.eo \
+       lib/elementary/elm_interface_atspi_accessible.eo \
+       lib/elementary/elm_interface_atspi_action.eo \
+       lib/elementary/elm_interface_atspi_component.eo \
+       lib/elementary/elm_interface_atspi_editable_text.eo \
+       lib/elementary/elm_interface_atspi_image.eo \
+       lib/elementary/elm_interface_atspi_selection.eo \
+       lib/elementary/elm_interface_atspi_text.eo \
+       lib/elementary/elm_interface_atspi_value.eo \
+       lib/elementary/elm_interface_atspi_widget_action.eo \
+       lib/elementary/elm_interface_atspi_window.eo \
+       lib/elementary/elm_interface_fileselector.eo \
+       lib/elementary/elm_interface_scrollable.eo \
+       lib/elementary/elm_inwin.eo \
+       lib/elementary/elm_label.eo \
+       lib/elementary/elm_layout.eo \
+       lib/elementary/elm_list.eo \
+       lib/elementary/elm_map.eo \
+       lib/elementary/elm_map_pan.eo \
+       lib/elementary/elm_mapbuf.eo \
+       lib/elementary/elm_menu.eo \
+       lib/elementary/elm_multibuttonentry.eo \
+       lib/elementary/elm_naviframe.eo \
+       lib/elementary/elm_notify.eo \
+       lib/elementary/elm_pan.eo \
+       lib/elementary/elm_panel.eo \
+       lib/elementary/elm_panes.eo \
+       lib/elementary/elm_photo.eo \
+       lib/elementary/elm_photocam.eo \
+       lib/elementary/elm_photocam_pan.eo \
+       lib/elementary/elm_player.eo \
+       lib/elementary/elm_plug.eo \
+       lib/elementary/elm_popup.eo \
+       lib/elementary/elm_prefs.eo \
+       lib/elementary/elm_progressbar.eo \
+       lib/elementary/elm_radio.eo \
+       lib/elementary/elm_route.eo \
+       lib/elementary/elm_scroller.eo \
+       lib/elementary/elm_segment_control.eo \
+       lib/elementary/elm_separator.eo \
+       lib/elementary/elm_slider.eo \
+       lib/elementary/elm_slideshow.eo \
+       lib/elementary/elm_spinner.eo \
+       lib/elementary/elm_sys_notify_interface.eo \
+       lib/elementary/elm_sys_notify.eo \
+       lib/elementary/elm_sys_notify_dbus.eo \
+       lib/elementary/elm_systray.eo \
+       lib/elementary/elm_table.eo \
+       lib/elementary/elm_thumb.eo \
+       lib/elementary/elm_toolbar.eo \
+       lib/elementary/elm_video.eo \
+       lib/elementary/elm_view_list.eo \
+       lib/elementary/elm_view_form.eo \
+       lib/elementary/elm_web.eo \
+       lib/elementary/elm_widget.eo \
+       lib/elementary/elm_win.eo \
+       lib/elementary/elm_win_standard.eo \
+       lib/elementary/elm_widget_item.eo \
+       lib/elementary/elm_color_item.eo \
+       lib/elementary/elm_dayselector_item.eo \
+       lib/elementary/elm_hoversel_item.eo \
+       lib/elementary/elm_segment_control_item.eo \
+       lib/elementary/elm_slideshow_item.eo \
+       lib/elementary/elm_flipselector_item.eo \
+       lib/elementary/elm_menu_item.eo \
+       lib/elementary/elm_ctxpopup_item.eo \
+       lib/elementary/elm_index_item.eo \
+       lib/elementary/elm_multibuttonentry_item.eo \
+       lib/elementary/elm_naviframe_item.eo \
+       lib/elementary/elm_genlist_item.eo \
+       lib/elementary/elm_gengrid_item.eo \
+       lib/elementary/elm_list_item.eo \
+       lib/elementary/elm_toolbar_item.eo \
+       lib/elementary/elm_diskselector_item.eo \
+       lib/elementary/elm_popup_item.eo
+
+elm_eolian_type_files = \
+       lib/elementary/elm_general.eot
+
+elm_eolian_c = $(elm_eolian_files:%.eo=%.eo.c)
+elm_eolian_h = $(elm_eolian_files:%.eo=%.eo.h) \
+       $(elm_eolian_files:%.eo=%.eo.legacy.h) \
+       $(elm_eolian_type_files:%.eot=%.eot.h)
+
+BUILT_SOURCES += \
+       $(elm_eolian_c) \
+       $(elm_eolian_h)
+
+CLEANFILES += \
+       $(elm_eolian_c) \
+       $(elm_eolian_h)
+
+elementaryeolianfilesdir = $(datadir)/eolian/include/elementary-@VMAJ@
+elementaryeolianfiles_DATA = $(elm_eolian_files) $(elm_eolian_type_files)
+
+EXTRA_DIST += ${elementaryeolianfiles_DATA}
+
+lib_LTLIBRARIES += lib/elementary/libelementary.la
+
+includes_HEADERS = \
+lib/elementary/Elementary.h \
+lib/elementary/Elementary_Cursor.h
+includesdir = $(includedir)/elementary-@VMAJ@
+
+includesunstable_HEADERS = \
+       lib/elementary/elm_gen_common.h \
+       lib/elementary/elm_atspi_bridge.h \
+       lib/elementary/elm_interface_atspi_accessible.h \
+       lib/elementary/elm_interface_atspi_text.h \
+       lib/elementary/elm_interface_atspi_widget_action.h \
+       lib/elementary/elm_interface_atspi_window.h \
+       lib/elementary/elm_interface_fileselector.h \
+       lib/elementary/elm_interface_scrollable.h \
+       lib/elementary/elm_interfaces.h \
+       lib/elementary/elm_widget.h \
+       lib/elementary/elm_widget_actionslider.h \
+       lib/elementary/elm_widget_bg.h \
+       lib/elementary/elm_widget_box.h \
+       lib/elementary/elm_widget_bubble.h \
+       lib/elementary/elm_widget_button.h \
+       lib/elementary/elm_widget_calendar.h \
+       lib/elementary/elm_widget_check.h \
+       lib/elementary/elm_widget_clock.h \
+       lib/elementary/elm_widget_colorselector.h \
+       lib/elementary/elm_widget_conform.h \
+       lib/elementary/elm_widget_container.h \
+       lib/elementary/elm_widget_combobox.h \
+       lib/elementary/elm_widget_ctxpopup.h \
+       lib/elementary/elm_widget_datetime.h \
+       lib/elementary/elm_widget_dayselector.h \
+       lib/elementary/elm_widget_diskselector.h \
+       lib/elementary/elm_widget_entry.h \
+       lib/elementary/elm_widget_fileselector.h \
+       lib/elementary/elm_widget_fileselector_button.h \
+       lib/elementary/elm_widget_fileselector_entry.h \
+       lib/elementary/elm_widget_flip.h \
+       lib/elementary/elm_widget_flipselector.h \
+       lib/elementary/elm_widget_frame.h \
+       lib/elementary/elm_widget_gengrid.h \
+       lib/elementary/elm_widget_genlist.h \
+       lib/elementary/elm_widget_glview.h \
+       lib/elementary/elm_widget_grid.h \
+       lib/elementary/elm_widget_hover.h \
+       lib/elementary/elm_widget_hoversel.h \
+       lib/elementary/elm_widget_icon.h \
+       lib/elementary/elm_widget_image.h \
+       lib/elementary/elm_widget_index.h \
+       lib/elementary/elm_widget_inwin.h \
+       lib/elementary/elm_widget_label.h \
+       lib/elementary/elm_widget_layout.h \
+       lib/elementary/elm_widget_list.h \
+       lib/elementary/elm_widget_map.h \
+       lib/elementary/elm_widget_mapbuf.h \
+       lib/elementary/elm_widget_menu.h \
+       lib/elementary/elm_widget_multibuttonentry.h \
+       lib/elementary/elm_widget_naviframe.h \
+       lib/elementary/elm_widget_notify.h \
+       lib/elementary/elm_widget_panel.h \
+       lib/elementary/elm_widget_panes.h \
+       lib/elementary/elm_widget_photo.h \
+       lib/elementary/elm_widget_photocam.h \
+       lib/elementary/elm_widget_player.h \
+       lib/elementary/elm_widget_plug.h \
+       lib/elementary/elm_widget_popup.h \
+       lib/elementary/elm_widget_prefs.h \
+       lib/elementary/elm_widget_progressbar.h \
+       lib/elementary/elm_widget_radio.h \
+       lib/elementary/elm_widget_route.h \
+       lib/elementary/elm_widget_scroller.h \
+       lib/elementary/elm_widget_segment_control.h \
+       lib/elementary/elm_widget_separator.h \
+       lib/elementary/elm_widget_slider.h \
+       lib/elementary/elm_widget_slideshow.h \
+       lib/elementary/elm_widget_spinner.h \
+       lib/elementary/elm_widget_table.h \
+       lib/elementary/elm_widget_thumb.h \
+       lib/elementary/elm_widget_toolbar.h \
+       lib/elementary/elm_widget_video.h \
+       lib/elementary/elm_widget_web.h
+includesunstabledir = $(includedir)/elementary-@VMAJ@
+
+nodist_includesunstable_HEADERS = $(elm_eolian_h)
+
+includesub_HEADERS = \
+       lib/elementary/elc_ctxpopup.h \
+       lib/elementary/elc_ctxpopup_eo.h \
+       lib/elementary/elc_ctxpopup_legacy.h \
+       lib/elementary/elc_combobox.h \
+       lib/elementary/elc_combobox_legacy.h \
+       lib/elementary/elc_fileselector.h \
+       lib/elementary/elc_fileselector_eo.h \
+       lib/elementary/elc_fileselector_legacy.h \
+       lib/elementary/elc_fileselector_common.h \
+       lib/elementary/elc_fileselector_button.h \
+       lib/elementary/elc_fileselector_button_eo.h \
+       lib/elementary/elc_fileselector_button_legacy.h \
+       lib/elementary/elc_fileselector_entry.h \
+       lib/elementary/elc_fileselector_entry_eo.h \
+       lib/elementary/elc_fileselector_entry_legacy.h \
+       lib/elementary/elc_hoversel.h \
+       lib/elementary/elc_hoversel_eo.h \
+       lib/elementary/elc_hoversel_legacy.h \
+       lib/elementary/elc_multibuttonentry.h \
+       lib/elementary/elc_multibuttonentry_eo.h \
+       lib/elementary/elc_multibuttonentry_legacy.h \
+       lib/elementary/elc_multibuttonentry_common.h \
+       lib/elementary/elc_naviframe.h \
+       lib/elementary/elc_naviframe_eo.h \
+       lib/elementary/elc_naviframe_legacy.h \
+       lib/elementary/elc_naviframe_common.h \
+       lib/elementary/elc_popup.h \
+       lib/elementary/elc_popup_eo.h \
+       lib/elementary/elc_popup_legacy.h \
+       lib/elementary/elm_access.h \
+       lib/elementary/elm_actionslider.h \
+       lib/elementary/elm_actionslider_eo.h \
+       lib/elementary/elm_actionslider_legacy.h \
+       lib/elementary/elm_app_common.h \
+       lib/elementary/elm_app_server_eo.h \
+       lib/elementary/elm_app_server_view_eo.h \
+       lib/elementary/elm_app_server_view.h \
+       lib/elementary/elm_app_server_eet.h \
+       lib/elementary/elm_app_server.h \
+       lib/elementary/elm_app_client_eo.h \
+       lib/elementary/elm_app_client.h \
+       lib/elementary/elm_app_client_view_eo.h \
+       lib/elementary/elm_app_client_view.h \
+       lib/elementary/elm_app.h \
+       lib/elementary/elm_atspi_app_object.h \
+       lib/elementary/elm_authors.h \
+       lib/elementary/elm_bg.h \
+       lib/elementary/elm_bg_eo.h \
+       lib/elementary/elm_bg_legacy.h \
+       lib/elementary/elm_box.h \
+       lib/elementary/elm_box_eo.h \
+       lib/elementary/elm_box_legacy.h \
+       lib/elementary/elm_box_common.h \
+       lib/elementary/elm_bubble.h \
+       lib/elementary/elm_bubble_eo.h \
+       lib/elementary/elm_bubble_legacy.h \
+       lib/elementary/elm_button.h \
+       lib/elementary/elm_button_eo.h \
+       lib/elementary/elm_button_legacy.h \
+       lib/elementary/elm_cache.h \
+       lib/elementary/elm_calendar.h \
+       lib/elementary/elm_calendar_eo.h \
+       lib/elementary/elm_calendar_legacy.h \
+       lib/elementary/elm_calendar_common.h \
+       lib/elementary/elm_check.h \
+       lib/elementary/elm_check_eo.h \
+       lib/elementary/elm_check_legacy.h \
+       lib/elementary/elm_clock.h \
+       lib/elementary/elm_clock_eo.h \
+       lib/elementary/elm_clock_legacy.h \
+       lib/elementary/elm_cnp.h \
+       lib/elementary/elm_colorselector.h \
+       lib/elementary/elm_colorselector_eo.h \
+       lib/elementary/elm_colorselector_legacy.h \
+       lib/elementary/elm_colorselector_common.h \
+       lib/elementary/elm_color_class.h \
+       lib/elementary/elm_config.h \
+       lib/elementary/elm_conform.h \
+       lib/elementary/elm_conform_eo.h \
+       lib/elementary/elm_conform_legacy.h \
+       lib/elementary/elm_container.h \
+       lib/elementary/elm_cursor.h \
+       lib/elementary/elm_datetime.h \
+       lib/elementary/elm_datetime_common.h \
+       lib/elementary/elm_datetime_eo.h \
+       lib/elementary/elm_datetime_legacy.h \
+       lib/elementary/elm_dayselector.h \
+       lib/elementary/elm_dayselector_eo.h \
+       lib/elementary/elm_dayselector_legacy.h \
+       lib/elementary/elm_debug.h \
+       lib/elementary/elm_deprecated.h \
+       lib/elementary/elm_diskselector.h \
+       lib/elementary/elm_diskselector_common.h \
+       lib/elementary/elm_diskselector_eo.h \
+       lib/elementary/elm_diskselector_legacy.h \
+       lib/elementary/elm_entry.h \
+       lib/elementary/elm_entry_common.h \
+       lib/elementary/elm_entry_eo.h \
+       lib/elementary/elm_entry_legacy.h \
+       lib/elementary/elm_finger.h \
+       lib/elementary/elm_flip.h \
+       lib/elementary/elm_flip_eo.h \
+       lib/elementary/elm_flip_legacy.h \
+       lib/elementary/elm_flipselector.h \
+       lib/elementary/elm_flipselector_eo.h \
+       lib/elementary/elm_flipselector_legacy.h \
+       lib/elementary/elm_focus.h \
+       lib/elementary/elm_focus_item.h \
+       lib/elementary/elm_font.h \
+       lib/elementary/elm_frame.h \
+       lib/elementary/elm_frame_eo.h \
+       lib/elementary/elm_frame_legacy.h \
+       lib/elementary/elm_gen.h \
+       lib/elementary/elm_general.h \
+       lib/elementary/elm_gengrid.h \
+       lib/elementary/elm_gengrid_common.h \
+       lib/elementary/elm_gengrid_eo.h \
+       lib/elementary/elm_gengrid_legacy.h \
+       lib/elementary/elm_genlist.h \
+       lib/elementary/elm_genlist_common.h \
+       lib/elementary/elm_genlist_eo.h \
+       lib/elementary/elm_genlist_legacy.h \
+       lib/elementary/elm_gesture_layer.h \
+       lib/elementary/elm_gesture_layer_common.h \
+       lib/elementary/elm_gesture_layer_eo.h \
+       lib/elementary/elm_gesture_layer_legacy.h \
+       lib/elementary/elm_getting_started.h \
+       lib/elementary/elm_glview.h \
+       lib/elementary/elm_glview_common.h \
+       lib/elementary/elm_glview_eo.h \
+       lib/elementary/elm_glview_legacy.h \
+       lib/elementary/elm_grid.h \
+       lib/elementary/elm_grid_eo.h \
+       lib/elementary/elm_grid_legacy.h \
+       lib/elementary/elm_hover.h \
+       lib/elementary/elm_hover_eo.h \
+       lib/elementary/elm_hover_legacy.h \
+       lib/elementary/elm_icon.h \
+       lib/elementary/elm_icon_eo.h \
+       lib/elementary/elm_icon_legacy.h \
+       lib/elementary/elm_image.h \
+       lib/elementary/elm_image_eo.h \
+       lib/elementary/elm_image_legacy.h \
+       lib/elementary/elm_index.h \
+       lib/elementary/elm_index_eo.h \
+       lib/elementary/elm_index_legacy.h \
+       ${top_builddir}/elm_intro.h \
+       lib/elementary/elm_inwin.h \
+       lib/elementary/elm_inwin_eo.h \
+       lib/elementary/elm_inwin_legacy.h \
+       lib/elementary/elm_label.h \
+       lib/elementary/elm_label_eo.h \
+       lib/elementary/elm_label_legacy.h \
+       lib/elementary/elm_layout.h \
+       lib/elementary/elm_layout_common.h \
+       lib/elementary/elm_layout_eo.h \
+       lib/elementary/elm_layout_legacy.h \
+       lib/elementary/elm_list.h \
+       lib/elementary/elm_list_eo.h \
+       lib/elementary/elm_list_legacy.h \
+       lib/elementary/elm_macros.h \
+       lib/elementary/elm_map.h \
+       lib/elementary/elm_map_common.h \
+       lib/elementary/elm_map_eo.h \
+       lib/elementary/elm_map_legacy.h \
+       lib/elementary/elm_mapbuf.h \
+       lib/elementary/elm_mapbuf_eo.h \
+       lib/elementary/elm_mapbuf_legacy.h \
+       lib/elementary/elm_menu.h \
+       lib/elementary/elm_menu_eo.h \
+       lib/elementary/elm_menu_legacy.h \
+       lib/elementary/elm_mirroring.h \
+       lib/elementary/elm_need.h \
+       lib/elementary/elm_notify.h \
+       lib/elementary/elm_notify_common.h \
+       lib/elementary/elm_notify_eo.h \
+       lib/elementary/elm_notify_legacy.h \
+       lib/elementary/elm_object.h \
+       lib/elementary/elm_object_item.h \
+       lib/elementary/elm_panel.h \
+       lib/elementary/elm_panel_common.h \
+       lib/elementary/elm_panel_eo.h \
+       lib/elementary/elm_panel_legacy.h \
+       lib/elementary/elm_panes.h \
+       lib/elementary/elm_panes_eo.h \
+       lib/elementary/elm_panes_legacy.h \
+       lib/elementary/elm_photo.h \
+       lib/elementary/elm_photo_eo.h \
+       lib/elementary/elm_photo_legacy.h \
+       lib/elementary/elm_photocam.h \
+       lib/elementary/elm_photocam_eo.h \
+       lib/elementary/elm_photocam_legacy.h \
+       lib/elementary/elm_plug.h \
+       lib/elementary/elm_plug_eo.h \
+       lib/elementary/elm_plug_legacy.h \
+       lib/elementary/elm_prefs.h \
+       lib/elementary/elm_prefs_common.h \
+       lib/elementary/elm_prefs_eo.h \
+       lib/elementary/elm_prefs_legacy.h \
+       lib/elementary/elm_prefs_data.h \
+       lib/elementary/elm_progressbar.h \
+       lib/elementary/elm_progressbar_common.h \
+       lib/elementary/elm_progressbar_eo.h \
+       lib/elementary/elm_progressbar_legacy.h \
+       lib/elementary/elm_radio.h \
+       lib/elementary/elm_radio_eo.h \
+       lib/elementary/elm_radio_legacy.h \
+       lib/elementary/elm_route.h \
+       lib/elementary/elm_route_eo.h \
+       lib/elementary/elm_route_legacy.h \
+       lib/elementary/elm_scale.h \
+       lib/elementary/elm_scroll.h \
+       lib/elementary/elm_scroller.h \
+       lib/elementary/elm_scroller_eo.h \
+       lib/elementary/elm_scroller_legacy.h \
+       lib/elementary/elm_segment_control.h \
+       lib/elementary/elm_segment_control_eo.h \
+       lib/elementary/elm_segment_control_legacy.h \
+       lib/elementary/elm_separator.h \
+       lib/elementary/elm_separator_eo.h \
+       lib/elementary/elm_separator_legacy.h \
+       lib/elementary/elm_slider.h \
+       lib/elementary/elm_slider_common.h \
+       lib/elementary/elm_slider_eo.h \
+       lib/elementary/elm_slider_legacy.h \
+       lib/elementary/elm_slideshow.h \
+       lib/elementary/elm_slideshow_common.h \
+       lib/elementary/elm_slideshow_eo.h \
+       lib/elementary/elm_slideshow_legacy.h \
+       lib/elementary/elm_spinner.h \
+       lib/elementary/elm_spinner_eo.h \
+       lib/elementary/elm_spinner_legacy.h \
+       lib/elementary/elm_store.h \
+       lib/elementary/elm_systray.h \
+       lib/elementary/elm_systray_eo.h \
+       lib/elementary/elm_systray_common.h \
+       lib/elementary/elm_systray_watcher.h \
+       lib/elementary/elm_sys_notify.h \
+       lib/elementary/elm_table.h \
+       lib/elementary/elm_table_eo.h \
+       lib/elementary/elm_table_legacy.h \
+       lib/elementary/elm_theme.h \
+       lib/elementary/elm_thumb.h \
+       lib/elementary/elm_thumb_common.h \
+       lib/elementary/elm_thumb_eo.h \
+       lib/elementary/elm_thumb_legacy.h \
+       lib/elementary/elm_toolbar.h \
+       lib/elementary/elm_toolbar_common.h \
+       lib/elementary/elm_toolbar_eo.h \
+       lib/elementary/elm_toolbar_legacy.h \
+       lib/elementary/elm_tooltip.h \
+       lib/elementary/elm_transit.h \
+       lib/elementary/elm_video.h \
+       lib/elementary/elm_video_eo.h \
+       lib/elementary/elm_video_legacy.h \
+       lib/elementary/elm_view_list.h \
+       lib/elementary/elm_view_form.h \
+       lib/elementary/elm_web.h \
+       lib/elementary/elm_web_common.h \
+       lib/elementary/elm_web_eo.h \
+       lib/elementary/elm_web_legacy.h \
+       lib/elementary/elm_win.h \
+       lib/elementary/elm_win_common.h \
+       lib/elementary/elm_win_eo.h \
+       lib/elementary/elm_win_legacy.h \
+       lib/elementary/elm_win_standard.h \
+       lib/elementary/elm_helper.h
+includesubdir = $(includedir)/elementary-@VMAJ@/
+
+lib_elementary_libelementary_la_SOURCES = \
+       lib/elementary/elm_priv.h \
+       lib/elementary/elementary_config.h \
+       lib/elementary/els_box.h \
+       lib/elementary/elc_ctxpopup.c \
+       lib/elementary/elc_fileselector.c \
+       lib/elementary/elc_fileselector_button.c \
+       lib/elementary/elc_fileselector_entry.c \
+       lib/elementary/elc_hoversel.c \
+       lib/elementary/elc_multibuttonentry.c \
+       lib/elementary/elc_naviframe.c \
+       lib/elementary/elc_player.c \
+       lib/elementary/elc_popup.c \
+       lib/elementary/elc_scrolled_entry.c \
+       lib/elementary/elm_access.c \
+       lib/elementary/elm_actionslider.c \
+       lib/elementary/elm_app_common.c \
+       lib/elementary/elm_app_server_eet.c \
+       lib/elementary/elm_app_server.c \
+       lib/elementary/elm_app_server_view.c \
+       lib/elementary/elm_app_client.c \
+       lib/elementary/elm_app_client_view.c \
+       lib/elementary/elm_atspi_app_object.c \
+       lib/elementary/elm_atspi_bridge.c \
+       lib/elementary/elm_bg.c \
+       lib/elementary/elm_box.c \
+       lib/elementary/elm_bubble.c \
+       lib/elementary/elm_button.c \
+       lib/elementary/elm_calendar.c \
+       lib/elementary/elm_check.c \
+       lib/elementary/elm_clock.c \
+       lib/elementary/elm_cnp.c \
+       lib/elementary/elm_colorselector.c \
+       lib/elementary/elm_color_class.c \
+       lib/elementary/elc_combobox.c \
+       lib/elementary/elm_config.c \
+       lib/elementary/elm_conform.c \
+       lib/elementary/elm_container.c \
+       lib/elementary/elm_datetime.c \
+       lib/elementary/elm_dayselector.c \
+       lib/elementary/elm_dbus_menu.c \
+       lib/elementary/elm_diskselector.c \
+       lib/elementary/elm_entry.c \
+       lib/elementary/elm_flip.c \
+       lib/elementary/elm_flipselector.c \
+       lib/elementary/elm_font.c \
+       lib/elementary/elm_frame.c \
+       lib/elementary/elm_gengrid.c \
+       lib/elementary/elm_genlist.c \
+       lib/elementary/elm_gesture_layer.c \
+       lib/elementary/elm_gesture_layer_extra_gestures.c \
+       lib/elementary/elm_glview.c \
+       lib/elementary/elm_grid.c \
+       lib/elementary/elm_hover.c \
+       lib/elementary/elm_icon.c \
+       lib/elementary/elm_image.c \
+       lib/elementary/elm_index.c \
+       lib/elementary/elm_interface_atspi_accessible.c \
+       lib/elementary/elm_interface_atspi_action.c \
+       lib/elementary/elm_interface_atspi_component.c \
+       lib/elementary/elm_interface_atspi_editable_text.c \
+       lib/elementary/elm_interface_atspi_image.c \
+       lib/elementary/elm_interface_atspi_selection.c \
+       lib/elementary/elm_interface_atspi_text.c \
+       lib/elementary/elm_interface_atspi_value.c \
+       lib/elementary/elm_interface_atspi_widget_action.c \
+       lib/elementary/elm_interface_atspi_window.c \
+       lib/elementary/elm_interface_fileselector.c \
+       lib/elementary/elm_interface_scrollable.c \
+       lib/elementary/elm_inwin.c \
+       lib/elementary/elm_label.c \
+       lib/elementary/elm_layout.c \
+       lib/elementary/elm_list.c \
+       lib/elementary/elm_main.c \
+       lib/elementary/elm_map.c \
+       lib/elementary/elm_mapbuf.c \
+       lib/elementary/elm_menu.c \
+       lib/elementary/elm_module.c \
+       lib/elementary/elm_notify.c \
+       lib/elementary/elm_panel.c \
+       lib/elementary/elm_panes.c \
+       lib/elementary/elm_photo.c \
+       lib/elementary/elm_photocam.c \
+       lib/elementary/elm_plug.c \
+       lib/elementary/elm_prefs.c \
+       lib/elementary/elm_prefs_data.c \
+       lib/elementary/elm_prefs_edd.x \
+       lib/elementary/elm_progressbar.c \
+       lib/elementary/elm_radio.c \
+       lib/elementary/elm_route.c \
+       lib/elementary/elm_scroller.c \
+       lib/elementary/elm_segment_control.c \
+       lib/elementary/elm_separator.c \
+       lib/elementary/elm_slider.c \
+       lib/elementary/elm_slideshow.c \
+       lib/elementary/elm_spinner.c \
+       lib/elementary/elm_store.c \
+       lib/elementary/elm_systray.c \
+       lib/elementary/elm_systray_watcher.c \
+       lib/elementary/elm_sys_notify_interface.c \
+       lib/elementary/elm_sys_notify.c \
+       lib/elementary/elm_sys_notify_dbus.c \
+       lib/elementary/elm_table.c \
+       lib/elementary/elm_theme.c \
+       lib/elementary/elm_thumb.c \
+       lib/elementary/elm_toolbar.c \
+       lib/elementary/elm_transit.c \
+       lib/elementary/elm_util.c \
+       lib/elementary/elm_url.c \
+       lib/elementary/elm_video.c \
+       lib/elementary/elm_view_list.c \
+       lib/elementary/elm_view_form.c \
+       lib/elementary/elm_web2.c \
+       lib/elementary/elm_widget.c \
+       lib/elementary/elm_win.c \
+       lib/elementary/elm_win_standard.c \
+       lib/elementary/elm_helper.c \
+       lib/elementary/els_box.c \
+       lib/elementary/els_cursor.c \
+       lib/elementary/els_tooltip.c \
+       lib/elementary/elu_ews_wm.c
+
+lib_elementary_libelementary_la_CFLAGS = @ELEMENTARY_CFLAGS@
+lib_elementary_libelementary_la_LIBADD = \
+@ELEMENTARY_LIBS@ \
+@LTLIBINTL@
+lib_elementary_libelementary_la_DEPENDENCIES = @ELEMENTARY_INTERNAL_LIBS@
+lib_elementary_libelementary_la_LDFLAGS = @EFL_LTLIBRARY_FLAGS@
+
+lib_elementary_libelementary_la_CPPFLAGS = \
+-DELM_INTERNAL_API_ARGESFSDFEFC=1 \
+-DMODULES_PATH=\"$(pkglibdir)/modules\" \
+-I. \
+-I$(top_builddir) \
+-I$(top_srcdir) \
+-I$(top_srcdir)/src/static_libs/ \
+-I$(top_srcdir)/src/lib/elementary \
+-I$(top_builddir)/src/lib/elementary \
+-DPACKAGE_DATA_DIR=\"$(pkgdatadir)\" \
+-DLOCALE_DIR=\"$(localedir)\" \
+-DPACKAGE_LIB_DIR=\"$(libdir)\" \
+-DICON_DIR=\"$(datadir)/icons\" \
+-DELM_TOP_BUILD_DIR=\"$(top_builddir)\" \
+-DELEMENTARY_BUILD \
+@ELEMENTARY_CFLAGS@
+
+EXTRA_DIST += \
+       lib/elementary/elm_factory.h \
+       lib/elementary/elm_factory.c \
+       $(top_srcdir)/elm_intro.h.in
+
+# if HAVE_ELUA
+
+# elementary_eolian_lua = $(elm_eolian_files:%.eo=%.eo.lua)
+
+# generated_elementary_lua_all = $(elementary_eolian_lua)
+
+# CLEANFILES += $(generated_elementary_lua_all)
+
+# installed_elementaryluadir = $(datadir)/elua/modules/elementary
+# nodist_installed_elementarylua_DATA = $(generated_elementary_lua_all)
+
+# endif
+
+if HAVE_JS
+
+generated_elementary_js_bindings = $(elm_eolian_files:%.eo=%.eo.js.cc)
+
+CLEANFILES += $(generated_elementary_js_bindings)
+
+GENERATED_JS_BINDINGS += $(generated_elementary_js_bindings)
+
+endif

diff --git a/src/lib/elementary/Elementary.h.in b/src/lib/elementary/Elementary.h.in
index f94d6b7..3e948c5 100644 (file)
--- a/src/lib/elementary/Elementary.h.in
+++ b/src/lib/elementary/Elementary.h.in
@@ -13,14 +13,14 @@
 
 @ELM_UNIX_DEF@ ELM_UNIX
 @ELM_WIN32_DEF@ ELM_WIN32
-@ELM_EMAP_DEF@ ELM_EMAP
+#undef ELM_EMAP
 @ELM_DEBUG_DEF@ ELM_DEBUG
 @ELM_ALLOCA_H_DEF@ ELM_ALLOCA_H
 @ELM_LIBINTL_H_DEF@ ELM_LIBINTL_H
 @ELM_DIRENT_H_DEF@ ELM_DIRENT_H
 
 #ifdef EFL_BETA_API_SUPPORT
-@ELM_ELOCATION_DEF@ ELM_ELOCATION
+# define ELM_ELOCATION
 #endif
 
 /* Standard headers for standard system calls etc. */

diff --git a/src/lib/elementary/elementary_config.h b/src/lib/elementary/elementary_config.h
new file mode 100644 (file)
index 0000000..a5c0006
--- /dev/null
+++ b/src/lib/elementary/elementary_config.h
@@ -0,0 +1,3 @@
+#ifdef HAVE_CONFIG_H
+# include "config.h"
+#endif