aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.gitignore1
-rwxr-xr-xautogen.sh2
-rw-r--r--configure.ac70
-rw-r--r--src/bin/e_config.c2
-rw-r--r--src/bin/e_start_main.c24
-rw-r--r--src/modules/Makefile.am151
-rw-r--r--src/modules/Makefile_access.am13
-rw-r--r--src/modules/Makefile_backlight.am13
-rw-r--r--src/modules/Makefile_battery.am37
-rw-r--r--src/modules/Makefile_clock.am14
-rw-r--r--src/modules/Makefile_comp.am41
-rw-r--r--src/modules/Makefile_conf.am16
-rw-r--r--src/modules/Makefile_conf_applications.am21
-rw-r--r--src/modules/Makefile_conf_dialogs.am18
-rw-r--r--src/modules/Makefile_conf_display.am26
-rw-r--r--src/modules/Makefile_conf_edgebindings.am16
-rw-r--r--src/modules/Makefile_conf_interaction.am17
-rw-r--r--src/modules/Makefile_conf_intl.am18
-rw-r--r--src/modules/Makefile_conf_keybindings.am18
-rw-r--r--src/modules/Makefile_conf_menus.am15
-rw-r--r--src/modules/Makefile_conf_paths.am17
-rw-r--r--src/modules/Makefile_conf_performance.am20
-rw-r--r--src/modules/Makefile_conf_randr.am19
-rw-r--r--src/modules/Makefile_conf_shelves.am15
-rw-r--r--src/modules/Makefile_conf_theme.am31
-rw-r--r--src/modules/Makefile_conf_wallpaper2.am14
-rw-r--r--src/modules/Makefile_conf_window_manipulation.am21
-rw-r--r--src/modules/Makefile_conf_window_remembers.am15
-rw-r--r--src/modules/Makefile_connman.am21
-rw-r--r--src/modules/Makefile_cpufreq.am29
-rw-r--r--src/modules/Makefile_dropshadow.am15
-rw-r--r--src/modules/Makefile_everything.am47
-rw-r--r--src/modules/Makefile_fileman.am24
-rw-r--r--src/modules/Makefile_fileman_opinfo.am13
-rw-r--r--src/modules/Makefile_gadman.am17
-rw-r--r--src/modules/Makefile_ibar.am14
-rw-r--r--src/modules/Makefile_ibox.am14
-rw-r--r--src/modules/Makefile_illume-bluetooth.am13
-rw-r--r--src/modules/Makefile_illume-home-toggle.am13
-rw-r--r--src/modules/Makefile_illume-home.am17
-rw-r--r--src/modules/Makefile_illume-indicator.am34
-rw-r--r--src/modules/Makefile_illume-kbd-toggle.am13
-rw-r--r--src/modules/Makefile_illume-keyboard.am60
-rw-r--r--src/modules/Makefile_illume-mode-toggle.am13
-rw-r--r--src/modules/Makefile_illume-softkey.am28
-rw-r--r--src/modules/Makefile_illume2.am73
-rw-r--r--src/modules/Makefile_mixer.am41
-rw-r--r--src/modules/Makefile_msgbus.am16
-rw-r--r--src/modules/Makefile_notification.am18
-rw-r--r--src/modules/Makefile_pager.am14
-rw-r--r--src/modules/Makefile_physics.am20
-rw-r--r--src/modules/Makefile_quickaccess.am17
-rw-r--r--src/modules/Makefile_shot.am13
-rw-r--r--src/modules/Makefile_start.am13
-rw-r--r--src/modules/Makefile_syscon.am18
-rw-r--r--src/modules/Makefile_systray.am13
-rw-r--r--src/modules/Makefile_tasks.am14
-rw-r--r--src/modules/Makefile_temperature.am25
-rw-r--r--src/modules/Makefile_tiling.am22
-rw-r--r--src/modules/Makefile_winlist.am17
-rw-r--r--src/modules/Makefile_wizard.am133
-rw-r--r--src/modules/Makefile_xkbswitch.am16
-rw-r--r--src/modules/access/Makefile.am28
-rw-r--r--src/modules/backlight/Makefile.am28
-rw-r--r--src/modules/battery/Makefile.am57
-rw-r--r--src/modules/clock/Makefile.am29
-rw-r--r--src/modules/comp/Makefile.am57
-rw-r--r--src/modules/conf/Makefile.am32
-rw-r--r--src/modules/conf_applications/Makefile.am37
-rw-r--r--src/modules/conf_dialogs/Makefile.am33
-rw-r--r--src/modules/conf_display/Makefile.am43
-rw-r--r--src/modules/conf_edgebindings/Makefile.am32
-rw-r--r--src/modules/conf_interaction/Makefile.am34
-rw-r--r--src/modules/conf_intl/Makefile.am35
-rw-r--r--src/modules/conf_keybindings/Makefile.am35
-rw-r--r--src/modules/conf_menus/Makefile.am31
-rw-r--r--src/modules/conf_paths/Makefile.am33
-rw-r--r--src/modules/conf_performance/Makefile.am35
-rw-r--r--src/modules/conf_randr/Makefile.am37
-rw-r--r--src/modules/conf_shelves/Makefile.am31
-rw-r--r--src/modules/conf_theme/Makefile.am49
-rw-r--r--src/modules/conf_wallpaper2/Makefile.am31
-rw-r--r--src/modules/conf_window_manipulation/Makefile.am38
-rw-r--r--src/modules/conf_window_remembers/Makefile.am31
-rw-r--r--src/modules/connman/Makefile.am38
-rw-r--r--src/modules/cpufreq/Makefile.am40
-rw-r--r--src/modules/dropshadow/Makefile.am30
-rw-r--r--src/modules/everything/Makefile.am67
-rw-r--r--src/modules/fileman/Makefile.am40
-rw-r--r--src/modules/fileman_opinfo/Makefile.am28
-rw-r--r--src/modules/gadman/Makefile.am31
-rw-r--r--src/modules/ibar/Makefile.am28
-rw-r--r--src/modules/ibox/Makefile.am29
-rw-r--r--src/modules/illume-bluetooth/Makefile.am29
-rw-r--r--src/modules/illume-home-toggle/Makefile.am29
-rw-r--r--src/modules/illume-home/Makefile.am33
-rw-r--r--src/modules/illume-indicator/Makefile.am60
-rw-r--r--src/modules/illume-indicator/images/Makefile.am4
-rw-r--r--src/modules/illume-kbd-toggle/Makefile.am29
-rw-r--r--src/modules/illume-keyboard/Makefile.am60
-rw-r--r--src/modules/illume-keyboard/dicts/Makefile.am9
-rw-r--r--src/modules/illume-keyboard/images/Makefile.am22
-rw-r--r--src/modules/illume-keyboard/keyboards/Makefile.am22
-rw-r--r--src/modules/illume-mode-toggle/Makefile.am29
-rw-r--r--src/modules/illume-softkey/Makefile.am56
-rw-r--r--src/modules/illume-softkey/images/Makefile.am6
-rw-r--r--src/modules/illume2/Makefile.am83
-rw-r--r--src/modules/illume2/doc/Makefile.am34
-rw-r--r--src/modules/illume2/images/Makefile.am3
-rw-r--r--src/modules/illume2/keyboards/Makefile.am11
-rw-r--r--src/modules/illume2/policies/Makefile.am2
-rw-r--r--src/modules/illume2/policies/illume/Makefile.am27
-rw-r--r--src/modules/illume2/policies/tablet/Makefile.am27
-rw-r--r--src/modules/layout/Makefile.am28
-rw-r--r--src/modules/mixer/Makefile.am55
-rw-r--r--src/modules/msgbus/Makefile.am36
-rw-r--r--src/modules/notification/Makefile.am36
-rw-r--r--src/modules/pager/Makefile.am29
-rw-r--r--src/modules/physics/Makefile.am36
-rw-r--r--src/modules/quickaccess/Makefile.am34
-rw-r--r--src/modules/shot/Makefile.am28
-rw-r--r--src/modules/start/Makefile.am28
-rw-r--r--src/modules/syscon/Makefile.am34
-rw-r--r--src/modules/systray/Makefile.am28
-rw-r--r--src/modules/tasks/Makefile.am29
-rw-r--r--src/modules/temperature/Makefile.am44
-rw-r--r--src/modules/tiling/Makefile.am40
-rw-r--r--src/modules/winlist/Makefile.am33
-rw-r--r--src/modules/wizard/.gitignore3
-rw-r--r--src/modules/wizard/Makefile.am196
-rw-r--r--src/modules/wl_drm/Makefile.am35
-rw-r--r--src/modules/wl_screenshot/Makefile.am33
-rw-r--r--src/modules/wl_shell/Makefile.am31
-rw-r--r--src/modules/xkbswitch/Makefile.am32
134 files changed, 1420 insertions, 2683 deletions
diff --git a/.gitignore b/.gitignore
index ae35cc4f6..60b00be13 100644
--- a/.gitignore
+++ b/.gitignore
@@ -10,6 +10,7 @@ Makefile.in
*~
*.cfg
*.desktop
+*.dirstamp
default.edj
/ABOUT-NLS
/aclocal.m4
diff --git a/autogen.sh b/autogen.sh
index 7fb3a1e7c..bee4e1b94 100755
--- a/autogen.sh
+++ b/autogen.sh
@@ -1,6 +1,6 @@
#!/bin/sh
-autoreconf --symlink --install -Wno-portability
+autoreconf --symlink --install
if [ -z "$NOCONFIGURE" ]; then
exec ./configure -C "$@"
diff --git a/configure.ac b/configure.ac
index ff2f08aaf..8096505b6 100644
--- a/configure.ac
+++ b/configure.ac
@@ -7,7 +7,6 @@ m4_define([v_rev], m4_esyscmd([(svnversion "${SVN_REPO_PATH:-.}" | grep -v '\(ex
m4_if(v_rev, [0], [m4_define([v_rev], m4_esyscmd([git log 2> /dev/null | (grep -m1 git-svn-id || echo 0) | sed -e 's/.*@\([0-9]*\).*/\1/' | tr -d '\n']))])
##-- When released, remove the dnl on the below line
m4_undefine([v_rev])
-m4_define([relname], [0.17.0])
##-- When doing snapshots - change soname. remove dnl on below line
dnl m4_define([relname], [ver-pre-svn-08])
dnl m4_define([v_rel], [-release relname])
@@ -36,7 +35,7 @@ AH_BOTTOM([
#endif /* EFL_CONFIG_H__ */
])
-AM_INIT_AUTOMAKE([1.6 dist-bzip2])
+AM_INIT_AUTOMAKE([1.11 dist-bzip2 subdir-objects -Wno-portability])
m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
AC_GNU_SOURCE
@@ -929,129 +928,62 @@ src/bin/Makefile
src/bin/e_fm_shared_types.h
src/bin/e_fm/Makefile
src/modules/Makefile
-src/modules/ibar/Makefile
src/modules/ibar/module.desktop
-src/modules/dropshadow/Makefile
src/modules/dropshadow/module.desktop
-src/modules/clock/Makefile
src/modules/clock/module.desktop
-src/modules/pager/Makefile
src/modules/pager/module.desktop
-src/modules/battery/Makefile
src/modules/battery/module.desktop
-src/modules/temperature/Makefile
src/modules/temperature/module.desktop
-src/modules/notification/Makefile
src/modules/notification/module.desktop
-src/modules/cpufreq/Makefile
src/modules/cpufreq/module.desktop
-src/modules/ibox/Makefile
src/modules/ibox/module.desktop
-src/modules/start/Makefile
src/modules/start/module.desktop
-src/modules/winlist/Makefile
src/modules/winlist/module.desktop
-src/modules/fileman/Makefile
src/modules/fileman/module.desktop
-src/modules/fileman_opinfo/Makefile
src/modules/fileman_opinfo/module.desktop
-src/modules/wizard/Makefile
-src/modules/conf/Makefile
src/modules/conf/module.desktop
-src/modules/conf_wallpaper2/Makefile
src/modules/conf_wallpaper2/module.desktop
-src/modules/conf_theme/Makefile
src/modules/conf_theme/module.desktop
-src/modules/conf_intl/Makefile
src/modules/conf_intl/module.desktop
-src/modules/conf_applications/Makefile
src/modules/conf_applications/module.desktop
-src/modules/conf_display/Makefile
src/modules/conf_display/module.desktop
-src/modules/conf_shelves/Makefile
src/modules/conf_shelves/module.desktop
-src/modules/conf_keybindings/Makefile
src/modules/conf_keybindings/module.desktop
-src/modules/conf_edgebindings/Makefile
src/modules/conf_edgebindings/module.desktop
-src/modules/conf_window_remembers/Makefile
src/modules/conf_window_remembers/module.desktop
-src/modules/conf_window_manipulation/Makefile
src/modules/conf_window_manipulation/module.desktop
-src/modules/conf_menus/Makefile
src/modules/conf_menus/module.desktop
-src/modules/conf_dialogs/Makefile
src/modules/conf_dialogs/module.desktop
-src/modules/conf_performance/Makefile
src/modules/conf_performance/module.desktop
-src/modules/conf_paths/Makefile
src/modules/conf_paths/module.desktop
-src/modules/conf_interaction/Makefile
src/modules/conf_interaction/module.desktop
-src/modules/msgbus/Makefile
src/modules/msgbus/module.desktop
-src/modules/conf_randr/Makefile
src/modules/conf_randr/module.desktop
-src/modules/gadman/Makefile
src/modules/gadman/module.desktop
-src/modules/mixer/Makefile
src/modules/mixer/module.desktop
-src/modules/connman/Makefile
src/modules/connman/module.desktop
-src/modules/illume2/Makefile
src/modules/illume2/doc/illume.dox
-src/modules/illume2/doc/Makefile
-src/modules/illume2/images/Makefile
src/modules/illume2/module.desktop
-src/modules/illume2/keyboards/Makefile
-src/modules/illume2/policies/Makefile
-src/modules/illume2/policies/illume/Makefile
-src/modules/illume2/policies/tablet/Makefile
-src/modules/illume-home/Makefile
src/modules/illume-home/module.desktop
-src/modules/illume-home-toggle/Makefile
src/modules/illume-home-toggle/module.desktop
-src/modules/illume-softkey/Makefile
src/modules/illume-softkey/module.desktop
-src/modules/illume-softkey/images/Makefile
-src/modules/illume-keyboard/Makefile
src/modules/illume-keyboard/module.desktop
-src/modules/illume-keyboard/keyboards/Makefile
-src/modules/illume-keyboard/dicts/Makefile
-src/modules/illume-keyboard/images/Makefile
-src/modules/illume-indicator/Makefile
src/modules/illume-indicator/module.desktop
-src/modules/illume-indicator/images/Makefile
-src/modules/illume-kbd-toggle/Makefile
src/modules/illume-kbd-toggle/module.desktop
-src/modules/illume-mode-toggle/Makefile
src/modules/illume-mode-toggle/module.desktop
-src/modules/illume-bluetooth/Makefile
src/modules/illume-bluetooth/module.desktop
-src/modules/syscon/Makefile
src/modules/syscon/module.desktop
-src/modules/everything/Makefile
src/modules/everything/module.desktop
src/modules/everything/everything.pc
-src/modules/systray/Makefile
src/modules/systray/module.desktop
-src/modules/comp/Makefile
src/modules/comp/module.desktop
-src/modules/physics/Makefile
src/modules/physics/module.desktop
-src/modules/quickaccess/Makefile
src/modules/quickaccess/module.desktop
-src/modules/shot/Makefile
src/modules/shot/module.desktop
-src/modules/backlight/Makefile
src/modules/backlight/module.desktop
-src/modules/tasks/Makefile
src/modules/tasks/module.desktop
-src/modules/xkbswitch/Makefile
src/modules/xkbswitch/module.desktop
-src/modules/tiling/Makefile
src/modules/tiling/module.desktop
-src/modules/access/Makefile
src/modules/access/module.desktop
data/Makefile
data/images/Makefile
diff --git a/src/bin/e_config.c b/src/bin/e_config.c
index 94703e742..6cdeaae59 100644
--- a/src/bin/e_config.c
+++ b/src/bin/e_config.c
@@ -1057,7 +1057,7 @@ e_config_load(void)
"files available for the given profile (normally\n"
"default or the last profile used or provided on the\n"
"command-line with -profile etc.)\n\n"
- "Cannot continue without configuration to work with.\n"
+ "Cannot contiue without configuration to work with.\n"
"Please ensure you have system or user configuration\n"
"for the profile you are using before proceeeding.");
abort();
diff --git a/src/bin/e_start_main.c b/src/bin/e_start_main.c
index 201f4b588..69771455d 100644
--- a/src/bin/e_start_main.c
+++ b/src/bin/e_start_main.c
@@ -216,6 +216,13 @@ _env_path_append(const char *env, const char *path)
}
}
+static void
+_sigusr1(int x __UNUSED__, siginfo_t *info __UNUSED__, void *data __UNUSED__)
+{
+ /* release ptrace */
+ printf("sigusr1 -- release ptrace\n");
+}
+
int
main(int argc, char **argv)
{
@@ -227,7 +234,13 @@ main(int argc, char **argv)
const char *valgrind_log = NULL;
Eina_Bool really_know = EINA_FALSE;
Eina_Bool restart = EINA_TRUE;
-
+ struct sigaction action;
+
+ action.sa_sigaction = _sigusr1;
+ action.sa_flags = SA_NODEFER | SA_RESETHAND | SA_SIGINFO;
+ sigemptyset(&action.sa_mask);
+ sigaction(SIGUSR1, &action, NULL);
+
eina_init();
/* reexcute myself with dbus-launch if dbus-launch is not running yet */
@@ -408,17 +421,24 @@ main(int argc, char **argv)
ptrace(PT_ATTACH, child, NULL, NULL);
+ printf("a\n");
result = waitpid(child, &status, 0);
-
+ printf("b\n");
+
+ //ptrace(PT_DETACH, child, NULL, back);
+
if (WIFSTOPPED(status))
ptrace(PT_CONTINUE, child, NULL, NULL);
+ printf("c\n");
while (!done)
{
Eina_Bool remember_sigill = EINA_FALSE;
Eina_Bool remember_sigusr1 = EINA_FALSE;
+ printf("d\n");
result = waitpid(child, &status, 0);
+ printf("e\n");
if (result == child)
{
diff --git a/src/modules/Makefile.am b/src/modules/Makefile.am
index 610fd271a..78789fa50 100644
--- a/src/modules/Makefile.am
+++ b/src/modules/Makefile.am
@@ -1,216 +1,241 @@
MAINTAINERCLEANFILES = Makefile.in
SUBDIRS =
+CLEANFILES =
+EXTRA_DIST =
+INSTALL_DATA_HOOKS =
+
+MDIR = $(libdir)/enlightenment/modules
+MDEPENDENCIES = $(top_builddir)/config.h
+AM_LDFLAGS = -module -avoid-version
+AM_CPPFLAGS = -I. \
+ -I$(top_srcdir) \
+ -I$(top_srcdir)/src/bin \
+ -I$(top_builddir)/src/bin \
+ -I$(top_srcdir)/src/modules
+AM_CFLAGS = @e_cflags@
+AM_LIBADD = @e_libs@ @dlopen_libs@
+
+EDJE_CC = $(EDJE_CC_$(V))
+EDJE_CC_ = $(EDJE_CC_$(AM_DEFAULT_VERBOSITY))
+EDJE_CC_0 = @echo " EDJE_CC " $@; @edje_cc@
+EDJE_CC_1 = @edje_cc@
+
+EDJE_FLAGS_VERBOSE_ = $(EDJE_FLAGS_VERBOSE_$(AM_DEFAULT_VERBOSITY))
+EDJE_FLAGS_VERBOSE_0 =
+EDJE_FLAGS_VERBOSE_1 = -v
+EDJE_FLAGS = $(EDJE_FLAGS_VERBOSE_$(V)) @EDJE_DEF@
+
+if USE_MODULE_CONNMAN
+include Makefile_connman.am
+endif
if USE_MODULE_IBAR
-SUBDIRS += ibar
+include Makefile_ibar.am
endif
if USE_MODULE_DROPSHADOW
-SUBDIRS += dropshadow
+include Makefile_dropshadow.am
endif
if USE_MODULE_CLOCK
-SUBDIRS += clock
+include Makefile_clock.am
endif
if USE_MODULE_PAGER
-SUBDIRS += pager
+include Makefile_pager.am
endif
if USE_MODULE_BATTERY
-SUBDIRS += battery
+include Makefile_battery.am
endif
if USE_MODULE_TEMPERATURE
-SUBDIRS += temperature
+include Makefile_temperature.am
endif
if USE_MODULE_NOTIFICATION
-SUBDIRS += notification
+include Makefile_notification.am
endif
if USE_MODULE_CPUFREQ
-SUBDIRS += cpufreq
+include Makefile_cpufreq.am
endif
if USE_MODULE_IBOX
-SUBDIRS += ibox
+include Makefile_ibox.am
endif
if USE_MODULE_START
-SUBDIRS += start
+include Makefile_start.am
endif
if USE_MODULE_WINLIST
-SUBDIRS += winlist
+include Makefile_winlist.am
endif
if USE_MODULE_FILEMAN
-SUBDIRS += fileman
+include Makefile_fileman.am
endif
if USE_MODULE_FILEMAN_OPINFO
-SUBDIRS += fileman_opinfo
+include Makefile_fileman_opinfo.am
endif
if USE_MODULE_WIZARD
-SUBDIRS += wizard
+include Makefile_wizard.am
endif
if USE_MODULE_CONF
-SUBDIRS += conf
+include Makefile_conf.am
endif
if USE_MODULE_CONF_WALLPAPER2
-SUBDIRS += conf_wallpaper2
+include Makefile_conf_wallpaper2.am
endif
if USE_MODULE_CONF_THEME
-SUBDIRS += conf_theme
+include Makefile_conf_theme.am
endif
if USE_MODULE_CONF_INTL
-SUBDIRS += conf_intl
+include Makefile_conf_intl.am
endif
if USE_MODULE_MSGBUS
-SUBDIRS += msgbus
+include Makefile_msgbus.am
endif
if USE_MODULE_CONF_APPLICATIONS
-SUBDIRS += conf_applications
+include Makefile_conf_applications.am
endif
if USE_MODULE_CONF_DISPLAY
-SUBDIRS += conf_display
+include Makefile_conf_display.am
endif
if USE_MODULE_CONF_SHELVES
-SUBDIRS += conf_shelves
+include Makefile_conf_shelves.am
endif
if USE_MODULE_CONF_KEYBINDINGS
-SUBDIRS += conf_keybindings
+include Makefile_conf_keybindings.am
endif
if USE_MODULE_CONF_EDGEBINDINGS
-SUBDIRS += conf_edgebindings
+include Makefile_conf_edgebindings.am
endif
if USE_MODULE_CONF_WINDOW_REMEMBERS
-SUBDIRS += conf_window_remembers
+include Makefile_conf_window_remembers.am
endif
if USE_MODULE_CONF_WINDOW_MANIPULATION
-SUBDIRS += conf_window_manipulation
+include Makefile_conf_window_manipulation.am
endif
if USE_MODULE_CONF_MENUS
-SUBDIRS += conf_menus
+include Makefile_conf_menus.am
endif
if USE_MODULE_CONF_DIALOGS
-SUBDIRS += conf_dialogs
+include Makefile_conf_dialogs.am
endif
if USE_MODULE_CONF_PERFORMANCE
-SUBDIRS += conf_performance
+include Makefile_conf_performance.am
endif
if USE_MODULE_CONF_PATHS
-SUBDIRS += conf_paths
+include Makefile_conf_paths.am
endif
if USE_MODULE_CONF_INTERACTION
-SUBDIRS += conf_interaction
+include Makefile_conf_interaction.am
endif
if USE_MODULE_CONF_RANDR
-SUBDIRS += conf_randr
+include Makefile_conf_randr.am
endif
if USE_MODULE_GADMAN
-SUBDIRS += gadman
+include Makefile_gadman.am
endif
if USE_MODULE_MIXER
-SUBDIRS += mixer
-endif
-
-if USE_MODULE_CONNMAN
-SUBDIRS += connman
+include Makefile_mixer.am
endif
if USE_MODULE_ILLUME2
-SUBDIRS += \
- illume2 \
- illume-home \
- illume-home-toggle \
- illume-softkey \
- illume-keyboard \
- illume-indicator \
- illume-kbd-toggle \
- illume-mode-toggle \
- illume-bluetooth
+include Makefile_illume2.am
+include Makefile_illume-home.am
+include Makefile_illume-home-toggle.am
+include Makefile_illume-softkey.am
+include Makefile_illume-keyboard.am
+include Makefile_illume-indicator.am
+include Makefile_illume-kbd-toggle.am
+include Makefile_illume-mode-toggle.am
+include Makefile_illume-bluetooth.am
endif
if USE_MODULE_SYSCON
-SUBDIRS += syscon
+include Makefile_syscon.am
endif
if USE_MODULE_EVERYTHING
-SUBDIRS += everything
+include Makefile_everything.am
endif
if USE_MODULE_SYSTRAY
-SUBDIRS += systray
+include Makefile_systray.am
endif
if USE_MODULE_COMP
-SUBDIRS += comp
+include Makefile_comp.am
endif
if USE_MODULE_PHYSICS
-SUBDIRS += physics
+include Makefile_physics.am
endif
if USE_MODULE_QUICKACCESS
-SUBDIRS += quickaccess
+include Makefile_quickaccess.am
endif
if USE_MODULE_SHOT
-SUBDIRS += shot
+include Makefile_shot.am
endif
if USE_MODULE_BACKLIGHT
-SUBDIRS += backlight
+include Makefile_backlight.am
endif
if USE_MODULE_TASKS
-SUBDIRS += tasks
+include Makefile_tasks.am
endif
if USE_MODULE_XKBSWITCH
-SUBDIRS += xkbswitch
+include Makefile_xkbswitch.am
endif
if USE_MODULE_TILING
-SUBDIRS += tiling
+include Makefile_tiling.am
endif
if USE_MODULE_ACCESS
-SUBDIRS += access
+include Makefile_access.am
endif
#if HAVE_WAYLAND_DRM
-# SUBDIRS += wl_drm
+#include Makefile_wl_drm.am
#endif
#if HAVE_WAYLAND_SHELL
-# SUBDIRS += wl_shell
+#include Makefile_wl_shell.am
#endif
#if HAVE_WAYLAND_SCREENSHOT
-# SUBDIRS += wl_screenshot
+#include Makefile_wl_screenshot.am
#endif
+
+install-data-hook: $(INSTALL_DATA_HOOKS)
diff --git a/src/modules/Makefile_access.am b/src/modules/Makefile_access.am
new file mode 100644
index 000000000..8dcbec7be
--- /dev/null
+++ b/src/modules/Makefile_access.am
@@ -0,0 +1,13 @@
+accessdir = $(MDIR)/access
+access_DATA = access/module.desktop
+
+EXTRA_DIST += $(access_DATA)
+
+accesspkgdir = $(MDIR)/access/$(MODULE_ARCH)
+accesspkg_LTLIBRARIES = access/module.la
+
+access_module_la_SOURCES = access/e_mod_main.c \
+ access/e_mod_main.h \
+ access/e_mod_config.c
+
+access_module_la_DEPENDENCIES = $(MDEPENDENCIES)
diff --git a/src/modules/Makefile_backlight.am b/src/modules/Makefile_backlight.am
new file mode 100644
index 000000000..e55c1b103
--- /dev/null
+++ b/src/modules/Makefile_backlight.am
@@ -0,0 +1,13 @@
+backlightdir = $(MDIR)/backlight
+backlight_DATA = backlight/e-module-backlight.edj \
+ backlight/module.desktop
+
+EXTRA_DIST += $(backlight_DATA)
+
+backlightpkgdir = $(MDIR)/backlight/$(MODULE_ARCH)
+backlightpkg_LTLIBRARIES = backlight/module.la
+
+backlight_module_la_SOURCES = backlight/e_mod_main.c \
+ backlight/e_mod_main.h
+
+backlight_module_la_DEPENDENCIES = $(MDEPENDENCIES)
diff --git a/src/modules/Makefile_battery.am b/src/modules/Makefile_battery.am
new file mode 100644
index 000000000..e0e56b988
--- /dev/null
+++ b/src/modules/Makefile_battery.am
@@ -0,0 +1,37 @@
+batterydir = $(MDIR)/battery
+battery_DATA = battery/e-module-battery.edj \
+ battery/module.desktop
+
+EXTRA_DIST += $(battery_DATA)
+
+batterypkgdir = $(MDIR)/battery/$(MODULE_ARCH)
+batterypkg_LTLIBRARIES = battery/module.la
+
+battery_module_la_DEPENDENCIES = $(MDEPENDENCIES)
+battery_module_la_CFLAGS = $(AM_CFLAGS)
+battery_module_la_LIBADD = $(AM_LIBADD)
+battery_module_la_SOURCES = battery/e_mod_main.h \
+ battery/e_mod_main.c \
+ battery/e_mod_config.c
+
+if HAVE_EEZE
+battery_module_la_SOURCES += battery/e_mod_udev.c
+else
+if HAVE_OPENBSD
+battery_module_la_SOURCES += battery/e_mod_openbsd.c
+else
+battery_module_la_SOURCES += battery/e_mod_dbus.c
+endif
+endif
+
+if HAVE_ENOTIFY
+battery_module_la_CFLAGS += @ENOTIFY_CFLAGS@
+battery_module_la_LIBADD += @ENOTIFY_LIBS@
+endif
+
+batgetdir = $(batterypkgdir)
+batget_PROGRAMS = battery/batget
+
+battery_batget_SOURCES = battery/batget.c
+battery_batget_LDADD = @BATTERY_LIBS@
+battery_batget_LDFLAGS = @BATTERY_LDFLAGS@
diff --git a/src/modules/Makefile_clock.am b/src/modules/Makefile_clock.am
new file mode 100644
index 000000000..b5604c5be
--- /dev/null
+++ b/src/modules/Makefile_clock.am
@@ -0,0 +1,14 @@
+clockdir = $(MDIR)/clock
+clock_DATA = clock/e-module-clock.edj \
+ clock/module.desktop
+
+EXTRA_DIST += $(clock_DATA)
+
+clockpkgdir = $(MDIR)/clock/$(MODULE_ARCH)
+clockpkg_LTLIBRARIES = clock/module.la
+
+clock_module_la_SOURCES = clock/e_mod_main.h \
+ clock/e_mod_main.c \
+ clock/e_mod_config.c
+
+clock_module_la_DEPENDENCIES = $(MDEPENDENCIES)
diff --git a/src/modules/Makefile_comp.am b/src/modules/Makefile_comp.am
new file mode 100644
index 000000000..635950b9a
--- /dev/null
+++ b/src/modules/Makefile_comp.am
@@ -0,0 +1,41 @@
+compdir = $(MDIR)/comp
+comp_DATA = comp/e-module-comp.edj \
+ comp/module.desktop
+
+EXTRA_DIST += $(comp_DATA)
+
+comppkgdir = $(MDIR)/comp/$(MODULE_ARCH)
+comppkg_LTLIBRARIES = comp/module.la
+
+comp_module_la_SOURCES = comp/e_mod_main.h \
+ comp/e_mod_main.c \
+ comp/e_mod_config.c \
+ comp/e_mod_config.h \
+ comp/e_mod_comp.c \
+ comp/e_mod_comp.h \
+ comp/e_mod_comp_update.c \
+ comp/e_mod_comp_update.h \
+ comp/e_mod_comp_cfdata.c \
+ comp/e_mod_comp_cfdata.h
+
+if HAVE_WAYLAND_CLIENTS
+comp_module_la_SOURCES += comp/e_mod_comp_wl.h \
+ comp/e_mod_comp_wl.c \
+ comp/e_mod_comp_wl_comp.h \
+ comp/e_mod_comp_wl_comp.c \
+ comp/e_mod_comp_wl_output.h \
+ comp/e_mod_comp_wl_output.c \
+ comp/e_mod_comp_wl_input.h \
+ comp/e_mod_comp_wl_input.c \
+ comp/e_mod_comp_wl_shell.h \
+ comp/e_mod_comp_wl_shell.c \
+ comp/e_mod_comp_wl_surface.h \
+ comp/e_mod_comp_wl_surface.c \
+ comp/e_mod_comp_wl_buffer.h \
+ comp/e_mod_comp_wl_buffer.c \
+ comp/e_mod_comp_wl_region.h \
+ comp/e_mod_comp_wl_region.c
+endif
+
+comp_module_la_LIBADD = $(AM_LIBADD) @WAYLAND_LIBS@
+comp_module_la_DEPENDENCIES = $(MDEPENDENCIES)
diff --git a/src/modules/Makefile_conf.am b/src/modules/Makefile_conf.am
new file mode 100644
index 000000000..19c1356d2
--- /dev/null
+++ b/src/modules/Makefile_conf.am
@@ -0,0 +1,16 @@
+confdir = $(MDIR)/conf
+conf_DATA = conf/e-module-conf.edj \
+ conf/module.desktop
+
+EXTRA_DIST += $(conf_DATA)
+
+confpkgdir = $(MDIR)/conf/$(MODULE_ARCH)
+confpkg_LTLIBRARIES = conf/module.la
+
+conf_module_la_SOURCES = conf/e_mod_main.c \
+ conf/e_mod_main.h \
+ conf/e_conf.c \
+ conf/e_conf.h \
+ conf/e_mod_config.c
+
+conf_module_la_DEPENDENCIES = $(MDEPENDENCIES)
diff --git a/src/modules/Makefile_conf_applications.am b/src/modules/Makefile_conf_applications.am
new file mode 100644
index 000000000..68b30ff40
--- /dev/null
+++ b/src/modules/Makefile_conf_applications.am
@@ -0,0 +1,21 @@
+conf_applicationsdir = $(MDIR)/conf_applications
+conf_applications_DATA = conf_applications/e-module-conf_applications.edj \
+ conf_applications/module.desktop
+
+EXTRA_DIST += $(conf_applications_DATA)
+
+conf_applicationspkgdir = $(MDIR)/conf_applications/$(MODULE_ARCH)
+conf_applicationspkg_LTLIBRARIES = conf_applications/module.la
+
+conf_applications_module_la_SOURCES = conf_applications/e_mod_main.c \
+ conf_applications/e_mod_main.h \
+ conf_applications/e_int_config_apps.c \
+ conf_applications/e_int_config_apps.h \
+ conf_applications/e_int_config_defapps.c \
+ conf_applications/e_int_config_defapps.h \
+ conf_applications/e_int_config_deskenv.c \
+ conf_applications/e_int_config_deskenv.h \
+ conf_applications/e_int_config_apps_personal.c \
+ conf_applications/e_int_config_apps_personal.h
+
+conf_applications_module_la_DEPENDENCIES = $(MDEPENDENCIES)
diff --git a/src/modules/Makefile_conf_dialogs.am b/src/modules/Makefile_conf_dialogs.am
new file mode 100644
index 000000000..56cdebb87
--- /dev/null
+++ b/src/modules/Makefile_conf_dialogs.am
@@ -0,0 +1,18 @@
+conf_dialogsdir = $(MDIR)/conf_dialogs
+conf_dialogs_DATA = conf_dialogs/e-module-conf_dialogs.edj \
+ conf_dialogs/module.desktop
+
+EXTRA_DIST += $(conf_dialogs_DATA)
+
+conf_dialogspkgdir = $(MDIR)/conf_dialogs/$(MODULE_ARCH)
+conf_dialogspkg_LTLIBRARIES = conf_dialogs/module.la
+
+conf_dialogs_module_la_SOURCES = conf_dialogs/e_mod_main.c \
+ conf_dialogs/e_mod_main.h \
+ conf_dialogs/e_int_config_dialogs.c \
+ conf_dialogs/e_int_config_dialogs.h \
+ conf_dialogs/e_int_config_profiles.c \
+ conf_dialogs/e_int_config_profiles.h
+
+
+conf_dialogs_module_la_DEPENDENCIES = $(MDEPENDENCIES)
diff --git a/src/modules/Makefile_conf_display.am b/src/modules/Makefile_conf_display.am
new file mode 100644
index 000000000..4f3a5f7a7
--- /dev/null
+++ b/src/modules/Makefile_conf_display.am
@@ -0,0 +1,26 @@
+conf_displaydir = $(MDIR)/conf_display
+conf_display_DATA = conf_display/module.desktop
+
+EXTRA_DIST += $(conf_display_DATA)
+
+conf_displaypkgdir = $(MDIR)/conf_display/$(MODULE_ARCH)
+conf_displaypkg_LTLIBRARIES = conf_display/module.la
+
+conf_display_module_la_SOURCES = conf_display/e_mod_main.c \
+ conf_display/e_mod_main.h \
+ conf_display/e_int_config_display.c \
+ conf_display/e_int_config_display.h \
+ conf_display/e_int_config_screensaver.c \
+ conf_display/e_int_config_screensaver.h \
+ conf_display/e_int_config_dpms.c \
+ conf_display/e_int_config_dpms.h \
+ conf_display/e_int_config_desklock.c \
+ conf_display/e_int_config_desklock.h \
+ conf_display/e_int_config_desklock_fsel.c \
+ conf_display/e_int_config_desklock_fsel.h \
+ conf_display/e_int_config_desks.c \
+ conf_display/e_int_config_desks.h \
+ conf_display/e_int_config_desk.c \
+ conf_display/e_int_config_desk.h
+
+conf_display_module_la_DEPENDENCIES = $(MDEPENDENCIES)
diff --git a/src/modules/Makefile_conf_edgebindings.am b/src/modules/Makefile_conf_edgebindings.am
new file mode 100644
index 000000000..31bedac60
--- /dev/null
+++ b/src/modules/Makefile_conf_edgebindings.am
@@ -0,0 +1,16 @@
+conf_edgebindingsdir = $(MDIR)/conf_edgebindings
+conf_edgebindings_DATA = conf_edgebindings/e-module-conf_edgebindings.edj \
+ conf_edgebindings/module.desktop
+
+EXTRA_DIST += $(conf_edgebindings_DATA)
+
+conf_edgebindingspkgdir = $(MDIR)/conf_edgebindings/$(MODULE_ARCH)
+conf_edgebindingspkg_LTLIBRARIES = conf_edgebindings/module.la
+
+conf_edgebindings_module_la_SOURCES = conf_edgebindings/e_mod_main.c \
+ conf_edgebindings/e_mod_main.h \
+ conf_edgebindings/e_int_config_edgebindings.c \
+ conf_edgebindings/e_int_config_signalbindings.c \
+ conf_edgebindings/e_int_config_edgebindings.h
+
+conf_edgebindings_module_la_DEPENDENCIES = $(MDEPENDENCIES)
diff --git a/src/modules/Makefile_conf_interaction.am b/src/modules/Makefile_conf_interaction.am
new file mode 100644
index 000000000..867666b04
--- /dev/null
+++ b/src/modules/Makefile_conf_interaction.am
@@ -0,0 +1,17 @@
+conf_interactiondir = $(MDIR)/conf_interaction
+conf_interaction_DATA = conf_interaction/e-module-conf_interaction.edj \
+ conf_interaction/module.desktop
+
+EXTRA_DIST += $(conf_interaction_DATA)
+
+conf_interactionpkgdir = $(MDIR)/conf_interaction/$(MODULE_ARCH)
+conf_interactionpkg_LTLIBRARIES = conf_interaction/module.la
+
+conf_interaction_module_la_SOURCES = conf_interaction/e_mod_main.c \
+ conf_interaction/e_mod_main.h \
+ conf_interaction/e_int_config_interaction.c \
+ conf_interaction/e_int_config_interaction.h \
+ conf_interaction/e_int_config_mouse.c \
+ conf_interaction/e_int_config_mouse.h
+
+conf_interaction_module_la_DEPENDENCIES = $(MDEPENDENCIES)
diff --git a/src/modules/Makefile_conf_intl.am b/src/modules/Makefile_conf_intl.am
new file mode 100644
index 000000000..dc8535a83
--- /dev/null
+++ b/src/modules/Makefile_conf_intl.am
@@ -0,0 +1,18 @@
+conf_intldir = $(MDIR)/conf_intl
+conf_intl_DATA = conf_intl/module.desktop
+
+EXTRA_DIST += $(conf_intl_DATA)
+
+conf_intlpkgdir = $(MDIR)/conf_intl/$(MODULE_ARCH)
+conf_intlpkg_LTLIBRARIES = conf_intl/module.la
+
+conf_intl_module_la_SOURCES = conf_intl/e_mod_main.c \
+ conf_intl/e_mod_main.h \
+ conf_intl/e_int_config_intl.c \
+ conf_intl/e_int_config_intl.h \
+ conf_intl/e_int_config_imc_import.c \
+ conf_intl/e_int_config_imc_import.h \
+ conf_intl/e_int_config_imc.c \
+ conf_intl/e_int_config_imc.h
+
+conf_intl_module_la_DEPENDENCIES = $(MDEPENDENCIES)
diff --git a/src/modules/Makefile_conf_keybindings.am b/src/modules/Makefile_conf_keybindings.am
new file mode 100644
index 000000000..73b80e77b
--- /dev/null
+++ b/src/modules/Makefile_conf_keybindings.am
@@ -0,0 +1,18 @@
+conf_keybindingsdir = $(MDIR)/conf_keybindings
+conf_keybindings_DATA = conf_keybindings/module.desktop
+
+EXTRA_DIST += $(conf_keybindings_DATA)
+
+conf_keybindingspkgdir = $(MDIR)/conf_keybindings/$(MODULE_ARCH)
+conf_keybindingspkg_LTLIBRARIES = conf_keybindings/module.la
+
+conf_keybindings_module_la_SOURCES = conf_keybindings/e_mod_main.c \
+ conf_keybindings/e_mod_main.h \
+ conf_keybindings/e_int_config_keybindings.c \
+ conf_keybindings/e_int_config_keybindings.h \
+ conf_keybindings/e_int_config_mousebindings.c \
+ conf_keybindings/e_int_config_mousebindings.h \
+ conf_keybindings/e_int_config_acpibindings.c \
+ conf_keybindings/e_int_config_acpibindings.h
+
+conf_keybindings_module_la_DEPENDENCIES = $(MDEPENDENCIES)
diff --git a/src/modules/Makefile_conf_menus.am b/src/modules/Makefile_conf_menus.am
new file mode 100644
index 000000000..77aca0901
--- /dev/null
+++ b/src/modules/Makefile_conf_menus.am
@@ -0,0 +1,15 @@
+conf_menusdir = $(MDIR)/conf_menus
+conf_menus_DATA = conf_menus/e-module-conf_menus.edj \
+ conf_menus/module.desktop
+
+EXTRA_DIST += $(conf_menus_DATA)
+
+conf_menuspkgdir = $(MDIR)/conf_menus/$(MODULE_ARCH)
+conf_menuspkg_LTLIBRARIES = conf_menus/module.la
+
+conf_menus_module_la_SOURCES = conf_menus/e_mod_main.c \
+ conf_menus/e_mod_main.h \
+ conf_menus/e_int_config_menus.c \
+ conf_menus/e_int_config_menus.h
+
+conf_menus_module_la_DEPENDENCIES = $(MDEPENDENCIES)
diff --git a/src/modules/Makefile_conf_paths.am b/src/modules/Makefile_conf_paths.am
new file mode 100644
index 000000000..f3d21f3b2
--- /dev/null
+++ b/src/modules/Makefile_conf_paths.am
@@ -0,0 +1,17 @@
+conf_pathsdir = $(MDIR)/conf_paths
+conf_paths_DATA = conf_paths/e-module-conf_paths.edj \
+ conf_paths/module.desktop
+
+EXTRA_DIST += $(conf_paths_DATA)
+
+conf_pathspkgdir = $(MDIR)/conf_paths/$(MODULE_ARCH)
+conf_pathspkg_LTLIBRARIES = conf_paths/module.la
+
+conf_paths_module_la_SOURCES = conf_paths/e_mod_main.c \
+ conf_paths/e_mod_main.h \
+ conf_paths/e_int_config_paths.c \
+ conf_paths/e_int_config_paths.h \
+ conf_paths/e_int_config_env.c \
+ conf_paths/e_int_config_env.h
+
+conf_paths_module_la_DEPENDENCIES = $(MDEPENDENCIES)
diff --git a/src/modules/Makefile_conf_performance.am b/src/modules/Makefile_conf_performance.am
new file mode 100644
index 000000000..908ac1537
--- /dev/null
+++ b/src/modules/Makefile_conf_performance.am
@@ -0,0 +1,20 @@
+conf_performancedir = $(MDIR)/conf_performance
+conf_performance_DATA = conf_performance/e-module-conf_performance.edj \
+ conf_performance/module.desktop
+
+EXTRA_DIST += $(conf_performance_DATA)
+
+conf_performancepkgdir = $(MDIR)/conf_performance/$(MODULE_ARCH)
+conf_performancepkg_LTLIBRARIES = conf_performance/module.la
+
+conf_performance_module_la_SOURCES = conf_performance/e_mod_main.c \
+ conf_performance/e_mod_main.h \
+ conf_performance/e_int_config_performance.c \
+ conf_performance/e_int_config_performance.h \
+ conf_performance/e_int_config_engine.c \
+ conf_performance/e_int_config_engine.h \
+ conf_performance/e_int_config_powermanagement.c \
+ conf_performance/e_int_config_powermanagement.h
+
+
+conf_performance_module_la_DEPENDENCIES = $(MDEPENDENCIES)
diff --git a/src/modules/Makefile_conf_randr.am b/src/modules/Makefile_conf_randr.am
new file mode 100644
index 000000000..6bb72f654
--- /dev/null
+++ b/src/modules/Makefile_conf_randr.am
@@ -0,0 +1,19 @@
+conf_randrdir = $(MDIR)/conf_randr
+conf_randr_DATA = conf_randr/e-module-conf_randr.edj \
+ conf_randr/module.desktop
+
+EXTRA_DIST += $(conf_randr_DATA)
+
+conf_randrpkgdir = $(MDIR)/conf_randr/$(MODULE_ARCH)
+conf_randrpkg_LTLIBRARIES = conf_randr/module.la
+
+conf_randr_module_la_SOURCES = conf_randr/e_mod_main.c \
+ conf_randr/e_mod_main.h \
+ conf_randr/e_int_config_randr.h \
+ conf_randr/e_int_config_randr.c \
+ conf_randr/e_smart_randr.h \
+ conf_randr/e_smart_randr.c \
+ conf_randr/e_smart_monitor.h \
+ conf_randr/e_smart_monitor.c
+
+conf_randr_module_la_DEPENDENCIES = $(MDEPENDENCIES)
diff --git a/src/modules/Makefile_conf_shelves.am b/src/modules/Makefile_conf_shelves.am
new file mode 100644
index 000000000..69b5f72ef
--- /dev/null
+++ b/src/modules/Makefile_conf_shelves.am
@@ -0,0 +1,15 @@
+conf_shelvesdir = $(MDIR)/conf_shelves
+conf_shelves_DATA = conf_shelves/e-module-conf_shelves.edj \
+ conf_shelves/module.desktop
+
+EXTRA_DIST += $(conf_shelves_DATA)
+
+conf_shelvespkgdir = $(MDIR)/conf_shelves/$(MODULE_ARCH)
+conf_shelvespkg_LTLIBRARIES = conf_shelves/module.la
+
+conf_shelves_module_la_SOURCES = conf_shelves/e_mod_main.c \
+ conf_shelves/e_mod_main.h \
+ conf_shelves/e_int_config_shelf.c \
+ conf_shelves/e_int_config_shelf.h
+
+conf_shelves_module_la_DEPENDENCIES = $(MDEPENDENCIES)
diff --git a/src/modules/Makefile_conf_theme.am b/src/modules/Makefile_conf_theme.am
new file mode 100644
index 000000000..1614495f1
--- /dev/null
+++ b/src/modules/Makefile_conf_theme.am
@@ -0,0 +1,31 @@
+conf_themedir = $(MDIR)/conf_theme
+conf_theme_DATA = conf_theme/module.desktop
+
+EXTRA_DIST += $(conf_theme_DATA)
+
+conf_themepkgdir = $(MDIR)/conf_theme/$(MODULE_ARCH)
+conf_themepkg_LTLIBRARIES = conf_theme/module.la
+
+conf_theme_module_la_SOURCES = conf_theme/e_mod_main.c \
+ conf_theme/e_mod_main.h \
+ conf_theme/e_int_config_borders.c \
+ conf_theme/e_int_config_borders.h \
+ conf_theme/e_int_config_color_classes.c \
+ conf_theme/e_int_config_color_classes.h \
+ conf_theme/e_int_config_fonts.c \
+ conf_theme/e_int_config_fonts.h \
+ conf_theme/e_int_config_scale.c \
+ conf_theme/e_int_config_scale.h \
+ conf_theme/e_int_config_startup.c \
+ conf_theme/e_int_config_startup.h \
+ conf_theme/e_int_config_theme.c \
+ conf_theme/e_int_config_theme.h \
+ conf_theme/e_int_config_theme_import.c \
+ conf_theme/e_int_config_theme_import.h \
+ conf_theme/e_int_config_transitions.c \
+ conf_theme/e_int_config_transitions.h \
+ conf_theme/e_int_config_wallpaper.c \
+ conf_theme/e_int_config_wallpaper.h \
+ conf_theme/e_int_config_xsettings.c
+
+conf_theme_module_la_DEPENDENCIES = $(MDEPENDENCIES)
diff --git a/src/modules/Makefile_conf_wallpaper2.am b/src/modules/Makefile_conf_wallpaper2.am
new file mode 100644
index 000000000..724c7b00a
--- /dev/null
+++ b/src/modules/Makefile_conf_wallpaper2.am
@@ -0,0 +1,14 @@
+conf_wallpaper2dir = $(MDIR)/conf_wallpaper2
+conf_wallpaper2_DATA = conf_wallpaper2/module.desktop
+
+EXTRA_DIST += $(conf_wallpaper2_DATA)
+
+conf_wallpaper2pkgdir = $(MDIR)/conf_wallpaper2/$(MODULE_ARCH)
+conf_wallpaper2pkg_LTLIBRARIES = conf_wallpaper2/module.la
+
+conf_wallpaper2_module_la_SOURCES = conf_wallpaper2/e_mod_main.c \
+ conf_wallpaper2/e_mod_main.h \
+ conf_wallpaper2/e_int_config_wallpaper.c \
+ conf_wallpaper2/e_int_config_wallpaper.h
+
+conf_wallpaper2_module_la_DEPENDENCIES = $(MDEPENDENCIES)
diff --git a/src/modules/Makefile_conf_window_manipulation.am b/src/modules/Makefile_conf_window_manipulation.am
new file mode 100644
index 000000000..353b44506
--- /dev/null
+++ b/src/modules/Makefile_conf_window_manipulation.am
@@ -0,0 +1,21 @@
+conf_window_manipulationdir = $(MDIR)/conf_window_manipulation
+conf_window_manipulation_DATA = conf_window_manipulation/module.desktop
+
+EXTRA_DIST += $(conf_window_manipulation_DATA)
+
+conf_window_manipulationpkgdir = $(MDIR)/conf_window_manipulation/$(MODULE_ARCH)
+conf_window_manipulationpkg_LTLIBRARIES = conf_window_manipulation/module.la
+
+conf_window_manipulation_module_la_SOURCES = conf_window_manipulation/e_mod_main.c \
+ conf_window_manipulation/e_mod_main.h \
+ conf_window_manipulation/e_int_config_window_manip.h \
+ conf_window_manipulation/e_int_config_window_geometry.c \
+ conf_window_manipulation/e_int_config_window_process.c \
+ conf_window_manipulation/e_int_config_window_display.c \
+ conf_window_manipulation/e_int_config_window_display.h \
+ conf_window_manipulation/e_int_config_focus.c \
+ conf_window_manipulation/e_int_config_focus.h \
+ conf_window_manipulation/e_int_config_clientlist.c \
+ conf_window_manipulation/e_int_config_clientlist.h
+
+conf_window_manipulation_module_la_DEPENDENCIES = $(MDEPENDENCIES)
diff --git a/src/modules/Makefile_conf_window_remembers.am b/src/modules/Makefile_conf_window_remembers.am
new file mode 100644
index 000000000..8d8732591
--- /dev/null
+++ b/src/modules/Makefile_conf_window_remembers.am
@@ -0,0 +1,15 @@
+conf_window_remembersdir = $(MDIR)/conf_window_remembers
+conf_window_remembers_DATA = conf_window_remembers/e-module-conf_window_remembers.edj \
+ conf_window_remembers/module.desktop
+
+EXTRA_DIST += $(conf_window_remembers_DATA)
+
+conf_window_rememberspkgdir = $(MDIR)/conf_window_remembers/$(MODULE_ARCH)
+conf_window_rememberspkg_LTLIBRARIES = conf_window_remembers/module.la
+
+conf_window_remembers_module_la_SOURCES = conf_window_remembers/e_mod_main.c \
+ conf_window_remembers/e_mod_main.h \
+ conf_window_remembers/e_int_config_remembers.c \
+ conf_window_remembers/e_int_config_remembers.h
+
+conf_window_remembers_module_la_DEPENDENCIES = $(MDEPENDENCIES)
diff --git a/src/modules/Makefile_connman.am b/src/modules/Makefile_connman.am
new file mode 100644
index 000000000..d708f2dcd
--- /dev/null
+++ b/src/modules/Makefile_connman.am
@@ -0,0 +1,21 @@
+connmandir = $(MDIR)/connman
+connman_DATA = connman/e-module-connman.edj \
+ connman/module.desktop
+
+EXTRA_DIST += $(connman_DATA)
+
+connmanpkgdir = $(MDIR)/connman/$(MODULE_ARCH)
+connmanpkg_LTLIBRARIES = connman/module.la
+
+connman_module_la_SOURCES = connman/e_mod_main.h \
+ connman/e_mod_main.c \
+ connman/e_mod_config.c \
+ connman/e_connman.c \
+ connman/agent.c \
+ connman/agent.h \
+ connman/log.h \
+ connman/E_Connman.h
+
+connman_module_la_CFLAGS = $(AM_CFLAGS) -Wno-unused-parameter
+connman_module_la_LIBADD = $(AM_LIBADD) @ECONNMAN_LIBS@
+connman_module_la_DEPENDENCIES = $(MDEPENDENCIES)
diff --git a/src/modules/Makefile_cpufreq.am b/src/modules/Makefile_cpufreq.am
new file mode 100644
index 000000000..78b369e0d
--- /dev/null
+++ b/src/modules/Makefile_cpufreq.am
@@ -0,0 +1,29 @@
+cpufreqdir = $(MDIR)/cpufreq
+cpufreq_DATA = cpufreq/e-module-cpufreq.edj \
+ cpufreq/module.desktop
+
+EXTRA_DIST += $(cpufreq_DATA)
+
+cpufreqpkgdir = $(MDIR)/cpufreq/$(MODULE_ARCH)
+cpufreqpkg_LTLIBRARIES = cpufreq/module.la
+
+cpufreq_module_la_SOURCES = cpufreq/e_mod_main.h \
+ cpufreq/e_mod_main.c
+
+cpufreq_module_la_DEPENDENCIES = $(MDEPENDENCIES)
+
+freqsetdir = $(cpufreqpkgdir)
+freqset_PROGRAMS = cpufreq/freqset
+
+cpufreq_freqset_SOURCES = cpufreq/freqset.c
+cpufreq_freqset_CFLAGS = @e_cflags@ @SUID_CFLAGS@
+cpufreq_freqset_LDFLAGS = @SUID_LDFLAGS@
+
+cpufreq_setuid_root_mode = a=rx,u+xs
+cpufreq_setuid_root_user = root
+
+cpufreq-install-data-hook:
+ @chown $(cpufreq_setuid_root_user) $(DESTDIR)$(freqsetdir)/freqset$(EXEEXT) || true
+ @chmod $(cpufreq_setuid_root_mode) $(DESTDIR)$(freqsetdir)/freqset$(EXEEXT) || true
+
+INSTALL_DATA_HOOKS += cpufreq-install-data-hook
diff --git a/src/modules/Makefile_dropshadow.am b/src/modules/Makefile_dropshadow.am
new file mode 100644
index 000000000..924e03c5d
--- /dev/null
+++ b/src/modules/Makefile_dropshadow.am
@@ -0,0 +1,15 @@
+dropshadowdir = $(MDIR)/dropshadow
+dropshadow_DATA = dropshadow/e-module-dropshadow.edj \
+ dropshadow/module.desktop
+
+EXTRA_DIST += $(dropshadow_DATA)
+
+dropshadowpkgdir = $(MDIR)/dropshadow/$(MODULE_ARCH)
+dropshadowpkg_LTLIBRARIES = dropshadow/module.la
+
+dropshadow_module_la_SOURCES = dropshadow/e_mod_main.h \
+ dropshadow/e_mod_main.c \
+ dropshadow/e_mod_config.h \
+ dropshadow/e_mod_config.c
+
+dropshadow_module_la_DEPENDENCIES = $(MDEPENDENCIES)
diff --git a/src/modules/Makefile_everything.am b/src/modules/Makefile_everything.am
new file mode 100644
index 000000000..d11dcdb87
--- /dev/null
+++ b/src/modules/Makefile_everything.am
@@ -0,0 +1,47 @@
+everythingdir = $(MDIR)/everything
+everything_DATA = everything/e-module-everything.edj \
+ everything/e-module-everything-start.edj \
+ everything/module.desktop
+
+EXTRA_DIST += $(everything_DATA)
+
+everythingpkgdir = $(MDIR)/everything/$(MODULE_ARCH)
+everythingpkg_LTLIBRARIES = everything/module.la
+
+EVRYHEADERS = everything/evry_api.h \
+ everything/evry_types.h
+
+everything_module_la_SOURCES = $(EVRYHEADERS) \
+ everything/e_mod_main.c \
+ everything/e_mod_main.h \
+ everything/evry.c \
+ everything/evry_config.c \
+ everything/evry_util.c \
+ everything/evry_history.c \
+ everything/evry_plugin.c \
+ everything/evry_plug_aggregator.c \
+ everything/evry_plug_actions.c \
+ everything/evry_view.c \
+ everything/evry_view_tabs.c \
+ everything/evry_view_help.c \
+ everything/evry_plug_clipboard.c \
+ everything/evry_plug_text.c \
+ everything/evry_plug_collection.c \
+ everything/evry_gadget.c \
+ everything/md5.c \
+ everything/md5.h \
+ everything/evry_plug_apps.c \
+ everything/evry_plug_files.c \
+ everything/evry_plug_windows.c \
+ everything/evry_plug_settings.c \
+ everything/evry_plug_calc.c
+
+everything_module_la_DEPENDENCIES = $(MDEPENDENCIES)
+
+everything_headersdir = $(pkgincludedir)
+dist_everything_headers_DATA = $(EVRYHEADERS)
+
+everything_pkgconfigdir = $(libdir)/pkgconfig
+everything_pkgconfig_DATA = everything/everything.pc
+EXTRA_DIST += everything/everything.pc.in
+CLEANFILES += everything/everything.pc
diff --git a/src/modules/Makefile_fileman.am b/src/modules/Makefile_fileman.am
new file mode 100644
index 000000000..d32bd0ab3
--- /dev/null
+++ b/src/modules/Makefile_fileman.am
@@ -0,0 +1,24 @@
+filemandir = $(MDIR)/fileman
+fileman_DATA = fileman/e-module-fileman.edj \
+ fileman/module.desktop
+
+EXTRA_DIST += $(fileman_DATA)
+
+filemanpkgdir = $(MDIR)/fileman/$(MODULE_ARCH)
+filemanpkg_LTLIBRARIES = fileman/module.la
+
+fileman_module_la_SOURCES = fileman/e_mod_main.c \
+ fileman/e_mod_main.h \
+ fileman/e_fwin.c \
+ fileman/e_fwin.h \
+ fileman/e_fwin_nav.c \
+ fileman/e_mod_config.c \
+ fileman/e_int_config_mime.c \
+ fileman/e_int_config_mime.h \
+ fileman/e_int_config_mime_edit.c \
+ fileman/e_int_config_mime_edit.h \
+ fileman/e_mod_dbus.c \
+ fileman/e_mod_dbus.h \
+ fileman/e_mod_menu.c
+
+fileman_module_la_DEPENDENCIES = $(MDEPENDENCIES)
diff --git a/src/modules/Makefile_fileman_opinfo.am b/src/modules/Makefile_fileman_opinfo.am
new file mode 100644
index 000000000..b3adda245
--- /dev/null
+++ b/src/modules/Makefile_fileman_opinfo.am
@@ -0,0 +1,13 @@
+fileman_opinfodir = $(MDIR)/fileman_opinfo
+fileman_opinfo_DATA = fileman_opinfo/e-module-fileman_opinfo.edj \
+ fileman_opinfo/module.desktop
+
+EXTRA_DIST += $(fileman_opinfo_DATA)
+
+fileman_opinfopkgdir = $(MDIR)/fileman_opinfo/$(MODULE_ARCH)
+fileman_opinfopkg_LTLIBRARIES = fileman_opinfo/module.la
+
+fileman_opinfo_module_la_SOURCES = fileman_opinfo/e_mod_main.c \
+ fileman_opinfo/e_mod_main.h
+
+fileman_opinfo_module_la_DEPENDENCIES = $(MDEPENDENCIES)
diff --git a/src/modules/Makefile_gadman.am b/src/modules/Makefile_gadman.am
new file mode 100644
index 000000000..d51fc6111
--- /dev/null
+++ b/src/modules/Makefile_gadman.am
@@ -0,0 +1,17 @@
+gadmandir = $(MDIR)/gadman
+gadman_DATA = gadman/e-module-gadman.edj \
+ gadman/module.desktop
+
+EXTRA_DIST += $(gadman_DATA)
+
+gadmanpkgdir = $(MDIR)/gadman/$(MODULE_ARCH)
+gadmanpkg_LTLIBRARIES = gadman/module.la
+
+gadman_module_la_SOURCES = gadman/e_mod_main.c \
+ gadman/e_mod_main.h \
+ gadman/e_mod_config.c \
+ gadman/e_mod_config.h \
+ gadman/e_mod_gadman.c \
+ gadman/e_mod_gadman.h
+
+gadman_module_la_DEPENDENCIES = $(MDEPENDENCIES)
diff --git a/src/modules/Makefile_ibar.am b/src/modules/Makefile_ibar.am
new file mode 100644
index 000000000..884b639d8
--- /dev/null
+++ b/src/modules/Makefile_ibar.am
@@ -0,0 +1,14 @@
+ibardir = $(MDIR)/ibar
+ibar_DATA = ibar/e-module-ibar.edj \
+ ibar/module.desktop
+
+EXTRA_DIST += $(ibar_DATA)
+
+ibarpkgdir = $(MDIR)/ibar/$(MODULE_ARCH)
+ibarpkg_LTLIBRARIES = ibar/module.la
+
+ibar_module_la_SOURCES = ibar/e_mod_main.c \
+ ibar/e_mod_main.h \
+ ibar/e_mod_config.c
+
+ibar_module_la_DEPENDENCIES = $(MDEPENDENCIES)
diff --git a/src/modules/Makefile_ibox.am b/src/modules/Makefile_ibox.am
new file mode 100644
index 000000000..eff1131fa
--- /dev/null
+++ b/src/modules/Makefile_ibox.am
@@ -0,0 +1,14 @@
+iboxdir = $(MDIR)/ibox
+ibox_DATA = ibox/e-module-ibox.edj \
+ ibox/module.desktop
+
+EXTRA_DIST += $(ibox_DATA)
+
+iboxpkgdir = $(MDIR)/ibox/$(MODULE_ARCH)
+iboxpkg_LTLIBRARIES = ibox/module.la
+
+ibox_module_la_SOURCES = ibox/e_mod_main.c \
+ ibox/e_mod_main.h \
+ ibox/e_mod_config.c
+
+ibox_module_la_DEPENDENCIES = $(MDEPENDENCIES)
diff --git a/src/modules/Makefile_illume-bluetooth.am b/src/modules/Makefile_illume-bluetooth.am
new file mode 100644
index 000000000..9b528ae3b
--- /dev/null
+++ b/src/modules/Makefile_illume-bluetooth.am
@@ -0,0 +1,13 @@
+illume_bluetoothdir = $(MDIR)/illume-bluetooth
+illume_bluetooth_DATA = illume-bluetooth/e-module-illume-bluetooth.edj \
+ illume-bluetooth/module.desktop
+
+EXTRA_DIST += $(illume_bluetooth_DATA)
+
+illume_bluetoothpkgdir = $(MDIR)/illume-bluetooth/$(MODULE_ARCH)
+illume_bluetoothpkg_LTLIBRARIES = illume-bluetooth/module.la
+
+illume_bluetooth_module_la_SOURCES = illume-bluetooth/e_mod_main.c \
+ illume-bluetooth/e_mod_main.h
+
+illume_bluetooth_module_la_DEPENDENCIES = $(MDEPENDENCIES)
diff --git a/src/modules/Makefile_illume-home-toggle.am b/src/modules/Makefile_illume-home-toggle.am
new file mode 100644
index 000000000..18a00bf6a
--- /dev/null
+++ b/src/modules/Makefile_illume-home-toggle.am
@@ -0,0 +1,13 @@
+illume_home_toggledir = $(MDIR)/illume-home-toggle
+illume_home_toggle_DATA = illume-home-toggle/e-module-illume-home-toggle.edj \
+ illume-home-toggle/module.desktop
+
+EXTRA_DIST += $(illume_home_toggle_DATA)
+
+illume_home_togglepkgdir = $(MDIR)/illume-home-toggle/$(MODULE_ARCH)
+illume_home_togglepkg_LTLIBRARIES = illume-home-toggle/module.la
+
+illume_home_toggle_module_la_SOURCES = illume-home-toggle/e_mod_main.c \
+ illume-home-toggle/e_mod_main.h
+
+illume_home_toggle_module_la_DEPENDENCIES = $(MDEPENDENCIES)
diff --git a/src/modules/Makefile_illume-home.am b/src/modules/Makefile_illume-home.am
new file mode 100644
index 000000000..f4fe7d56f
--- /dev/null
+++ b/src/modules/Makefile_illume-home.am
@@ -0,0 +1,17 @@
+illume_homedir = $(MDIR)/illume-home
+illume_home_DATA = illume-home/e-module-illume-home.edj \
+ illume-home/module.desktop
+
+EXTRA_DIST += $(illume_home_DATA)
+
+illume_homepkgdir = $(MDIR)/illume-home/$(MODULE_ARCH)
+illume_homepkg_LTLIBRARIES = illume-home/module.la
+
+illume_home_module_la_SOURCES = illume-home/e_mod_main.c \
+ illume-home/e_mod_main.h \
+ illume-home/e_mod_config.c \
+ illume-home/e_mod_config.h \
+ illume-home/e_busycover.c \
+ illume-home/e_busycover.h
+
+illume_home_module_la_DEPENDENCIES = $(MDEPENDENCIES)
diff --git a/src/modules/Makefile_illume-indicator.am b/src/modules/Makefile_illume-indicator.am
new file mode 100644
index 000000000..437a26d0e
--- /dev/null
+++ b/src/modules/Makefile_illume-indicator.am
@@ -0,0 +1,34 @@
+illume_indicatordir = $(MDIR)/illume-indicator
+illume_indicator_DATA = illume-indicator/e-module-illume-indicator.edj \
+ illume-indicator/module.desktop
+
+EXTRA_DIST += illume-indicator/e-module-illume-indicator.edc \
+ illume-indicator/module.desktop.in
+
+# images
+EXTRA_DIST += illume-indicator/images/base_bg.png \
+ illume-indicator/images/module_icon.png
+
+ILLUME_INDICATOR_EDJE_FLAGS = $(EDJE_FLAGS) \
+ -id $(srcdir)/illume-indicator/images
+
+illume-indicator/%.edj: illume-indicator/%.edc Makefile
+ $(EDJE_CC) $(ILLUME_INDICATOR_EDJE_FLAGS) $< $@
+
+illume_indicatorpkgdir = $(MDIR)/illume-indicator/$(MODULE_ARCH)
+illume_indicatorpkg_LTLIBRARIES = illume-indicator/module.la
+
+illume_indicator_module_la_SOURCES = illume-indicator/e_mod_main.c \
+ illume-indicator/e_mod_main.h \
+ illume-indicator/e_mod_config.c \
+ illume-indicator/e_mod_config.h \
+ illume-indicator/e_mod_ind_win.c \
+ illume-indicator/e_mod_ind_win.h
+
+if HAVE_ENOTIFY
+illume_indicator_module_la_SOURCES += illume-indicator/e_mod_notify.c \
+ illume-indicator/e_mod_notify.h
+endif
+
+illume_indicator_module_la_LIBADD = $(AM_LIBADD) @ENOTIFY_LIBS@
+illume_indicator_module_la_DEPENDENCIES = $(MDEPENDENCIES)
diff --git a/src/modules/Makefile_illume-kbd-toggle.am b/src/modules/Makefile_illume-kbd-toggle.am
new file mode 100644
index 000000000..ffcae4907
--- /dev/null
+++ b/src/modules/Makefile_illume-kbd-toggle.am
@@ -0,0 +1,13 @@
+illume_kbd_toggledir = $(MDIR)/illume-kbd-toggle
+illume_kbd_toggle_DATA = illume-kbd-toggle/e-module-illume-kbd-toggle.edj \
+ illume-kbd-toggle/module.desktop
+
+EXTRA_DIST += $(illume_kbd_toggle_DATA)
+
+illume_kbd_togglepkgdir = $(MDIR)/illume-kbd-toggle/$(MODULE_ARCH)
+illume_kbd_togglepkg_LTLIBRARIES = illume-kbd-toggle/module.la
+
+illume_kbd_toggle_module_la_SOURCES = illume-kbd-toggle/e_mod_main.c \
+ illume-kbd-toggle/e_mod_main.h
+
+illume_kbd_toggle_module_la_DEPENDENCIES = $(MDEPENDENCIES)
diff --git a/src/modules/Makefile_illume-keyboard.am b/src/modules/Makefile_illume-keyboard.am
new file mode 100644
index 000000000..503e83662
--- /dev/null
+++ b/src/modules/Makefile_illume-keyboard.am
@@ -0,0 +1,60 @@
+illume_keyboarddir = $(MDIR)/illume-keyboard
+illume_keyboard_DATA = illume-keyboard/e-module-illume-keyboard.edj \
+ illume-keyboard/module.desktop
+
+EXTRA_DIST += $(illume_keyboard_DATA) \
+ illume-keyboard/e-module-illume-keyboard.edj \
+ illume-keyboard/module.desktop.in
+CLEANFILES += illume-keyboard/e-module-illume-keyboard.edj
+
+
+# keyboards
+illumekeyboardsdir = $(MDIR)/illume-keyboard/keyboards
+illumekeyboards_DATA = illume-keyboard/keyboards/ignore_built_in_keyboards \
+ illume-keyboard/keyboards/Default.kbd \
+ illume-keyboard/keyboards/alpha.png \
+ illume-keyboard/keyboards/Numbers.kbd \
+ illume-keyboard/keyboards/numeric.png \
+ illume-keyboard/keyboards/Terminal.kbd \
+ illume-keyboard/keyboards/qwerty.png \
+ illume-keyboard/keyboards/up.png \
+ illume-keyboard/keyboards/down.png \
+ illume-keyboard/keyboards/left.png \
+ illume-keyboard/keyboards/right.png \
+ illume-keyboard/keyboards/shift.png \
+ illume-keyboard/keyboards/tab.png \
+ illume-keyboard/keyboards/enter.png \
+ illume-keyboard/keyboards/backspace.png
+
+EXTRA_DIST += $(illumekeyboards_DATA)
+
+# dicts
+illumedictsdir = $(MDIR)/illume-keyboard/dicts
+illumedicts_DATA = illume-keyboard/dicts/English_US.dic \
+ illume-keyboard/dicts/English_US_Small.dic
+
+EXTRA_DIST += $(illumedicts_DATA)
+
+
+ILLUME_KEYBOARD_EDJE_FLAGS = $(EDJE_FLAGS) -id $(srcdir)/illume-keyboard/images
+
+illume-keyboard/%.edj: illume-keyboard/%.edc Makefile
+ $(EDJE_CC) $(ILLUME_KEYBOARD_EDJE_FLAGS) $< $@
+
+illume_keyboardpkgdir = $(MDIR)/illume-keyboard/$(MODULE_ARCH)
+illume_keyboardpkg_LTLIBRARIES = illume-keyboard/module.la
+
+illume_keyboard_module_la_SOURCES = illume-keyboard/e_mod_main.c \
+ illume-keyboard/e_mod_main.h \
+ illume-keyboard/e_kbd_int.c \
+ illume-keyboard/e_kbd_int.h \
+ illume-keyboard/e_kbd_dict.c \
+ illume-keyboard/e_kbd_dict.h \
+ illume-keyboard/e_kbd_buf.c \
+ illume-keyboard/e_kbd_buf.h \
+ illume-keyboard/e_kbd_send.c \
+ illume-keyboard/e_kbd_send.h \
+ illume-keyboard/e_mod_config.c \
+ illume-keyboard/e_mod_config.h
+
+illume_keyboard_module_la_DEPENDENCIES = $(MDEPENDENCIES)
diff --git a/src/modules/Makefile_illume-mode-toggle.am b/src/modules/Makefile_illume-mode-toggle.am
new file mode 100644
index 000000000..0359e31b4
--- /dev/null
+++ b/src/modules/Makefile_illume-mode-toggle.am
@@ -0,0 +1,13 @@
+illume_mode_toggledir = $(MDIR)/illume-mode-toggle
+illume_mode_toggle_DATA = illume-mode-toggle/e-module-illume-mode-toggle.edj \
+ illume-mode-toggle/module.desktop
+
+EXTRA_DIST += $(illume_mode_toggle_DATA)
+
+illume_mode_togglepkgdir = $(MDIR)/illume-mode-toggle/$(MODULE_ARCH)
+illume_mode_togglepkg_LTLIBRARIES = illume-mode-toggle/module.la
+
+illume_mode_toggle_module_la_SOURCES = illume-mode-toggle/e_mod_main.c \
+ illume-mode-toggle/e_mod_main.h
+
+illume_mode_toggle_module_la_DEPENDENCIES = $(MDEPENDENCIES)
diff --git a/src/modules/Makefile_illume-softkey.am b/src/modules/Makefile_illume-softkey.am
new file mode 100644
index 000000000..b76cf2b83
--- /dev/null
+++ b/src/modules/Makefile_illume-softkey.am
@@ -0,0 +1,28 @@
+illume_softkeydir = $(MDIR)/illume-softkey
+illume_softkey_DATA = illume-softkey/e-module-illume-softkey.edj \
+ illume-softkey/module.desktop
+
+EXTRA_DIST += $(illume_softkey_DATA)
+
+# images
+EXTRA_DIST += illume-softkey/images/shelf_alt_bg.png \
+ illume-softkey/images/shelf_alt_shine.png \
+ illume-softkey/images/module_icon.png \
+ illume-softkey/images/shelf_alt_over.png
+
+ILLUME_SOFTKEY_EDJE_FLAGS = $(EDJE_FLAGS) -id $(srcdir)/illume-softkey/images
+
+illume-softkey/%.edj: illume-softkey/%.edc Makefile
+ $(EDJE_CC) $(ILLUME_SOFTKEY_EDJE_FLAGS) $< $@
+
+illume_softkeypkgdir = $(MDIR)/illume-softkey/$(MODULE_ARCH)
+illume_softkeypkg_LTLIBRARIES = illume-softkey/module.la
+
+illume_softkey_module_la_SOURCES = illume-softkey/e_mod_main.c \
+ illume-softkey/e_mod_main.h \
+ illume-softkey/e_mod_sft_win.c \
+ illume-softkey/e_mod_sft_win.h \
+ illume-softkey/e_mod_config.c \
+ illume-softkey/e_mod_config.h
+
+illume_softkey_module_la_DEPENDENCIES = $(MDEPENDENCIES)
diff --git a/src/modules/Makefile_illume2.am b/src/modules/Makefile_illume2.am
new file mode 100644
index 000000000..1c97ac276
--- /dev/null
+++ b/src/modules/Makefile_illume2.am
@@ -0,0 +1,73 @@
+illume2dir = $(MDIR)/illume2
+illume2_DATA = illume2/e-module-illume2.edj \
+ illume2/module.desktop
+
+EXTRA_DIST += illume2/e-module-illume2.edc \
+ illume2/module.desktop.in
+CLEANFILES += illume2/e-module-illume2.edj
+
+# images
+EXTRA_DIST += illume2/images/module_icon.png
+
+# keyboards
+illume2keyboardsdir = $(MDIR)/keyboards
+illume2keyboards_DATA = illume2/keyboards/ignore_built_in_keyboards
+EXTRA_DIST += $(illume2keyboards_DATA)
+
+# policies
+## illume
+illume2policyillumedir = $(MDIR)/policies
+illume2policyillume_LTLIBRARIES = illume2/policies/illume/illume.la
+ILLUME2POLICYCPPFLAGS = $(AM_CPPFLAGS) -I$(top_srcdir)/src/modules/illume2
+
+illume2_policies_illume_illume_la_CPPFLAGS = $(ILLUME2POLICYCPPFLAGS)
+illume2_policies_illume_illume_la_SOURCES = illume2/policies/illume/policy.c \
+ illume2/policies/illume/policy.h \
+ illume2/policies/illume/illume.c \
+ illume2/policies/illume/illume.h
+illume2_policies_illume_illume_la_LIBTOOLFLAGS = --tag=disable-static
+
+## tablet
+illume2policytabletdir = $(MDIR)/policies
+illume2policytablet_LTLIBRARIES = illume2/policies/tablet/tablet.la
+
+illume2_policies_tablet_tablet_la_CPPFLAGS = $(ILLUME2POLICYCPPFLAGS)
+illume2_policies_tablet_tablet_la_SOURCES = illume2/policies/tablet/policy.c \
+ illume2/policies/tablet/policy.h \
+ illume2/policies/tablet/tablet.c \
+ illume2/policies/tablet/tablet.h
+illume2_policies_tablet_tablet_la_LIBTOOLFLAGS = --tag=disable-static
+
+ILLUME2_EDJE_FLAGS = $(EDJE_FLAGS) -id $(srcdir)/illume2/images
+
+illume2/%.edj: illume2/%.edc Makefile
+ $(EDJE_CC) $(ILLUME2_EDJE_FLAGS) $< $@
+
+illume2pkgdir = $(MDIR)/illume2/$(MODULE_ARCH)
+illume2pkg_LTLIBRARIES = illume2/module.la
+
+illume2_module_la_SOURCES = illume2/e_mod_main.c \
+ illume2/e_mod_main.h \
+ illume2/e_illume.h \
+ illume2/e_illume.c \
+ illume2/e_illume_private.h \
+ illume2/e_mod_config_policy.h \
+ illume2/e_mod_config_policy.c \
+ illume2/e_mod_select_window.h \
+ illume2/e_mod_select_window.c \
+ illume2/e_mod_config_windows.h \
+ illume2/e_mod_config_windows.c \
+ illume2/e_mod_config_animation.h \
+ illume2/e_mod_config_animation.c \
+ illume2/e_mod_quickpanel.h \
+ illume2/e_mod_quickpanel.c \
+ illume2/e_mod_kbd_device.h \
+ illume2/e_mod_kbd_device.c \
+ illume2/e_mod_kbd.h \
+ illume2/e_mod_kbd.c \
+ illume2/e_mod_policy.h \
+ illume2/e_mod_policy.c \
+ illume2/e_mod_config.h \
+ illume2/e_mod_config.c
+
+illume2_module_la_DEPENDENCIES = $(MDEPENDENCIES)
diff --git a/src/modules/Makefile_mixer.am b/src/modules/Makefile_mixer.am
new file mode 100644
index 000000000..672aa74f8
--- /dev/null
+++ b/src/modules/Makefile_mixer.am
@@ -0,0 +1,41 @@
+mixerdir = $(MDIR)/mixer
+mixer_DATA = mixer/e-module-mixer.edj \
+ mixer/module.desktop
+
+EXTRA_DIST += $(mixer_DATA)
+
+mixerpkgdir = $(MDIR)/mixer/$(MODULE_ARCH)
+mixerpkg_LTLIBRARIES = mixer/module.la
+
+mixer_module_la_CFLAGS = $(AM_CFLAGS)
+mixer_module_la_LIBADD = $(AM_LIBADD)
+
+mixer_module_la_SOURCES = mixer/e_mod_main.c \
+ mixer/e_mod_main.h \
+ mixer/app_mixer.c \
+ mixer/conf_gadget.c \
+ mixer/conf_module.c \
+ mixer/e_mod_system.h \
+ mixer/msg.c \
+ mixer/Pulse.h \
+ mixer/pa.h \
+ mixer/pa.c \
+ mixer/serial.c \
+ mixer/sink.c \
+ mixer/sys_pulse.c \
+ mixer/tag.c
+
+if HAVE_ALSA
+mixer_module_la_SOURCES += mixer/sys_alsa.c
+else
+mixer_module_la_SOURCES += mixer/sys_dummy.c
+endif
+
+mixer_module_la_LIBADD += @SOUND_LIBS@
+
+if HAVE_ENOTIFY
+mixer_module_la_CFLAGS += @ENOTIFY_CFLAGS@
+mixer_module_la_LIBADD += @ENOTIFY_LIBS@
+endif
+
+mixer_module_la_DEPENDENCIES = $(MDEPENDENCIES)
diff --git a/src/modules/Makefile_msgbus.am b/src/modules/Makefile_msgbus.am
new file mode 100644
index 000000000..2249ceb22
--- /dev/null
+++ b/src/modules/Makefile_msgbus.am
@@ -0,0 +1,16 @@
+msgbusdir = $(MDIR)/msgbus
+msgbus_DATA = msgbus/e-module-msgbus.edj \
+ msgbus/module.desktop
+
+EXTRA_DIST += $(msgbus_DATA)
+
+msgbuspkgdir = $(MDIR)/msgbus/$(MODULE_ARCH)
+msgbuspkg_LTLIBRARIES = msgbus/module.la
+
+msgbus_module_la_SOURCES = msgbus/e_mod_main.h \
+ msgbus/e_mod_main.c \
+ msgbus/msgbus_audit.c \
+ msgbus/msgbus_desktop.c \
+ msgbus/msgbus_lang.c
+
+msgbus_module_la_DEPENDENCIES = $(MDEPENDENCIES)
diff --git a/src/modules/Makefile_notification.am b/src/modules/Makefile_notification.am
new file mode 100644
index 000000000..f7fe4b334
--- /dev/null
+++ b/src/modules/Makefile_notification.am
@@ -0,0 +1,18 @@
+notificationdir = $(MDIR)/notification
+notification_DATA = notification/e-module-notification.edj \
+ notification/module.desktop
+
+EXTRA_DIST += $(notification_DATA)
+
+notificationpkgdir = $(MDIR)/notification/$(MODULE_ARCH)
+notificationpkg_LTLIBRARIES = notification/module.la
+
+notification_module_la_SOURCES = notification/e_mod_main.h \
+ notification/e_mod_main.c \
+ notification/e_mod_box.c \
+ notification/e_mod_config.c \
+ notification/e_mod_config_item.c \
+ notification/e_mod_popup.c
+
+notification_module_la_LIBADD = $(AM_LIBADD) @ENOTIFY_LIBS@
+notification_module_la_DEPENDENCIES = $(MDEPENDENCIES)
diff --git a/src/modules/Makefile_pager.am b/src/modules/Makefile_pager.am
new file mode 100644
index 000000000..10167351d
--- /dev/null
+++ b/src/modules/Makefile_pager.am
@@ -0,0 +1,14 @@
+pagerdir = $(MDIR)/pager
+pager_DATA = pager/e-module-pager.edj \
+ pager/module.desktop
+
+EXTRA_DIST += $(pager_DATA)
+
+pagerpkgdir = $(MDIR)/pager/$(MODULE_ARCH)
+pagerpkg_LTLIBRARIES = pager/module.la
+
+pager_module_la_SOURCES = pager/e_mod_main.h \
+ pager/e_mod_main.c \
+ pager/e_mod_config.c
+
+pager_module_la_DEPENDENCIES = $(MDEPENDENCIES)
diff --git a/src/modules/Makefile_physics.am b/src/modules/Makefile_physics.am
new file mode 100644
index 000000000..9ad17647d
--- /dev/null
+++ b/src/modules/Makefile_physics.am
@@ -0,0 +1,20 @@
+physicsdir = $(MDIR)/physics
+physics_DATA = physics/e-module-physics.edj \
+ physics/module.desktop
+
+EXTRA_DIST += $(physics_DATA)
+
+physicspkgdir = $(MDIR)/physics/$(MODULE_ARCH)
+physicspkg_LTLIBRARIES = physics/module.la
+
+physics_module_la_SOURCES = physics/e_mod_main.c \
+ physics/e_mod_main.h \
+ physics/e_mod_config.c \
+ physics/e_mod_config.h \
+ physics/e_mod_physics_cfdata.c \
+ physics/e_mod_physics_cfdata.h \
+ physics/e_mod_physics.c \
+ physics/e_mod_physics.h
+
+physics_module_la_LIBADD = $(AM_LIBADD) @EPHYSICS_LIBS@
+physics_module_la_DEPENDENCIES = $(MDEPENDENCIES)
diff --git a/src/modules/Makefile_quickaccess.am b/src/modules/Makefile_quickaccess.am
new file mode 100644
index 000000000..90ba98a4e
--- /dev/null
+++ b/src/modules/Makefile_quickaccess.am
@@ -0,0 +1,17 @@
+quickaccessdir = $(MDIR)/quickaccess
+quickaccess_DATA = quickaccess/e-module-quickaccess.edj \
+ quickaccess/module.desktop
+
+EXTRA_DIST += $(quickaccess_DATA)
+
+quickaccesspkgdir = $(MDIR)/quickaccess/$(MODULE_ARCH)
+quickaccesspkg_LTLIBRARIES = quickaccess/module.la
+
+quickaccess_module_la_SOURCES = quickaccess/e_mod_main.c \
+ quickaccess/e_mod_main.h \
+ quickaccess/e_mod_config.c \
+ quickaccess/e_mod_quickaccess.c \
+ quickaccess/e_quickaccess_bindings.c \
+ quickaccess/e_quickaccess_db.c
+
+quickaccess_module_la_DEPENDENCIES = $(MDEPENDENCIES)
diff --git a/src/modules/Makefile_shot.am b/src/modules/Makefile_shot.am
new file mode 100644
index 000000000..e532a3d45
--- /dev/null
+++ b/src/modules/Makefile_shot.am
@@ -0,0 +1,13 @@
+shotdir = $(MDIR)/shot
+shot_DATA = shot/e-module-shot.edj \
+ shot/module.desktop
+
+EXTRA_DIST += $(shot_DATA)
+
+shotpkgdir = $(MDIR)/shot/$(MODULE_ARCH)
+shotpkg_LTLIBRARIES = shot/module.la
+
+shot_module_la_SOURCES = shot/e_mod_main.c \
+ shot/e_mod_main.h
+
+shot_module_la_DEPENDENCIES = $(MDEPENDENCIES)
diff --git a/src/modules/Makefile_start.am b/src/modules/Makefile_start.am
new file mode 100644
index 000000000..bf8633da9
--- /dev/null
+++ b/src/modules/Makefile_start.am
@@ -0,0 +1,13 @@
+startdir = $(MDIR)/start
+start_DATA = start/e-module-start.edj \
+ start/module.desktop
+
+EXTRA_DIST += $(start_DATA)
+
+startpkgdir = $(MDIR)/start/$(MODULE_ARCH)
+startpkg_LTLIBRARIES = start/module.la
+
+start_module_la_SOURCES = start/e_mod_main.h \
+ start/e_mod_main.c
+
+start_module_la_DEPENDENCIES = $(MDEPENDENCIES)
diff --git a/src/modules/Makefile_syscon.am b/src/modules/Makefile_syscon.am
new file mode 100644
index 000000000..dc78e6c10
--- /dev/null
+++ b/src/modules/Makefile_syscon.am
@@ -0,0 +1,18 @@
+syscondir = $(MDIR)/syscon
+syscon_DATA = syscon/e-module-syscon.edj \
+ syscon/module.desktop
+
+EXTRA_DIST += $(syscon_DATA)
+
+sysconpkgdir = $(MDIR)/syscon/$(MODULE_ARCH)
+sysconpkg_LTLIBRARIES = syscon/module.la
+
+syscon_module_la_SOURCES = syscon/e_mod_main.c \
+ syscon/e_mod_main.h \
+ syscon/e_int_config_syscon.c \
+ syscon/e_int_config_syscon.h \
+ syscon/e_syscon.c \
+ syscon/e_syscon.h \
+ syscon/e_syscon_gadget.c
+
+syscon_module_la_DEPENDENCIES = $(MDEPENDENCIES)
diff --git a/src/modules/Makefile_systray.am b/src/modules/Makefile_systray.am
new file mode 100644
index 000000000..d5c078e53
--- /dev/null
+++ b/src/modules/Makefile_systray.am
@@ -0,0 +1,13 @@
+systraydir = $(MDIR)/systray
+systray_DATA = systray/e-module-systray.edj \
+ systray/module.desktop
+
+EXTRA_DIST += $(systray_DATA)
+
+systraypkgdir = $(MDIR)/systray/$(MODULE_ARCH)
+systraypkg_LTLIBRARIES = systray/module.la
+
+systray_module_la_SOURCES = systray/e_mod_main.h \
+ systray/e_mod_main.c
+
+systray_module_la_DEPENDENCIES = $(MDEPENDENCIES)
diff --git a/src/modules/Makefile_tasks.am b/src/modules/Makefile_tasks.am
new file mode 100644
index 000000000..357873f42
--- /dev/null
+++ b/src/modules/Makefile_tasks.am
@@ -0,0 +1,14 @@
+tasksdir = $(MDIR)/tasks
+tasks_DATA = tasks/e-module-tasks.edj \
+ tasks/module.desktop
+
+EXTRA_DIST += $(tasks_DATA)
+
+taskspkgdir = $(MDIR)/tasks/$(MODULE_ARCH)
+taskspkg_LTLIBRARIES = tasks/module.la
+
+tasks_module_la_SOURCES = tasks/e_mod_main.c \
+ tasks/e_mod_main.h \
+ tasks/e_mod_config.c
+
+tasks_module_la_DEPENDENCIES = $(MDEPENDENCIES)
diff --git a/src/modules/Makefile_temperature.am b/src/modules/Makefile_temperature.am
new file mode 100644
index 000000000..1d18292bc
--- /dev/null
+++ b/src/modules/Makefile_temperature.am
@@ -0,0 +1,25 @@
+temperaturedir = $(MDIR)/temperature
+temperature_DATA = temperature/e-module-temperature.edj \
+ temperature/module.desktop
+
+EXTRA_DIST += $(temperature_DATA)
+
+temperaturepkgdir = $(MDIR)/temperature/$(MODULE_ARCH)
+temperaturepkg_LTLIBRARIES = temperature/module.la
+
+temperature_module_la_DEPENDENCIES = $(MDEPENDENCIES)
+temperature_module_la_SOURCES = temperature/e_mod_main.c \
+ temperature/e_mod_main.h \
+ temperature/e_mod_config.c \
+ temperature/e_mod_main_private.h \
+ temperature/e_mod_tempget.c
+
+if HAVE_EEZE
+temperature_module_la_SOURCES += temperature/e_mod_udev.c
+endif
+
+tempgetdir = $(temperaturepkgdir)
+tempget_PROGRAMS = temperature/tempget
+
+temperature_tempget_SOURCES = temperature/tempget.c
+temperature_tempget_LDADD = @TEMPERATURE_LIBS@
diff --git a/src/modules/Makefile_tiling.am b/src/modules/Makefile_tiling.am
new file mode 100644
index 000000000..c14039282
--- /dev/null
+++ b/src/modules/Makefile_tiling.am
@@ -0,0 +1,22 @@
+tilingdir = $(MDIR)/tiling
+tiling_DATA = tiling/e-module-tiling.edj \
+ tiling/module.desktop
+
+EXTRA_DIST += $(tiling_DATA) \
+ tiling/e-module-tiling.edc \
+ tiling/module.desktop.in \
+ tiling/images/module_icon.png
+
+tilingpkgdir = $(MDIR)/tiling/$(MODULE_ARCH)
+tilingpkg_LTLIBRARIES = tiling/module.la
+
+TILING_EDJE_FLAGS = $(EDJE_FLAGS) -id $(srcdir)/tiling/images
+
+tiling/%.edj: tiling/%.edc Makefile
+ $(EDJE_CC) $(TILING_EDJE_FLAGS) $< $@
+
+tiling_module_la_SOURCES = tiling/e_mod_tiling.c \
+ tiling/e_mod_tiling.h \
+ tiling/e_mod_config.c
+
+tiling_module_la_DEPENDENCIES = $(MDEPENDENCIES)
diff --git a/src/modules/Makefile_winlist.am b/src/modules/Makefile_winlist.am
new file mode 100644
index 000000000..0b6360131
--- /dev/null
+++ b/src/modules/Makefile_winlist.am
@@ -0,0 +1,17 @@
+winlistdir = $(MDIR)/winlist
+winlist_DATA = winlist/e-module-winlist.edj \
+ winlist/module.desktop
+
+EXTRA_DIST += $(winlist_DATA)
+
+winlistpkgdir = $(MDIR)/winlist/$(MODULE_ARCH)
+winlistpkg_LTLIBRARIES = winlist/module.la
+
+winlist_module_la_SOURCES = winlist/e_mod_main.h \
+ winlist/e_mod_main.c \
+ winlist/e_int_config_winlist.h \
+ winlist/e_int_config_winlist.c \
+ winlist/e_winlist.h \
+ winlist/e_winlist.c
+
+winlist_module_la_DEPENDENCIES = $(MDEPENDENCIES)
diff --git a/src/modules/Makefile_wizard.am b/src/modules/Makefile_wizard.am
new file mode 100644
index 000000000..4474fb43c
--- /dev/null
+++ b/src/modules/Makefile_wizard.am
@@ -0,0 +1,133 @@
+wizarddir = $(MDIR)/wizard
+wizard_DATA = wizard/data/def-ibar.txt
+
+wizard_desksdir= $(MDIR)/wizard/extra_desktops
+wizard_desks_DATA = wizard/data/extra_desktops/mplayer.desktop \
+ wizard/data/extra_desktops/xterm.desktop
+
+wizard_desktopdir = $(MDIR)/wizard/desktop
+wizard_desktop_DATA = wizard/data/desktop/home.desktop \
+ wizard/data/desktop/root.desktop \
+ wizard/data/desktop/tmp.desktop
+
+EXTRA_DIST += $(wizard_DATA) $(wizard_desks_DATA) $(wizard_desktop_DATA)
+
+### dont install these - this way e wont list the module for people to
+#wizard_DATA = wizard/e-module-wizard.edj \
+# wizard/module.desktop
+
+wizardpkgdir = $(MDIR)/wizard/$(MODULE_ARCH)
+wizardpkg_LTLIBRARIES = wizard/module.la \
+ wizard/page_000.la \
+ wizard/page_010.la \
+ wizard/page_011.la \
+ wizard/page_020.la \
+ wizard/page_030.la \
+ wizard/page_040.la \
+ wizard/page_050.la \
+ wizard/page_060.la \
+ wizard/page_070.la \
+ wizard/page_080.la \
+ wizard/page_090.la \
+ wizard/page_100.la \
+ wizard/page_120.la \
+ wizard/page_130.la \
+ wizard/page_140.la \
+ wizard/page_150.la \
+ wizard/page_160.la \
+ wizard/page_170.la \
+ wizard/page_200.la
+
+if USE_MODULE_CONNMAN
+wizardpkg_LTLIBRARIES += wizard/page_110.la
+endif
+
+wizard_module_la_SOURCES = wizard/e_mod_main.h \
+ wizard/e_mod_main.c \
+ wizard/e_wizard.c \
+ wizard/e_wizard.h
+wizard_module_la_DEPENDENCIES = $(MDEPENDENCIES)
+
+wizard_page_000_la_SOURCES = wizard/page_000.c
+wizard_page_000_la_DEPENDENCIES = $(MDEPENDENCIES)
+
+wizard_page_010_la_SOURCES = wizard/page_010.c
+wizard_page_010_la_DEPENDENCIES = $(MDEPENDENCIES)
+
+wizard_page_011_la_SOURCES = wizard/page_011.c
+wizard_page_011_la_DEPENDENCIES = $(MDEPENDENCIES)
+
+wizard_page_020_la_SOURCES = wizard/page_020.c
+wizard_page_020_la_DEPENDENCIES = $(MDEPENDENCIES)
+
+wizard_page_030_la_SOURCES = wizard/page_030.c
+wizard_page_030_la_DEPENDENCIES = $(MDEPENDENCIES)
+
+wizard_page_040_la_SOURCES = wizard/page_040.c
+wizard_page_040_la_DEPENDENCIES = $(MDEPENDENCIES)
+
+wizard_page_050_la_SOURCES = wizard/page_050.c
+wizard_page_050_la_DEPENDENCIES = $(MDEPENDENCIES)
+
+wizard_page_060_la_SOURCES = wizard/page_060.c
+wizard_page_060_la_DEPENDENCIES = $(MDEPENDENCIES)
+
+wizard_page_070_la_SOURCES = wizard/page_070.c
+wizard_page_070_la_DEPENDENCIES = $(MDEPENDENCIES)
+
+wizard_page_080_la_SOURCES = wizard/page_080.c
+wizard_page_080_la_DEPENDENCIES = $(MDEPENDENCIES)
+
+wizard_page_090_la_SOURCES = wizard/page_090.c
+
+wizard_page_090_la_DEPENDENCIES = $(MDEPENDENCIES)
+
+wizard_page_100_la_SOURCES = wizard/page_100.c
+wizard_page_100_la_DEPENDENCIES = $(MDEPENDENCIES)
+
+if USE_MODULE_CONNMAN
+wizard_page_110_la_SOURCES = wizard/page_110.c
+wizard_page_110_la_LIBADD = $(AM_LIBADD) @ECONNMAN_LIBS@
+wizard_page_110_la_DEPENDENCIES = $(MDEPENDENCIES)
+endif
+
+wizard_page_120_la_SOURCES = wizard/page_120.c
+wizard_page_120_la_DEPENDENCIES = $(MDEPENDENCIES)
+
+wizard_page_130_la_SOURCES = wizard/page_130.c
+wizard_page_130_la_DEPENDENCIES = $(MDEPENDENCIES)
+
+wizard_page_140_la_SOURCES = wizard/page_140.c
+wizard_page_140_la_DEPENDENCIES = $(MDEPENDENCIES)
+
+wizard/e_mod_comp_main.h: $(abs_top_srcdir)/src/modules/comp/e_mod_main.h
+ $(AM_V_GEN) $(LN_S) -f $< $@
+
+wizard/e_mod_comp_cfdata.h: $(abs_top_srcdir)/src/modules/comp/e_mod_comp_cfdata.h
+ $(AM_V_GEN) $(LN_S) -f $< $@
+
+wizard/e_mod_comp_cfdata.c: $(top_srcdir)/src/modules/comp/e_mod_comp_cfdata.c wizard/e_mod_comp_main.h wizard/e_mod_comp_cfdata.h
+ $(AM_V_GEN) $(SED) 's/e_mod_main\.h/e_mod_comp_main.h/g' $< > $@
+
+$(wizard_page_150_la_OBJECTS): wizard/e_mod_comp_cfdata.c
+
+CLEANFILES += wizard/e_mod_comp_cfdata.c \
+ wizard/e_mod_comp_cfdata.h \
+ wizard/e_mod_comp_main.h
+
+wizard_page_150_la_CPPFLAGS = $(AM_CPPFLAGS) -I$(builddir)/wizard/
+wizard_page_150_la_SOURCES = wizard/page_150.c
+nodist_wizard_page_150_la_SOURCES = wizard/e_mod_comp_cfdata.c \
+ wizard/e_mod_comp_cfdata.h \
+ wizard/e_mod_comp_main.h
+
+wizard_page_150_la_DEPENDENCIES = $(MDEPENDENCIES)
+
+wizard_page_160_la_SOURCES = wizard/page_160.c
+wizard_page_160_la_DEPENDENCIES = $(MDEPENDENCIES)
+
+wizard_page_170_la_SOURCES = wizard/page_170.c
+wizard_page_170_la_DEPENDENCIES = $(MDEPENDENCIES)
+
+wizard_page_200_la_SOURCES = wizard/page_200.c
+wizard_page_200_la_DEPENDENCIES = $(MDEPENDENCIES)
diff --git a/src/modules/Makefile_xkbswitch.am b/src/modules/Makefile_xkbswitch.am
new file mode 100644
index 000000000..33b537bad
--- /dev/null
+++ b/src/modules/Makefile_xkbswitch.am
@@ -0,0 +1,16 @@
+xkbswitchdir = $(MDIR)/xkbswitch
+xkbswitch_DATA = xkbswitch/e-module-xkbswitch.edj \
+ xkbswitch/module.desktop
+
+EXTRA_DIST += $(xkbswitch_DATA)
+
+xkbswitchpkgdir = $(MDIR)/xkbswitch/$(MODULE_ARCH)
+xkbswitchpkg_LTLIBRARIES = xkbswitch/module.la
+
+xkbswitch_module_la_SOURCES = xkbswitch/e_mod_main.c \
+ xkbswitch/e_mod_main.h \
+ xkbswitch/e_mod_config.c \
+ xkbswitch/e_mod_parse.c \
+ xkbswitch/e_mod_parse.h
+
+xkbswitch_module_la_DEPENDENCIES = $(MDEPENDENCIES)
diff --git a/src/modules/access/Makefile.am b/src/modules/access/Makefile.am
deleted file mode 100644
index 2c1ce3289..000000000
--- a/src/modules/access/Makefile.am
+++ /dev/null
@@ -1,28 +0,0 @@
-MAINTAINERCLEANFILES = Makefile.in
-MODULE = access
-
-# data files for the module
-filesdir = $(libdir)/enlightenment/modules/$(MODULE)
-files_DATA = module.desktop
-
-EXTRA_DIST = $(files_DATA)
-
-# the module .so file
-AM_CPPFLAGS = -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 \
- @e_cflags@
-pkgdir = $(libdir)/enlightenment/modules/$(MODULE)/$(MODULE_ARCH)
-pkg_LTLIBRARIES = module.la
-module_la_SOURCES = e_mod_main.c \
- e_mod_main.h \
- e_mod_config.c
-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)
diff --git a/src/modules/backlight/Makefile.am b/src/modules/backlight/Makefile.am
deleted file mode 100644
index d7f9dbc43..000000000
--- a/src/modules/backlight/Makefile.am
+++ /dev/null
@@ -1,28 +0,0 @@
-MAINTAINERCLEANFILES = Makefile.in
-MODULE = backlight
-
-# data files for the module
-filesdir = $(libdir)/enlightenment/modules/$(MODULE)
-files_DATA = \
-e-module-$(MODULE).edj module.desktop
-
-EXTRA_DIST = $(files_DATA)
-
-# the module .so file
-AM_CPPFLAGS = -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 \
- @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)
diff --git a/src/modules/battery/Makefile.am b/src/modules/battery/Makefile.am
deleted file mode 100644
index 45c3546ee..000000000
--- a/src/modules/battery/Makefile.am
+++ /dev/null
@@ -1,57 +0,0 @@
-MAINTAINERCLEANFILES = Makefile.in
-MODULE = battery
-
-if HAVE_EEZE
-DEVICE_FILE = e_mod_udev.c
-else
-if HAVE_OPENBSD
-DEVICE_FILE = e_mod_openbsd.c
-else
-DEVICE_FILE = e_mod_dbus.c
-endif
-endif
-
-# data files for the module
-filesdir = $(libdir)/enlightenment/modules/$(MODULE)
-files_DATA = \
-e-module-$(MODULE).edj module.desktop
-
-EXTRA_DIST = $(files_DATA)
-
-# the module .so file
-AM_CPPFLAGS = -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 \
- @e_cflags@ \
- @cf_cflags@
-if HAVE_ENOTIFY
-AM_CPPFLAGS += @ENOTIFY_CFLAGS@
-endif
-
-pkgdir = $(libdir)/enlightenment/modules/$(MODULE)/$(MODULE_ARCH)
-pkg_LTLIBRARIES = module.la
-module_la_SOURCES = e_mod_main.c \
- e_mod_main.h \
- e_mod_config.c \
- $(DEVICE_FILE)
-
-module_la_LIBADD = @e_libs@ @cf_libs@ @dlopen_libs@
-if HAVE_ENOTIFY
-module_la_LIBADD += @ENOTIFY_LIBS@
-endif
-module_la_LDFLAGS = -module -avoid-version
-module_la_DEPENDENCIES = $(top_builddir)/config.h
-
-batgetdir = $(pkgdir)
-
-batget_PROGRAMS = batget
-batget_SOURCES = batget.c
-batget_LDADD = @BATTERY_LIBS@
-batget_LDFLAGS = @BATTERY_LDFLAGS@
-
-
-uninstall:
- rm -rf $(DESTDIR)$(libdir)/enlightenment/modules/$(MODULE)
diff --git a/src/modules/clock/Makefile.am b/src/modules/clock/Makefile.am
deleted file mode 100644
index f4cc83257..000000000
--- a/src/modules/clock/Makefile.am
+++ /dev/null
@@ -1,29 +0,0 @@
-MAINTAINERCLEANFILES = Makefile.in
-MODULE = clock
-
-# data files for the module
-filesdir = $(libdir)/enlightenment/modules/$(MODULE)
-files_DATA = \
-e-module-$(MODULE).edj module.desktop
-
-EXTRA_DIST = $(files_DATA)
-
-# the module .so file
-AM_CPPFLAGS = -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 \
- @e_cflags@
-pkgdir = $(libdir)/enlightenment/modules/$(MODULE)/$(MODULE_ARCH)
-pkg_LTLIBRARIES = module.la
-module_la_SOURCES = e_mod_main.c \
- e_mod_main.h \
- e_mod_config.c
-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)
diff --git a/src/modules/comp/Makefile.am b/src/modules/comp/Makefile.am
deleted file mode 100644
index 3af451cfe..000000000
--- a/src/modules/comp/Makefile.am
+++ /dev/null
@@ -1,57 +0,0 @@
-MAINTAINERCLEANFILES = Makefile.in
-MODULE = comp
-
-# data files for the module
-filesdir = $(libdir)/enlightenment/modules/$(MODULE)
-files_DATA = \
-e-module-$(MODULE).edj module.desktop
-
-EXTRA_DIST = $(files_DATA)
-
-# the module .so file
-AM_CPPFLAGS = -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 \
- @e_cflags@ @WAYLAND_CFLAGS@
-
-pkgdir = $(libdir)/enlightenment/modules/$(MODULE)/$(MODULE_ARCH)
-pkg_LTLIBRARIES = module.la
-
-module_la_SOURCES = e_mod_main.c \
- e_mod_main.h \
- e_mod_config.c \
- e_mod_config.h \
- e_mod_comp.c \
- e_mod_comp.h \
- e_mod_comp_update.c \
- e_mod_comp_update.h \
- e_mod_comp_cfdata.c \
- e_mod_comp_cfdata.h
-if HAVE_WAYLAND_CLIENTS
-module_la_SOURCES += e_mod_comp_wl.h \
- e_mod_comp_wl.c \
- e_mod_comp_wl_comp.h \
- e_mod_comp_wl_comp.c \
- e_mod_comp_wl_output.h \
- e_mod_comp_wl_output.c \
- e_mod_comp_wl_input.h \
- e_mod_comp_wl_input.c \
- e_mod_comp_wl_shell.h \
- e_mod_comp_wl_shell.c \
- e_mod_comp_wl_surface.h \
- e_mod_comp_wl_surface.c \
- e_mod_comp_wl_buffer.h \
- e_mod_comp_wl_buffer.c \
- e_mod_comp_wl_region.h \
- e_mod_comp_wl_region.c
-endif
-
-module_la_LIBADD = @e_libs@ @dlopen_libs@ @WAYLAND_LIBS@
-module_la_LDFLAGS = -module -avoid-version
-module_la_DEPENDENCIES = $(top_builddir)/config.h
-
-uninstall:
- rm -rf $(DESTDIR)$(libdir)/enlightenment/modules/$(MODULE)
diff --git a/src/modules/conf/Makefile.am b/src/modules/conf/Makefile.am
deleted file mode 100644
index 8e4c8d17c..000000000
--- a/src/modules/conf/Makefile.am
+++ /dev/null
@@ -1,32 +0,0 @@
-MAINTAINERCLEANFILES = Makefile.in
-MODULE = conf
-
-# data files for the module
-filesdir = $(libdir)/enlightenment/modules/$(MODULE)
-files_DATA = \
-e-module-$(MODULE).edj module.desktop
-
-EXTRA_DIST = $(files_DATA)
-
-# the module .so file
-AM_CPPFLAGS = -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 \
- @e_cflags@
-pkgdir = $(libdir)/enlightenment/modules/$(MODULE)/$(MODULE_ARCH)
-pkg_LTLIBRARIES = module.la
-module_la_SOURCES = e_mod_main.c \
- e_mod_main.h \
- e_conf.c \
- e_conf.h \
- e_mod_config.c
-
-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)
diff --git a/src/modules/conf_applications/Makefile.am b/src/modules/conf_applications/Makefile.am
deleted file mode 100644
index 80fa48b7b..000000000
--- a/src/modules/conf_applications/Makefile.am
+++ /dev/null
@@ -1,37 +0,0 @@
-MAINTAINERCLEANFILES = Makefile.in
-MODULE = conf_applications
-
-# data files for the module
-filesdir = $(libdir)/enlightenment/modules/$(MODULE)
-files_DATA = \
-e-module-$(MODULE).edj module.desktop
-
-EXTRA_DIST = $(files_DATA)
-
-# the module .so file
-AM_CPPFLAGS = -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 \
- @e_cflags@
-pkgdir = $(libdir)/enlightenment/modules/$(MODULE)/$(MODULE_ARCH)
-pkg_LTLIBRARIES = module.la
-module_la_SOURCES = e_mod_main.c \
- e_mod_main.h \
- e_int_config_apps.c \
- e_int_config_apps.h \
- e_int_config_defapps.c \
- e_int_config_defapps.h \
- e_int_config_deskenv.c \
- e_int_config_deskenv.h \
- e_int_config_apps_personal.c \
- e_int_config_apps_personal.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)
diff --git a/src/modules/conf_dialogs/Makefile.am b/src/modules/conf_dialogs/Makefile.am
deleted file mode 100644
index ee6397438..000000000
--- a/src/modules/conf_dialogs/Makefile.am
+++ /dev/null
@@ -1,33 +0,0 @@
-MAINTAINERCLEANFILES = Makefile.in
-MODULE = conf_dialogs
-
-# data files for the module
-filesdir = $(libdir)/enlightenment/modules/$(MODULE)
-files_DATA = \
-e-module-$(MODULE).edj module.desktop
-
-EXTRA_DIST = $(files_DATA)
-
-# the module .so file
-AM_CPPFLAGS = -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 \
- @e_cflags@
-pkgdir = $(libdir)/enlightenment/modules/$(MODULE)/$(MODULE_ARCH)
-pkg_LTLIBRARIES = module.la
-module_la_SOURCES = e_mod_main.c \
- e_mod_main.h \
- e_int_config_dialogs.c \
- e_int_config_dialogs.h \
- e_int_config_profiles.c \
- e_int_config_profiles.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)
diff --git a/src/modules/conf_display/Makefile.am b/src/modules/conf_display/Makefile.am
deleted file mode 100644
index 636bcf8cf..000000000
--- a/src/modules/conf_display/Makefile.am
+++ /dev/null
@@ -1,43 +0,0 @@
-MAINTAINERCLEANFILES = Makefile.in
-MODULE = conf_display
-
-# data files for the module
-filesdir = $(libdir)/enlightenment/modules/$(MODULE)
-files_DATA = \
-module.desktop
-
-EXTRA_DIST = $(files_DATA)
-
-# the module .so file
-AM_CPPFLAGS = -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 \
- @e_cflags@
-pkgdir = $(libdir)/enlightenment/modules/$(MODULE)/$(MODULE_ARCH)
-pkg_LTLIBRARIES = module.la
-module_la_SOURCES = e_mod_main.c \
- e_mod_main.h \
- e_int_config_display.c \
- e_int_config_display.h \
- e_int_config_screensaver.c \
- e_int_config_screensaver.h \
- e_int_config_dpms.c \
- e_int_config_dpms.h \
- e_int_config_desklock.c \
- e_int_config_desklock.h \
- e_int_config_desklock_fsel.c \
- e_int_config_desklock_fsel.h \
- e_int_config_desks.c \
- e_int_config_desks.h \
- e_int_config_desk.c \
- e_int_config_desk.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)
diff --git a/src/modules/conf_edgebindings/Makefile.am b/src/modules/conf_edgebindings/Makefile.am
deleted file mode 100644
index 8cfe80479..000000000
--- a/src/modules/conf_edgebindings/Makefile.am
+++ /dev/null
@@ -1,32 +0,0 @@
-MAINTAINERCLEANFILES = Makefile.in
-MODULE = conf_edgebindings
-
-# data files for the module
-filesdir = $(libdir)/enlightenment/modules/$(MODULE)
-files_DATA = \
-e-module-$(MODULE).edj module.desktop
-
-EXTRA_DIST = $(files_DATA)
-
-# the module .so file
-AM_CPPFLAGS = -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 \
- @e_cflags@
-pkgdir = $(libdir)/enlightenment/modules/$(MODULE)/$(MODULE_ARCH)
-pkg_LTLIBRARIES = module.la
-module_la_SOURCES = e_mod_main.c \
- e_mod_main.h \
- e_int_config_edgebindings.c \
- e_int_config_signalbindings.c \
- e_int_config_edgebindings.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)
diff --git a/src/modules/conf_interaction/Makefile.am b/src/modules/conf_interaction/Makefile.am
deleted file mode 100644
index 4a05789ee..000000000
--- a/src/modules/conf_interaction/Makefile.am
+++ /dev/null
@@ -1,34 +0,0 @@
-MAINTAINERCLEANFILES = Makefile.in
-MODULE = conf_interaction
-
-# data files for the module
-filesdir = $(libdir)/enlightenment/modules/$(MODULE)
-files_DATA = \
-e-module-$(MODULE).edj module.desktop
-
-EXTRA_DIST = $(files_DATA)
-
-# the module .so file
-AM_CPPFLAGS = -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 \
- @e_cflags@
-
-pkgdir = $(libdir)/enlightenment/modules/$(MODULE)/$(MODULE_ARCH)
-pkg_LTLIBRARIES = module.la
-module_la_SOURCES = e_mod_main.c \
- e_mod_main.h \
- e_int_config_interaction.c \
- e_int_config_interaction.h \
- e_int_config_mouse.c \
- e_int_config_mouse.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)
diff --git a/src/modules/conf_intl/Makefile.am b/src/modules/conf_intl/Makefile.am
deleted file mode 100644
index da9f778cc..000000000
--- a/src/modules/conf_intl/Makefile.am
+++ /dev/null
@@ -1,35 +0,0 @@
-MAINTAINERCLEANFILES = Makefile.in
-MODULE = conf_intl
-
-# data files for the module
-filesdir = $(libdir)/enlightenment/modules/$(MODULE)
-files_DATA = module.desktop
-
-EXTRA_DIST = $(files_DATA)
-
-# the module .so file
-AM_CPPFLAGS = -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 \
- @e_cflags@
-
-pkgdir = $(libdir)/enlightenment/modules/$(MODULE)/$(MODULE_ARCH)
-pkg_LTLIBRARIES = module.la
-module_la_SOURCES = e_mod_main.c \
- e_mod_main.h \
- e_int_config_intl.c \
- e_int_config_intl.h \
- e_int_config_imc_import.c \
- e_int_config_imc_import.h \
- e_int_config_imc.c \
- e_int_config_imc.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)
diff --git a/src/modules/conf_keybindings/Makefile.am b/src/modules/conf_keybindings/Makefile.am
deleted file mode 100644
index b4a535f28..000000000
--- a/src/modules/conf_keybindings/Makefile.am
+++ /dev/null
@@ -1,35 +0,0 @@
-MAINTAINERCLEANFILES = Makefile.in
-MODULE = conf_keybindings
-
-# data files for the module
-filesdir = $(libdir)/enlightenment/modules/$(MODULE)
-files_DATA = \
-module.desktop
-
-EXTRA_DIST = $(files_DATA)
-
-# the module .so file
-AM_CPPFLAGS = -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 \
- @e_cflags@
-pkgdir = $(libdir)/enlightenment/modules/$(MODULE)/$(MODULE_ARCH)
-pkg_LTLIBRARIES = module.la
-module_la_SOURCES = e_mod_main.c \
- e_mod_main.h \
- e_int_config_keybindings.c \
- e_int_config_keybindings.h \
- e_int_config_mousebindings.c \
- e_int_config_mousebindings.h \
- e_int_config_acpibindings.c \
- e_int_config_acpibindings.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)
diff --git a/src/modules/conf_menus/Makefile.am b/src/modules/conf_menus/Makefile.am
deleted file mode 100644
index e826e35ae..000000000
--- a/src/modules/conf_menus/Makefile.am
+++ /dev/null
@@ -1,31 +0,0 @@
-MAINTAINERCLEANFILES = Makefile.in
-MODULE = conf_menus
-
-# data files for the module
-filesdir = $(libdir)/enlightenment/modules/$(MODULE)
-files_DATA = \
-e-module-$(MODULE).edj module.desktop
-
-EXTRA_DIST = $(files_DATA)
-
-# the module .so file
-AM_CPPFLAGS = -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 \
- @e_cflags@
-pkgdir = $(libdir)/enlightenment/modules/$(MODULE)/$(MODULE_ARCH)
-pkg_LTLIBRARIES = module.la
-module_la_SOURCES = e_mod_main.c \
- e_mod_main.h \
- e_int_config_menus.c \
- e_int_config_menus.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)
diff --git a/src/modules/conf_paths/Makefile.am b/src/modules/conf_paths/Makefile.am
deleted file mode 100644
index 8565818db..000000000
--- a/src/modules/conf_paths/Makefile.am
+++ /dev/null
@@ -1,33 +0,0 @@
-MAINTAINERCLEANFILES = Makefile.in
-MODULE = conf_paths
-
-# data files for the module
-filesdir = $(libdir)/enlightenment/modules/$(MODULE)
-files_DATA = \
-e-module-$(MODULE).edj module.desktop
-
-EXTRA_DIST = $(files_DATA)
-
-# the module .so file
-AM_CPPFLAGS = -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 \
- @e_cflags@
-pkgdir = $(libdir)/enlightenment/modules/$(MODULE)/$(MODULE_ARCH)
-pkg_LTLIBRARIES = module.la
-module_la_SOURCES = e_mod_main.c \
- e_mod_main.h \
- e_int_config_paths.c \
- e_int_config_paths.h \
- e_int_config_env.c \
- e_int_config_env.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)
diff --git a/src/modules/conf_performance/Makefile.am b/src/modules/conf_performance/Makefile.am
deleted file mode 100644
index cd72c8b25..000000000
--- a/src/modules/conf_performance/Makefile.am
+++ /dev/null
@@ -1,35 +0,0 @@
-MAINTAINERCLEANFILES = Makefile.in
-MODULE = conf_performance
-
-# data files for the module
-filesdir = $(libdir)/enlightenment/modules/$(MODULE)
-files_DATA = \
-e-module-$(MODULE).edj module.desktop
-
-EXTRA_DIST = $(files_DATA)
-
-# the module .so file
-AM_CPPFLAGS = -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 \
- @e_cflags@
-pkgdir = $(libdir)/enlightenment/modules/$(MODULE)/$(MODULE_ARCH)
-pkg_LTLIBRARIES = module.la
-module_la_SOURCES = e_mod_main.c \
- e_mod_main.h \
- e_int_config_performance.c \
- e_int_config_performance.h \
- e_int_config_engine.c \
- e_int_config_engine.h \
- e_int_config_powermanagement.c \
- e_int_config_powermanagement.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)
diff --git a/src/modules/conf_randr/Makefile.am b/src/modules/conf_randr/Makefile.am
deleted file mode 100644
index dcc48e07e..000000000
--- a/src/modules/conf_randr/Makefile.am
+++ /dev/null
@@ -1,37 +0,0 @@
-MAINTAINERCLEANFILES = Makefile.in module.desktop
-MODULE = conf_randr
-
-# data files for the module
-filesdir = $(libdir)/enlightenment/modules/$(MODULE)
-files_DATA = \
- e-module-$(MODULE).edj \
- module.desktop
-
-EXTRA_DIST = $(files_DATA)
-
-# the module .so file
-AM_CPPFLAGS = -I. \
- -I$(top_srcdir) \
- -I$(top_srcdir)/src/modules/$(MODULE) \
- -I$(top_srcdir)/src/bin \
- -I$(top_builddir)/src/bin \
- -I$(top_srcdir)/src/lib \
- -I$(top_srcdir)/src/modules \
- @e_cflags@
-pkgdir = $(libdir)/enlightenment/modules/$(MODULE)/$(MODULE_ARCH)
-pkg_LTLIBRARIES = module.la
-module_la_SOURCES = e_mod_main.c \
- e_mod_main.h \
- e_int_config_randr.h \
- e_int_config_randr.c \
- e_smart_randr.h \
- e_smart_randr.c \
- e_smart_monitor.h \
- e_smart_monitor.c
-
-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)
diff --git a/src/modules/conf_shelves/Makefile.am b/src/modules/conf_shelves/Makefile.am
deleted file mode 100644
index aded02ec1..000000000
--- a/src/modules/conf_shelves/Makefile.am
+++ /dev/null
@@ -1,31 +0,0 @@
-MAINTAINERCLEANFILES = Makefile.in
-MODULE = conf_shelves
-
-# data files for the module
-filesdir = $(libdir)/enlightenment/modules/$(MODULE)
-files_DATA = \
-e-module-$(MODULE).edj module.desktop
-
-EXTRA_DIST = $(files_DATA)
-
-# the module .so file
-AM_CPPFLAGS = -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 \
- @e_cflags@
-pkgdir = $(libdir)/enlightenment/modules/$(MODULE)/$(MODULE_ARCH)
-pkg_LTLIBRARIES = module.la
-module_la_SOURCES = e_mod_main.c \
- e_mod_main.h \
- e_int_config_shelf.c \
- e_int_config_shelf.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)
diff --git a/src/modules/conf_theme/Makefile.am b/src/modules/conf_theme/Makefile.am
deleted file mode 100644
index ed8c4a733..000000000
--- a/src/modules/conf_theme/Makefile.am
+++ /dev/null
@@ -1,49 +0,0 @@
-MAINTAINERCLEANFILES = Makefile.in
-MODULE = conf_theme
-
-# data files for the module
-filesdir = $(libdir)/enlightenment/modules/$(MODULE)
-files_DATA = \
-module.desktop
-
-EXTRA_DIST = $(files_DATA)
-
-# the module .so file
-AM_CPPFLAGS = -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 \
- @e_cflags@
-
-pkgdir = $(libdir)/enlightenment/modules/$(MODULE)/$(MODULE_ARCH)
-pkg_LTLIBRARIES = module.la
-module_la_SOURCES = e_mod_main.c \
- e_mod_main.h \
- e_int_config_borders.c \
- e_int_config_borders.h \
- e_int_config_color_classes.c \
- e_int_config_color_classes.h \
- e_int_config_fonts.c \
- e_int_config_fonts.h \
- e_int_config_scale.c \
- e_int_config_scale.h \
- e_int_config_startup.c \
- e_int_config_startup.h \
- e_int_config_theme.c \
- e_int_config_theme.h \
- e_int_config_theme_import.c \
- e_int_config_theme_import.h \
- e_int_config_transitions.c \
- e_int_config_transitions.h \
- e_int_config_wallpaper.c \
- e_int_config_wallpaper.h \
- e_int_config_xsettings.c
-
-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)
diff --git a/src/modules/conf_wallpaper2/Makefile.am b/src/modules/conf_wallpaper2/Makefile.am
deleted file mode 100644
index 3c3a38e3a..000000000
--- a/src/modules/conf_wallpaper2/Makefile.am
+++ /dev/null
@@ -1,31 +0,0 @@
-MAINTAINERCLEANFILES = Makefile.in
-MODULE = conf_wallpaper2
-
-# data files for the module
-filesdir = $(libdir)/enlightenment/modules/$(MODULE)
-files_DATA = \
-module.desktop
-
-EXTRA_DIST = $(files_DATA)
-
-# the module .so file
-AM_CPPFLAGS = -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 \
- @e_cflags@
-pkgdir = $(libdir)/enlightenment/modules/$(MODULE)/$(MODULE_ARCH)
-pkg_LTLIBRARIES = module.la
-module_la_SOURCES = e_mod_main.c \
- e_mod_main.h \
- e_int_config_wallpaper.c \
- e_int_config_wallpaper.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)
diff --git a/src/modules/conf_window_manipulation/Makefile.am b/src/modules/conf_window_manipulation/Makefile.am
deleted file mode 100644
index fc32e7452..000000000
--- a/src/modules/conf_window_manipulation/Makefile.am
+++ /dev/null
@@ -1,38 +0,0 @@
-MAINTAINERCLEANFILES = Makefile.in
-MODULE = conf_window_manipulation
-
-# data files for the module
-filesdir = $(libdir)/enlightenment/modules/$(MODULE)
-files_DATA = \
-e-module-conf_winmanip.edj module.desktop
-
-EXTRA_DIST = $(files_DATA)
-
-# the module .so file
-AM_CPPFLAGS = -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 \
- @e_cflags@
-pkgdir = $(libdir)/enlightenment/modules/$(MODULE)/$(MODULE_ARCH)
-pkg_LTLIBRARIES = module.la
-module_la_SOURCES = e_mod_main.c \
- e_mod_main.h \
- e_int_config_window_manip.h \
- e_int_config_window_geometry.c \
- e_int_config_window_process.c \
- e_int_config_window_display.c \
- e_int_config_window_display.h \
- e_int_config_focus.c \
- e_int_config_focus.h \
- e_int_config_clientlist.c \
- e_int_config_clientlist.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)
diff --git a/src/modules/conf_window_remembers/Makefile.am b/src/modules/conf_window_remembers/Makefile.am
deleted file mode 100644
index b7bfa72ae..000000000
--- a/src/modules/conf_window_remembers/Makefile.am
+++ /dev/null
@@ -1,31 +0,0 @@
-MAINTAINERCLEANFILES = Makefile.in
-MODULE = conf_window_remembers
-
-# data files for the module
-filesdir = $(libdir)/enlightenment/modules/$(MODULE)
-files_DATA = \
-e-module-$(MODULE).edj module.desktop
-
-EXTRA_DIST = $(files_DATA)
-
-# the module .so file
-AM_CPPFLAGS = -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 \
- @e_cflags@
-pkgdir = $(libdir)/enlightenment/modules/$(MODULE)/$(MODULE_ARCH)
-pkg_LTLIBRARIES = module.la
-module_la_SOURCES = e_mod_main.c \
- e_mod_main.h \
- e_int_config_remembers.c \
- e_int_config_remembers.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)
diff --git a/src/modules/connman/Makefile.am b/src/modules/connman/Makefile.am
deleted file mode 100644
index 08f3dd2af..000000000
--- a/src/modules/connman/Makefile.am
+++ /dev/null
@@ -1,38 +0,0 @@
-MAINTAINERCLEANFILES = Makefile.in
-MODULE = connman
-
-# data files for the module
-filesdir = $(libdir)/enlightenment/modules/$(MODULE)
-files_DATA = \
-e-module-$(MODULE).edj module.desktop
-
-EXTRA_DIST = $(files_DATA)
-
-# the module .so file
-AM_CPPFLAGS = -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
-
-pkgdir = $(libdir)/enlightenment/modules/$(MODULE)/$(MODULE_ARCH)
-
-pkg_LTLIBRARIES = module.la
-
-module_la_SOURCES = e_mod_main.h \
- e_mod_main.c \
- e_mod_config.c \
- e_connman.c \
- agent.c \
- agent.h \
- log.h \
- E_Connman.h
-
-module_la_LIBADD = @e_libs@ @dlopen_libs@ @ECONNMAN_LIBS@
-module_la_LDFLAGS = -module -avoid-version
-module_la_CFLAGS = $(AM_CFLAGS) @e_cflags@ @ECONNMAN_CFLAGS@ -Wno-unused-parameter
-module_la_DEPENDENCIES = $(top_builddir)/config.h
-
-uninstall:
- rm -rf $(DESTDIR)$(libdir)/enlightenment/modules/$(MODULE)
diff --git a/src/modules/cpufreq/Makefile.am b/src/modules/cpufreq/Makefile.am
deleted file mode 100644
index f8bc65f79..000000000
--- a/src/modules/cpufreq/Makefile.am
+++ /dev/null
@@ -1,40 +0,0 @@
-MAINTAINERCLEANFILES = Makefile.in
-MODULE = cpufreq
-
-# data files for the module
-filesdir = $(libdir)/enlightenment/modules/$(MODULE)
-files_DATA = \
-e-module-$(MODULE).edj module.desktop
-
-EXTRA_DIST = $(files_DATA)
-
-# the module .so file
-AM_CPPFLAGS = -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 \
- @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
-
-freqsetdir = $(pkgdir)
-
-setuid_root_mode = a=rx,u+xs
-setuid_root_user = root
-install-data-hook:
- @chown $(setuid_root_user) $(DESTDIR)$(freqsetdir)/freqset$(EXEEXT) || true
- @chmod $(setuid_root_mode) $(DESTDIR)$(freqsetdir)/freqset$(EXEEXT) || true
-
-freqset_PROGRAMS = freqset
-freqset_SOURCES = freqset.c
-freqset_CFLAGS = @e_cflags@ @SUID_CFLAGS@
-freqset_LDFLAGS = @SUID_LDFLAGS@
-
-uninstall:
- rm -rf $(DESTDIR)$(libdir)/enlightenment/modules/$(MODULE)
diff --git a/src/modules/dropshadow/Makefile.am b/src/modules/dropshadow/Makefile.am
deleted file mode 100644
index 16b780378..000000000
--- a/src/modules/dropshadow/Makefile.am
+++ /dev/null
@@ -1,30 +0,0 @@
-MAINTAINERCLEANFILES = Makefile.in
-MODULE = dropshadow
-
-# data files for the module
-filesdir = $(libdir)/enlightenment/modules/$(MODULE)
-files_DATA = \
-e-module-$(MODULE).edj module.desktop
-
-EXTRA_DIST = $(files_DATA)
-
-# the module .so file
-AM_CPPFLAGS = -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 \
- @e_cflags@
-pkgdir = $(libdir)/enlightenment/modules/$(MODULE)/$(MODULE_ARCH)
-pkg_LTLIBRARIES = module.la
-module_la_SOURCES = e_mod_main.c \
- e_mod_main.h \
- e_mod_config.c \
- e_mod_config.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)
diff --git a/src/modules/everything/Makefile.am b/src/modules/everything/Makefile.am
deleted file mode 100644
index 414c9ca90..000000000
--- a/src/modules/everything/Makefile.am
+++ /dev/null
@@ -1,67 +0,0 @@
-MAINTAINERCLEANFILES = Makefile.in everything.pc module.desktop
-MODULE = everything
-
-# data files for the module
-filesdir = $(libdir)/enlightenment/modules/$(MODULE)
-files_DATA = \
-e-module-$(MODULE).edj \
-e-module-$(MODULE)-start.edj \
-module.desktop
-
-EXTRA_DIST = $(files_DATA) everything.pc.in module.desktop.in
-
-# the module .so file
-AM_CPPFLAGS = -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 \
- @e_cflags@
-
-pkgdir = $(libdir)/enlightenment/modules/$(MODULE)/$(MODULE_ARCH)
-pkg_LTLIBRARIES = module.la
-
-EVRYHEADERS = evry_api.h evry_types.h
-
-module_la_SOURCES = $(EVRYHEADERS) \
- e_mod_main.c \
- e_mod_main.h \
- evry.c \
- evry_config.c \
- evry_util.c \
- evry_history.c \
- evry_plugin.c \
- evry_plug_aggregator.c \
- evry_plug_actions.c \
- evry_view.c \
- evry_view_tabs.c \
- evry_view_help.c \
- evry_plug_clipboard.c \
- evry_plug_text.c \
- evry_plug_collection.c \
- evry_gadget.c \
- 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
-module_la_DEPENDENCIES = $(top_builddir)/config.h
-
-installed_headersdir = $(includedir)/enlightenment
-dist_installed_headers_DATA = $(EVRYHEADERS)
-
-pkgconfigdir = $(libdir)/pkgconfig
-dist_pkgconfig_DATA = everything.pc
-
-uninstall:
- rm -rf $(DESTDIR)$(libdir)/enlightenment/modules/$(MODULE)
- rm -f $(DESTDIR)$(includedir)/enlightenment/evry_api.h
- rm -f $(DESTDIR)$(includedir)/enlightenment/evry_types.h
- rm -f $(DESTDIR)$(libdir)/pkgconfig/everything.pc
-
diff --git a/src/modules/fileman/Makefile.am b/src/modules/fileman/Makefile.am
deleted file mode 100644
index 0f31ac2d8..000000000
--- a/src/modules/fileman/Makefile.am
+++ /dev/null
@@ -1,40 +0,0 @@
-MAINTAINERCLEANFILES = Makefile.in
-MODULE = fileman
-
-# data files for the module
-filesdir = $(libdir)/enlightenment/modules/$(MODULE)
-files_DATA = \
-e-module-$(MODULE).edj module.desktop
-
-EXTRA_DIST = $(files_DATA)
-
-# the module .so file
-AM_CPPFLAGS = -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 \
- @e_cflags@
-pkgdir = $(libdir)/enlightenment/modules/$(MODULE)/$(MODULE_ARCH)
-pkg_LTLIBRARIES = module.la
-module_la_SOURCES = e_mod_main.c \
- e_mod_menu.c \
- e_mod_main.h \
- e_mod_config.c \
- e_mod_dbus.c \
- e_mod_dbus.h \
- e_fwin.c \
- e_fwin.h \
- e_int_config_mime.c \
- e_int_config_mime.h \
- e_int_config_mime_edit.c \
- e_int_config_mime_edit.h \
- e_fwin_nav.c
-
-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)
diff --git a/src/modules/fileman_opinfo/Makefile.am b/src/modules/fileman_opinfo/Makefile.am
deleted file mode 100644
index 2484eebb0..000000000
--- a/src/modules/fileman_opinfo/Makefile.am
+++ /dev/null
@@ -1,28 +0,0 @@
-MAINTAINERCLEANFILES = Makefile.in
-MODULE = fileman_opinfo
-
-# data files for the module
-filesdir = $(libdir)/enlightenment/modules/$(MODULE)
-files_DATA = \
-e-module-$(MODULE).edj module.desktop
-
-EXTRA_DIST = $(files_DATA)
-
-# the module .so file
-AM_CPPFLAGS = -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 \
- @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)
diff --git a/src/modules/gadman/Makefile.am b/src/modules/gadman/Makefile.am
deleted file mode 100644
index e8266bd19..000000000
--- a/src/modules/gadman/Makefile.am
+++ /dev/null
@@ -1,31 +0,0 @@
-MAINTAINERCLEANFILES = Makefile.in
-MODULE = gadman
-
-# data files for the module
-filesdir = $(libdir)/enlightenment/modules/$(MODULE)
-files_DATA = e-module-gadman.edj module.desktop
-
-EXTRA_DIST = $(files_DATA)
-
-# the module .so file
-AM_CPPFLAGS = -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 \
- @e_cflags@
-pkgdir = $(libdir)/enlightenment/modules/$(MODULE)/$(MODULE_ARCH)
-pkg_LTLIBRARIES = module.la
-module_la_SOURCES = e_mod_main.c \
- e_mod_main.h \
- e_mod_config.c \
- e_mod_config.h \
- e_mod_gadman.c \
- e_mod_gadman.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)
diff --git a/src/modules/ibar/Makefile.am b/src/modules/ibar/Makefile.am
deleted file mode 100644
index c67b0346c..000000000
--- a/src/modules/ibar/Makefile.am
+++ /dev/null
@@ -1,28 +0,0 @@
-MAINTAINERCLEANFILES = Makefile.in
-MODULE = ibar
-
-# data files for the module
-filesdir = $(libdir)/enlightenment/modules/$(MODULE)
-files_DATA = \
-e-module-$(MODULE).edj module.desktop
-
-EXTRA_DIST = $(files_DATA)
-
-# the module .so file
-AM_CPPFLAGS = -I. \
- -I$(top_srcdir) \
- -I$(top_srcdir)/src/modules/$(MODULE) \
- -I$(top_srcdir)/src/bin \
- -I$(top_builddir)/src/bin \
- @e_cflags@
-pkgdir = $(libdir)/enlightenment/modules/$(MODULE)/$(MODULE_ARCH)
-pkg_LTLIBRARIES = module.la
-module_la_SOURCES = e_mod_main.c \
- e_mod_main.h \
- e_mod_config.c
-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)
diff --git a/src/modules/ibox/Makefile.am b/src/modules/ibox/Makefile.am
deleted file mode 100644
index 4f69943b3..000000000
--- a/src/modules/ibox/Makefile.am
+++ /dev/null
@@ -1,29 +0,0 @@
-MAINTAINERCLEANFILES = Makefile.in
-MODULE = ibox
-
-# data files for the module
-filesdir = $(libdir)/enlightenment/modules/$(MODULE)
-files_DATA = \
-e-module-$(MODULE).edj module.desktop
-
-EXTRA_DIST = $(files_DATA)
-
-# the module .so file
-AM_CPPFLAGS = -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 \
- @e_cflags@
-pkgdir = $(libdir)/enlightenment/modules/$(MODULE)/$(MODULE_ARCH)
-pkg_LTLIBRARIES = module.la
-module_la_SOURCES = e_mod_main.c \
- e_mod_main.h \
- e_mod_config.c
-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)
diff --git a/src/modules/illume-bluetooth/Makefile.am b/src/modules/illume-bluetooth/Makefile.am
deleted file mode 100644
index b17459cae..000000000
--- a/src/modules/illume-bluetooth/Makefile.am
+++ /dev/null
@@ -1,29 +0,0 @@
-MAINTAINERCLEANFILES = Makefile.in
-MODULE = illume-bluetooth
-
-# data files for the module
-filesdir = $(libdir)/enlightenment/modules/$(MODULE)
-files_DATA = \
-e-module-$(MODULE).edj module.desktop
-
-EXTRA_DIST = $(files_DATA)
-
-# the module .so file
-AM_CPPFLAGS = -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 \
- @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)
diff --git a/src/modules/illume-home-toggle/Makefile.am b/src/modules/illume-home-toggle/Makefile.am
deleted file mode 100644
index 798118ca5..000000000
--- a/src/modules/illume-home-toggle/Makefile.am
+++ /dev/null
@@ -1,29 +0,0 @@
-MAINTAINERCLEANFILES = Makefile.in
-MODULE = illume-home-toggle
-
-# data files for the module
-filesdir = $(libdir)/enlightenment/modules/$(MODULE)
-files_DATA = \
-e-module-$(MODULE).edj module.desktop
-
-EXTRA_DIST = $(files_DATA)
-
-# the module .so file
-AM_CPPFLAGS = -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 \
- @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)
diff --git a/src/modules/illume-home/Makefile.am b/src/modules/illume-home/Makefile.am
deleted file mode 100644
index 1e6a9e4ee..000000000
--- a/src/modules/illume-home/Makefile.am
+++ /dev/null
@@ -1,33 +0,0 @@
-MAINTAINERCLEANFILES = Makefile.in
-MODULE = illume-home
-
-# data files for the module
-filesdir = $(libdir)/enlightenment/modules/$(MODULE)
-files_DATA = \
-e-module-$(MODULE).edj module.desktop
-
-EXTRA_DIST = $(files_DATA)
-
-# the module .so file
-AM_CPPFLAGS = -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 \
- @e_cflags@
-pkgdir = $(libdir)/enlightenment/modules/$(MODULE)/$(MODULE_ARCH)
-pkg_LTLIBRARIES = module.la
-module_la_SOURCES = e_mod_main.c \
- e_mod_main.h \
- e_mod_config.c \
- e_mod_config.h \
- e_busycover.c \
- e_busycover.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)
diff --git a/src/modules/illume-indicator/Makefile.am b/src/modules/illume-indicator/Makefile.am
deleted file mode 100644
index 541df75ec..000000000
--- a/src/modules/illume-indicator/Makefile.am
+++ /dev/null
@@ -1,60 +0,0 @@
-MAINTAINERCLEANFILES = Makefile.in
-MODULE = illume-indicator
-SUBDIRS = images
-
-EDJE_CC = @edje_cc@
-EDJE_FLAGS_VERBOSE_ =
-EDJE_FLAGS_VERBOSE_0 =
-EDJE_FLAGS_VERBOSE_1 = -v
-EDJE_FLAGS = $(EDJE_FLAGS_$(V)) \
- -id $(top_srcdir)/src/modules/$(MODULE)/images \
- @EDJE_DEF@
-
-# data files for the module
-filesdir = $(libdir)/enlightenment/modules/$(MODULE)
-files_DATA = \
- e-module-$(MODULE).edj \
- module.desktop
-
-EXTRA_DIST = \
- e-module-$(MODULE).edc \
- module.desktop.in
-
-# the module .so file
-AM_CPPFLAGS = -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 \
- @e_cflags@ @ENOTIFY_CFLAGS@
-
-pkgdir = $(libdir)/enlightenment/modules/$(MODULE)/$(MODULE_ARCH)
-pkg_LTLIBRARIES = module.la
-
-module_la_SOURCES = \
- e_mod_ind_win.c \
- e_mod_ind_win.h \
- e_mod_config.c \
- e_mod_config.h \
- e_mod_main.c \
- e_mod_main.h
-
-if HAVE_ENOTIFY
-module_la_SOURCES += e_mod_notify.h e_mod_notify.c
-endif
-
-module_la_LIBADD = @e_libs@ @ENOTIFY_LIBS@ @dlopen_libs@
-module_la_LDFLAGS = -module -avoid-version
-module_la_DEPENDENCIES = $(top_builddir)/config.h
-
-e-module-$(MODULE).edj: Makefile $(EXTRA_DIST)
- $(EDJE_CC) $(EDJE_FLAGS) \
- $(top_srcdir)/src/modules/$(MODULE)/e-module-$(MODULE).edc \
- $(top_builddir)/src/modules/$(MODULE)/e-module-$(MODULE).edj
-
-clean-local:
- rm -f *.edj
-
-uninstall:
- rm -rf $(DESTDIR)$(libdir)/enlightenment/modules/$(MODULE)
diff --git a/src/modules/illume-indicator/images/Makefile.am b/src/modules/illume-indicator/images/Makefile.am
deleted file mode 100644
index 692077fed..000000000
--- a/src/modules/illume-indicator/images/Makefile.am
+++ /dev/null
@@ -1,4 +0,0 @@
-MAINTAINERCLEANFILES = Makefile.in
-
-EXTRA_DIST = base_bg.png \
- module_icon.png
diff --git a/src/modules/illume-kbd-toggle/Makefile.am b/src/modules/illume-kbd-toggle/Makefile.am
deleted file mode 100644
index ed4566bd8..000000000
--- a/src/modules/illume-kbd-toggle/Makefile.am
+++ /dev/null
@@ -1,29 +0,0 @@
-MAINTAINERCLEANFILES = Makefile.in
-MODULE = illume-kbd-toggle
-
-# data files for the module
-filesdir = $(libdir)/enlightenment/modules/$(MODULE)
-files_DATA = \
-e-module-$(MODULE).edj module.desktop
-
-EXTRA_DIST = $(files_DATA)
-
-# the module .so file
-AM_CPPFLAGS = -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 \
- @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)
diff --git a/src/modules/illume-keyboard/Makefile.am b/src/modules/illume-keyboard/Makefile.am
deleted file mode 100644
index 68fd79c86..000000000
--- a/src/modules/illume-keyboard/Makefile.am
+++ /dev/null
@@ -1,60 +0,0 @@
-MAINTAINERCLEANFILES = Makefile.in module.desktop
-SUBDIRS = keyboards dicts images
-MODULE = illume-keyboard
-
-EDJE_CC = @edje_cc@
-EDJE_FLAGS_VERBOSE_ =
-EDJE_FLAGS_VERBOSE_0 =
-EDJE_FLAGS_VERBOSE_1 = -v
-EDJE_FLAGS = $(EDJE_FLAGS_$(V)) \
- -id $(top_srcdir)/src/modules/$(MODULE)/images \
- @EDJE_DEF@
-
-
-
-# data files for the module
-filesdir = $(libdir)/enlightenment/modules/$(MODULE)
-files_DATA = \
-e-module-$(MODULE).edj module.desktop
-
-EXTRA_DIST = \
- e-module-$(MODULE).edc \
- module.desktop.in
-
-# the module .so file
-AM_CPPFLAGS = -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 \
- @e_cflags@
-pkgdir = $(libdir)/enlightenment/modules/$(MODULE)/$(MODULE_ARCH)
-pkg_LTLIBRARIES = module.la
-module_la_SOURCES = e_mod_main.c \
- e_mod_main.h \
- e_kbd_int.c \
- e_kbd_int.h \
- e_kbd_dict.c \
- e_kbd_dict.h \
- e_kbd_buf.c \
- e_kbd_buf.h \
- e_kbd_send.c \
- e_kbd_send.h \
- e_mod_config.c \
- e_mod_config.h
-
-module_la_LIBADD = @e_libs@ @dlopen_libs@
-module_la_LDFLAGS = -module -avoid-version
-module_la_DEPENDENCIES = $(top_builddir)/config.h
-
-e-module-$(MODULE).edj: Makefile $(EXTRA_DIST)
- $(EDJE_CC) $(EDJE_FLAGS) \
- $(top_srcdir)/src/modules/$(MODULE)/e-module-$(MODULE).edc \
- $(top_builddir)/src/modules/$(MODULE)/e-module-$(MODULE).edj
-
-clean-local:
- rm -f *.edj
-
-uninstall:
- rm -rf $(DESTDIR)$(libdir)/enlightenment/modules/$(MODULE)
diff --git a/src/modules/illume-keyboard/dicts/Makefile.am b/src/modules/illume-keyboard/dicts/Makefile.am
deleted file mode 100644
index c4c57ddf3..000000000
--- a/src/modules/illume-keyboard/dicts/Makefile.am
+++ /dev/null
@@ -1,9 +0,0 @@
-MAINTAINERCLEANFILES = Makefile.in
-MODULE = illume-keyboard
-
-filesdir = $(libdir)/enlightenment/modules/$(MODULE)/dicts
-files_DATA = \
- English_US.dic \
- English_US_Small.dic
-
-EXTRA_DIST = $(files_DATA)
diff --git a/src/modules/illume-keyboard/images/Makefile.am b/src/modules/illume-keyboard/images/Makefile.am
deleted file mode 100644
index 1c3dec353..000000000
--- a/src/modules/illume-keyboard/images/Makefile.am
+++ /dev/null
@@ -1,22 +0,0 @@
-MAINTAINERCLEANFILES = Makefile.in
-
-EXTRA_DIST = \
-base_bg.png \
-big_arrow_up.png \
-bt_base2.png \
-bt_basew.png \
-bt_dis_hilight.png \
-bt_glow.png \
-bt_hilight.png \
-bt_hilightw.png \
-bt_shine.png \
-inset_sunk.png \
-k_grad.png \
-k_tabhl.png \
-k_tabhm.png \
-k_tabhr.png \
-k_tabl.png \
-k_tabr.png \
-k_tpsh.png \
-k_wtgr.png \
-module_icon.png
diff --git a/src/modules/illume-keyboard/keyboards/Makefile.am b/src/modules/illume-keyboard/keyboards/Makefile.am
deleted file mode 100644
index 7fc25a059..000000000
--- a/src/modules/illume-keyboard/keyboards/Makefile.am
+++ /dev/null
@@ -1,22 +0,0 @@
-MAINTAINERCLEANFILES = Makefile.in
-MODULE = illume-keyboard
-
-filesdir = $(libdir)/enlightenment/modules/$(MODULE)/keyboards
-files_DATA = \
- ignore_built_in_keyboards \
- Default.kbd \
- alpha.png \
- Numbers.kbd \
- numeric.png \
- Terminal.kbd \
- qwerty.png \
- up.png \
- down.png \
- left.png \
- right.png \
- shift.png \
- tab.png \
- enter.png \
- backspace.png
-
-EXTRA_DIST = $(files_DATA)
diff --git a/src/modules/illume-mode-toggle/Makefile.am b/src/modules/illume-mode-toggle/Makefile.am
deleted file mode 100644
index 1b5a98fd2..000000000
--- a/src/modules/illume-mode-toggle/Makefile.am
+++ /dev/null
@@ -1,29 +0,0 @@
-MAINTAINERCLEANFILES = Makefile.in
-MODULE = illume-mode-toggle
-
-# data files for the module
-filesdir = $(libdir)/enlightenment/modules/$(MODULE)
-files_DATA = \
-e-module-$(MODULE).edj module.desktop
-
-EXTRA_DIST = $(files_DATA)
-
-# the module .so file
-AM_CPPFLAGS = -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 \
- @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)
diff --git a/src/modules/illume-softkey/Makefile.am b/src/modules/illume-softkey/Makefile.am
deleted file mode 100644
index c0e1f5602..000000000
--- a/src/modules/illume-softkey/Makefile.am
+++ /dev/null
@@ -1,56 +0,0 @@
-MAINTAINERCLEANFILES = Makefile.in
-MODULE = illume-softkey
-SUBDIRS = images
-
-EDJE_CC = @edje_cc@
-EDJE_FLAGS_VERBOSE_ =
-EDJE_FLAGS_VERBOSE_0 =
-EDJE_FLAGS_VERBOSE_1 = -v
-EDJE_FLAGS = $(EDJE_FLAGS_$(V)) \
- -id $(top_srcdir)/src/modules/$(MODULE)/images \
- @EDJE_DEF@
-
-# data files for the module
-filesdir = $(libdir)/enlightenment/modules/$(MODULE)
-files_DATA = \
- e-module-$(MODULE).edj \
- module.desktop
-
-EXTRA_DIST = \
- e-module-$(MODULE).edc \
- module.desktop.in
-
-# the module .so file
-AM_CPPFLAGS = -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 \
- @e_cflags@
-
-pkgdir = $(libdir)/enlightenment/modules/$(MODULE)/$(MODULE_ARCH)
-pkg_LTLIBRARIES = module.la
-
-module_la_SOURCES = \
- e_mod_sft_win.c \
- e_mod_sft_win.h \
- e_mod_config.c \
- e_mod_config.h \
- 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
-
-e-module-$(MODULE).edj: Makefile $(EXTRA_DIST)
- $(EDJE_CC) $(EDJE_FLAGS) \
- $(top_srcdir)/src/modules/$(MODULE)/e-module-$(MODULE).edc \
- $(top_builddir)/src/modules/$(MODULE)/e-module-$(MODULE).edj
-
-clean-local:
- rm -f *.edj
-
-uninstall:
- rm -rf $(DESTDIR)$(libdir)/enlightenment/modules/$(MODULE)
diff --git a/src/modules/illume-softkey/images/Makefile.am b/src/modules/illume-softkey/images/Makefile.am
deleted file mode 100644
index e6de6fd76..000000000
--- a/src/modules/illume-softkey/images/Makefile.am
+++ /dev/null
@@ -1,6 +0,0 @@
-MAINTAINERCLEANFILES = Makefile.in
-
-EXTRA_DIST = shelf_alt_bg.png \
- shelf_alt_shine.png \
- module_icon.png \
- shelf_alt_over.png
diff --git a/src/modules/illume2/Makefile.am b/src/modules/illume2/Makefile.am
deleted file mode 100644
index 254193684..000000000
--- a/src/modules/illume2/Makefile.am
+++ /dev/null
@@ -1,83 +0,0 @@
-MAINTAINERCLEANFILES = Makefile.in module.desktop
-MODULE = illume2
-SUBDIRS = images keyboards policies doc
-
-EDJE_CC = @edje_cc@
-EDJE_FLAGS_VERBOSE_ =
-EDJE_FLAGS_VERBOSE_0 =
-EDJE_FLAGS_VERBOSE_1 = -v
-EDJE_FLAGS = $(EDJE_FLAGS_$(V)) \
- -id $(top_srcdir)/src/modules/$(MODULE)/images \
- @EDJE_DEF@
-
-# data files for the module
-filesdir = $(libdir)/enlightenment/modules/$(MODULE)
-files_DATA = \
- e-module-$(MODULE).edj \
- module.desktop
-
-EXTRA_DIST = \
- e-module-$(MODULE).edc \
- module.desktop.in
-
-# the module .so file
-AM_CPPFLAGS = -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 \
- @e_cflags@
-
-pkgdir = $(libdir)/enlightenment/modules/$(MODULE)/$(MODULE_ARCH)
-pkg_LTLIBRARIES = module.la
-
-module_la_SOURCES = \
- e_illume.h \
- e_illume.c \
- e_illume_private.h \
- e_mod_config_policy.h \
- e_mod_config_policy.c \
- e_mod_select_window.h \
- e_mod_select_window.c \
- e_mod_config_windows.h \
- e_mod_config_windows.c \
- e_mod_config_animation.h \
- e_mod_config_animation.c \
- e_mod_quickpanel.h \
- e_mod_quickpanel.c \
- e_mod_kbd_device.h \
- e_mod_kbd_device.c \
- e_mod_kbd.h \
- e_mod_kbd.c \
- e_mod_policy.h \
- e_mod_policy.c \
- e_mod_config.h \
- e_mod_config.c \
- e_mod_main.h \
- e_mod_main.c
-
-module_la_LIBADD = @e_libs@ @dlopen_libs@
-module_la_LDFLAGS = -module -avoid-version
-module_la_DEPENDENCIES = $(top_builddir)/config.h
-
-e-module-$(MODULE).edj: Makefile $(EXTRA_DIST)
- $(EDJE_CC) $(EDJE_FLAGS) \
- $(top_srcdir)/src/modules/$(MODULE)/e-module-$(MODULE).edc \
- $(top_builddir)/src/modules/$(MODULE)/e-module-$(MODULE).edj
-
-.PHONY: doc
-
-# Documentation
-
-doc:
- @echo "entering doc/"
- make -C doc doc
-
-clean-local:
- rm -f *.edj
-
-uninstall:
- rm -rf $(DESTDIR)$(libdir)/enlightenment/modules/$(MODULE)
- rm -rf $(DESTDIR)$(libdir)/enlightenment/modules/$(MODULE)/policies
- rm -rf $(DESTDIR)$(libdir)/enlightenment/modules/$(MODULE)/keyboards
diff --git a/src/modules/illume2/doc/Makefile.am b/src/modules/illume2/doc/Makefile.am
deleted file mode 100644
index 51215f436..000000000
--- a/src/modules/illume2/doc/Makefile.am
+++ /dev/null
@@ -1,34 +0,0 @@
-MAINTAINERCLEANFILES = Makefile.in illume.dox
-MODULE_TARNAME = illume2
-MODULE_VERSION = 2.0
-
-.PHONY: doc
-
-PACKAGE_DOCNAME = $(MODULE_TARNAME)-$(MODULE_VERSION)-doc
-
-if EFL_BUILD_DOC
-
-doc-clean:
- rm -rf html/ latex/ man/ xml/ $(PACKAGE_DOCNAME).tar*
-
-doc: all doc-clean
- $(efl_doxygen)
- cp img/* html/
- rm -rf $(PACKAGE_DOCNAME).tar*
- mkdir -p $(PACKAGE_DOCNAME)/doc
- cp -R html/ latex/ man/ $(PACKAGE_DOCNAME)/doc
- tar cf $(PACKAGE_DOCNAME).tar $(PACKAGE_DOCNAME)/
- bzip2 -9 $(PACKAGE_DOCNAME).tar
- rm -rf $(PACKAGE_DOCNAME)/
- mv $(PACKAGE_DOCNAME).tar.bz2 $(top_srcdir)
-
-clean-local: doc-clean
-
-else
-
-doc:
- @echo "Documentation not built. Run ./configure --help"
-
-endif
-
-EXTRA_DIST = Doxyfile $(wildcard img/*.*) e.css head.html foot.html illume.dox.in
diff --git a/src/modules/illume2/images/Makefile.am b/src/modules/illume2/images/Makefile.am
deleted file mode 100644
index 6093afd3b..000000000
--- a/src/modules/illume2/images/Makefile.am
+++ /dev/null
@@ -1,3 +0,0 @@
-MAINTAINERCLEANFILES = Makefile.in
-
-EXTRA_DIST = module_icon.png
diff --git a/src/modules/illume2/keyboards/Makefile.am b/src/modules/illume2/keyboards/Makefile.am
deleted file mode 100644
index 1b2192047..000000000
--- a/src/modules/illume2/keyboards/Makefile.am
+++ /dev/null
@@ -1,11 +0,0 @@
-MAINTAINERCLEANFILES = Makefile.in
-MODULE = illume2
-
-filesdir = $(libdir)/enlightenment/modules/$(MODULE)/keyboards
-files_DATA = ignore_built_in_keyboards
-
-EXTRA_DIST = $(files_DATA)
-
-uninstall:
- rm -rf $(DESTDIR)$(libdir)/enlightenment/modules/$(MODULE)/keyboards
-
diff --git a/src/modules/illume2/policies/Makefile.am b/src/modules/illume2/policies/Makefile.am
deleted file mode 100644
index 286743308..000000000
--- a/src/modules/illume2/policies/Makefile.am
+++ /dev/null
@@ -1,2 +0,0 @@
-MAINTAINERCLEANFILES = Makefile.in
-SUBDIRS = illume tablet
diff --git a/src/modules/illume2/policies/illume/Makefile.am b/src/modules/illume2/policies/illume/Makefile.am
deleted file mode 100644
index 899abadf1..000000000
--- a/src/modules/illume2/policies/illume/Makefile.am
+++ /dev/null
@@ -1,27 +0,0 @@
-MAINTAINERCLEANFILES = Makefile.in
-MODULE = illume2
-POLICY = illume
-
-# the module .so file
-AM_CPPFLAGS = -I.. \
- -I$(top_srcdir) \
- -I$(top_srcdir)/src/modules/$(MODULE) \
- -I$(top_srcdir)/src/modules/$(MODULE)/policies/$(POLICY) \
- -I$(top_srcdir)/src/bin \
- -I$(top_builddir)/src/bin \
- -I$(top_srcdir)/src/modules \
- @e_cflags@
-
-plugindir = $(libdir)/enlightenment/modules/$(MODULE)/policies
-
-illumedir = $(plugindir)
-illume_LTLIBRARIES = illume.la
-illume_la_SOURCES = \
- policy.h \
- policy.c \
- illume.h \
- illume.c
-
-illume_la_LIBADD = @e_libs@
-illume_la_LDFLAGS = -module -avoid-version
-illume_la_LIBTOOLFLAGS = --tag=disable-static
diff --git a/src/modules/illume2/policies/tablet/Makefile.am b/src/modules/illume2/policies/tablet/Makefile.am
deleted file mode 100644
index 7f2a64090..000000000
--- a/src/modules/illume2/policies/tablet/Makefile.am
+++ /dev/null
@@ -1,27 +0,0 @@
-MAINTAINERCLEANFILES = Makefile.in
-MODULE = illume2
-POLICY = tablet
-
-# the module .so file
-AM_CPPFLAGS = -I.. \
- -I$(top_srcdir) \
- -I$(top_srcdir)/src/modules/$(MODULE) \
- -I$(top_srcdir)/src/modules/$(MODULE)/policies/$(POLICY) \
- -I$(top_srcdir)/src/bin \
- -I$(top_builddir)/src/bin \
- -I$(top_srcdir)/src/modules \
- @e_cflags@
-
-plugindir = $(libdir)/enlightenment/modules/$(MODULE)/policies
-
-tabletdir = $(plugindir)
-tablet_LTLIBRARIES = tablet.la
-tablet_la_SOURCES = \
- policy.h \
- policy.c \
- tablet.h \
- tablet.c
-
-tablet_la_LIBADD = @e_libs@
-tablet_la_LDFLAGS = -module -avoid-version
-tablet_la_LIBTOOLFLAGS = --tag=disable-static
diff --git a/src/modules/layout/Makefile.am b/src/modules/layout/Makefile.am
deleted file mode 100644
index d412d4d39..000000000
--- a/src/modules/layout/Makefile.am
+++ /dev/null
@@ -1,28 +0,0 @@
-MAINTAINERCLEANFILES = Makefile.in
-MODULE = layout
-
-# data files for the module
-filesdir = $(libdir)/enlightenment/modules/$(MODULE)
-files_DATA = \
-e-module-$(MODULE).edj module.desktop
-
-EXTRA_DIST = $(files_DATA)
-
-# the module .so file
-AM_CPPFLAGS = -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 \
- @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)
diff --git a/src/modules/mixer/Makefile.am b/src/modules/mixer/Makefile.am
deleted file mode 100644
index afa1edc92..000000000
--- a/src/modules/mixer/Makefile.am
+++ /dev/null
@@ -1,55 +0,0 @@
-MAINTAINERCLEANFILES = Makefile.in
-MODULE = mixer
-
-# data files for the module
-filesdir = $(libdir)/enlightenment/modules/$(MODULE)
-files_DATA = e-module-$(MODULE).edj module.desktop
-
-EXTRA_DIST = $(files_DATA)
-
-# the module .so file
-AM_CPPFLAGS = -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 \
- @e_cflags@ @SOUND_CFLAGS@
-if HAVE_ENOTIFY
-AM_CPPFLAGS += @ENOTIFY_CFLAGS@
-endif
-
-pkgdir = $(libdir)/enlightenment/modules/$(MODULE)/$(MODULE_ARCH)
-pkg_LTLIBRARIES = module.la
-
-module_la_SOURCES = e_mod_main.h \
- Pulse.h \
- pa.h \
- e_mod_main.c \
- e_mod_system.h \
- conf_gadget.c \
- conf_module.c \
- sys_pulse.c \
- app_mixer.c \
- msg.c \
- pa.c \
- serial.c \
- sink.c \
- tag.c
-
-if HAVE_ALSA
-module_la_SOURCES += sys_alsa.c
-else
-module_la_SOURCES += sys_dummy.c
-endif
-
-module_la_LIBADD = @SOUND_LIBS@ @e_libs@ @dlopen_libs@
-if HAVE_ENOTIFY
-module_la_LIBADD += @ENOTIFY_LIBS@
-endif
-
-module_la_LDFLAGS = -module -avoid-version
-module_la_DEPENDENCIES = $(top_builddir)/config.h
-
-uninstall:
- rm -rf $(DESTDIR)$(libdir)/enlightenment/modules/$(MODULE)
diff --git a/src/modules/msgbus/Makefile.am b/src/modules/msgbus/Makefile.am
deleted file mode 100644
index 8cfbc0c3d..000000000
--- a/src/modules/msgbus/Makefile.am
+++ /dev/null
@@ -1,36 +0,0 @@
-MAINTAINERCLEANFILES = Makefile.in
-MODULE = msgbus
-
-# data files for the module
-filesdir = $(libdir)/enlightenment/modules/$(MODULE)
-
-# the module .so file
-AM_CPPFLAGS = -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 \
- @e_cflags@
-
-pkgdir = $(libdir)/enlightenment/modules/$(MODULE)/$(MODULE_ARCH)
-
-files_DATA = \
-e-module-$(MODULE).edj \
-module.desktop
-
-EXTRA_DIST = $(files_DATA)
-
-pkg_LTLIBRARIES = module.la
-module_la_SOURCES = e_mod_main.c \
- e_mod_main.h \
- msgbus_lang.c \
- msgbus_audit.c \
- msgbus_desktop.c
-
-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)
diff --git a/src/modules/notification/Makefile.am b/src/modules/notification/Makefile.am
deleted file mode 100644
index f00443853..000000000
--- a/src/modules/notification/Makefile.am
+++ /dev/null
@@ -1,36 +0,0 @@
-MAINTAINERCLEANFILES = Makefile.in
-MODULE = notification
-
-# data files for the module
-filesdir = $(libdir)/enlightenment/modules/$(MODULE)
-files_DATA = \
-e-module-$(MODULE).edj module.desktop
-
-EXTRA_DIST = $(files_DATA)
-
-# the module .so file
-AM_CPPFLAGS = -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 \
- @e_cflags@ @ENOTIFY_CFLAGS@
-
-pkgdir = $(libdir)/enlightenment/modules/$(MODULE)/$(MODULE_ARCH)
-
-pkg_LTLIBRARIES = module.la
-
-module_la_SOURCES = e_mod_main.h \
- e_mod_box.c \
- e_mod_config_item.c \
- e_mod_main.c \
- e_mod_popup.c \
- e_mod_config.c
-
-module_la_LIBADD = @e_libs@ @dlopen_libs@ @ENOTIFY_LIBS@
-module_la_LDFLAGS = -module -avoid-version
-module_la_DEPENDENCIES = $(top_builddir)/config.h
-
-uninstall:
- rm -rf $(DESTDIR)$(libdir)/enlightenment/modules/$(MODULE)
diff --git a/src/modules/pager/Makefile.am b/src/modules/pager/Makefile.am
deleted file mode 100644
index a99187bcc..000000000
--- a/src/modules/pager/Makefile.am
+++ /dev/null
@@ -1,29 +0,0 @@
-MAINTAINERCLEANFILES = Makefile.in
-MODULE = pager
-
-# data files for the module
-filesdir = $(libdir)/enlightenment/modules/$(MODULE)
-files_DATA = \
-e-module-$(MODULE).edj module.desktop
-
-EXTRA_DIST = $(files_DATA)
-
-# the module .so file
-AM_CPPFLAGS = -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 \
- @e_cflags@
-pkgdir = $(libdir)/enlightenment/modules/$(MODULE)/$(MODULE_ARCH)
-pkg_LTLIBRARIES = module.la
-module_la_SOURCES = e_mod_main.c \
- e_mod_main.h \
- e_mod_config.c
-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)
diff --git a/src/modules/physics/Makefile.am b/src/modules/physics/Makefile.am
deleted file mode 100644
index 174907480..000000000
--- a/src/modules/physics/Makefile.am
+++ /dev/null
@@ -1,36 +0,0 @@
-MAINTAINERCLEANFILES = Makefile.in
-MODULE = physics
-
-# data files for the module
-filesdir = $(libdir)/enlightenment/modules/$(MODULE)
-files_DATA = e-module-$(MODULE).edj module.desktop
-
-EXTRA_DIST = $(files_DATA)
-
-# the module .so file
-AM_CPPFLAGS = -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 \
- @e_cflags@ @EPHYSICS_CFLAGS@
-
-pkgdir = $(libdir)/enlightenment/modules/$(MODULE)/$(MODULE_ARCH)
-pkg_LTLIBRARIES = module.la
-
-module_la_SOURCES = e_mod_main.c \
- e_mod_main.h \
- e_mod_config.c \
- e_mod_config.h \
- e_mod_physics_cfdata.c \
- e_mod_physics_cfdata.h \
- e_mod_physics.c \
- e_mod_physics.h
-
-module_la_LIBADD = @e_libs@ @dlopen_libs@ @EPHYSICS_LIBS@
-module_la_LDFLAGS = -module -avoid-version
-module_la_DEPENDENCIES = $(top_builddir)/config.h
-
-uninstall:
- rm -rf $(DESTDIR)$(libdir)/enlightenment/modules/$(MODULE)
diff --git a/src/modules/quickaccess/Makefile.am b/src/modules/quickaccess/Makefile.am
deleted file mode 100644
index 8cb2ea540..000000000
--- a/src/modules/quickaccess/Makefile.am
+++ /dev/null
@@ -1,34 +0,0 @@
-MAINTAINERCLEANFILES = Makefile.in
-MODULE = quickaccess
-
-# data files for the module
-filesdir = $(libdir)/enlightenment/modules/$(MODULE)
-files_DATA = e-module-$(MODULE).edj module.desktop
-
-EXTRA_DIST = $(files_DATA)
-
-# the module .so file
-AM_CPPFLAGS = -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 \
- @e_cflags@
-
-pkgdir = $(libdir)/enlightenment/modules/$(MODULE)/$(MODULE_ARCH)
-pkg_LTLIBRARIES = module.la
-
-module_la_SOURCES = e_mod_main.h \
- e_mod_main.c \
- e_mod_quickaccess.c \
- e_quickaccess_bindings.c \
- e_quickaccess_db.c \
- e_mod_config.c
-
-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)
diff --git a/src/modules/shot/Makefile.am b/src/modules/shot/Makefile.am
deleted file mode 100644
index 17e070d7c..000000000
--- a/src/modules/shot/Makefile.am
+++ /dev/null
@@ -1,28 +0,0 @@
-MAINTAINERCLEANFILES = Makefile.in
-MODULE = shot
-
-# data files for the module
-filesdir = $(libdir)/enlightenment/modules/$(MODULE)
-files_DATA = \
-e-module-$(MODULE).edj module.desktop
-
-EXTRA_DIST = $(files_DATA)
-
-# the module .so file
-AM_CPPFLAGS = -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 \
- @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)
diff --git a/src/modules/start/Makefile.am b/src/modules/start/Makefile.am
deleted file mode 100644
index b6134ee16..000000000
--- a/src/modules/start/Makefile.am
+++ /dev/null
@@ -1,28 +0,0 @@
-MAINTAINERCLEANFILES = Makefile.in
-MODULE = start
-
-# data files for the module
-filesdir = $(libdir)/enlightenment/modules/$(MODULE)
-files_DATA = \
-e-module-$(MODULE).edj module.desktop
-
-EXTRA_DIST = $(files_DATA)
-
-# the module .so file
-AM_CPPFLAGS = -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 \
- @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)
diff --git a/src/modules/syscon/Makefile.am b/src/modules/syscon/Makefile.am
deleted file mode 100644
index cd95dc1ae..000000000
--- a/src/modules/syscon/Makefile.am
+++ /dev/null
@@ -1,34 +0,0 @@
-MAINTAINERCLEANFILES = Makefile.in
-MODULE = syscon
-
-# data files for the module
-filesdir = $(libdir)/enlightenment/modules/$(MODULE)
-files_DATA = \
-e-module-$(MODULE).edj module.desktop
-
-EXTRA_DIST = $(files_DATA)
-
-# the module .so file
-AM_CPPFLAGS = -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 \
- @e_cflags@
-pkgdir = $(libdir)/enlightenment/modules/$(MODULE)/$(MODULE_ARCH)
-pkg_LTLIBRARIES = module.la
-module_la_SOURCES = e_mod_main.c \
- e_mod_main.h \
- e_syscon.c \
- e_syscon.h \
- e_syscon_gadget.c \
- e_int_config_syscon.c \
- e_int_config_syscon.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)
diff --git a/src/modules/systray/Makefile.am b/src/modules/systray/Makefile.am
deleted file mode 100644
index bcf18e475..000000000
--- a/src/modules/systray/Makefile.am
+++ /dev/null
@@ -1,28 +0,0 @@
-MAINTAINERCLEANFILES = Makefile.in
-MODULE = systray
-
-# data files for the module
-filesdir = $(libdir)/enlightenment/modules/$(MODULE)
-files_DATA = \
-e-module-$(MODULE).edj module.desktop
-
-EXTRA_DIST = $(files_DATA)
-
-# the module .so file
-AM_CPPFLAGS = -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 \
- @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)
diff --git a/src/modules/tasks/Makefile.am b/src/modules/tasks/Makefile.am
deleted file mode 100644
index 7bf013718..000000000
--- a/src/modules/tasks/Makefile.am
+++ /dev/null
@@ -1,29 +0,0 @@
-MAINTAINERCLEANFILES = Makefile.in
-MODULE = tasks
-
-# data files for the module
-filesdir = $(libdir)/enlightenment/modules/$(MODULE)
-files_DATA = \
-e-module-$(MODULE).edj module.desktop
-
-EXTRA_DIST = $(files_DATA)
-
-# the module .so file
-AM_CPPFLAGS = -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 \
- @e_cflags@
-pkgdir = $(libdir)/enlightenment/modules/$(MODULE)/$(MODULE_ARCH)
-pkg_LTLIBRARIES = module.la
-module_la_SOURCES = e_mod_main.c \
- e_mod_main.h \
- e_mod_config.c
-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)
diff --git a/src/modules/temperature/Makefile.am b/src/modules/temperature/Makefile.am
deleted file mode 100644
index c821de3fd..000000000
--- a/src/modules/temperature/Makefile.am
+++ /dev/null
@@ -1,44 +0,0 @@
-MAINTAINERCLEANFILES = Makefile.in
-MODULE = temperature
-
-if HAVE_EEZE
- DEVICE_FILE = e_mod_udev.c
-else
- DEVICE_FILE =
-endif
-
-# data files for the module
-filesdir = $(libdir)/enlightenment/modules/$(MODULE)
-files_DATA = \
-e-module-$(MODULE).edj module.desktop
-
-EXTRA_DIST = $(files_DATA)
-
-# the module .so file
-AM_CPPFLAGS = -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 \
- @e_cflags@
-pkgdir = $(libdir)/enlightenment/modules/$(MODULE)/$(MODULE_ARCH)
-pkg_LTLIBRARIES = module.la
-module_la_SOURCES = e_mod_main.c \
- e_mod_main.h \
- e_mod_config.c \
- e_mod_tempget.c \
- $(DEVICE_FILE) \
- e_mod_main_private.h
-module_la_LIBADD = @e_libs@ @dlopen_libs@
-module_la_LDFLAGS = -module -avoid-version
-module_la_DEPENDENCIES = $(top_builddir)/config.h
-
-tempgetdir = $(pkgdir)
-
-tempget_PROGRAMS = tempget
-tempget_SOURCES = tempget.c
-tempget_LDADD = @TEMPERATURE_LIBS@
-
-uninstall:
- rm -rf $(DESTDIR)$(libdir)/enlightenment/modules/$(MODULE)
diff --git a/src/modules/tiling/Makefile.am b/src/modules/tiling/Makefile.am
deleted file mode 100644
index c88adb832..000000000
--- a/src/modules/tiling/Makefile.am
+++ /dev/null
@@ -1,40 +0,0 @@
-MAINTAINERCLEANFILES = Makefile.in module.desktop
-MODULE = tiling
-
-filesdir = $(libdir)/enlightenment/modules/$(MODULE)
-files_DATA = e-module-$(MODULE).edj module.desktop
-
-EXTRA_DIST = $(files_DATA) \
- e-module-$(MODULE).edc \
- module.desktop.in \
- images/module_icon.png
-
-EDJE_CC = @edje_cc@
-EDJE_FLAGS = -id $(top_srcdir)/src/modules/$(MODULE)/images \
- @EDJE_DEF@
-
-e-module-$(MODULE).edj: e-module-$(MODULE).edc
- $(EDJE_CC) $(EDJE_FLAGS) \
- $(top_srcdir)/src/modules/$(MODULE)/e-module-$(MODULE).edc \
- $(top_builddir)/src/modules/$(MODULE)/e-module-$(MODULE).edj
-
-# the module .so file
-AM_CPPFLAGS = -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 \
- @e_cflags@
-pkgdir = $(libdir)/enlightenment/modules/$(MODULE)/$(MODULE_ARCH)
-pkg_LTLIBRARIES = module.la
-module_la_SOURCES = e_mod_tiling.c \
- e_mod_tiling.h \
- e_mod_config.c
-
-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)
diff --git a/src/modules/winlist/Makefile.am b/src/modules/winlist/Makefile.am
deleted file mode 100644
index 8cb085c3d..000000000
--- a/src/modules/winlist/Makefile.am
+++ /dev/null
@@ -1,33 +0,0 @@
-MAINTAINERCLEANFILES = Makefile.in
-MODULE = winlist
-
-# data files for the module
-filesdir = $(libdir)/enlightenment/modules/$(MODULE)
-files_DATA = \
-e-module-$(MODULE).edj module.desktop
-
-EXTRA_DIST = $(files_DATA)
-
-# the module .so file
-AM_CPPFLAGS = -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 \
- @e_cflags@
-pkgdir = $(libdir)/enlightenment/modules/$(MODULE)/$(MODULE_ARCH)
-pkg_LTLIBRARIES = module.la
-module_la_SOURCES = e_mod_main.c \
- e_mod_main.h \
- e_winlist.c \
- e_winlist.h \
- e_int_config_winlist.c \
- e_int_config_winlist.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)
diff --git a/src/modules/wizard/.gitignore b/src/modules/wizard/.gitignore
new file mode 100644
index 000000000..f92d024ab
--- /dev/null
+++ b/src/modules/wizard/.gitignore
@@ -0,0 +1,3 @@
+/e_mod_comp_cfdata.c
+/e_mod_comp_cfdata.h
+/e_mod_comp_main.h
diff --git a/src/modules/wizard/Makefile.am b/src/modules/wizard/Makefile.am
deleted file mode 100644
index bfb0d29b9..000000000
--- a/src/modules/wizard/Makefile.am
+++ /dev/null
@@ -1,196 +0,0 @@
-MAINTAINERCLEANFILES = Makefile.in
-MODULE = wizard
-
-# data files for the module
-filesdir = $(libdir)/enlightenment/modules/$(MODULE)
-files_DATA = \
-data/def-ibar.txt
-
-desksdir = $(libdir)/enlightenment/modules/$(MODULE)/extra_desktops
-desks_DATA = \
-data/extra_desktops/mplayer.desktop \
-data/extra_desktops/xterm.desktop
-
-desktopdir = $(libdir)/enlightenment/modules/$(MODULE)/desktop
-desktop_DATA = \
-data/desktop/home.desktop \
-data/desktop/root.desktop \
-data/desktop/tmp.desktop
-
-### dont install these - this way e wont list the module for people to
-# accidentally load
-#files_DATA = \
-# e-module-$(MODULE).edj
-# module.desktop
-
-EXTRA_DIST = $(files_DATA) $(desks_DATA) $(favs_DATA) $(desktop_DATA)
-
-# the module .so file
-AM_CPPFLAGS = -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 \
- @ECONNMAN_CFLAGS@ \
- @e_cflags@ \
- -I$(top_srcdir)/src/modules/comp
-pkgdir = $(libdir)/enlightenment/modules/$(MODULE)/$(MODULE_ARCH)
-pkg_LTLIBRARIES = module.la \
- page_000.la \
- page_010.la \
- page_011.la \
- page_020.la \
- page_030.la \
- page_040.la \
- page_050.la \
- page_060.la \
- page_070.la \
- page_080.la \
- page_090.la \
- page_100.la \
- page_120.la \
- page_130.la \
- page_140.la \
- page_150.la \
- page_160.la \
- page_170.la \
- page_200.la
-
-if USE_MODULE_CONNMAN
-pkg_LTLIBRARIES += page_110.la
-endif
-
-module_la_SOURCES = e_mod_main.c \
- e_mod_main.h \
- e_wizard.c \
- e_wizard.h
-
-module_la_LIBADD = @e_libs@ @dlopen_libs@
-module_la_LDFLAGS = -module -avoid-version
-module_la_DEPENDENCIES = $(top_builddir)/config.h
-
-#Auto - Splash screen
-page_000_la_SOURCES = page_000.c
-page_000_la_LIBADD = @e_libs@ @dlopen_libs@
-page_000_la_LDFLAGS = -module -avoid-version
-page_000_la_DEPENDENCIES = $(top_builddir)/config.h
-
-#Choose language
-page_010_la_SOURCES = page_010.c
-page_010_la_LIBADD = @e_libs@ @dlopen_libs@
-page_010_la_LDFLAGS = -module -avoid-version
-page_010_la_DEPENDENCIES = $(top_builddir)/config.h
-
-#Choose kbd layout
-page_011_la_SOURCES = page_011.c
-page_011_la_LIBADD = @e_libs@ @dlopen_libs@
-page_011_la_LDFLAGS = -module -avoid-version
-page_011_la_DEPENDENCIES = $(top_builddir)/config.h
-
-#Choose Profile
-page_020_la_SOURCES = page_020.c
-page_020_la_LIBADD = @e_libs@ @dlopen_libs@
-page_020_la_LDFLAGS = -module -avoid-version
-page_020_la_DEPENDENCIES = $(top_builddir)/config.h
-
-#Auto - set up menu
-page_030_la_SOURCES = page_030.c
-page_030_la_LIBADD = @e_libs@ @dlopen_libs@
-page_030_la_LDFLAGS = -module -avoid-version
-page_030_la_DEPENDENCIES = $(top_builddir)/config.h
-
-#Auto - add new app icons
-page_040_la_SOURCES = page_040.c
-page_040_la_LIBADD = @e_libs@ @dlopen_libs@
-page_040_la_LDFLAGS = -module -avoid-version
-page_040_la_DEPENDENCIES = $(top_builddir)/config.h
-
-#Request what scaling to use
-page_050_la_SOURCES = page_050.c
-page_050_la_LIBADD = @e_libs@ @dlopen_libs@
-page_050_la_LDFLAGS = -module -avoid-version
-page_050_la_DEPENDENCIES = $(top_builddir)/config.h
-
-#Request which focus style to use
-page_060_la_SOURCES = page_060.c
-page_060_la_LIBADD = @e_libs@ @dlopen_libs@
-page_060_la_LDFLAGS = -module -avoid-version
-page_060_la_DEPENDENCIES = $(top_builddir)/config.h
-
-#Auto - Figure out icon theme to use
-page_070_la_SOURCES = page_070.c
-page_070_la_LIBADD = @e_libs@ @dlopen_libs@
-page_070_la_LDFLAGS = -module -avoid-version
-page_070_la_DEPENDENCIES = $(top_builddir)/config.h
-
-#Auto - fill ibar
-page_080_la_SOURCES = page_080.c
-page_080_la_LIBADD = @e_libs@ @dlopen_libs@
-page_080_la_LDFLAGS = -module -avoid-version
-page_080_la_DEPENDENCIES = $(top_builddir)/config.h
-
-#Auto - do we need battery?
-page_090_la_SOURCES = page_090.c
-page_090_la_LIBADD = @e_libs@ @dlopen_libs@
-page_090_la_LDFLAGS = -module -avoid-version
-page_090_la_DEPENDENCIES = $(top_builddir)/config.h
-
-#Auto - do we need cpufreq?
-page_100_la_SOURCES = page_100.c
-page_100_la_LIBADD = @e_libs@ @dlopen_libs@
-page_100_la_LDFLAGS = -module -avoid-version
-page_100_la_DEPENDENCIES = $(top_builddir)/config.h
-
-if USE_MODULE_CONNMAN
-#Auto+feedback - do we need connman?
-page_110_la_SOURCES = page_110.c
-page_110_la_LIBADD = @e_libs@ @dlopen_libs@ @ECONNMAN_LIBS@
-page_110_la_LDFLAGS = -module -avoid-version
-page_110_la_DEPENDENCIES = $(top_builddir)/config.h
-endif
-
-#Auto - do we need temperature?
-page_120_la_SOURCES = page_120.c
-page_120_la_LIBADD = @e_libs@ @dlopen_libs@
-page_120_la_LDFLAGS = -module -avoid-version
-page_120_la_DEPENDENCIES = $(top_builddir)/config.h
-
-#Auto - do we need backlight?
-page_130_la_SOURCES = page_130.c
-page_130_la_LIBADD = @e_libs@ @dlopen_libs@
-page_130_la_LDFLAGS = -module -avoid-version
-page_130_la_DEPENDENCIES = $(top_builddir)/config.h
-
-#Auto - do we need temperature?
-page_140_la_SOURCES = page_140.c
-page_140_la_LIBADD = @e_libs@ @dlopen_libs@
-page_140_la_LDFLAGS = -module -avoid-version
-page_140_la_DEPENDENCIES = $(top_builddir)/config.h
-
-#Request if compositing is wanted
-page_150_la_SOURCES = page_150.c $(top_srcdir)/src/modules/comp/e_mod_comp_cfdata.c
-page_150_la_LIBADD = @e_libs@ @dlopen_libs@
-page_150_la_LDFLAGS = -module -avoid-version
-page_150_la_DEPENDENCIES = $(top_builddir)/config.h
-
-#Auto - install favorites and ~/Desktop and entries
-page_160_la_SOURCES = page_160.c
-page_160_la_LIBADD = @e_libs@ @dlopen_libs@
-page_160_la_LDFLAGS = -module -avoid-version
-page_160_la_DEPENDENCIES = $(top_builddir)/config.h
-
-#Request if user agrees to checking for updates
-page_170_la_SOURCES = page_170.c
-page_170_la_LIBADD = @e_libs@ @dlopen_libs@
-page_170_la_LDFLAGS = -module -avoid-version
-page_170_la_DEPENDENCIES = $(top_builddir)/config.h
-
-#Auto - finish up applying
-page_200_la_SOURCES = page_200.c
-page_200_la_LIBADD = @e_libs@ @dlopen_libs@
-page_200_la_LDFLAGS = -module -avoid-version
-page_200_la_DEPENDENCIES = $(top_builddir)/config.h
-
-uninstall:
- rm -rf $(DESTDIR)$(libdir)/enlightenment/modules/$(MODULE)
diff --git a/src/modules/wl_drm/Makefile.am b/src/modules/wl_drm/Makefile.am
deleted file mode 100644
index d097de0f0..000000000
--- a/src/modules/wl_drm/Makefile.am
+++ /dev/null
@@ -1,35 +0,0 @@
-MAINTAINERCLEANFILES = Makefile.in
-MODULE = wl_drm
-
-# data files for the module
-filesdir = $(libdir)/enlightenment/modules/$(MODULE)
-files_DATA = \
-e-module-$(MODULE).edj module.desktop
-
-EXTRA_DIST = $(files_DATA)
-
-# the module .so file
-AM_CPPFLAGS = -I. \
- -I$(top_srcdir) \
- -I$(top_srcdir)/src/modules/$(MODULE) \
- -I$(top_srcdir)/src/bin/e_wayland \
- -I$(top_builddir)/src/bin/e_wayland \
- -I$(top_srcdir)/src/modules \
- @e_wl_cflags@ @WAYLAND_DRM_CFLAGS@
-
-pkgdir = $(libdir)/enlightenment/modules/$(MODULE)/$(MODULE_ARCH)
-pkg_LTLIBRARIES = module.la
-
-module_la_SOURCES = e_mod_main.c \
- e_mod_main.h \
- e_tty.c \
- e_sprite.c \
- e_drm_output.c \
- e_evdev.c
-
-module_la_LIBADD = @e_wl_libs@ @dlopen_libs@ @WAYLAND_DRM_LIBS@
-module_la_LDFLAGS = -module -avoid-version
-module_la_DEPENDENCIES = $(top_builddir)/config.h
-
-uninstall:
- rm -rf $(DESTDIR)$(libdir)/enlightenment/modules/$(MODULE)
diff --git a/src/modules/wl_screenshot/Makefile.am b/src/modules/wl_screenshot/Makefile.am
deleted file mode 100644
index 27972ce0f..000000000
--- a/src/modules/wl_screenshot/Makefile.am
+++ /dev/null
@@ -1,33 +0,0 @@
-MAINTAINERCLEANFILES = Makefile.in
-MODULE = wl_screenshot
-
-# data files for the module
-filesdir = $(libdir)/enlightenment/modules/$(MODULE)
-files_DATA = \
-e-module-$(MODULE).edj module.desktop
-
-EXTRA_DIST = $(files_DATA)
-
-# the module .so file
-AM_CPPFLAGS = -I. \
- -I$(top_srcdir) \
- -I$(top_srcdir)/src/modules/$(MODULE) \
- -I$(top_srcdir)/src/bin/e_wayland \
- -I$(top_builddir)/src/bin/e_wayland \
- -I$(top_srcdir)/src/modules \
- @e_wl_cflags@ @WAYLAND_SCREENSHOT_CFLAGS@
-
-pkgdir = $(libdir)/enlightenment/modules/$(MODULE)/$(MODULE_ARCH)
-pkg_LTLIBRARIES = module.la
-
-module_la_SOURCES = e_mod_main.c \
- e_mod_main.h \
- e_screenshooter_client_protocol.c \
- e_screenshooter_client_protocol.h
-
-module_la_LIBADD = @e_wl_libs@ @dlopen_libs@ @WAYLAND_SCREENSHOT_LIBS@
-module_la_LDFLAGS = -module -avoid-version
-module_la_DEPENDENCIES = $(top_builddir)/config.h
-
-uninstall:
- rm -rf $(DESTDIR)$(libdir)/enlightenment/modules/$(MODULE)
diff --git a/src/modules/wl_shell/Makefile.am b/src/modules/wl_shell/Makefile.am
deleted file mode 100644
index c9fc13334..000000000
--- a/src/modules/wl_shell/Makefile.am
+++ /dev/null
@@ -1,31 +0,0 @@
-MAINTAINERCLEANFILES = Makefile.in
-MODULE = wl_shell
-
-# data files for the module
-filesdir = $(libdir)/enlightenment/modules/$(MODULE)
-files_DATA = \
-e-module-$(MODULE).edj module.desktop
-
-EXTRA_DIST = $(files_DATA)
-
-# the module .so file
-AM_CPPFLAGS = -I. \
- -I$(top_srcdir) \
- -I$(top_srcdir)/src/modules/$(MODULE) \
- -I$(top_srcdir)/src/bin/e_wayland \
- -I$(top_builddir)/src/bin/e_wayland \
- -I$(top_srcdir)/src/modules \
- @e_wl_cflags@ @WAYLAND_SHELL_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_wl_libs@ @dlopen_libs@ @WAYLAND_SHELL_LIBS@
-module_la_LDFLAGS = -module -avoid-version
-module_la_DEPENDENCIES = $(top_builddir)/config.h
-
-uninstall:
- rm -rf $(DESTDIR)$(libdir)/enlightenment/modules/$(MODULE)
diff --git a/src/modules/xkbswitch/Makefile.am b/src/modules/xkbswitch/Makefile.am
deleted file mode 100644
index e804076fa..000000000
--- a/src/modules/xkbswitch/Makefile.am
+++ /dev/null
@@ -1,32 +0,0 @@
-MAINTAINERCLEANFILES = Makefile.in
-MODULE = xkbswitch
-
-# data files for the module
-filesdir = $(libdir)/enlightenment/modules/$(MODULE)
-files_DATA = \
-e-module-$(MODULE).edj module.desktop
-
-EXTRA_DIST = $(files_DATA)
-
-# the module .so file
-AM_CPPFLAGS = -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 \
- @e_cflags@
-pkgdir = $(libdir)/enlightenment/modules/$(MODULE)/$(MODULE_ARCH)
-pkg_LTLIBRARIES = module.la
-module_la_SOURCES = e_mod_main.c \
- e_mod_main.h \
- e_mod_config.c \
- e_mod_parse.c \
- e_mod_parse.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)