pass make distcheck for evry - move the disparate evry module c files

into evry dir as the disparate module dirs are missing e_mod_main.c anyway ande can no longer build as stand alone modules anyway. SVN revision: 59939
13 years ago · e4a94c3888
parent 59ea0d4f62
commit e4a94c3888
65 changed files with 112123 additions and 104978 deletions
--- a/configure.ac
+++ b/configure.ac
@ -708,7 +708,6 @@ AC_E_OPTIONAL_MODULE([ofono], true, [CHECK_MODULE_OFONO])
 AC_E_OPTIONAL_MODULE([illume2], true)
 AC_E_OPTIONAL_MODULE([syscon], true)
 AC_E_OPTIONAL_MODULE([everything], true)
-AC_E_OPTIONAL_MODULE([everything-as-modules], false)
 AC_E_OPTIONAL_MODULE([systray], true)
 AC_E_OPTIONAL_MODULE([comp], true)
 AC_E_OPTIONAL_MODULE([shot], true)
@ -851,16 +850,6 @@ src/modules/syscon/module.desktop
 src/modules/everything/Makefile
 src/modules/everything/module.desktop
 src/modules/everything/everything.pc
-src/modules/everything-files/Makefile
-src/modules/everything-files/module.desktop
-src/modules/everything-apps/Makefile
-src/modules/everything-apps/module.desktop
-src/modules/everything-windows/Makefile
-src/modules/everything-windows/module.desktop
-src/modules/everything-settings/Makefile
-src/modules/everything-settings/module.desktop
-src/modules/everything-calc/Makefile
-src/modules/everything-calc/module.desktop
 src/modules/systray/Makefile
 src/modules/systray/module.desktop
 src/modules/comp/Makefile
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@ -201,11 +201,11 @@ src/modules/everything/evry_plug_aggregator.c
 src/modules/everything/evry_plug_clipboard.c
 src/modules/everything/evry_view_help.c
 src/modules/everything/evry_util.c
-src/modules/everything-apps/evry_plug_apps.c
-src/modules/everything-calc/evry_plug_calc.c
-src/modules/everything-files/evry_plug_files.c
-src/modules/everything-settings/evry_plug_settings.c
-src/modules/everything-windows/evry_plug_windows.c
+src/modules/everything/evry_plug_apps.c
+src/modules/everything/evry_plug_calc.c
+src/modules/everything/evry_plug_files.c
+src/modules/everything/evry_plug_settings.c
+src/modules/everything/evry_plug_windows.c
 src/modules/fileman/e_int_config_mime.c
 src/modules/fileman/e_int_config_mime_edit.c
 src/modules/fileman/e_mod_main.c
--- a/po/ar.po
+++ b/po/ar.po
--- a/po/bg.po
+++ b/po/bg.po
--- a/po/ca.po
+++ b/po/ca.po
--- a/po/cs.po
+++ b/po/cs.po
--- a/po/da.po
+++ b/po/da.po
--- a/po/de.po
+++ b/po/de.po
--- a/po/el.po
+++ b/po/el.po
--- a/po/eo.po
+++ b/po/eo.po
--- a/po/es.po
+++ b/po/es.po
--- a/po/et.po
+++ b/po/et.po
--- a/po/fi.po
+++ b/po/fi.po
--- a/po/fo.po
+++ b/po/fo.po
--- a/po/fr.po
+++ b/po/fr.po
--- a/po/fr_CH.po
+++ b/po/fr_CH.po
--- a/po/he.po
+++ b/po/he.po
--- a/po/hr.po
+++ b/po/hr.po
--- a/po/hu.po
+++ b/po/hu.po
--- a/po/it.po
+++ b/po/it.po
@ -6,7 +6,7 @@ msgid ""
 msgstr ""
 "Project-Id-Version: Enlightenment 0.17\n"
 "Report-Msgid-Bugs-To: enlightenment-devel@lists.sourceforge.net\n"
-"POT-Creation-Date: 2011-05-30 18:50+0200\n"
+"POT-Creation-Date: 2011-06-04 10:05+0900\n"
 "PO-Revision-Date: 2011-05-30 18:54+0200\n"
 "Last-Translator: Massimo Maiurana <maiurana@gmail.com>\n"
 "Language-Team: none\n"
@ -25,9 +25,8 @@ msgstr "Informazioni su Enlightenment"
 #: src/modules/conf_edgebindings/e_int_config_edgebindings.c:845
 #: src/modules/conf_theme/e_int_config_wallpaper_web.c:237
 #: src/modules/conf_theme/e_int_config_theme_web.c:129
-#: src/modules/everything-windows/evry_plug_windows.c:447
-#: src/modules/fileman/e_fwin.c:2011 src/modules/illume/e_mod_win.c:173
-#: src/modules/mixer/app_mixer.c:514
+#: src/modules/everything/evry_plug_windows.c:446
+#: src/modules/fileman/e_fwin.c:2011 src/modules/mixer/app_mixer.c:514
 msgid "Close"
 msgstr "Chiudi"

@ -578,7 +577,7 @@ msgstr "Mostra menù..."

 #: src/bin/e_actions.c:3001 src/bin/e_actions.c:3006
 #: src/modules/conf/e_mod_main.c:264 src/modules/conf/e_mod_main.c:367
-#: src/modules/everything-apps/evry_plug_apps.c:1064
+#: src/modules/everything/evry_plug_apps.c:1062
 #: src/modules/fileman/e_mod_main.c:72 src/modules/fileman/e_mod_main.c:156
 msgid "Launch"
 msgstr "Lancia"
@ -1053,7 +1052,7 @@ msgstr "File desktop"
 #: src/modules/conf_performance/e_int_config_performance.c:115
 #: src/modules/everything/evry_config.c:379
 #: src/modules/everything/evry_config.c:463
-#: src/modules/everything-files/evry_plug_files.c:1493
+#: src/modules/everything/evry_plug_files.c:1492
 #: src/modules/pager/e_mod_config.c:126 src/modules/pager/e_mod_config.c:213
 msgid "General"
 msgstr "Impostazioni generali"
@ -1062,8 +1061,7 @@ msgstr "Impostazioni generali"
 msgid "Startup Notify"
 msgstr "Notifica avvio"

-#: src/bin/e_eap_editor.c:784
-#: src/modules/everything-apps/evry_plug_apps.c:1078
+#: src/bin/e_eap_editor.c:784 src/modules/everything/evry_plug_apps.c:1076
 msgid "Run in Terminal"
 msgstr "Esegui in terminale"

@ -1130,7 +1128,8 @@ msgstr "Enlightenment non ha potuto tornare alla directory:<br><br>%s"
 #: src/bin/e_exec.c:261
 #, c-format
 msgid "Enlightenment was unable to fork a child process:<br><br>%s"
-msgstr "Enlightenment non ha potuto fare il fork di un processo figlio:<br><br>%s"
+msgstr ""
+"Enlightenment non ha potuto fare il fork di un processo figlio:<br><br>%s"

 #: src/bin/e_exec.c:389
 msgid "Application run error"
@ -1801,7 +1800,7 @@ msgid "ICCCM/NetWM"
 msgstr "ICCCM/NetWM"

 #: src/bin/e_int_border_menu.c:641
-#: src/modules/everything-windows/evry_plug_windows.c:433
+#: src/modules/everything/evry_plug_windows.c:432
 msgid "Iconify"
 msgstr "Iconifica"

@ -2139,15 +2138,15 @@ msgid "Utilities"
 msgstr "Utilità"

 #: src/bin/e_int_config_modules.c:55
-#: src/modules/everything-files/evry_plug_files.c:1370
-#: src/modules/everything-files/evry_plug_files.c:1379
-#: src/modules/everything-files/evry_plug_files.c:1603
+#: src/modules/everything/evry_plug_files.c:1369
+#: src/modules/everything/evry_plug_files.c:1378
+#: src/modules/everything/evry_plug_files.c:1602
 #: src/modules/fileman/e_mod_main.c:56 src/modules/fileman/e_mod_main.c:76
 #: src/modules/fileman/e_mod_main.c:416
 msgid "Files"
 msgstr "File"

-#: src/bin/e_int_config_modules.c:56 src/modules/everything/e_mod_main.c:70
+#: src/bin/e_int_config_modules.c:56 src/modules/everything/e_mod_main.c:68
 msgid "Launcher"
 msgstr "Lanciatore"

@ -2165,7 +2164,7 @@ msgstr "Mobile"
 #: src/modules/conf/e_conf.c:124 src/modules/conf/e_conf.c:134
 #: src/modules/conf/e_mod_main.c:102 src/modules/conf_dialogs/e_mod_main.c:17
 #: src/modules/conf_theme/e_int_config_cursor.c:133
-#: src/modules/everything-settings/evry_plug_settings.c:190
+#: src/modules/everything/evry_plug_settings.c:189
 #: src/modules/ibar/e_mod_main.c:309 src/modules/ibar/e_mod_main.c:807
 #: src/modules/ibox/e_mod_main.c:301 src/modules/ibox/e_mod_main.c:694
 #: src/modules/pager/e_mod_main.c:790 src/modules/temperature/e_mod_main.c:226
@ -2218,11 +2217,11 @@ msgstr "Impostazioni barra strumenti"
 msgid "Layout"
 msgstr "Posizione"

-#: src/bin/e_intl.c:341
+#: src/bin/e_intl.c:342
 msgid "Input Method Error"
 msgstr "Errore del metodo di input"

-#: src/bin/e_intl.c:342
+#: src/bin/e_intl.c:343
 msgid ""
 "Error starting the input method executable<br><br>please make sure that your "
 "input<br>method configuration is correct and<br>that your "
@ -2247,9 +2246,9 @@ msgstr "Applicazioni preferite"
 #: src/modules/conf_menus/e_int_config_menus.c:260
 #: src/modules/conf_menus/e_int_config_menus.c:283
 #: src/modules/conf_window_remembers/e_int_config_remembers.c:194
-#: src/modules/everything-apps/evry_plug_apps.c:1031
-#: src/modules/everything-apps/evry_plug_apps.c:1049
-#: src/modules/everything-apps/evry_plug_apps.c:1311
+#: src/modules/everything/evry_plug_apps.c:1029
+#: src/modules/everything/evry_plug_apps.c:1047
+#: src/modules/everything/evry_plug_apps.c:1309
 #: src/modules/wizard/page_070.c:201
 msgid "Applications"
 msgstr "Applicazioni"
@ -2257,7 +2256,7 @@ msgstr "Applicazioni"
 #: src/bin/e_int_menus.c:151 src/bin/e_int_menus.c:1119
 #: src/modules/conf_window_manipulation/e_mod_main.c:17
 #: src/modules/conf_window_remembers/e_mod_main.c:14
-#: src/modules/everything-windows/evry_plug_windows.c:418
+#: src/modules/everything/evry_plug_windows.c:417
 #: src/modules/winlist/e_mod_main.c:25
 msgid "Windows"
 msgstr "Finestre"
@ -3643,7 +3642,7 @@ msgstr "ERRORE"
 msgid "Battery Meter"
 msgstr "Indicatore di carica"

-#: src/modules/clock/e_mod_main.c:141
+#: src/modules/clock/e_mod_main.c:149
 msgid "Clock"
 msgstr "Clock"

@ -6371,28 +6370,28 @@ msgstr "Molto chiara"
 msgid "Dropshadow"
 msgstr "Dropshadow"

-#: src/modules/everything/e_mod_main.c:61
-#: src/modules/everything/e_mod_main.c:211
+#: src/modules/everything/e_mod_main.c:59
+#: src/modules/everything/e_mod_main.c:207
 msgid "Everything Launcher"
 msgstr "Pannello di Everything"

-#: src/modules/everything/e_mod_main.c:62
+#: src/modules/everything/e_mod_main.c:60
 msgid "Show Everything Launcher"
 msgstr "Mostra lanciatore Everything"

-#: src/modules/everything/e_mod_main.c:76
+#: src/modules/everything/e_mod_main.c:74
 msgid "Everything Configuration"
 msgstr "Configurazione di Everything"

-#: src/modules/everything/e_mod_main.c:212
+#: src/modules/everything/e_mod_main.c:208
 msgid "Show Everything Dialog"
 msgstr "Mostra finestra di dialogo di Everything"

-#: src/modules/everything/e_mod_main.c:413
+#: src/modules/everything/e_mod_main.c:409
 msgid "Everything Module"
 msgstr "Modulo Everything"

-#: src/modules/everything/e_mod_main.c:595
+#: src/modules/everything/e_mod_main.c:591
 msgid "Run Everything"
 msgstr "Pannello di Everything"

@ -6613,136 +6612,136 @@ msgstr ""
 "hilight> cambia visualizzazione a elenco<br>    <hilight>&lt;ctrl+3&gt;</"
 "hilight> cambia visualizzazione a miniature"

-#: src/modules/everything-apps/evry_plug_apps.c:1040
+#: src/modules/everything/evry_plug_apps.c:1038
 msgid "Exebuf"
 msgstr "Riga di comando"

-#: src/modules/everything-apps/evry_plug_apps.c:1057
+#: src/modules/everything/evry_plug_apps.c:1055
 msgid "Open With..."
 msgstr "Apri con..."

-#: src/modules/everything-apps/evry_plug_apps.c:1071
+#: src/modules/everything/evry_plug_apps.c:1069
 msgid "Open File..."
 msgstr "Apri file..."

-#: src/modules/everything-apps/evry_plug_apps.c:1085
+#: src/modules/everything/evry_plug_apps.c:1083
 msgid "Edit Application Entry"
 msgstr "Modifica applicazione"

-#: src/modules/everything-apps/evry_plug_apps.c:1092
+#: src/modules/everything/evry_plug_apps.c:1090
 msgid "New Application Entry"
 msgstr "Nuova applicazione"

-#: src/modules/everything-apps/evry_plug_apps.c:1099
+#: src/modules/everything/evry_plug_apps.c:1097
 msgid "Run with Sudo"
 msgstr "Esegui con Sudo"

-#: src/modules/everything-apps/evry_plug_apps.c:1105
+#: src/modules/everything/evry_plug_apps.c:1103
 #: src/modules/fileman/e_fwin.c:1682 src/modules/fileman/e_fwin.c:2007
 msgid "Open with..."
 msgstr "Apri con..."

-#: src/modules/everything-apps/evry_plug_apps.c:1112
+#: src/modules/everything/evry_plug_apps.c:1110
 msgid "Open Terminal here"
 msgstr "Apri terminale qui"

-#: src/modules/everything-apps/evry_plug_apps.c:1118
+#: src/modules/everything/evry_plug_apps.c:1116
 msgid "Run Executable"
 msgstr "Lancia eseguibile"

-#: src/modules/everything-apps/evry_plug_apps.c:1193
-#: src/modules/everything-apps/evry_plug_apps.c:1332
+#: src/modules/everything/evry_plug_apps.c:1191
+#: src/modules/everything/evry_plug_apps.c:1330
 msgid "Everything Applications"
 msgstr "Modulo applicazioni di Everything"

-#: src/modules/everything-apps/evry_plug_apps.c:1226
+#: src/modules/everything/evry_plug_apps.c:1224
 msgid "Commands"
 msgstr "Comandi"

-#: src/modules/everything-apps/evry_plug_apps.c:1227
+#: src/modules/everything/evry_plug_apps.c:1225
 msgid "Terminal Command"
 msgstr "Comando terminale"

-#: src/modules/everything-apps/evry_plug_apps.c:1232
+#: src/modules/everything/evry_plug_apps.c:1230
 msgid "Sudo GUI"
 msgstr "Interfaccia sudo"

-#: src/modules/everything-apps/evry_plug_apps.c:1311
-#: src/modules/everything-files/evry_plug_files.c:1603
+#: src/modules/everything/evry_plug_apps.c:1309
+#: src/modules/everything/evry_plug_files.c:1602
 msgid "Everything Plugin"
 msgstr "Plugin di Everything"

-#: src/modules/everything-calc/evry_plug_calc.c:255
+#: src/modules/everything/evry_plug_calc.c:254
 msgid "Calculator"
 msgstr "Calcolatrice"

-#: src/modules/everything-files/evry_plug_files.c:1332
+#: src/modules/everything/evry_plug_files.c:1331
 msgid "Copy To ..."
 msgstr "Copia in ..."

-#: src/modules/everything-files/evry_plug_files.c:1337
+#: src/modules/everything/evry_plug_files.c:1336
 msgid "Move To ..."
 msgstr "Sposta in ..."

-#: src/modules/everything-files/evry_plug_files.c:1342
+#: src/modules/everything/evry_plug_files.c:1341
 msgid "Move to Trash"
 msgstr "Sposta nel cestino"

-#: src/modules/everything-files/evry_plug_files.c:1346
+#: src/modules/everything/evry_plug_files.c:1345
 msgid "Open Folder (EFM)"
 msgstr "Apri cartella (EFM)"

-#: src/modules/everything-files/evry_plug_files.c:1350
+#: src/modules/everything/evry_plug_files.c:1349
 msgid "Sort by Date"
 msgstr "Ordina per data"

-#: src/modules/everything-files/evry_plug_files.c:1355
+#: src/modules/everything/evry_plug_files.c:1354
 msgid "Sort by Name"
 msgstr "Ordina per nome"

-#: src/modules/everything-files/evry_plug_files.c:1387
-#: src/modules/everything-files/evry_plug_files.c:1396
+#: src/modules/everything/evry_plug_files.c:1386
+#: src/modules/everything/evry_plug_files.c:1395
 msgid "Recent Files"
 msgstr "File recenti"

-#: src/modules/everything-files/evry_plug_files.c:1473
-#: src/modules/everything-files/evry_plug_files.c:1626
+#: src/modules/everything/evry_plug_files.c:1472
+#: src/modules/everything/evry_plug_files.c:1625
 msgid "Everything Files"
 msgstr "Modulo file di Everything"

-#: src/modules/everything-files/evry_plug_files.c:1500
+#: src/modules/everything/evry_plug_files.c:1499
 msgid "Show recent files"
 msgstr "Mostra file recenti"

-#: src/modules/everything-files/evry_plug_files.c:1504
+#: src/modules/everything/evry_plug_files.c:1503
 msgid "Search recent files"
 msgstr "Cerca file recenti"

-#: src/modules/everything-files/evry_plug_files.c:1508
+#: src/modules/everything/evry_plug_files.c:1507
 msgid "Search cached files"
 msgstr "Cerca file in cache"

-#: src/modules/everything-files/evry_plug_files.c:1512
+#: src/modules/everything/evry_plug_files.c:1511
 msgid "Cache visited directories"
 msgstr "Cache per directory visitate"

-#: src/modules/everything-files/evry_plug_files.c:1516
+#: src/modules/everything/evry_plug_files.c:1515
 msgid "Clear cache"
 msgstr "Svuota cache"

-#: src/modules/everything-settings/evry_plug_settings.c:196
+#: src/modules/everything/evry_plug_settings.c:195
 msgid "Show Dialog"
 msgstr "Mostra finestra di dialogo"

-#: src/modules/everything-windows/evry_plug_windows.c:425
+#: src/modules/everything/evry_plug_windows.c:424
 msgid "Switch to Window"
 msgstr "Vai alla finestra"

-#: src/modules/everything-windows/evry_plug_windows.c:440
+#: src/modules/everything/evry_plug_windows.c:439
 msgid "Toggle Fullscreen"
 msgstr "A tutto schermo"

-#: src/modules/everything-windows/evry_plug_windows.c:454
+#: src/modules/everything/evry_plug_windows.c:453
 msgid "Send to Desktop"
 msgstr "Invia al desktop"

@ -6800,7 +6799,7 @@ msgstr "Seleziona un'immagine"
 msgid "File Manager"
 msgstr "File manager"

-#: src/modules/fileman/e_mod_main.c:348 src/modules/illume/e_mod_win.c:176
+#: src/modules/fileman/e_mod_main.c:348
 msgid "Home"
 msgstr "Home"

--- a/po/ja.po
+++ b/po/ja.po
--- a/po/km.po
+++ b/po/km.po
--- a/po/ko.po
+++ b/po/ko.po
--- a/po/ku.po
+++ b/po/ku.po
--- a/po/lt.po
+++ b/po/lt.po
--- a/po/ms.po
+++ b/po/ms.po
--- a/po/nb.po
+++ b/po/nb.po
--- a/po/nl.po
+++ b/po/nl.po
--- a/po/pl.po
+++ b/po/pl.po
--- a/po/pt.po
+++ b/po/pt.po
--- a/po/pt_BR.po
+++ b/po/pt_BR.po
--- a/po/ro.po
+++ b/po/ro.po
--- a/po/ru.po
+++ b/po/ru.po
--- a/po/sk.po
+++ b/po/sk.po
--- a/po/sl.po
+++ b/po/sl.po
--- a/po/sv.po
+++ b/po/sv.po
--- a/po/tr.po
+++ b/po/tr.po
--- a/po/uk.po
+++ b/po/uk.po
--- a/po/zh_CN.po
+++ b/po/zh_CN.po
--- a/po/zh_TW.po
+++ b/po/zh_TW.po
--- a/src/modules/Makefile.am
+++ b/src/modules/Makefile.am
@ -159,15 +159,6 @@ if USE_MODULE_EVERYTHING
 SUBDIRS += everything
 endif

-if USE_MODULE_EVERYTHING_AS_MODULES
-SUBDIRS += \
-	everything-files \
-	everything-apps \
-	everything-settings \
-	everything-calc \
-	everything-windows
-endif
-
 if USE_MODULE_SYSTRAY
 SUBDIRS += systray
 endif
--- a/src/modules/everything-apps/Makefile.am
+++ b/src/modules/everything-apps/Makefile.am
@ -1,30 +0,0 @@
-MAINTAINERCLEANFILES = Makefile.in
-MODULE = everything-apps
-
-# data files for the module
-filesdir = $(libdir)/enlightenment/modules/$(MODULE)
-files_DATA = \
-e-module.edj module.desktop
-
-EXTRA_DIST = $(files_DATA)
-
-# the module .so file
-INCLUDES               = -I. \
-                         -I$(top_srcdir) \
-                         -I$(top_srcdir)/src/modules/$(MODULE) \
-                         -I$(top_srcdir)/src/bin \
-                         -I$(top_builddir)/src/bin \
-                         -I$(top_srcdir)/src/modules \
-                         -I$(top_srcdir)/src/modules/everything \
-                         @e_cflags@
-pkgdir                 = $(libdir)/enlightenment/modules/$(MODULE)/$(MODULE_ARCH)
-pkg_LTLIBRARIES        = module.la
-module_la_SOURCES      = e_mod_main.c \
-                         e_mod_main.h
-
-module_la_LIBADD       = @e_libs@ @dlopen_libs@
-module_la_LDFLAGS      = -module -avoid-version
-module_la_DEPENDENCIES = $(top_builddir)/config.h
-
-uninstall:
-	rm -rf $(DESTDIR)$(libdir)/enlightenment/modules/$(MODULE)
--- a/src/modules/everything-apps/e-module.edj
+++ b/src/modules/everything-apps/e-module.edj
--- a/src/modules/everything-apps/e_mod_main.h
+++ b/src/modules/everything-apps/e_mod_main.h
@ -1,10 +0,0 @@
-#ifndef E_MOD_MAIN_H
-#define E_MOD_MAIN_H
-
-EAPI extern E_Module_Api e_modapi;
-
-EAPI void *e_modapi_init     (E_Module *m);
-EAPI int   e_modapi_shutdown (E_Module *m);
-EAPI int   e_modapi_save     (E_Module *m);
-
-#endif
--- a/src/modules/everything-apps/module.desktop.in
+++ b/src/modules/everything-apps/module.desktop.in
@ -1,17 +0,0 @@
-[Desktop Entry]
-Type=Link
-Name=Everything Applications
-Name[ru]=Всё - Приложения
-Name[de]=Everything - Anwendungen
-Name[fr]=Omni - Applications
-Name[it]=Everything - Applicazioni 
-Name[pt]=Everything - Aplicações
-Name[tr]=Everything - Uygulamalar
-Icon=e-module
-Comment=Actions for your applications.
-Comment[de]=Aktionen für Ihre Anwendungen.
-Comment[ru]=Действия для приложений.
-Comment[fr]=Actions sur les applications.
-Comment[it]=Azioni con le applicazioni.
-Comment[tr]=Uygulamalar için eylemler.
-X-Enlightenment-ModuleType=launcher
--- a/src/modules/everything-calc/Makefile.am
+++ b/src/modules/everything-calc/Makefile.am
@ -1,30 +0,0 @@
-MAINTAINERCLEANFILES = Makefile.in
-MODULE = everything-calc
-
-# data files for the module
-filesdir = $(libdir)/enlightenment/modules/$(MODULE)
-files_DATA = \
-module.desktop
-
-EXTRA_DIST = $(files_DATA)
-
-# the module .so file
-INCLUDES               = -I. \
-                         -I$(top_srcdir) \
-                         -I$(top_srcdir)/src/modules/$(MODULE) \
-                         -I$(top_srcdir)/src/bin \
-                         -I$(top_builddir)/src/bin \
-                         -I$(top_srcdir)/src/modules \
-                         -I$(top_srcdir)/src/modules/everything \
-                         @e_cflags@
-pkgdir                 = $(libdir)/enlightenment/modules/$(MODULE)/$(MODULE_ARCH)
-pkg_LTLIBRARIES        = module.la
-module_la_SOURCES      = evry_plug_calc.c \
-                         e_mod_main.h
-
-module_la_LIBADD       = @e_libs@ @dlopen_libs@
-module_la_LDFLAGS      = -module -avoid-version
-module_la_DEPENDENCIES = $(top_builddir)/config.h
-
-uninstall:
-	rm -rf $(DESTDIR)$(libdir)/enlightenment/modules/$(MODULE)
--- a/src/modules/everything-calc/e_mod_main.h
+++ b/src/modules/everything-calc/e_mod_main.h
@ -1,10 +0,0 @@
-#ifndef E_MOD_MAIN_H
-#define E_MOD_MAIN_H
-
-EAPI extern E_Module_Api e_modapi;
-
-EAPI void *e_modapi_init     (E_Module *m);
-EAPI int   e_modapi_shutdown (E_Module *m);
-EAPI int   e_modapi_save     (E_Module *m);
-
-#endif
--- a/src/modules/everything-calc/module.desktop.in
+++ b/src/modules/everything-calc/module.desktop.in
@ -1,18 +0,0 @@
-[Desktop Entry]
-Type=Link
-Name=Everything Calculator
-Name[ru]=Всё - Калькулятор
-Name[de]=Everything - Taschenrechner
-Name[fr]=Omni - Calculatrice
-Name[it]=Everything - Calcolatrice
-Name[pt]=Everything - Calculadora
-Name[tr]=Everything - Hesap Makinesi
-Icon=accessories-calculator
-Comment=Frontend for bc. Use '=' as trigger.
-Comment[ru]=Интерфейс к утилите bc. Используйте '=' для запуска.
-Comment[de]=Bedienung von bc. Verwenden Sie '=' als Auslöser.
-Comment[fr]=Frontal pour bc, utilise « = » comme déclencheur.
-Comment[it]=Frontend per bc, usa '=' come richiamo.
-Comment[pt]=Interface gráfica para calculadora. Utiliza "=" como lançador
-Comment[tr]=bc arayüzü. Tetikleyici olarak '=' kullanın.
-X-Enlightenment-ModuleType=launcher
--- a/src/modules/everything-files/Makefile.am
+++ b/src/modules/everything-files/Makefile.am
@ -1,30 +0,0 @@
-MAINTAINERCLEANFILES = Makefile.in
-MODULE = everything-files
-
-# data files for the module
-filesdir = $(libdir)/enlightenment/modules/$(MODULE)
-files_DATA = \
-module.desktop
-
-EXTRA_DIST = $(files_DATA)
-
-# the module .so file
-INCLUDES               = -I. \
-                         -I$(top_srcdir) \
-                         -I$(top_srcdir)/src/modules/$(MODULE) \
-                         -I$(top_srcdir)/src/bin \
-                         -I$(top_builddir)/src/bin \
-                         -I$(top_srcdir)/src/modules \
-                         -I$(top_srcdir)/src/modules/everything \
-                         @e_cflags@
-pkgdir                 = $(libdir)/enlightenment/modules/$(MODULE)/$(MODULE_ARCH)
-pkg_LTLIBRARIES        = module.la
-module_la_SOURCES      = evry_plug_files.c \
-                         e_mod_main.h
-
-module_la_LIBADD       = @e_libs@ @dlopen_libs@
-module_la_LDFLAGS      = -module -avoid-version
-module_la_DEPENDENCIES = $(top_builddir)/config.h
-
-uninstall:
-	rm -rf $(DESTDIR)$(libdir)/enlightenment/modules/$(MODULE)
--- a/src/modules/everything-files/e_mod_main.h
+++ b/src/modules/everything-files/e_mod_main.h
@ -1,10 +0,0 @@
-#ifndef E_MOD_MAIN_H
-#define E_MOD_MAIN_H
-
-EAPI extern E_Module_Api e_modapi;
-
-EAPI void *e_modapi_init     (E_Module *m);
-EAPI int   e_modapi_shutdown (E_Module *m);
-EAPI int   e_modapi_save     (E_Module *m);
-
-#endif
--- a/src/modules/everything-files/module.desktop.in
+++ b/src/modules/everything-files/module.desktop.in
@ -1,17 +0,0 @@
-[Desktop Entry]
-Type=Link
-Name=Everything Files
-Name[ru]=Всё - Файлы
-Name[de]=Everything - Dateien
-Name[fr]=Omni - Fichiers
-Name[it]=Everything - File
-Name[pt]=Everything - Ficheiros
-Name[tr]=Everything - Dosyalar
-Icon=system-file-manager
-Comment=File actions.
-Comment[ru]=Действия для файлов.
-Comment[de]=Aktionen auf Ihren Dateien.
-Comment[fr]=Actions sur les fichiers.
-Comment[it]=Azioni sui file.
-Comment[pt]=Ações sobre os ficheiros
-X-Enlightenment-ModuleType=launcher
--- a/src/modules/everything-settings/Makefile.am
+++ b/src/modules/everything-settings/Makefile.am
@ -1,30 +0,0 @@
-MAINTAINERCLEANFILES = Makefile.in
-MODULE = everything-settings
-
-# data files for the module
-filesdir = $(libdir)/enlightenment/modules/$(MODULE)
-files_DATA = \
-module.desktop
-
-EXTRA_DIST = $(files_DATA)
-
-# the module .so file
-INCLUDES               = -I. \
-                         -I$(top_srcdir) \
-                         -I$(top_srcdir)/src/modules/$(MODULE) \
-                         -I$(top_srcdir)/src/bin \
-                         -I$(top_builddir)/src/bin \
-                         -I$(top_srcdir)/src/modules \
-                         -I$(top_srcdir)/src/modules/everything \
-                         @e_cflags@
-pkgdir                 = $(libdir)/enlightenment/modules/$(MODULE)/$(MODULE_ARCH)
-pkg_LTLIBRARIES        = module.la
-module_la_SOURCES      = evry_plug_settings.c \
-                         e_mod_main.h
-
-module_la_LIBADD       = @e_libs@ @dlopen_libs@
-module_la_LDFLAGS      = -module -avoid-version
-module_la_DEPENDENCIES = $(top_builddir)/config.h
-
-uninstall:
-	rm -rf $(DESTDIR)$(libdir)/enlightenment/modules/$(MODULE)
--- a/src/modules/everything-settings/e_mod_main.h
+++ b/src/modules/everything-settings/e_mod_main.h
@ -1,10 +0,0 @@
-#ifndef E_MOD_MAIN_H
-#define E_MOD_MAIN_H
-
-EAPI extern E_Module_Api e_modapi;
-
-EAPI void *e_modapi_init     (E_Module *m);
-EAPI int   e_modapi_shutdown (E_Module *m);
-EAPI int   e_modapi_save     (E_Module *m);
-
-#endif
--- a/src/modules/everything-settings/module.desktop.in
+++ b/src/modules/everything-settings/module.desktop.in
@ -1,18 +0,0 @@
-[Desktop Entry]
-Type=Link
-Name=Everything Settings
-Name[ru]=Всё - Настройки
-Name[de]=Everything - Einstellungen
-Name[fr]=Omni - Configuration
-Name[it]=Everything - Impostazioni
-Name[pt]=Everything - Definições
-Name[tr]=Everything - Ayarlar
-Icon=configure
-Comment=Quickly open e17 settings dialogs.
-Comment[ru]=Быстрый доступ к диалогам настроек E17.
-Comment[de]=Schnell den Einstellungsdialog für E17 öffnen.
-Comment[fr]=Accès rapide aux paramètres de configuration de E17.
-Comment[it]=Accede rapidamente alle finestre di dialogo per le impostazioni di e17.
-Comment[pt]=Início rápido para as definições do E17
-Comment[tr]=e17 ayarlar penceresini hızlıca açar.
-X-Enlightenment-ModuleType=launcher
--- a/src/modules/everything-windows/Makefile.am
+++ b/src/modules/everything-windows/Makefile.am
@ -1,30 +0,0 @@
-MAINTAINERCLEANFILES = Makefile.in
-MODULE = everything-windows
-
-# data files for the module
-filesdir = $(libdir)/enlightenment/modules/$(MODULE)
-files_DATA = \
-module.desktop
-
-EXTRA_DIST = $(files_DATA)
-
-# the module .so file
-INCLUDES               = -I. \
-                         -I$(top_srcdir) \
-                         -I$(top_srcdir)/src/modules/$(MODULE) \
-                         -I$(top_srcdir)/src/bin \
-                         -I$(top_builddir)/src/bin \
-                         -I$(top_srcdir)/src/modules \
-                         -I$(top_srcdir)/src/modules/everything \
-                         @e_cflags@
-pkgdir                 = $(libdir)/enlightenment/modules/$(MODULE)/$(MODULE_ARCH)
-pkg_LTLIBRARIES        = module.la
-module_la_SOURCES      = evry_plug_windows.c \
-                         e_mod_main.h
-
-module_la_LIBADD       = @e_libs@ @dlopen_libs@
-module_la_LDFLAGS      = -module -avoid-version
-module_la_DEPENDENCIES = $(top_builddir)/config.h
-
-uninstall:
-	rm -rf $(DESTDIR)$(libdir)/enlightenment/modules/$(MODULE)
--- a/src/modules/everything-windows/e_mod_main.h
+++ b/src/modules/everything-windows/e_mod_main.h
@ -1,10 +0,0 @@
-#ifndef E_MOD_MAIN_H
-#define E_MOD_MAIN_H
-
-EAPI extern E_Module_Api e_modapi;
-
-EAPI void *e_modapi_init     (E_Module *m);
-EAPI int   e_modapi_shutdown (E_Module *m);
-EAPI int   e_modapi_save     (E_Module *m);
-
-#endif
--- a/src/modules/everything-windows/module.desktop.in
+++ b/src/modules/everything-windows/module.desktop.in
@ -1,18 +0,0 @@
-[Desktop Entry]
-Type=Link
-Name=Everything Windows
-Name[ru]=Всё - Окна
-Name[de]=Everything - Fenster
-Name[fr]=Omni - Fenêtres
-Name[it]=Everything - Finestre
-Name[pt]=Everything - Janelas
-Name[tr]=Everything - Pencereler
-Icon=preferences-system-windows
-Comment=Window actions
-Comment[ru]=Действия для окон.
-Comment[de]=Fensteraktionen.
-Comment[fr]=Actions sur les fenêtres.
-Comment[it]=Azioni sulle finestre.
-Comment[pt]=Ações sobre as janelas
-Comment[tr]=Pencere eylemleri
-X-Enlightenment-ModuleType=launcher
--- a/src/modules/everything/Makefile.am
+++ b/src/modules/everything/Makefile.am
@ -39,16 +39,13 @@ module_la_SOURCES      = $(EVRYHEADERS) \
 			 evry_plug_text.c \
 			 evry_plug_collection.c \
 			 evry_gadget.c \
-			 md5.c
-
-if !USE_MODULE_EVERYTHING_AS_MODULES 
-module_la_SOURCES     += \
-			 ../everything-apps/evry_plug_apps.c \
-			 ../everything-files/evry_plug_files.c \
-			 ../everything-windows/evry_plug_windows.c \
-			 ../everything-settings/evry_plug_settings.c \
-			 ../everything-calc/evry_plug_calc.c
-endif
+			 md5.c \
+                         md5.h \
+			 evry_plug_apps.c \
+			 evry_plug_files.c \
+			 evry_plug_windows.c \
+			 evry_plug_settings.c \
+			 evry_plug_calc.c

 module_la_LIBADD       = @e_libs@ @dlopen_libs@
 module_la_LDFLAGS      = -module -avoid-version
--- a/src/modules/everything/e_mod_main.c
+++ b/src/modules/everything/e_mod_main.c
@ -1,6 +1,4 @@
 #include "e_mod_main.h"
-#include "../everything-apps/e_mod_main.h"
-

 static void _e_mod_action_cb(E_Object *obj, const char *params);
 static void _e_mod_action_cb_edge(E_Object *obj, const char *params, E_Event_Zone_Edge *ev);
@ -136,13 +134,11 @@ e_modapi_init(E_Module *m)

   evry_history_init();
   evry_plug_actions_init();
-#ifndef USE_MODULE_EVERYTHING_AS_MODULES
   evry_plug_apps_init(m);
   evry_plug_files_init(m);
   evry_plug_windows_init(m);
   evry_plug_settings_init(m);
   evry_plug_calc_init(m);
-#endif   
   e_datastore_set("evry_api", _api);

   EINA_LIST_FOREACH(e_datastore_get("evry_modules"), l, em)
--- a/src/modules/everything/e_mod_main.h
+++ b/src/modules/everything/e_mod_main.h
@ -325,7 +325,6 @@ int   evry_view_toggle(Evry_State *s, const char *trigger);
 int evry_gadget_init(void);
 void evry_gadget_shutdown(void);

-#ifndef USE_MODULE_EVERYTHING_AS_MODULES
 Eina_Bool evry_plug_apps_init(E_Module *m);
 void evry_plug_apps_shutdown(void);
 void evry_plug_apps_save(void);
@ -345,7 +344,6 @@ void evry_plug_settings_save(void);
 Eina_Bool evry_plug_calc_init(E_Module *m);
 void evry_plug_calc_shutdown(void);
 void evry_plug_calc_save(void);
-#endif

 Ecore_Event_Handler *evry_event_handler_add(int type, Eina_Bool (*func) (void *data, int type, void *event), const void *data);

--- a/src/modules/everything-apps/evry_plug_apps.c
+++ b/src/modules/everything-apps/evry_plug_apps.c
@ -1,12 +1,10 @@
 #include "e.h"
-#include "e_mod_main.h"
 #include "evry_api.h"
-#include "e_mod_main.h"

 #define MOD_CONFIG_FILE_EPOCH 0x0001
 #define MOD_CONFIG_FILE_GENERATION 0x009d
-#define MOD_CONFIG_FILE_VERSION					\
-  ((MOD_CONFIG_FILE_EPOCH << 16) | MOD_CONFIG_FILE_GENERATION)
+#define MOD_CONFIG_FILE_VERSION                                 \
+     ((MOD_CONFIG_FILE_EPOCH << 16) | MOD_CONFIG_FILE_GENERATION)

 // FIXME clear cache on .desktop chage event

@ -1391,41 +1389,6 @@ evry_plug_apps_save(void)
   e_config_domain_save("module.everything-apps", conf_edd, _conf);
 }

-#ifdef USE_MODULE_EVERYTHING_AS_MODULES
-
-EAPI E_Module_Api e_modapi =
-  {
-    E_MODULE_API_VERSION,
-    "everything-apps"
-  };
-
-EAPI void *
-e_modapi_init(E_Module *m)
-{
-   evry_plug_apps_init(m);
-
-   e_module_delayed_set(m, 1);
-
-   return m;
-}
-
-EAPI int
-e_modapi_shutdown(E_Module *m __UNUSED__)
-{
-   evry_plug_apps_shutdown();
-   
-   return 1;
-}
-
-EAPI int
-e_modapi_save(E_Module *m __UNUSED__)
-{
-   evry_plug_apps_save();
-   
-   return 1;
-}
-#endif
-
 /***************************************************************************/


--- a/src/modules/everything-calc/evry_plug_calc.c
+++ b/src/modules/everything-calc/evry_plug_calc.c
@ -1,5 +1,4 @@
 #include "e.h"
-#include "e_mod_main.h"
 #include "evry_api.h"
 // TODO - show error when input not parseable

@ -289,40 +288,6 @@ _plugins_shutdown(void)

 /***************************************************************************/

-#ifdef USE_MODULE_EVERYTHING_AS_MODULES
-
-EAPI E_Module_Api e_modapi =
-{
-   E_MODULE_API_VERSION,
-   "everything-calc"
-};
-
-EAPI void *
-e_modapi_init(E_Module *m)
-{
-   EVRY_MODULE_NEW(evry_module, evry, _plugins_init, _plugins_shutdown);
-
-   e_module_delayed_set(m, 1);
-
-   return m;
-}
-
-EAPI int
-e_modapi_shutdown(E_Module *m __UNUSED__)
-{
-   EVRY_MODULE_FREE(evry_module);
-
-   return 1;
-}
-
-EAPI int
-e_modapi_save(E_Module *m __UNUSED__)
-{
-   return 1;
-}
-
-#else
-
 Eina_Bool
 evry_plug_calc_init(E_Module *m)
 {
@ -339,4 +304,3 @@ evry_plug_calc_shutdown(void)

 void
 evry_plug_calc_save(void){}
-#endif
--- a/src/modules/everything-files/evry_plug_files.c
+++ b/src/modules/everything-files/evry_plug_files.c
@ -5,14 +5,13 @@ FIXME
 */

 #include "e.h"
-#include "e_mod_main.h"
 #include "evry_api.h"
 #include <Efreet_Trash.h>

 #define MOD_CONFIG_FILE_EPOCH 0x0001
 #define MOD_CONFIG_FILE_GENERATION 0x008d
-#define MOD_CONFIG_FILE_VERSION					\
-  ((MOD_CONFIG_FILE_EPOCH << 16) | MOD_CONFIG_FILE_GENERATION)
+#define MOD_CONFIG_FILE_VERSION                                 \
+     ((MOD_CONFIG_FILE_EPOCH << 16) | MOD_CONFIG_FILE_GENERATION)

 #define MAX_ITEMS 10
 #define MAX_SHOWN 300
@ -1643,46 +1642,6 @@ _conf_shutdown(void)

 /***************************************************************************/

-#ifdef USE_MODULE_EVERYTHING_AS_MODULES
-
-EAPI E_Module_Api e_modapi =
-{
-   E_MODULE_API_VERSION,
-   "everything-files"
-};
-
-
-EAPI void *
-e_modapi_init(E_Module *m)
-{
-   _conf_init(m);
-
-   EVRY_MODULE_NEW(evry_module, evry, _plugins_init, _plugins_shutdown);
-
-   e_module_delayed_set(m, 1);
-
-   return m;
-}
-
-EAPI int
-e_modapi_shutdown(E_Module *m __UNUSED__)
-{
-   EVRY_MODULE_FREE(evry_module);
-
-   _conf_shutdown();
-
-   return 1;
-}
-
-EAPI int
-e_modapi_save(E_Module *m __UNUSED__)
-{
-   e_config_domain_save("module.everything-files", conf_edd, _conf);
-   return 1;
-}
-
-#else
-
 Eina_Bool
 evry_plug_files_init(E_Module *m)
 {
@ -1706,4 +1665,3 @@ evry_plug_files_save(void)
 {
   e_config_domain_save("module.everything-files", conf_edd, _conf);
 }
-#endif
--- a/src/modules/everything-settings/evry_plug_settings.c
+++ b/src/modules/everything-settings/evry_plug_settings.c
@ -1,5 +1,4 @@
 #include "e.h"
-#include "e_mod_main.h"
 #include "evry_api.h"

 typedef struct _Plugin Plugin;
@ -218,40 +217,6 @@ _plugins_shutdown(void)

 /***************************************************************************/

-#ifdef USE_MODULE_EVERYTHING_AS_MODULES
-
-EAPI E_Module_Api e_modapi =
-{
-   E_MODULE_API_VERSION,
-   "everything-settings"
-};
-
-EAPI void *
-e_modapi_init(E_Module *m)
-{   
-   EVRY_MODULE_NEW(evry_module, evry, _plugins_init, _plugins_shutdown);
-
-   e_module_delayed_set(m, 1);
-
-   return m;
-}
-
-EAPI int
-e_modapi_shutdown(E_Module *m __UNUSED__)
-{
-   EVRY_MODULE_FREE(evry_module);
-
-   return 1;
-}
-
-EAPI int
-e_modapi_save(E_Module *m __UNUSED__)
-{
-   return 1;
-}
-
-#else
-
 Eina_Bool
 evry_plug_settings_init(E_Module *m)
 {
@ -270,4 +235,3 @@ evry_plug_settings_shutdown(void)

 void
 evry_plug_settings_save(void){}
-#endif
--- a/src/modules/everything-windows/evry_plug_windows.c
+++ b/src/modules/everything-windows/evry_plug_windows.c
@ -1,5 +1,4 @@
 #include "e.h"
-#include "e_mod_main.h"
 #include "evry_api.h"

 #define BORDER_SHOW		1
@ -478,40 +477,6 @@ _plugins_shutdown(void)

 /***************************************************************************/

-#ifdef USE_MODULE_EVERYTHING_AS_MODULES
-
-EAPI E_Module_Api e_modapi =
-{
-   E_MODULE_API_VERSION,
-   "everything-windows"
-};
-
-EAPI void *
-e_modapi_init(E_Module *m)
-{
-   EVRY_MODULE_NEW(evry_module, evry, _plugins_init, _plugins_shutdown);
-
-   e_module_delayed_set(m, 1);
-
-   return m;
-}
-
-EAPI int
-e_modapi_shutdown(E_Module *m __UNUSED__)
-{
-   EVRY_MODULE_FREE(evry_module);
-
-   return 1;
-}
-
-EAPI int
-e_modapi_save(E_Module *m __UNUSED__)
-{
-   return 1;
-}
-
-#else
-
 Eina_Bool
 evry_plug_windows_init(E_Module *m)
 {
@ -528,4 +493,3 @@ evry_plug_windows_shutdown(void)

 void
 evry_plug_windows_save(void){}
-#endif