From 3dabd42a102f8cacf36d69fbb5a893a6c8acfeb4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=A9r=C3=A9my=20Zurcher?= Date: Sun, 26 Feb 2012 23:37:01 +0100 Subject: reorder elementary stack requires: all require elementary, which requires elm_general and elm_tootip --- lib/efl/native/elementary.rb | 3 ++- lib/efl/native/elm/elm_general.rb | 1 + lib/efl/native/elm/elm_object_item.rb | 2 -- tools/genruby.rb | 6 +++--- 4 files changed, 6 insertions(+), 6 deletions(-) diff --git a/lib/efl/native/elementary.rb b/lib/efl/native/elementary.rb index 5e1317f..1bba9d0 100644 --- a/lib/efl/native/elementary.rb +++ b/lib/efl/native/elementary.rb @@ -2,7 +2,8 @@ # -*- coding: UTF-8 -*- # require 'efl/native' -require 'efl/native/evas' +require 'efl/native/elm/elm_general' +require 'efl/native/elm/elm_tooltip' # module Efl # diff --git a/lib/efl/native/elm/elm_general.rb b/lib/efl/native/elm/elm_general.rb index 71b61e2..8cde6ac 100644 --- a/lib/efl/native/elm/elm_general.rb +++ b/lib/efl/native/elm/elm_general.rb @@ -2,6 +2,7 @@ # -*- coding: UTF-8 -*- # require 'efl/native' +require 'efl/native/evas' require 'efl/native/elementary' # module Efl diff --git a/lib/efl/native/elm/elm_object_item.rb b/lib/efl/native/elm/elm_object_item.rb index 86a67d1..5cdc65f 100644 --- a/lib/efl/native/elm/elm_object_item.rb +++ b/lib/efl/native/elm/elm_object_item.rb @@ -3,8 +3,6 @@ # require 'efl/native' require 'efl/native/elementary' -require 'efl/native/elm/elm_general' -require 'efl/native/elm/elm_tooltip' # module Efl # diff --git a/tools/genruby.rb b/tools/genruby.rb index e36eef2..b5922bd 100755 --- a/tools/genruby.rb +++ b/tools/genruby.rb @@ -330,12 +330,12 @@ libs << { libs << { :lib=>'elementary-ver-pre-svn-09.so.0',:header=>'Elementary.h', :modname=>'Elm', :prefix=>'elm', :outfile=>'elementary.rb', - :requires=>['efl/native/evas'], :constants=>[] + :requires=>['efl/native/elm/elm_general','efl/native/elm/elm_tooltip'], :constants=>[] } libs << { :lib=>'elementary-ver-pre-svn-09.so.0',:header=>'elm_general.h', :modname=>'Elm', :prefix=>'elm', :outfile=>'elm/elm_general.rb', - :requires=>['efl/native/elementary'], :constants=>[] + :requires=>['efl/native/evas','efl/native/elementary'], :constants=>[] } libs << { :lib=>'elementary-ver-pre-svn-09.so.0',:header=>'elm_tooltip.h', @@ -345,7 +345,7 @@ libs << { libs << { :lib=>'elementary-ver-pre-svn-09.so.0',:header=>'elm_object_item.h', :modname=>'Elm', :prefix=>'elm_object_item', :outfile=>'elm/elm_object_item.rb', - :requires=>['efl/native/elementary','efl/native/elm/elm_general','efl/native/elm/elm_tooltip'], :constants=>[] + :requires=>['efl/native/elementary'], :constants=>[] } Dir.mkdir lib_path unless (File.exists? lib_path) # -- cgit v1.1-2-g2b99