aboutsummaryrefslogtreecommitdiffstats
path: root/src
diff options
context:
space:
mode:
authorLucas De Marchi <lucas.demarchi@profusion.mobi>2012-11-07 21:46:35 +0000
committerLucas De Marchi <lucas.demarchi@profusion.mobi>2012-11-07 21:46:35 +0000
commit7d6e2c877833ca68f58b220fc7131a305ce675f0 (patch)
tree2bb6c67b29736a89d7f38edb13ad103d153eb421 /src
parentE: should now compile on Mac OS X. (diff)
downloadenlightenment-7d6e2c877833ca68f58b220fc7131a305ce675f0.tar.gz
e/modules: Do not use recursive Makefiles
SVN revision: 78978
Diffstat (limited to 'src')
-rw-r--r--src/modules/Makefile.am145
-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.am26
-rw-r--r--src/modules/Makefile_dropshadow.am15
-rw-r--r--src/modules/Makefile_everything.am44
-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.am37
-rw-r--r--src/modules/Makefile_illume-kbd-toggle.am13
-rw-r--r--src/modules/Makefile_illume-keyboard.am64
-rw-r--r--src/modules/Makefile_illume-mode-toggle.am13
-rw-r--r--src/modules/Makefile_illume-softkey.am29
-rw-r--r--src/modules/Makefile_illume2.am77
-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.am27
-rw-r--r--src/modules/Makefile_tiling.am26
-rw-r--r--src/modules/Makefile_winlist.am17
-rw-r--r--src/modules/Makefile_wizard.am131
-rw-r--r--src/modules/Makefile_xkbswitch.am16
-rw-r--r--src/modules/wizard/.gitignore3
58 files changed, 1398 insertions, 63 deletions
diff --git a/src/modules/Makefile.am b/src/modules/Makefile.am
index 610fd271a..5e14235fe 100644
--- a/src/modules/Makefile.am
+++ b/src/modules/Makefile.am
@@ -1,216 +1,235 @@
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@
+EDJE_FLAGS_VERBOSE_ =
+EDJE_FLAGS_VERBOSE_0 =
+EDJE_FLAGS_VERBOSE_1 = -v
+EDJE_FLAGS = $(EDJE_FLAGS_VERBOSE_$(V))
+
+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
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..882c60caa
--- /dev/null
+++ b/src/modules/Makefile_cpufreq.am
@@ -0,0 +1,26 @@
+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-install-data-hook:
+ @chown $(setuid_root_user) $(DESTDIR)$(freqsetdir)/freqset$(EXEEXT) || true
+ @chmod $(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..72faadc10
--- /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..afb165c4b
--- /dev/null
+++ b/src/modules/Makefile_everything.am
@@ -0,0 +1,44 @@
+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_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..b4aeb78e5
--- /dev/null
+++ b/src/modules/Makefile_illume-indicator.am
@@ -0,0 +1,37 @@
+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 $(top_srcdir)/src/modules/illume-indicator/images \
+ @EDJE_DEF@
+
+illume-indicator/e-module-illume-indicator.edj: Makefile $(top_srcdir)/src/modules/illume-indicator/e-module-illume-indicator.edc
+ $(EDJE_CC) $(ILLUME_INDICATOR_EDJE_FLAGS) \
+ $(top_srcdir)/src/modules/illume-indicator/e-module-illume-indicator.edc \
+ $(top_builddir)/src/modules/illume-indicator/e-module-illume-indicator.edj
+
+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..72a65d7dc
--- /dev/null
+++ b/src/modules/Makefile_illume-keyboard.am
@@ -0,0 +1,64 @@
+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 $(top_srcdir)/src/modules/illume-keyboard/images \
+ @EDJE_DEF@
+
+illume-keyboard/e-module-illume-keyboard.edj: Makefile $(top_srcdir)/src/modules/illume-keyboard/e-module-illume-keyboard.edc
+ $(EDJE_CC) $(ILLUME_KEYBOARD_EDJE_FLAGS) \
+ $(top_srcdir)/src/modules/illume-keyboard/e-module-illume-keyboard.edc \
+ $(top_builddir)/src/modules/illume-keyboard/e-module-illume-keyboard.edj
+
+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..970b9edb3
--- /dev/null
+++ b/src/modules/Makefile_illume-softkey.am
@@ -0,0 +1,29 @@
+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 \
+ @EDJE_DEF@
+
+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..2f87724f9
--- /dev/null
+++ b/src/modules/Makefile_illume2.am
@@ -0,0 +1,77 @@
+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 $(top_srcdir)/src/modules/illume2/images \
+ @EDJE_DEF@
+
+illume2/e-module-illume2.edj: Makefile $(top_srcdir)/src/modules/illume2/e-module-illume2.edc
+ $(EDJE_CC) $(ILLUME2_EDJE_FLAGS) \
+ $(top_srcdir)/src/modules/illume2/e-module-illume2.edc \
+ $(top_builddir)/src/modules/illume2/e-module-illume2.edj
+
+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..9115665dc
--- /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..6a3753509
--- /dev/null
+++ b/src/modules/Makefile_temperature.am
@@ -0,0 +1,27 @@
+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_CFLAGS = $(AM_CFLAGS)
+temperature_module_la_LIBADD = $(AM_LIBADD)
+temperature_module_la_SOURCES = temperature/e_mod_main.h \
+ temperature/e_mod_main.c \
+ temperature/e_mod_main_private.h
+ temperature/e_mod_config.c \
+ 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..81058359b
--- /dev/null
+++ b/src/modules/Makefile_tiling.am
@@ -0,0 +1,26 @@
+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 $(top_srcdir)/src/modules/tiling/images \
+ @EDJE_DEF@
+
+tiling/e-module-tiling.edj: tiling/e-module-tiling.edc
+ $(EDJE_CC) $(TILING_EDJE_FLAGS) \
+ $(top_srcdir)/src/modules/tiling/e-module-tiling.edc \
+ $(top_builddir)/src/modules/tiling/e-module-tiling.edj
+
+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..fded2b0fd
--- /dev/null
+++ b/src/modules/Makefile_wizard.am
@@ -0,0 +1,131 @@
+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: $(top_srcdir)/src/modules/comp/e_mod_main.h
+ $(AM_V_GEN) $(LN_S) -f ../$< $@
+
+wizard/e_mod_comp_cfdata.h: $(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' $< > $@
+
+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/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