cross-compile fixes, (odd that this didnt screw up before when i did some

cross-compiling of e for arm), illogict patches too :)

SVN revision: 20552

diff --git a/src/bin/Makefile.am b/src/bin/Makefile.am
index 61fa9a1..c1a2779 100644 (file)
--- a/src/bin/Makefile.am
+++ b/src/bin/Makefile.am
@@ -1,6 +1,5 @@
 MAINTAINERCLEANFILES = Makefile.in
-INCLUDES = -I$(includedir) \
-          -I$(top_srcdir) \
+INCLUDES = -I$(top_srcdir) \
           -I$(top_srcdir)/src/bin \
           -I$(top_srcdir)/src/lib \
           @e_cflags@ \

diff --git a/src/bin/e_apps_error.c b/src/bin/e_apps_error.c
index 5cb3dda..301f91b 100644 (file)
--- a/src/bin/e_apps_error.c
+++ b/src/bin/e_apps_error.c
@@ -60,19 +60,19 @@ _e_app_error_dialog_fill_data(E_App_Autopsy *app, E_Config_Dialog_Data *cfdata)
    if ((app->del.signalled) && (!cfdata->signal))
       {
         if (app->del.exit_signal == SIGINT)
-          snprintf(buf, sizeof(buf), _("%s was interrupted by an Interrupt Singal"),
+          snprintf(buf, sizeof(buf), _("%s was interrupted by an Interrupt Signal"),
                    app->app->exe);
         else if (app->del.exit_signal == SIGQUIT)
-          snprintf(buf, sizeof(buf), _("%s was interrupted by a Quit Singal"),
+          snprintf(buf, sizeof(buf), _("%s was interrupted by a Quit Signal"),
                    app->app->exe);
         else if (app->del.exit_signal == SIGABRT)
-          snprintf(buf, sizeof(buf), _("%s was interrupted by an Abort Singal"),
+          snprintf(buf, sizeof(buf), _("%s was interrupted by an Abort Signal"),
                    app->app->exe);
         else if (app->del.exit_signal == SIGFPE)
           snprintf(buf, sizeof(buf), _("%s was interrupted by a Floating Point Error"),
                    app->app->exe);
         else if (app->del.exit_signal == SIGKILL)
-          snprintf(buf, sizeof(buf), _("%s was interrupted by an Uninterruptable Kill Singal"),
+          snprintf(buf, sizeof(buf), _("%s was interrupted by an Uninterruptable Kill Signal"),
                    app->app->exe);
         else if (app->del.exit_signal == SIGSEGV)
           snprintf(buf, sizeof(buf), _("%s was interrupted by a Segmentation Fault"),
@@ -87,7 +87,7 @@ _e_app_error_dialog_fill_data(E_App_Autopsy *app, E_Config_Dialog_Data *cfdata)
           snprintf(buf, sizeof(buf), _("%s was interrupted by a Bus Error"),
                    app->app->exe);
         else
-          snprintf(buf, sizeof(buf), _("%s was interupted by the signal number %i"),
+          snprintf(buf, sizeof(buf), _("%s was interrupted by the signal number %i"),
                    app->app->exe, app->del.exit_signal);
          cfdata->signal = strdup(buf);
 /* FIXME: Add  sigchld_info stuff

diff --git a/src/bin/e_bindings.c b/src/bin/e_bindings.c
index 52040ce..c1cc5fb 100644 (file)
--- a/src/bin/e_bindings.c
+++ b/src/bin/e_bindings.c
@@ -475,7 +475,6 @@ e_bindings_key_up_event_handle(E_Binding_Context ctxt, E_Object *obj, Ecore_X_Ev
    return NULL;
 }
 
-/* FIXME: finish off signal bindings */
 EAPI void
 e_bindings_signal_add(E_Binding_Context ctxt, char *sig, char *src, E_Binding_Modifier mod, int any_mod, char *action, char *params)
 {
@@ -573,7 +572,6 @@ e_bindings_signal_handle(E_Binding_Context ctxt, E_Object *obj, char *sig, char
    return act;
 }
 
-/* FIXME: finish off wheel bindings */
 EAPI void
 e_bindings_wheel_add(E_Binding_Context ctxt, int direction, int z, E_Binding_Modifier mod, int any_mod, char *action, char *params)
 {

diff --git a/src/bin/e_file_dialog.c b/src/bin/e_file_dialog.c
index a2e409a..8ac49ad 100644 (file)
--- a/src/bin/e_file_dialog.c
+++ b/src/bin/e_file_dialog.c
@@ -63,7 +63,7 @@ e_file_dialog_new(E_Container *con)
    e_widget_min_size_get(ol, &w, &h);
    e_dialog_content_set(dia->dia, ol, w, h);
    
-   e_dialog_button_add(dia->dia, _("Ok"), NULL, _e_file_dialog_button1_click, dia);
+   e_dialog_button_add(dia->dia, _("OK"), NULL, _e_file_dialog_button1_click, dia);
    e_dialog_button_add(dia->dia, _("Cancel"), NULL, _e_file_dialog_button2_click, dia);
    
    return dia;

diff --git a/src/bin/e_fileman_smart.c b/src/bin/e_fileman_smart.c
index 319ebc5..7e6aa0d 100644 (file)
--- a/src/bin/e_fileman_smart.c
+++ b/src/bin/e_fileman_smart.c
@@ -906,7 +906,7 @@ _e_fm_file_delete(E_Fm_Icon *icon)
        char text[PATH_MAX + 256];
 
        dia = e_dialog_new(icon->sd->win->container);
-       e_dialog_button_add(dia, _("Ok"), NULL, NULL, NULL);
+       e_dialog_button_add(dia, _("OK"), NULL, NULL, NULL);
        e_dialog_button_focus_num(dia, 1);
        e_dialog_title_set(dia, _("Error"));
        snprintf(text, PATH_MAX + 256, _("Could not delete  <br><b>%s</b>"), icon->file->path);

diff --git a/src/bin/e_int_border_locks.c b/src/bin/e_int_border_locks.c
index b6a2d71..cb86a14 100644 (file)
--- a/src/bin/e_int_border_locks.c
+++ b/src/bin/e_int_border_locks.c
@@ -351,7 +351,7 @@ _advanced_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data
    e_widget_frametable_object_append(of, ob, 1, 1, 1, 1, 1, 1, 1, 1);
    ob = e_widget_check_add(evas, _("Fullscreen state"), &(cfdata->lock.user.fullscreen));
    e_widget_frametable_object_append(of, ob, 1, 2, 1, 1, 1, 1, 1, 1);
-   ob = e_widget_check_add(evas, _("The border style"), &(cfdata->lock.border));
+   ob = e_widget_check_add(evas, _("Border style"), &(cfdata->lock.border));
    e_widget_frametable_object_append(of, ob, 1, 3, 1, 1, 1, 1, 1, 1);
    e_widget_list_object_append(o, of, 1, 1, 0.5);
    

diff --git a/src/bin/e_int_border_menu.c b/src/bin/e_int_border_menu.c
index f1b0eea..9aaa1e4 100644 (file)
--- a/src/bin/e_int_border_menu.c
+++ b/src/bin/e_int_border_menu.c
@@ -32,15 +32,16 @@ e_int_border_menu_show(E_Border *bd, Evas_Coord x, Evas_Coord y, int key, Ecore_
    E_Menu_Item *mi;
 
    if (bd->border_menu) return;
-   
-   m = e_menu_new();
-   e_menu_category_set(m,"border/stacking");
-   e_menu_category_data_set("border/stacking",bd);
-   bd->border_stacking_menu = m;
+
    /* Only allow to change layer for windows in "normal" layers */
    if ((!bd->lock_user_stacking) &&
        ((bd->layer == 50) || (bd->layer == 100) || (bd->layer == 150)))
      {
+       m = e_menu_new();
+       e_menu_category_set(m,"border/stacking");
+       e_menu_category_data_set("border/stacking",bd);
+       bd->border_stacking_menu = m;
+
        mi = e_menu_item_new(m);
        e_menu_item_label_set(mi, _("Always On Top"));
        e_menu_item_radio_set(mi, 1);
@@ -51,6 +52,7 @@ e_int_border_menu_show(E_Border *bd, Evas_Coord x, Evas_Coord y, int key, Ecore_
                                  (char *)e_theme_edje_file_get("base/theme/borders",
                                                                "widgets/border/default/stack_on_top"),
                                  "widgets/border/default/stack_on_top");
+       
        mi = e_menu_item_new(m);
        e_menu_item_label_set(mi, _("Normal"));
        e_menu_item_radio_set(mi, 1);
@@ -61,6 +63,7 @@ e_int_border_menu_show(E_Border *bd, Evas_Coord x, Evas_Coord y, int key, Ecore_
                                  (char *)e_theme_edje_file_get("base/theme/borders",
                                                                "widgets/border/default/stack_normal"),
                                  "widgets/border/default/stack_normal");
+
        mi = e_menu_item_new(m);
        e_menu_item_label_set(mi, _("Always Below"));
        e_menu_item_radio_set(mi, 1);
@@ -73,15 +76,17 @@ e_int_border_menu_show(E_Border *bd, Evas_Coord x, Evas_Coord y, int key, Ecore_
                                  "widgets/border/default/stack_below");
      }
 
-   m = e_menu_new();
-   e_menu_category_set(m,"border/maximize");
-   e_menu_category_data_set("border/maximize",bd);
-   bd->border_maximize_menu = m;
    /* Only allow to change layer for windows in "normal" layers */
    if ((!bd->lock_user_maximize) && (!bd->shaded) &&
        ((bd->layer == 50) || (bd->layer == 100) || (bd->layer == 150)))
    { 
      int __fullmaximization = 0;
+
+     m = e_menu_new();
+     e_menu_category_set(m,"border/maximize");
+     e_menu_category_data_set("border/maximize",bd);
+     bd->border_maximize_menu = m;
+
      mi = e_menu_item_new(m);
      e_menu_item_label_set(mi, _("Maximized"));
      e_menu_item_check_set(mi, 1);

diff --git a/src/bin/e_int_config_background_import.c b/src/bin/e_int_config_background_import.c
index 18fd5e3..6f466a8 100644 (file)
--- a/src/bin/e_int_config_background_import.c
+++ b/src/bin/e_int_config_background_import.c
@@ -199,7 +199,7 @@ e_int_config_background_import(E_Config_Dialog *parent)
    edje_object_part_swallow(import->bg_obj, "content_swallow", o);
    evas_object_show(o);
    
-   import->ok_obj = e_widget_button_add(evas, _("Ok"), NULL, _import_cb_ok, win, cfdata);
+   import->ok_obj = e_widget_button_add(evas, _("OK"), NULL, _import_cb_ok, win, cfdata);
    e_widget_disabled_set(import->ok_obj, 1);
    e_widget_list_object_append(import->box_obj, import->ok_obj, 1, 0, 0.5);
 

diff --git a/src/bin/e_int_config_window_display.c b/src/bin/e_int_config_window_display.c
index e614fc9..0a8d593 100644 (file)
--- a/src/bin/e_int_config_window_display.c
+++ b/src/bin/e_int_config_window_display.c
@@ -150,7 +150,7 @@ _basic_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data *cf
    rg = e_widget_radio_group_new(&(cfdata->placement));
    ob = e_widget_radio_add(evas, _("Smart Placement"), E_WINDOW_PLACEMENT_SMART, rg);
    e_widget_framelist_object_append(of, ob);
-   ob = e_widget_radio_add(evas, _("Dont hide Gadgets"), E_WINDOW_PLACEMENT_ANTIGADGET, rg);
+   ob = e_widget_radio_add(evas, _("Don't hide Gadgets"), E_WINDOW_PLACEMENT_ANTIGADGET, rg);
    e_widget_framelist_object_append(of, ob);
    ob = e_widget_radio_add(evas, _("Place at mouse pointer"), E_WINDOW_PLACEMENT_CURSOR, rg);
    e_widget_framelist_object_append(of, ob);
@@ -204,7 +204,7 @@ _advanced_create_widgets(E_Config_Dialog *cfd, Evas *evas, E_Config_Dialog_Data
    rg = e_widget_radio_group_new(&(cfdata->placement));
    ob = e_widget_radio_add(evas, _("Smart Placement"), E_WINDOW_PLACEMENT_SMART, rg);
    e_widget_framelist_object_append(of, ob);
-   ob = e_widget_radio_add(evas, _("Dont hide Gadgets"), E_WINDOW_PLACEMENT_ANTIGADGET, rg);
+   ob = e_widget_radio_add(evas, _("Don't hide Gadgets"), E_WINDOW_PLACEMENT_ANTIGADGET, rg);
    e_widget_framelist_object_append(of, ob);
    ob = e_widget_radio_add(evas, _("Place at mouse pointer"), E_WINDOW_PLACEMENT_CURSOR, rg);
    e_widget_framelist_object_append(of, ob);

diff --git a/src/bin/e_main.c b/src/bin/e_main.c
index 93ac47b..11b49eb 100644 (file)
--- a/src/bin/e_main.c
+++ b/src/bin/e_main.c
@@ -202,7 +202,7 @@ main(int argc, char **argv)
                  "\t\tbe used to simulate xinerama.\n"
                  "\t\tEG: -fake-xinerama-screen 800x600+0+0 -fake-xinerama-screen 800x600+800+0\n"
                  "\t-profile CONF_PROFILE\n"
-                 "\t\tUse the configuration profile CONF_PROFILE instead of the the user selected default or just \"default\".\n"
+                 "\t\tUse the configuration profile CONF_PROFILE instead of the user selected default or just \"default\".\n"
                  "\t-good\n"
                  "\t\tBe good.\n"
                  "\t-evil\n"
@@ -374,7 +374,7 @@ main(int argc, char **argv)
        ee = ecore_evas_buffer_new(1, 1);
        if (!ee)
          {
-            e_error_message_show(_("Enlightenment found evas can't create a buffer canvas. Please check\n"
+            e_error_message_show(_("Enlightenment found Evas can't create a buffer canvas. Please check\n"
                                    "Evas has Software Buffer engine support.\n"));
             _e_main_shutdown(-1);
          }
@@ -384,7 +384,7 @@ main(int argc, char **argv)
        evas_object_image_file_set(im, buf, NULL);
        if (evas_object_image_load_error_get(im) != EVAS_LOAD_ERROR_NONE)
          {
-            e_error_message_show(_("Enlightenment found evas can't load PNG files. Check Evas has PNG\n"
+            e_error_message_show(_("Enlightenment found Evas can't load PNG files. Check Evas has PNG\n"
                                    "loader support.\n"));
             _e_main_shutdown(-1);
          }
@@ -393,7 +393,7 @@ main(int argc, char **argv)
        evas_object_image_file_set(im, buf, NULL);
        if (evas_object_image_load_error_get(im) != EVAS_LOAD_ERROR_NONE)
          {
-            e_error_message_show(_("Enlightenment found evas can't load JPEG files. Check Evas has JPEG\n"
+            e_error_message_show(_("Enlightenment found Evas can't load JPEG files. Check Evas has JPEG\n"
                                    "loader support.\n"));
             _e_main_shutdown(-1);
          }
@@ -402,7 +402,7 @@ main(int argc, char **argv)
        evas_object_image_file_set(im, buf, "images/0");
        if (evas_object_image_load_error_get(im) != EVAS_LOAD_ERROR_NONE)
          {
-            e_error_message_show(_("Enlightenment found evas can't load EET files. Check Evas has EET\n"
+            e_error_message_show(_("Enlightenment found Evas can't load EET files. Check Evas has EET\n"
                                    "loader support.\n"));
             _e_main_shutdown(-1);
          }

diff --git a/src/bin/e_module.c b/src/bin/e_module.c
index 3ab2a54..d9fda13 100644 (file)
--- a/src/bin/e_module.c
+++ b/src/bin/e_module.c
@@ -145,8 +145,8 @@ e_module_new(char *name)
                                       "The full path to this module is:<br>"
                                       "%s<br>"
                                       "The error reported was:<br>"
-                                      "Module does not contain all needed functions<br>"),
-                                    name, buf);
+                                      "%s<br>"),
+                                    name, buf, _("Module does not contain all needed functions"));
        _e_module_dialog_disable_show(_("Error loading Module"), body, m);
        m->api = NULL;
        m->func.init = NULL;
@@ -471,7 +471,7 @@ _e_module_control_menu_new(E_Module *mod)
    m = e_menu_new();
    
    mi = e_menu_item_new(m);
-   e_menu_item_label_set(mi, _("About..."));
+   e_menu_item_label_set(mi, _("About…"));
    e_menu_item_callback_set(mi, _e_module_control_menu_about, mod);
    
    mi = e_menu_item_new(m);

diff --git a/src/lib/Makefile.am b/src/lib/Makefile.am
index 6782ae9..837f9dd 100644 (file)
--- a/src/lib/Makefile.am
+++ b/src/lib/Makefile.am
@@ -1,6 +1,5 @@
 MAINTAINERCLEANFILES   = Makefile.in
-INCLUDES               = -I$(includedir) \
-                         -I$(top_srcdir)/src/bin \
+INCLUDES               = -I$(top_srcdir)/src/bin \
                          @e_cflags@
 
 lib_LTLIBRARIES                = libe.la

diff --git a/src/modules/battery/Makefile.am b/src/modules/battery/Makefile.am
index c2491f7..c8225ec 100644 (file)
--- a/src/modules/battery/Makefile.am
+++ b/src/modules/battery/Makefile.am
@@ -11,7 +11,6 @@ EXTRA_DIST = $(files_DATA)
 # the module .so file
 INCLUDES               = -I. \
                          -I$(top_srcdir) \
-                         -I$(includedir) \
                          -I$(top_srcdir)/$(MODULE) \
                          -I$(top_srcdir)/src/bin \
                          -I$(top_srcdir)/src/lib \

diff --git a/src/modules/battery/e_mod_main.c b/src/modules/battery/e_mod_main.c
index f010224..57c1e00 100644 (file)
--- a/src/modules/battery/e_mod_main.c
+++ b/src/modules/battery/e_mod_main.c
@@ -562,7 +562,7 @@ _battery_cb_check(void *data)
                                 e_dialog_text_set(dia, _("Battery Running Low<br>"
                                                          "Your battery is running low.<br>"
                                                          "You may wish to switch to an AC source."));
-                                e_dialog_button_add(dia, _("Ok"), NULL, NULL, NULL);
+                                e_dialog_button_add(dia, _("OK"), NULL, NULL, NULL);
                                 e_win_centered_set(dia->win, 1);
                                 e_dialog_show(dia);
                              }

diff --git a/src/modules/clock/Makefile.am b/src/modules/clock/Makefile.am
index 4641ec5..782c308 100644 (file)
--- a/src/modules/clock/Makefile.am
+++ b/src/modules/clock/Makefile.am
@@ -11,7 +11,6 @@ EXTRA_DIST = $(files_DATA)
 # the module .so file
 INCLUDES               = -I. \
                          -I$(top_srcdir) \
-                         -I$(includedir) \
                          -I$(top_srcdir)/$(MODULE) \
                          -I$(top_srcdir)/src/bin \
                          -I$(top_srcdir)/src/lib \

diff --git a/src/modules/cpufreq/Makefile.am b/src/modules/cpufreq/Makefile.am
index 64e3ec1..3714b1a 100644 (file)
--- a/src/modules/cpufreq/Makefile.am
+++ b/src/modules/cpufreq/Makefile.am
@@ -11,7 +11,6 @@ EXTRA_DIST = $(files_DATA)
 # the module .so file
 INCLUDES               = -I. \
                          -I$(top_srcdir) \
-                         -I$(includedir) \
                          -I$(top_srcdir)/$(MODULE) \
                          -I$(top_srcdir)/src/bin \
                          -I$(top_srcdir)/src/lib \

diff --git a/src/modules/cpufreq/e_mod_main.c b/src/modules/cpufreq/e_mod_main.c
index ce6dfe5..fd7e37f 100644 (file)
--- a/src/modules/cpufreq/e_mod_main.c
+++ b/src/modules/cpufreq/e_mod_main.c
@@ -315,7 +315,7 @@ _cpufreq_set_governor(Cpufreq *e, const char *governor)
        e_dialog_icon_set(dia, "enlightenment/e", 64);
        e_dialog_text_set(dia, _("There was an error trying to set the cpu frequency<br>"
                                 "governor via the module's setfreq utility."));
-       e_dialog_button_add(dia, _("Ok"), NULL, NULL, NULL);
+       e_dialog_button_add(dia, _("OK"), NULL, NULL, NULL);
        e_win_centered_set(dia->win, 1);
        e_dialog_show(dia);
      }
@@ -343,7 +343,7 @@ _cpufreq_set_frequency(Cpufreq *e, int frequency)
        e_dialog_icon_set(dia, "enlightenment/e", 64);
        e_dialog_text_set(dia, _("There was an error trying to set the cpu frequency<br>"
                                 "setting via the module's setfreq utility."));
-       e_dialog_button_add(dia, _("Ok"), NULL, NULL, NULL);
+       e_dialog_button_add(dia, _("OK"), NULL, NULL, NULL);
        e_win_centered_set(dia->win, 1);
        e_dialog_show(dia);
      }
@@ -570,10 +570,10 @@ _cpufreq_config_menu_new(Cpufreq *e)
             frequency = (int)l->data;
             mi = e_menu_item_new(mn);
             if (frequency < 1000000)
-              snprintf(buf, sizeof(buf), _("%i Mhz"), 
+              snprintf(buf, sizeof(buf), _("%i MHz"), 
                        frequency / 1000);
             else
-              snprintf(buf, sizeof(buf), _("%i.%i Ghz"), 
+              snprintf(buf, sizeof(buf), _("%i.%i GHz"), 
                        frequency / 1000000, (frequency % 1000000) / 100000);
             buf[sizeof(buf) - 1] = 0;
             e_menu_item_label_set(mi, buf);

diff --git a/src/modules/dropshadow/Makefile.am b/src/modules/dropshadow/Makefile.am
index 4bc5855..9ae4a88 100644 (file)
--- a/src/modules/dropshadow/Makefile.am
+++ b/src/modules/dropshadow/Makefile.am
@@ -23,7 +23,6 @@ EXTRA_DIST = $(files_DATA)
 # the module .so file
 INCLUDES               = -I. \
                          -I$(top_srcdir) \
-                         -I$(includedir) \
                          -I$(top_srcdir)/$(MODULE) \
                          -I$(top_srcdir)/src/bin \
                          -I$(top_srcdir)/src/lib \

diff --git a/src/modules/gadget_test/Makefile.am b/src/modules/gadget_test/Makefile.am
index 292a811..73f43b6 100644 (file)
--- a/src/modules/gadget_test/Makefile.am
+++ b/src/modules/gadget_test/Makefile.am
@@ -9,7 +9,6 @@ EXTRA_DIST = $(files_DATA)
 # the module .so file
 INCLUDES               = -I. \
                          -I$(top_srcdir) \
-                         -I$(includedir) \
                          -I$(top_srcdir)/$(MODULE) \
                          -I$(top_srcdir)/src/bin \
                          -I$(top_srcdir)/src/lib \

diff --git a/src/modules/ibar/Makefile.am b/src/modules/ibar/Makefile.am
index 4dbeb5f..cc74611 100644 (file)
--- a/src/modules/ibar/Makefile.am
+++ b/src/modules/ibar/Makefile.am
@@ -11,7 +11,6 @@ EXTRA_DIST = $(files_DATA)
 # the module .so file
 INCLUDES               = -I. \
                          -I$(top_srcdir) \
-                         -I$(includedir) \
                          -I$(top_srcdir)$(MODULE) \
                          -I$(top_srcdir)/src/bin \
                          -I$(top_srcdir)/src/lib \

diff --git a/src/modules/ibox/Makefile.am b/src/modules/ibox/Makefile.am
index 8cab540..f80f5e3 100644 (file)
--- a/src/modules/ibox/Makefile.am
+++ b/src/modules/ibox/Makefile.am
@@ -11,7 +11,6 @@ EXTRA_DIST = $(files_DATA)
 # the module .so file
 INCLUDES               = -I. \
                          -I$(top_srcdir) \
-                         -I$(includedir) \
                          -I$(top_srcdir)/$(MODULE) \
                          -I$(top_srcdir)/src/bin \
                          -I$(top_srcdir)/src/lib \

diff --git a/src/modules/itray/Makefile.am b/src/modules/itray/Makefile.am
index 43b92ed..0482129 100644 (file)
--- a/src/modules/itray/Makefile.am
+++ b/src/modules/itray/Makefile.am
@@ -11,7 +11,6 @@ EXTRA_DIST = $(files_DATA)
 # the module .so file
 INCLUDES               = -I. \
                          -I$(top_srcdir) \
-                         -I$(includedir) \
                          -I$(top_srcdir)/$(MODULE) \
                          -I$(top_srcdir)/src/bin \
                          -I$(top_srcdir)/src/lib \

diff --git a/src/modules/pager/Makefile.am b/src/modules/pager/Makefile.am
index 13025f9..db9b535 100644 (file)
--- a/src/modules/pager/Makefile.am
+++ b/src/modules/pager/Makefile.am
@@ -11,7 +11,6 @@ EXTRA_DIST = $(files_DATA)
 # the module .so file
 INCLUDES               = -I. \
                          -I$(top_srcdir) \
-                         -I$(includedir) \
                          -I$(top_srcdir)/$(MODULE) \
                          -I$(top_srcdir)/src/bin \
                          -I$(top_srcdir)/src/lib \

diff --git a/src/modules/randr/Makefile.am b/src/modules/randr/Makefile.am
index c5bb442..33e9896 100644 (file)
--- a/src/modules/randr/Makefile.am
+++ b/src/modules/randr/Makefile.am
@@ -11,7 +11,6 @@ MODULE = randr
 # the module .so file
 INCLUDES               = -I. \
                          -I$(top_srcdir) \
-                         -I$(includedir) \
                          -I$(top_srcdir)/$(MODULE) \
                          -I$(top_srcdir)/src/bin \
                          -I$(top_srcdir)/src/lib \

diff --git a/src/modules/start/Makefile.am b/src/modules/start/Makefile.am
index fc4a7f5..f81bfc6 100644 (file)
--- a/src/modules/start/Makefile.am
+++ b/src/modules/start/Makefile.am
@@ -11,7 +11,6 @@ EXTRA_DIST = $(files_DATA)
 # the module .so file
 INCLUDES               = -I. \
                          -I$(top_srcdir) \
-                         -I$(includedir) \
                          -I$(top_srcdir)$(MODULE) \
                          -I$(top_srcdir)/src/bin \
                          -I$(top_srcdir)/src/lib \

diff --git a/src/modules/temperature/Makefile.am b/src/modules/temperature/Makefile.am
index 38533e9..1d65440 100644 (file)
--- a/src/modules/temperature/Makefile.am
+++ b/src/modules/temperature/Makefile.am
@@ -11,7 +11,6 @@ EXTRA_DIST = $(files_DATA)
 # the module .so file
 INCLUDES               = -I. \
                          -I$(top_srcdir) \
-                         -I$(includedir) \
                          -I$(top_srcdir)/$(MODULE) \
                          -I$(top_srcdir)/src/bin \
                          -I$(top_srcdir)/src/lib \

diff --git a/src/modules/test/Makefile.am b/src/modules/test/Makefile.am
index 2c6f7a9..b4ad151 100644 (file)
--- a/src/modules/test/Makefile.am
+++ b/src/modules/test/Makefile.am
@@ -9,7 +9,6 @@ EXTRA_DIST = $(files_DATA)
 # the module .so file
 INCLUDES               = -I. \
                          -I$(top_srcdir) \
-                         -I$(includedir) \
                          -I$(top_srcdir)/$(MODULE) \
                          -I$(top_srcdir)/src/bin \
                          -I$(top_srcdir)/src/lib \

diff --git a/src/preload/Makefile.am b/src/preload/Makefile.am
index c08c6b2..f915608 100644 (file)
--- a/src/preload/Makefile.am
+++ b/src/preload/Makefile.am
@@ -2,7 +2,6 @@ MAINTAINERCLEANFILES = Makefile.in
 
 INCLUDES               = -I. \
                          -I$(top_srcdir) \
-                        -I$(includedir) \
                          -I$(top_srcdir)src/preload \
                          @x_cflags@
 pkgdir                 = $(libdir)/enlightenment/preload