summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCedric BAIL <cedric.bail@free.fr>2008-10-13 16:00:58 +0000
committerCedric BAIL <cedric.bail@free.fr>2008-10-13 16:00:58 +0000
commitd2f7e4da0d1a979ae6d279ab1a4483d1d979e28c (patch)
treef26e0c560e638df703abf8994804ca988398c4c4
parent7096b7fb186f53df2f7b02a264ece259ae2bff35 (diff)
Make e depend on eina. No change in the code yet, so just fix your build system and no bug must show up.
SVN revision: 36627
-rw-r--r--configure.ac2
-rw-r--r--src/bin/Makefile.am19
-rw-r--r--src/modules/battery/Makefile.am5
-rw-r--r--src/modules/clock/Makefile.am5
-rw-r--r--src/modules/conf/Makefile.am7
-rw-r--r--src/modules/conf_applications/Makefile.am9
-rw-r--r--src/modules/conf_borders/Makefile.am7
-rw-r--r--src/modules/conf_clientlist/Makefile.am9
-rw-r--r--src/modules/conf_colors/Makefile.am5
-rw-r--r--src/modules/conf_desk/Makefile.am9
-rw-r--r--src/modules/conf_desklock/Makefile.am7
-rw-r--r--src/modules/conf_desks/Makefile.am9
-rw-r--r--src/modules/conf_dialogs/Makefile.am5
-rw-r--r--src/modules/conf_display/Makefile.am5
-rw-r--r--src/modules/conf_dpms/Makefile.am4
-rw-r--r--src/modules/conf_engine/Makefile.am7
-rw-r--r--src/modules/conf_exebuf/Makefile.am5
-rw-r--r--src/modules/conf_fonts/Makefile.am7
-rw-r--r--src/modules/conf_icon_theme/Makefile.am5
-rw-r--r--src/modules/conf_imc/Makefile.am5
-rw-r--r--src/modules/conf_interaction/Makefile.am5
-rw-r--r--src/modules/conf_intl/Makefile.am5
-rw-r--r--src/modules/conf_keybindings/Makefile.am5
-rw-r--r--src/modules/conf_menus/Makefile.am5
-rw-r--r--src/modules/conf_mime/Makefile.am7
-rw-r--r--src/modules/conf_mouse/Makefile.am5
-rw-r--r--src/modules/conf_mouse_cursor/Makefile.am5
-rw-r--r--src/modules/conf_mousebindings/Makefile.am7
-rw-r--r--src/modules/conf_paths/Makefile.am9
-rw-r--r--src/modules/conf_performance/Makefile.am9
-rw-r--r--src/modules/conf_profiles/Makefile.am7
-rw-r--r--src/modules/conf_scale/Makefile.am5
-rw-r--r--src/modules/conf_screensaver/Makefile.am5
-rw-r--r--src/modules/conf_shelves/Makefile.am5
-rw-r--r--src/modules/conf_startup/Makefile.am5
-rw-r--r--src/modules/conf_theme/Makefile.am5
-rw-r--r--src/modules/conf_transitions/Makefile.am5
-rw-r--r--src/modules/conf_wallpaper/Makefile.am5
-rw-r--r--src/modules/conf_window_display/Makefile.am5
-rw-r--r--src/modules/conf_window_focus/Makefile.am7
-rw-r--r--src/modules/conf_window_manipulation/Makefile.am5
-rw-r--r--src/modules/conf_window_remembers/Makefile.am7
-rw-r--r--src/modules/conf_winlist/Makefile.am9
-rw-r--r--src/modules/connman/Makefile.am5
-rw-r--r--src/modules/cpufreq/Makefile.am5
-rw-r--r--src/modules/dropshadow/Makefile.am5
-rw-r--r--src/modules/exebuf/Makefile.am5
-rw-r--r--src/modules/fileman/Makefile.am5
-rw-r--r--src/modules/gadman/Makefile.am5
-rw-r--r--src/modules/ibar/Makefile.am5
-rw-r--r--src/modules/ibox/Makefile.am5
-rw-r--r--src/modules/layout/Makefile.am5
-rw-r--r--src/modules/mixer/Makefile.am5
-rw-r--r--src/modules/msgbus_lang/Makefile.am7
-rw-r--r--src/modules/pager/Makefile.am5
-rw-r--r--src/modules/start/Makefile.am5
-rw-r--r--src/modules/temperature/Makefile.am5
-rw-r--r--src/modules/winlist/Makefile.am5
-rw-r--r--src/modules/wizard/Makefile.am13
-rw-r--r--src/preload/Makefile.am9
60 files changed, 216 insertions, 156 deletions
diff --git a/configure.ac b/configure.ac
index a66e9e1d1..382101953 100644
--- a/configure.ac
+++ b/configure.ac
@@ -180,6 +180,8 @@ if test "[${e_cv_enable_files}]" = yes; then
180fi 180fi
181AC_MSG_RESULT([$e_cv_enable_files]) 181AC_MSG_RESULT([$e_cv_enable_files])
182 182
183PKG_CHECK_MODULES([EINA], [eina-0])
184
183PKG_CHECK_MODULES(E, [ 185PKG_CHECK_MODULES(E, [
184 evas 186 evas
185 ecore 187 ecore
diff --git a/src/bin/Makefile.am b/src/bin/Makefile.am
index 85fcb90f4..33611ca2b 100644
--- a/src/bin/Makefile.am
+++ b/src/bin/Makefile.am
@@ -7,6 +7,7 @@ INCLUDES = -I$(top_srcdir) \
7 @cf_cflags@ \ 7 @cf_cflags@ \
8 @VALGRIND_CFLAGS@ \ 8 @VALGRIND_CFLAGS@ \
9 @EDJE_DEF@ \ 9 @EDJE_DEF@ \
10 @EINA_CFLAGS@ \
10 -DPACKAGE_BIN_DIR=\"@PACKAGE_BIN_DIR@\" \ 11 -DPACKAGE_BIN_DIR=\"@PACKAGE_BIN_DIR@\" \
11 -DPACKAGE_LIB_DIR=\"@PACKAGE_LIB_DIR@\" \ 12 -DPACKAGE_LIB_DIR=\"@PACKAGE_LIB_DIR@\" \
12 -DPACKAGE_DATA_DIR=\"@PACKAGE_DATA_DIR@\" \ 13 -DPACKAGE_DATA_DIR=\"@PACKAGE_DATA_DIR@\" \
@@ -308,14 +309,14 @@ enlightenment_SOURCES = \
308e_main.c \ 309e_main.c \
309$(enlightenment_src) 310$(enlightenment_src)
310 311
311enlightenment_LDFLAGS = -export-dynamic @e_libs@ @x_libs@ @dlopen_libs@ @cf_libs@ @VALGRIND_LIBS@ @E_DBUS_LIBS@ 312enlightenment_LDFLAGS = -export-dynamic @e_libs@ @x_libs@ @dlopen_libs@ @cf_libs@ @VALGRIND_LIBS@ @E_DBUS_LIBS@ @EINA_LIBS@
312 313
313enlightenment_remote_SOURCES = \ 314enlightenment_remote_SOURCES = \
314e.h \ 315e.h \
315e_ipc_codec.c \ 316e_ipc_codec.c \
316e_remote_main.c 317e_remote_main.c
317 318
318enlightenment_remote_LDFLAGS = @e_libs@ 319enlightenment_remote_LDFLAGS = @e_libs@ @EINA_LIBS@
319 320
320enlightenment_imc_SOURCES = \ 321enlightenment_imc_SOURCES = \
321e.h \ 322e.h \
@@ -324,19 +325,19 @@ e_config_data.c \
324e_imc_main.c 325e_imc_main.c
325# $(enlightenment_src) 326# $(enlightenment_src)
326 327
327enlightenment_imc_LDFLAGS = @e_libs@ @dlopen_libs@ 328enlightenment_imc_LDFLAGS = @e_libs@ @dlopen_libs@ @EINA_LIBS@
328 329
329enlightenment_start_SOURCES = \ 330enlightenment_start_SOURCES = \
330e_start_main.c 331e_start_main.c
331 332
332enlightenment_start_LDFLAGS = @dlopen_libs@ 333enlightenment_start_LDFLAGS = @dlopen_libs@ @EINA_LIBS@
333 334
334enlightenment_thumb_SOURCES = \ 335enlightenment_thumb_SOURCES = \
335e_thumb_main.c \ 336e_thumb_main.c \
336e_user.c \ 337e_user.c \
337e_sha1.c 338e_sha1.c
338 339
339enlightenment_thumb_LDFLAGS = @e_libs@ 340enlightenment_thumb_LDFLAGS = @e_libs@ @EINA_LIBS@
340 341
341enlightenment_fm_SOURCES = \ 342enlightenment_fm_SOURCES = \
342e_fm_main.c \ 343e_fm_main.c \
@@ -344,25 +345,25 @@ e_user.c \
344e_sha1.c \ 345e_sha1.c \
345e_prefix.c 346e_prefix.c
346 347
347enlightenment_fm_LDFLAGS = @e_libs@ @dlopen_libs@ @E_DBUS_LIBS@ @E_HAL_LIBS@ 348enlightenment_fm_LDFLAGS = @e_libs@ @dlopen_libs@ @E_DBUS_LIBS@ @E_HAL_LIBS@ @EINA_LIBS@
348enlightenment_fm_CFLAGS = $(INCLUDES) @E_HAL_CFLAGS@ 349enlightenment_fm_CFLAGS = $(INCLUDES) @E_HAL_CFLAGS@
349 350
350enlightenment_fm_op_SOURCES = \ 351enlightenment_fm_op_SOURCES = \
351e_fm_op.c 352e_fm_op.c
352 353
353enlightenment_fm_op_LDFLAGS = @e_libs@ 354enlightenment_fm_op_LDFLAGS = @e_libs@ @EINA_LIBS@
354enlightenment_fm_op_CFLAGS = $(INCLUDES) 355enlightenment_fm_op_CFLAGS = $(INCLUDES)
355 356
356enlightenment_sys_SOURCES = \ 357enlightenment_sys_SOURCES = \
357e_sys_main.c 358e_sys_main.c
358 359
359enlightenment_sys_LDFLAGS = @e_libs@ 360enlightenment_sys_LDFLAGS = @e_libs@ @EINA_LIBS@
360 361
361enlightenment_init_SOURCES = \ 362enlightenment_init_SOURCES = \
362e_init_main.c \ 363e_init_main.c \
363e_xinerama.c 364e_xinerama.c
364 365
365enlightenment_init_LDFLAGS = @e_libs@ 366enlightenment_init_LDFLAGS = @e_libs@ @EINA_LIBS@
366 367
367setuid_root_mode = a=rx,u+xs 368setuid_root_mode = a=rx,u+xs
368install-exec-hook: 369install-exec-hook:
diff --git a/src/modules/battery/Makefile.am b/src/modules/battery/Makefile.am
index 6d1d3d245..6379fa917 100644
--- a/src/modules/battery/Makefile.am
+++ b/src/modules/battery/Makefile.am
@@ -16,13 +16,14 @@ INCLUDES = -I. \
16 -I$(top_srcdir)/src/lib \ 16 -I$(top_srcdir)/src/lib \
17 -I$(top_srcdir)/src/modules \ 17 -I$(top_srcdir)/src/modules \
18 @e_cflags@ \ 18 @e_cflags@ \
19 @cf_cflags@ 19 @cf_cflags@ \
20 @EINA_CFLAGS@
20pkgdir = $(libdir)/enlightenment/modules/$(MODULE)/$(MODULE_ARCH) 21pkgdir = $(libdir)/enlightenment/modules/$(MODULE)/$(MODULE_ARCH)
21pkg_LTLIBRARIES = module.la 22pkg_LTLIBRARIES = module.la
22module_la_SOURCES = e_mod_main.c \ 23module_la_SOURCES = e_mod_main.c \
23 e_mod_main.h \ 24 e_mod_main.h \
24 e_mod_config.c 25 e_mod_config.c
25module_la_LIBADD = @e_libs@ @cf_libs@ @dlopen_libs@ 26module_la_LIBADD = @e_libs@ @cf_libs@ @dlopen_libs@ @EINA_LIBS@
26module_la_LDFLAGS = -module -avoid-version 27module_la_LDFLAGS = -module -avoid-version
27module_la_DEPENDENCIES = $(top_builddir)/config.h 28module_la_DEPENDENCIES = $(top_builddir)/config.h
28 29
diff --git a/src/modules/clock/Makefile.am b/src/modules/clock/Makefile.am
index a39b6869e..a855b80d9 100644
--- a/src/modules/clock/Makefile.am
+++ b/src/modules/clock/Makefile.am
@@ -15,12 +15,13 @@ INCLUDES = -I. \
15 -I$(top_srcdir)/src/bin \ 15 -I$(top_srcdir)/src/bin \
16 -I$(top_srcdir)/src/lib \ 16 -I$(top_srcdir)/src/lib \
17 -I$(top_srcdir)/src/modules \ 17 -I$(top_srcdir)/src/modules \
18 @e_cflags@ 18 @e_cflags@ \
19 @EINA_CFLAGS@
19pkgdir = $(libdir)/enlightenment/modules/$(MODULE)/$(MODULE_ARCH) 20pkgdir = $(libdir)/enlightenment/modules/$(MODULE)/$(MODULE_ARCH)
20pkg_LTLIBRARIES = module.la 21pkg_LTLIBRARIES = module.la
21module_la_SOURCES = e_mod_main.c \ 22module_la_SOURCES = e_mod_main.c \
22 e_mod_main.h 23 e_mod_main.h
23module_la_LIBADD = @e_libs@ @dlopen_libs@ 24module_la_LIBADD = @e_libs@ @dlopen_libs@ @EINA_LIBS@
24module_la_LDFLAGS = -module -avoid-version 25module_la_LDFLAGS = -module -avoid-version
25module_la_DEPENDENCIES = $(top_builddir)/config.h 26module_la_DEPENDENCIES = $(top_builddir)/config.h
26 27
diff --git a/src/modules/conf/Makefile.am b/src/modules/conf/Makefile.am
index 3a681053e..c5a6e550b 100644
--- a/src/modules/conf/Makefile.am
+++ b/src/modules/conf/Makefile.am
@@ -15,15 +15,16 @@ INCLUDES = -I. \
15 -I$(top_srcdir)/src/bin \ 15 -I$(top_srcdir)/src/bin \
16 -I$(top_srcdir)/src/lib \ 16 -I$(top_srcdir)/src/lib \
17 -I$(top_srcdir)/src/modules \ 17 -I$(top_srcdir)/src/modules \
18 @e_cflags@ 18 @e_cflags@ \
19 @EINA_CFLAGS@
19pkgdir = $(libdir)/enlightenment/modules/$(MODULE)/$(MODULE_ARCH) 20pkgdir = $(libdir)/enlightenment/modules/$(MODULE)/$(MODULE_ARCH)
20pkg_LTLIBRARIES = module.la 21pkg_LTLIBRARIES = module.la
21module_la_SOURCES = e_mod_main.c \ 22module_la_SOURCES = e_mod_main.c \
22 e_mod_main.h \ 23 e_mod_main.h \
23 e_conf.c \ 24 e_conf.c \
24 e_conf.h 25 e_conf.h
25 26
26module_la_LIBADD = @e_libs@ @dlopen_libs@ 27module_la_LIBADD = @e_libs@ @dlopen_libs@ @EINA_LIBS@
27module_la_LDFLAGS = -module -avoid-version 28module_la_LDFLAGS = -module -avoid-version
28module_la_DEPENDENCIES = $(top_builddir)/config.h 29module_la_DEPENDENCIES = $(top_builddir)/config.h
29 30
diff --git a/src/modules/conf_applications/Makefile.am b/src/modules/conf_applications/Makefile.am
index d11e57b2c..6129c0ad3 100644
--- a/src/modules/conf_applications/Makefile.am
+++ b/src/modules/conf_applications/Makefile.am
@@ -15,15 +15,16 @@ INCLUDES = -I. \
15 -I$(top_srcdir)/src/bin \ 15 -I$(top_srcdir)/src/bin \
16 -I$(top_srcdir)/src/lib \ 16 -I$(top_srcdir)/src/lib \
17 -I$(top_srcdir)/src/modules \ 17 -I$(top_srcdir)/src/modules \
18 @e_cflags@ 18 @e_cflags@ \
19 @EINA_CFLAGS@
19pkgdir = $(libdir)/enlightenment/modules/$(MODULE)/$(MODULE_ARCH) 20pkgdir = $(libdir)/enlightenment/modules/$(MODULE)/$(MODULE_ARCH)
20pkg_LTLIBRARIES = module.la 21pkg_LTLIBRARIES = module.la
21module_la_SOURCES = e_mod_main.c \ 22module_la_SOURCES = e_mod_main.c \
22 e_mod_main.h \ 23 e_mod_main.h \
23 e_int_config_apps.c \ 24 e_int_config_apps.c \
24 e_int_config_apps.h 25 e_int_config_apps.h
25 26
26module_la_LIBADD = @e_libs@ @dlopen_libs@ 27module_la_LIBADD = @e_libs@ @dlopen_libs@ @EINA_LIBS@
27module_la_LDFLAGS = -module -avoid-version 28module_la_LDFLAGS = -module -avoid-version
28module_la_DEPENDENCIES = $(top_builddir)/config.h 29module_la_DEPENDENCIES = $(top_builddir)/config.h
29 30
diff --git a/src/modules/conf_borders/Makefile.am b/src/modules/conf_borders/Makefile.am
index e89935eeb..0f2302682 100644
--- a/src/modules/conf_borders/Makefile.am
+++ b/src/modules/conf_borders/Makefile.am
@@ -15,15 +15,16 @@ INCLUDES = -I. \
15 -I$(top_srcdir)/src/bin \ 15 -I$(top_srcdir)/src/bin \
16 -I$(top_srcdir)/src/lib \ 16 -I$(top_srcdir)/src/lib \
17 -I$(top_srcdir)/src/modules \ 17 -I$(top_srcdir)/src/modules \
18 @e_cflags@ 18 @e_cflags@ \
19 @EINA_CFLAGS@
19pkgdir = $(libdir)/enlightenment/modules/$(MODULE)/$(MODULE_ARCH) 20pkgdir = $(libdir)/enlightenment/modules/$(MODULE)/$(MODULE_ARCH)
20pkg_LTLIBRARIES = module.la 21pkg_LTLIBRARIES = module.la
21module_la_SOURCES = e_mod_main.c \ 22module_la_SOURCES = e_mod_main.c \
22 e_mod_main.h \ 23 e_mod_main.h \
23 e_int_config_borders.c \ 24 e_int_config_borders.c \
24 e_int_config_borders.h 25 e_int_config_borders.h
25 26
26module_la_LIBADD = @e_libs@ @dlopen_libs@ 27module_la_LIBADD = @e_libs@ @dlopen_libs@ @EINA_LIBS@
27module_la_LDFLAGS = -module -avoid-version 28module_la_LDFLAGS = -module -avoid-version
28module_la_DEPENDENCIES = $(top_builddir)/config.h 29module_la_DEPENDENCIES = $(top_builddir)/config.h
29 30
diff --git a/src/modules/conf_clientlist/Makefile.am b/src/modules/conf_clientlist/Makefile.am
index b9bdd1a80..b0330c6b4 100644
--- a/src/modules/conf_clientlist/Makefile.am
+++ b/src/modules/conf_clientlist/Makefile.am
@@ -15,15 +15,16 @@ INCLUDES = -I. \
15 -I$(top_srcdir)/src/bin \ 15 -I$(top_srcdir)/src/bin \
16 -I$(top_srcdir)/src/lib \ 16 -I$(top_srcdir)/src/lib \
17 -I$(top_srcdir)/src/modules \ 17 -I$(top_srcdir)/src/modules \
18 @e_cflags@ 18 @e_cflags@ \
19 @EINA_CFLAGS@
19pkgdir = $(libdir)/enlightenment/modules/$(MODULE)/$(MODULE_ARCH) 20pkgdir = $(libdir)/enlightenment/modules/$(MODULE)/$(MODULE_ARCH)
20pkg_LTLIBRARIES = module.la 21pkg_LTLIBRARIES = module.la
21module_la_SOURCES = e_mod_main.c \ 22module_la_SOURCES = e_mod_main.c \
22 e_mod_main.h \ 23 e_mod_main.h \
23 e_int_config_clientlist.c \ 24 e_int_config_clientlist.c \
24 e_int_config_clientlist.h 25 e_int_config_clientlist.h
25 26
26module_la_LIBADD = @e_libs@ @dlopen_libs@ 27module_la_LIBADD = @e_libs@ @dlopen_libs@ @EINA_LIBS@
27module_la_LDFLAGS = -module -avoid-version 28module_la_LDFLAGS = -module -avoid-version
28module_la_DEPENDENCIES = $(top_builddir)/config.h 29module_la_DEPENDENCIES = $(top_builddir)/config.h
29 30
diff --git a/src/modules/conf_colors/Makefile.am b/src/modules/conf_colors/Makefile.am
index 81b11a22c..227350b01 100644
--- a/src/modules/conf_colors/Makefile.am
+++ b/src/modules/conf_colors/Makefile.am
@@ -15,7 +15,8 @@ INCLUDES = -I. \
15 -I$(top_srcdir)/src/bin \ 15 -I$(top_srcdir)/src/bin \
16 -I$(top_srcdir)/src/lib \ 16 -I$(top_srcdir)/src/lib \
17 -I$(top_srcdir)/src/modules \ 17 -I$(top_srcdir)/src/modules \
18 @e_cflags@ 18 @e_cflags@ \
19 @EINA_CFLAGS@
19pkgdir = $(libdir)/enlightenment/modules/$(MODULE)/$(MODULE_ARCH) 20pkgdir = $(libdir)/enlightenment/modules/$(MODULE)/$(MODULE_ARCH)
20pkg_LTLIBRARIES = module.la 21pkg_LTLIBRARIES = module.la
21module_la_SOURCES = e_mod_main.c \ 22module_la_SOURCES = e_mod_main.c \
@@ -23,7 +24,7 @@ module_la_SOURCES = e_mod_main.c \
23 e_int_config_color_classes.c \ 24 e_int_config_color_classes.c \
24 e_int_config_color_classes.h 25 e_int_config_color_classes.h
25 26
26module_la_LIBADD = @e_libs@ @dlopen_libs@ 27module_la_LIBADD = @e_libs@ @dlopen_libs@ @EINA_LIBS@
27module_la_LDFLAGS = -module -avoid-version 28module_la_LDFLAGS = -module -avoid-version
28module_la_DEPENDENCIES = $(top_builddir)/config.h 29module_la_DEPENDENCIES = $(top_builddir)/config.h
29 30
diff --git a/src/modules/conf_desk/Makefile.am b/src/modules/conf_desk/Makefile.am
index 563d39707..096a18777 100644
--- a/src/modules/conf_desk/Makefile.am
+++ b/src/modules/conf_desk/Makefile.am
@@ -15,15 +15,16 @@ INCLUDES = -I. \
15 -I$(top_srcdir)/src/bin \ 15 -I$(top_srcdir)/src/bin \
16 -I$(top_srcdir)/src/lib \ 16 -I$(top_srcdir)/src/lib \
17 -I$(top_srcdir)/src/modules \ 17 -I$(top_srcdir)/src/modules \
18 @e_cflags@ 18 @e_cflags@ \
19 @EINA_CFLAGS@
19pkgdir = $(libdir)/enlightenment/modules/$(MODULE)/$(MODULE_ARCH) 20pkgdir = $(libdir)/enlightenment/modules/$(MODULE)/$(MODULE_ARCH)
20pkg_LTLIBRARIES = module.la 21pkg_LTLIBRARIES = module.la
21module_la_SOURCES = e_mod_main.c \ 22module_la_SOURCES = e_mod_main.c \
22 e_mod_main.h \ 23 e_mod_main.h \
23 e_int_config_desk.c \ 24 e_int_config_desk.c \
24 e_int_config_desk.h 25 e_int_config_desk.h
25 26
26module_la_LIBADD = @e_libs@ @dlopen_libs@ 27module_la_LIBADD = @e_libs@ @dlopen_libs@ @EINA_LIBS@
27module_la_LDFLAGS = -module -avoid-version 28module_la_LDFLAGS = -module -avoid-version
28module_la_DEPENDENCIES = $(top_builddir)/config.h 29module_la_DEPENDENCIES = $(top_builddir)/config.h
29 30
diff --git a/src/modules/conf_desklock/Makefile.am b/src/modules/conf_desklock/Makefile.am
index cd0307b15..0eb258533 100644
--- a/src/modules/conf_desklock/Makefile.am
+++ b/src/modules/conf_desklock/Makefile.am
@@ -15,15 +15,16 @@ INCLUDES = -I. \
15 -I$(top_srcdir)/src/bin \ 15 -I$(top_srcdir)/src/bin \
16 -I$(top_srcdir)/src/lib \ 16 -I$(top_srcdir)/src/lib \
17 -I$(top_srcdir)/src/modules \ 17 -I$(top_srcdir)/src/modules \
18 @e_cflags@ 18 @e_cflags@ \
19 @EINA_CFLAGS@
19pkgdir = $(libdir)/enlightenment/modules/$(MODULE)/$(MODULE_ARCH) 20pkgdir = $(libdir)/enlightenment/modules/$(MODULE)/$(MODULE_ARCH)
20pkg_LTLIBRARIES = module.la 21pkg_LTLIBRARIES = module.la
21module_la_SOURCES = e_mod_main.c \ 22module_la_SOURCES = e_mod_main.c \
22 e_mod_main.h \ 23 e_mod_main.h \
23 e_int_config_desklock.c \ 24 e_int_config_desklock.c \
24 e_int_config_desklock.h 25 e_int_config_desklock.h
25 26
26module_la_LIBADD = @e_libs@ @dlopen_libs@ 27module_la_LIBADD = @e_libs@ @dlopen_libs@ @EINA_LIBS@
27module_la_LDFLAGS = -module -avoid-version 28module_la_LDFLAGS = -module -avoid-version
28module_la_DEPENDENCIES = $(top_builddir)/config.h 29module_la_DEPENDENCIES = $(top_builddir)/config.h
29 30
diff --git a/src/modules/conf_desks/Makefile.am b/src/modules/conf_desks/Makefile.am
index 9e668a87c..d8402f9d1 100644
--- a/src/modules/conf_desks/Makefile.am
+++ b/src/modules/conf_desks/Makefile.am
@@ -15,15 +15,16 @@ INCLUDES = -I. \
15 -I$(top_srcdir)/src/bin \ 15 -I$(top_srcdir)/src/bin \
16 -I$(top_srcdir)/src/lib \ 16 -I$(top_srcdir)/src/lib \
17 -I$(top_srcdir)/src/modules \ 17 -I$(top_srcdir)/src/modules \
18 @e_cflags@ 18 @e_cflags@ \
19 @EINA_CFLAGS@
19pkgdir = $(libdir)/enlightenment/modules/$(MODULE)/$(MODULE_ARCH) 20pkgdir = $(libdir)/enlightenment/modules/$(MODULE)/$(MODULE_ARCH)
20pkg_LTLIBRARIES = module.la 21pkg_LTLIBRARIES = module.la
21module_la_SOURCES = e_mod_main.c \ 22module_la_SOURCES = e_mod_main.c \
22 e_mod_main.h \ 23 e_mod_main.h \
23 e_int_config_desks.c \ 24 e_int_config_desks.c \
24 e_int_config_desks.h 25 e_int_config_desks.h
25 26
26module_la_LIBADD = @e_libs@ @dlopen_libs@ 27module_la_LIBADD = @e_libs@ @dlopen_libs@ @EINA_LIBS@
27module_la_LDFLAGS = -module -avoid-version 28module_la_LDFLAGS = -module -avoid-version
28module_la_DEPENDENCIES = $(top_builddir)/config.h 29module_la_DEPENDENCIES = $(top_builddir)/config.h
29 30
diff --git a/src/modules/conf_dialogs/Makefile.am b/src/modules/conf_dialogs/Makefile.am
index 2b09d4543..1cbbddca0 100644
--- a/src/modules/conf_dialogs/Makefile.am
+++ b/src/modules/conf_dialogs/Makefile.am
@@ -15,7 +15,8 @@ INCLUDES = -I. \
15 -I$(top_srcdir)/src/bin \ 15 -I$(top_srcdir)/src/bin \
16 -I$(top_srcdir)/src/lib \ 16 -I$(top_srcdir)/src/lib \
17 -I$(top_srcdir)/src/modules \ 17 -I$(top_srcdir)/src/modules \
18 @e_cflags@ 18 @e_cflags@ \
19 @EINA_CFLAGS@
19pkgdir = $(libdir)/enlightenment/modules/$(MODULE)/$(MODULE_ARCH) 20pkgdir = $(libdir)/enlightenment/modules/$(MODULE)/$(MODULE_ARCH)
20pkg_LTLIBRARIES = module.la 21pkg_LTLIBRARIES = module.la
21module_la_SOURCES = e_mod_main.c \ 22module_la_SOURCES = e_mod_main.c \
@@ -23,7 +24,7 @@ module_la_SOURCES = e_mod_main.c \
23 e_int_config_dialogs.c \ 24 e_int_config_dialogs.c \
24 e_int_config_dialogs.h 25 e_int_config_dialogs.h
25 26
26module_la_LIBADD = @e_libs@ @dlopen_libs@ 27module_la_LIBADD = @e_libs@ @dlopen_libs@ @EINA_LIBS@
27module_la_LDFLAGS = -module -avoid-version 28module_la_LDFLAGS = -module -avoid-version
28module_la_DEPENDENCIES = $(top_builddir)/config.h 29module_la_DEPENDENCIES = $(top_builddir)/config.h
29 30
diff --git a/src/modules/conf_display/Makefile.am b/src/modules/conf_display/Makefile.am
index 7bfbe9f6b..bb49b1b28 100644
--- a/src/modules/conf_display/Makefile.am
+++ b/src/modules/conf_display/Makefile.am
@@ -15,7 +15,8 @@ INCLUDES = -I. \
15 -I$(top_srcdir)/src/bin \ 15 -I$(top_srcdir)/src/bin \
16 -I$(top_srcdir)/src/lib \ 16 -I$(top_srcdir)/src/lib \
17 -I$(top_srcdir)/src/modules \ 17 -I$(top_srcdir)/src/modules \
18 @e_cflags@ 18 @e_cflags@ \
19 @EINA_CFLAGS@
19pkgdir = $(libdir)/enlightenment/modules/$(MODULE)/$(MODULE_ARCH) 20pkgdir = $(libdir)/enlightenment/modules/$(MODULE)/$(MODULE_ARCH)
20pkg_LTLIBRARIES = module.la 21pkg_LTLIBRARIES = module.la
21module_la_SOURCES = e_mod_main.c \ 22module_la_SOURCES = e_mod_main.c \
@@ -23,7 +24,7 @@ module_la_SOURCES = e_mod_main.c \
23 e_int_config_display.c \ 24 e_int_config_display.c \
24 e_int_config_display.h 25 e_int_config_display.h
25 26
26module_la_LIBADD = @e_libs@ @dlopen_libs@ 27module_la_LIBADD = @e_libs@ @dlopen_libs@ @EINA_LIBS@
27module_la_LDFLAGS = -module -avoid-version 28module_la_LDFLAGS = -module -avoid-version
28module_la_DEPENDENCIES = $(top_builddir)/config.h 29module_la_DEPENDENCIES = $(top_builddir)/config.h
29 30
diff --git a/src/modules/conf_dpms/Makefile.am b/src/modules/conf_dpms/Makefile.am
index 941a64cd4..8706fdfdc 100644
--- a/src/modules/conf_dpms/Makefile.am
+++ b/src/modules/conf_dpms/Makefile.am
@@ -15,7 +15,7 @@ INCLUDES = -I. \
15 -I$(top_srcdir)/src/bin \ 15 -I$(top_srcdir)/src/bin \
16 -I$(top_srcdir)/src/lib \ 16 -I$(top_srcdir)/src/lib \
17 -I$(top_srcdir)/src/modules \ 17 -I$(top_srcdir)/src/modules \
18 @e_cflags@ 18 @e_cflags@ @EINA_CFLAGS@
19pkgdir = $(libdir)/enlightenment/modules/$(MODULE)/$(MODULE_ARCH) 19pkgdir = $(libdir)/enlightenment/modules/$(MODULE)/$(MODULE_ARCH)
20pkg_LTLIBRARIES = module.la 20pkg_LTLIBRARIES = module.la
21module_la_SOURCES = e_mod_main.c \ 21module_la_SOURCES = e_mod_main.c \
@@ -23,7 +23,7 @@ module_la_SOURCES = e_mod_main.c \
23 e_int_config_dpms.c \ 23 e_int_config_dpms.c \
24 e_int_config_dpms.h 24 e_int_config_dpms.h
25 25
26module_la_LIBADD = @e_libs@ @dlopen_libs@ 26module_la_LIBADD = @e_libs@ @dlopen_libs@ @EINA_LIBS@
27module_la_LDFLAGS = -module -avoid-version 27module_la_LDFLAGS = -module -avoid-version
28module_la_DEPENDENCIES = $(top_builddir)/config.h 28module_la_DEPENDENCIES = $(top_builddir)/config.h
29 29
diff --git a/src/modules/conf_engine/Makefile.am b/src/modules/conf_engine/Makefile.am
index 48341f895..665f38828 100644
--- a/src/modules/conf_engine/Makefile.am
+++ b/src/modules/conf_engine/Makefile.am
@@ -15,15 +15,16 @@ INCLUDES = -I. \
15 -I$(top_srcdir)/src/bin \ 15 -I$(top_srcdir)/src/bin \
16 -I$(top_srcdir)/src/lib \ 16 -I$(top_srcdir)/src/lib \
17 -I$(top_srcdir)/src/modules \ 17 -I$(top_srcdir)/src/modules \
18 @e_cflags@ 18 @e_cflags@ \
19 @EINA_CFLAGS@
19pkgdir = $(libdir)/enlightenment/modules/$(MODULE)/$(MODULE_ARCH) 20pkgdir = $(libdir)/enlightenment/modules/$(MODULE)/$(MODULE_ARCH)
20pkg_LTLIBRARIES = module.la 21pkg_LTLIBRARIES = module.la
21module_la_SOURCES = e_mod_main.c \ 22module_la_SOURCES = e_mod_main.c \
22 e_mod_main.h \ 23 e_mod_main.h \
23 e_int_config_engine.c \ 24 e_int_config_engine.c \
24 e_int_config_engine.h 25 e_int_config_engine.h
25 26
26module_la_LIBADD = @e_libs@ @dlopen_libs@ 27module_la_LIBADD = @e_libs@ @dlopen_libs@ @EINA_LIBS@
27module_la_LDFLAGS = -module -avoid-version 28module_la_LDFLAGS = -module -avoid-version
28module_la_DEPENDENCIES = $(top_builddir)/config.h 29module_la_DEPENDENCIES = $(top_builddir)/config.h
29 30
diff --git a/src/modules/conf_exebuf/Makefile.am b/src/modules/conf_exebuf/Makefile.am
index ff6736876..49c0e9a81 100644
--- a/src/modules/conf_exebuf/Makefile.am
+++ b/src/modules/conf_exebuf/Makefile.am
@@ -15,7 +15,8 @@ INCLUDES = -I. \
15 -I$(top_srcdir)/src/bin \ 15 -I$(top_srcdir)/src/bin \
16 -I$(top_srcdir)/src/lib \ 16 -I$(top_srcdir)/src/lib \
17 -I$(top_srcdir)/src/modules \ 17 -I$(top_srcdir)/src/modules \
18 @e_cflags@ 18 @e_cflags@ \
19 @EINA_CFLAGS@
19pkgdir = $(libdir)/enlightenment/modules/$(MODULE)/$(MODULE_ARCH) 20pkgdir = $(libdir)/enlightenment/modules/$(MODULE)/$(MODULE_ARCH)
20pkg_LTLIBRARIES = module.la 21pkg_LTLIBRARIES = module.la
21module_la_SOURCES = e_mod_main.c \ 22module_la_SOURCES = e_mod_main.c \
@@ -23,7 +24,7 @@ module_la_SOURCES = e_mod_main.c \
23 e_int_config_exebuf.c \ 24 e_int_config_exebuf.c \
24 e_int_config_exebuf.h 25 e_int_config_exebuf.h
25 26
26module_la_LIBADD = @e_libs@ @dlopen_libs@ 27module_la_LIBADD = @e_libs@ @dlopen_libs@ @EINA_LIBS@
27module_la_LDFLAGS = -module -avoid-version 28module_la_LDFLAGS = -module -avoid-version
28module_la_DEPENDENCIES = $(top_builddir)/config.h 29module_la_DEPENDENCIES = $(top_builddir)/config.h
29 30
diff --git a/src/modules/conf_fonts/Makefile.am b/src/modules/conf_fonts/Makefile.am
index db0031de0..beced3cbb 100644
--- a/src/modules/conf_fonts/Makefile.am
+++ b/src/modules/conf_fonts/Makefile.am
@@ -15,15 +15,16 @@ INCLUDES = -I. \
15 -I$(top_srcdir)/src/bin \ 15 -I$(top_srcdir)/src/bin \
16 -I$(top_srcdir)/src/lib \ 16 -I$(top_srcdir)/src/lib \
17 -I$(top_srcdir)/src/modules \ 17 -I$(top_srcdir)/src/modules \
18 @e_cflags@ 18 @e_cflags@ \
19 @EINA_CFLAGS@
19pkgdir = $(libdir)/enlightenment/modules/$(MODULE)/$(MODULE_ARCH) 20pkgdir = $(libdir)/enlightenment/modules/$(MODULE)/$(MODULE_ARCH)
20pkg_LTLIBRARIES = module.la 21pkg_LTLIBRARIES = module.la
21module_la_SOURCES = e_mod_main.c \ 22module_la_SOURCES = e_mod_main.c \
22 e_mod_main.h \ 23 e_mod_main.h \
23 e_int_config_fonts.c \ 24 e_int_config_fonts.c \
24 e_int_config_fonts.h 25 e_int_config_fonts.h
25 26
26module_la_LIBADD = @e_libs@ @dlopen_libs@ 27module_la_LIBADD = @e_libs@ @dlopen_libs@ @EINA_LIBS@
27module_la_LDFLAGS = -module -avoid-version 28module_la_LDFLAGS = -module -avoid-version
28module_la_DEPENDENCIES = $(top_builddir)/config.h 29module_la_DEPENDENCIES = $(top_builddir)/config.h
29 30
diff --git a/src/modules/conf_icon_theme/Makefile.am b/src/modules/conf_icon_theme/Makefile.am
index 6545f0e0d..ba665375a 100644
--- a/src/modules/conf_icon_theme/Makefile.am
+++ b/src/modules/conf_icon_theme/Makefile.am
@@ -15,7 +15,8 @@ INCLUDES = -I. \
15 -I$(top_srcdir)/src/bin \ 15 -I$(top_srcdir)/src/bin \
16 -I$(top_srcdir)/src/lib \ 16 -I$(top_srcdir)/src/lib \
17 -I$(top_srcdir)/src/modules \ 17 -I$(top_srcdir)/src/modules \
18 @e_cflags@ 18 @e_cflags@ \
19 @EINA_CFLAGS@
19pkgdir = $(libdir)/enlightenment/modules/$(MODULE)/$(MODULE_ARCH) 20pkgdir = $(libdir)/enlightenment/modules/$(MODULE)/$(MODULE_ARCH)
20pkg_LTLIBRARIES = module.la 21pkg_LTLIBRARIES = module.la
21module_la_SOURCES = e_mod_main.c \ 22module_la_SOURCES = e_mod_main.c \
@@ -23,7 +24,7 @@ module_la_SOURCES = e_mod_main.c \
23 e_int_config_icon_themes.c \ 24 e_int_config_icon_themes.c \
24 e_int_config_icon_themes.h 25 e_int_config_icon_themes.h
25 26
26module_la_LIBADD = @e_libs@ @dlopen_libs@ 27module_la_LIBADD = @e_libs@ @dlopen_libs@ @EINA_LIBS@
27module_la_LDFLAGS = -module -avoid-version 28module_la_LDFLAGS = -module -avoid-version
28module_la_DEPENDENCIES = $(top_builddir)/config.h 29module_la_DEPENDENCIES = $(top_builddir)/config.h
29 30
diff --git a/src/modules/conf_imc/Makefile.am b/src/modules/conf_imc/Makefile.am
index 58b1c6348..7019592d4 100644
--- a/src/modules/conf_imc/Makefile.am
+++ b/src/modules/conf_imc/Makefile.am
@@ -15,7 +15,8 @@ INCLUDES = -I. \
15 -I$(top_srcdir)/src/bin \ 15 -I$(top_srcdir)/src/bin \
16 -I$(top_srcdir)/src/lib \ 16 -I$(top_srcdir)/src/lib \
17 -I$(top_srcdir)/src/modules \ 17 -I$(top_srcdir)/src/modules \
18 @e_cflags@ 18 @e_cflags@ \
19 @EINA_CFLAGS@
19pkgdir = $(libdir)/enlightenment/modules/$(MODULE)/$(MODULE_ARCH) 20pkgdir = $(libdir)/enlightenment/modules/$(MODULE)/$(MODULE_ARCH)
20pkg_LTLIBRARIES = module.la 21pkg_LTLIBRARIES = module.la
21module_la_SOURCES = e_mod_main.c \ 22module_la_SOURCES = e_mod_main.c \
@@ -25,7 +26,7 @@ module_la_SOURCES = e_mod_main.c \
25 e_int_config_imc.c \ 26 e_int_config_imc.c \
26 e_int_config_imc.h 27 e_int_config_imc.h
27 28
28module_la_LIBADD = @e_libs@ @dlopen_libs@ 29module_la_LIBADD = @e_libs@ @dlopen_libs@ @EINA_LIBS@
29module_la_LDFLAGS = -module -avoid-version 30module_la_LDFLAGS = -module -avoid-version
30module_la_DEPENDENCIES = $(top_builddir)/config.h 31module_la_DEPENDENCIES = $(top_builddir)/config.h
31 32
diff --git a/src/modules/conf_interaction/Makefile.am b/src/modules/conf_interaction/Makefile.am
index 3c17f06cd..3a9c33163 100644
--- a/src/modules/conf_interaction/Makefile.am
+++ b/src/modules/conf_interaction/Makefile.am
@@ -15,7 +15,8 @@ INCLUDES = -I. \
15 -I$(top_srcdir)/src/bin \ 15 -I$(top_srcdir)/src/bin \
16 -I$(top_srcdir)/src/lib \ 16 -I$(top_srcdir)/src/lib \
17 -I$(top_srcdir)/src/modules \ 17 -I$(top_srcdir)/src/modules \
18 @e_cflags@ 18 @e_cflags@ \
19 @EINA_CFLAGS@
19pkgdir = $(libdir)/enlightenment/modules/$(MODULE)/$(MODULE_ARCH) 20pkgdir = $(libdir)/enlightenment/modules/$(MODULE)/$(MODULE_ARCH)
20pkg_LTLIBRARIES = module.la 21pkg_LTLIBRARIES = module.la
21module_la_SOURCES = e_mod_main.c \ 22module_la_SOURCES = e_mod_main.c \
@@ -23,7 +24,7 @@ module_la_SOURCES = e_mod_main.c \
23 e_int_config_interaction.c \ 24 e_int_config_interaction.c \
24 e_int_config_interaction.h 25 e_int_config_interaction.h
25 26
26module_la_LIBADD = @e_libs@ @dlopen_libs@ 27module_la_LIBADD = @e_libs@ @dlopen_libs@ @EINA_LIBS@
27module_la_LDFLAGS = -module -avoid-version 28module_la_LDFLAGS = -module -avoid-version
28module_la_DEPENDENCIES = $(top_builddir)/config.h 29module_la_DEPENDENCIES = $(top_builddir)/config.h
29 30
diff --git a/src/modules/conf_intl/Makefile.am b/src/modules/conf_intl/Makefile.am
index cfba84e22..cddc5d762 100644
--- a/src/modules/conf_intl/Makefile.am
+++ b/src/modules/conf_intl/Makefile.am
@@ -15,7 +15,8 @@ INCLUDES = -I. \
15 -I$(top_srcdir)/src/bin \ 15 -I$(top_srcdir)/src/bin \
16 -I$(top_srcdir)/src/lib \ 16 -I$(top_srcdir)/src/lib \
17 -I$(top_srcdir)/src/modules \ 17 -I$(top_srcdir)/src/modules \
18 @e_cflags@ 18 @e_cflags@ \
19 @EINA_CFLAGS@
19pkgdir = $(libdir)/enlightenment/modules/$(MODULE)/$(MODULE_ARCH) 20pkgdir = $(libdir)/enlightenment/modules/$(MODULE)/$(MODULE_ARCH)
20pkg_LTLIBRARIES = module.la 21pkg_LTLIBRARIES = module.la
21module_la_SOURCES = e_mod_main.c \ 22module_la_SOURCES = e_mod_main.c \
@@ -23,7 +24,7 @@ module_la_SOURCES = e_mod_main.c \
23 e_int_config_intl.c \ 24 e_int_config_intl.c \
24 e_int_config_intl.h 25 e_int_config_intl.h
25 26
26module_la_LIBADD = @e_libs@ @dlopen_libs@ 27module_la_LIBADD = @e_libs@ @dlopen_libs@ @EINA_LIBS@
27module_la_LDFLAGS = -module -avoid-version 28module_la_LDFLAGS = -module -avoid-version
28module_la_DEPENDENCIES = $(top_builddir)/config.h 29module_la_DEPENDENCIES = $(top_builddir)/config.h
29 30
diff --git a/src/modules/conf_keybindings/Makefile.am b/src/modules/conf_keybindings/Makefile.am
index c417ad63c..29bbadfc0 100644
--- a/src/modules/conf_keybindings/Makefile.am
+++ b/src/modules/conf_keybindings/Makefile.am
@@ -15,7 +15,8 @@ INCLUDES = -I. \
15 -I$(top_srcdir)/src/bin \ 15 -I$(top_srcdir)/src/bin \
16 -I$(top_srcdir)/src/lib \ 16 -I$(top_srcdir)/src/lib \
17 -I$(top_srcdir)/src/modules \ 17 -I$(top_srcdir)/src/modules \
18 @e_cflags@ 18 @e_cflags@ \
19 @EINA_CFLAGS@
19pkgdir = $(libdir)/enlightenment/modules/$(MODULE)/$(MODULE_ARCH) 20pkgdir = $(libdir)/enlightenment/modules/$(MODULE)/$(MODULE_ARCH)
20pkg_LTLIBRARIES = module.la 21pkg_LTLIBRARIES = module.la
21module_la_SOURCES = e_mod_main.c \ 22module_la_SOURCES = e_mod_main.c \
@@ -23,7 +24,7 @@ module_la_SOURCES = e_mod_main.c \
23 e_int_config_keybindings.c \ 24 e_int_config_keybindings.c \
24 e_int_config_keybindings.h 25 e_int_config_keybindings.h
25 26
26module_la_LIBADD = @e_libs@ @dlopen_libs@ 27module_la_LIBADD = @e_libs@ @dlopen_libs@ @EINA_LIBS@
27module_la_LDFLAGS = -module -avoid-version 28module_la_LDFLAGS = -module -avoid-version
28module_la_DEPENDENCIES = $(top_builddir)/config.h 29module_la_DEPENDENCIES = $(top_builddir)/config.h
29 30
diff --git a/src/modules/conf_menus/Makefile.am b/src/modules/conf_menus/Makefile.am
index 931402e88..189b7a885 100644
--- a/src/modules/conf_menus/Makefile.am
+++ b/src/modules/conf_menus/Makefile.am
@@ -15,7 +15,8 @@ INCLUDES = -I. \
15 -I$(top_srcdir)/src/bin \ 15 -I$(top_srcdir)/src/bin \
16 -I$(top_srcdir)/src/lib \ 16 -I$(top_srcdir)/src/lib \
17 -I$(top_srcdir)/src/modules \ 17 -I$(top_srcdir)/src/modules \
18 @e_cflags@ 18 @e_cflags@ \
19 @EINA_CFLAGS@
19pkgdir = $(libdir)/enlightenment/modules/$(MODULE)/$(MODULE_ARCH) 20pkgdir = $(libdir)/enlightenment/modules/$(MODULE)/$(MODULE_ARCH)
20pkg_LTLIBRARIES = module.la 21pkg_LTLIBRARIES = module.la
21module_la_SOURCES = e_mod_main.c \ 22module_la_SOURCES = e_mod_main.c \
@@ -23,7 +24,7 @@ module_la_SOURCES = e_mod_main.c \
23 e_int_config_menus.c \ 24 e_int_config_menus.c \
24 e_int_config_menus.h 25 e_int_config_menus.h
25 26
26module_la_LIBADD = @e_libs@ @dlopen_libs@ 27module_la_LIBADD = @e_libs@ @dlopen_libs@ @EINA_LIBS@
27module_la_LDFLAGS = -module -avoid-version 28module_la_LDFLAGS = -module -avoid-version
28module_la_DEPENDENCIES = $(top_builddir)/config.h 29module_la_DEPENDENCIES = $(top_builddir)/config.h
29 30
diff --git a/src/modules/conf_mime/Makefile.am b/src/modules/conf_mime/Makefile.am
index 0990b0e3b..1469e0263 100644
--- a/src/modules/conf_mime/Makefile.am
+++ b/src/modules/conf_mime/Makefile.am
@@ -15,7 +15,8 @@ INCLUDES = -I. \
15 -I$(top_srcdir)/src/bin \ 15 -I$(top_srcdir)/src/bin \
16 -I$(top_srcdir)/src/lib \ 16 -I$(top_srcdir)/src/lib \
17 -I$(top_srcdir)/src/modules \ 17 -I$(top_srcdir)/src/modules \
18 @e_cflags@ 18 @e_cflags@ \
19 @EINA_CFLAGS@
19pkgdir = $(libdir)/enlightenment/modules/$(MODULE)/$(MODULE_ARCH) 20pkgdir = $(libdir)/enlightenment/modules/$(MODULE)/$(MODULE_ARCH)
20pkg_LTLIBRARIES = module.la 21pkg_LTLIBRARIES = module.la
21module_la_SOURCES = e_mod_main.c \ 22module_la_SOURCES = e_mod_main.c \
@@ -24,8 +25,8 @@ module_la_SOURCES = e_mod_main.c \
24 e_int_config_mime.h \ 25 e_int_config_mime.h \
25 e_int_config_mime_edit.c \ 26 e_int_config_mime_edit.c \
26 e_int_config_mime_edit.h 27 e_int_config_mime_edit.h
27 28
28module_la_LIBADD = @e_libs@ @dlopen_libs@ 29module_la_LIBADD = @e_libs@ @dlopen_libs@ @EINA_LIBS@
29module_la_LDFLAGS = -module -avoid-version 30module_la_LDFLAGS = -module -avoid-version
30module_la_DEPENDENCIES = $(top_builddir)/config.h 31module_la_DEPENDENCIES = $(top_builddir)/config.h
31 32
diff --git a/src/modules/conf_mouse/Makefile.am b/src/modules/conf_mouse/Makefile.am
index 4f07564ea..08a6947c1 100644
--- a/src/modules/conf_mouse/Makefile.am
+++ b/src/modules/conf_mouse/Makefile.am
@@ -15,7 +15,8 @@ INCLUDES = -I. \
15 -I$(top_srcdir)/src/bin \ 15 -I$(top_srcdir)/src/bin \
16 -I$(top_srcdir)/src/lib \ 16 -I$(top_srcdir)/src/lib \
17 -I$(top_srcdir)/src/modules \ 17 -I$(top_srcdir)/src/modules \
18 @e_cflags@ 18 @e_cflags@ \
19 @EINA_CFLAGS@
19pkgdir = $(libdir)/enlightenment/modules/$(MODULE)/$(MODULE_ARCH) 20pkgdir = $(libdir)/enlightenment/modules/$(MODULE)/$(MODULE_ARCH)
20pkg_LTLIBRARIES = module.la 21pkg_LTLIBRARIES = module.la
21module_la_SOURCES = e_mod_main.c \ 22module_la_SOURCES = e_mod_main.c \
@@ -23,7 +24,7 @@ module_la_SOURCES = e_mod_main.c \
23 e_int_config_mouse.c \ 24 e_int_config_mouse.c \
24 e_int_config_mouse.h 25 e_int_config_mouse.h
25 26
26module_la_LIBADD = @e_libs@ @dlopen_libs@ 27module_la_LIBADD = @e_libs@ @dlopen_libs@ @EINA_LIBS@
27module_la_LDFLAGS = -module -avoid-version 28module_la_LDFLAGS = -module -avoid-version
28module_la_DEPENDENCIES = $(top_builddir)/config.h 29module_la_DEPENDENCIES = $(top_builddir)/config.h
29 30
diff --git a/src/modules/conf_mouse_cursor/Makefile.am b/src/modules/conf_mouse_cursor/Makefile.am
index cea578b25..656c5032c 100644
--- a/src/modules/conf_mouse_cursor/Makefile.am
+++ b/src/modules/conf_mouse_cursor/Makefile.am
@@ -15,7 +15,8 @@ INCLUDES = -I. \
15 -I$(top_srcdir)/src/bin \ 15 -I$(top_srcdir)/src/bin \
16 -I$(top_srcdir)/src/lib \ 16 -I$(top_srcdir)/src/lib \
17 -I$(top_srcdir)/src/modules \ 17 -I$(top_srcdir)/src/modules \
18 @e_cflags@ 18 @e_cflags@ \
19 @EINA_CFLAGS@
19pkgdir = $(libdir)/enlightenment/modules/$(MODULE)/$(MODULE_ARCH) 20pkgdir = $(libdir)/enlightenment/modules/$(MODULE)/$(MODULE_ARCH)
20pkg_LTLIBRARIES = module.la 21pkg_LTLIBRARIES = module.la
21module_la_SOURCES = e_mod_main.c \ 22module_la_SOURCES = e_mod_main.c \
@@ -23,7 +24,7 @@ module_la_SOURCES = e_mod_main.c \
23 e_int_config_cursor.c \ 24 e_int_config_cursor.c \
24 e_int_config_cursor.h 25 e_int_config_cursor.h
25 26
26module_la_LIBADD = @e_libs@ @dlopen_libs@ 27module_la_LIBADD = @e_libs@ @dlopen_libs@ @EINA_LIBS@
27module_la_LDFLAGS = -module -avoid-version 28module_la_LDFLAGS = -module -avoid-version
28module_la_DEPENDENCIES = $(top_builddir)/config.h 29module_la_DEPENDENCIES = $(top_builddir)/config.h
29 30
diff --git a/src/modules/conf_mousebindings/Makefile.am b/src/modules/conf_mousebindings/Makefile.am
index 6c152c028..a11d62b99 100644
--- a/src/modules/conf_mousebindings/Makefile.am
+++ b/src/modules/conf_mousebindings/Makefile.am
@@ -15,15 +15,16 @@ INCLUDES = -I. \
15 -I$(top_srcdir)/src/bin \ 15 -I$(top_srcdir)/src/bin \
16 -I$(top_srcdir)/src/lib \ 16 -I$(top_srcdir)/src/lib \
17 -I$(top_srcdir)/src/modules \ 17 -I$(top_srcdir)/src/modules \
18 @e_cflags@ 18 @e_cflags@ \
19 @EINA_CFLAGS@
19pkgdir = $(libdir)/enlightenment/modules/$(MODULE)/$(MODULE_ARCH) 20pkgdir = $(libdir)/enlightenment/modules/$(MODULE)/$(MODULE_ARCH)
20pkg_LTLIBRARIES = module.la 21pkg_LTLIBRARIES = module.la
21module_la_SOURCES = e_mod_main.c \ 22module_la_SOURCES = e_mod_main.c \
22 e_mod_main.h \ 23 e_mod_main.h \
23 e_int_config_mousebindings.c \ 24 e_int_config_mousebindings.c \
24 e_int_config_mousebindings.h 25 e_int_config_mousebindings.h
25 26
26module_la_LIBADD = @e_libs@ @dlopen_libs@ 27module_la_LIBADD = @e_libs@ @dlopen_libs@ @EINA_LIBS@
27module_la_LDFLAGS = -module -avoid-version 28module_la_LDFLAGS = -module -avoid-version
28module_la_DEPENDENCIES = $(top_builddir)/config.h 29module_la_DEPENDENCIES = $(top_builddir)/config.h
29 30
diff --git a/src/modules/conf_paths/Makefile.am b/src/modules/conf_paths/Makefile.am
index 24c1fb4ce..7cbf6a81e 100644
--- a/src/modules/conf_paths/Makefile.am
+++ b/src/modules/conf_paths/Makefile.am
@@ -15,15 +15,16 @@ INCLUDES = -I. \
15 -I$(top_srcdir)/src/bin \ 15 -I$(top_srcdir)/src/bin \
16 -I$(top_srcdir)/src/lib \ 16 -I$(top_srcdir)/src/lib \
17 -I$(top_srcdir)/src/modules \ 17 -I$(top_srcdir)/src/modules \
18 @e_cflags@ 18 @e_cflags@ \
19 @EINA_CFLAGS@
19pkgdir = $(libdir)/enlightenment/modules/$(MODULE)/$(MODULE_ARCH) 20pkgdir = $(libdir)/enlightenment/modules/$(MODULE)/$(MODULE_ARCH)
20pkg_LTLIBRARIES = module.la 21pkg_LTLIBRARIES = module.la
21module_la_SOURCES = e_mod_main.c \ 22module_la_SOURCES = e_mod_main.c \
22 e_mod_main.h \ 23 e_mod_main.h \
23 e_int_config_paths.c \ 24 e_int_config_paths.c \
24 e_int_config_paths.h 25 e_int_config_paths.h
25 26
26module_la_LIBADD = @e_libs@ @dlopen_libs@ 27module_la_LIBADD = @e_libs@ @dlopen_libs@ @EINA_LIBS@
27module_la_LDFLAGS = -module -avoid-version 28module_la_LDFLAGS = -module -avoid-version
28module_la_DEPENDENCIES = $(top_builddir)/config.h 29module_la_DEPENDENCIES = $(top_builddir)/config.h
29 30
diff --git a/src/modules/conf_performance/Makefile.am b/src/modules/conf_performance/Makefile.am
index d95553723..00a5f698a 100644
--- a/src/modules/conf_performance/Makefile.am
+++ b/src/modules/conf_performance/Makefile.am
@@ -15,15 +15,16 @@ INCLUDES = -I. \
15 -I$(top_srcdir)/src/bin \ 15 -I$(top_srcdir)/src/bin \
16 -I$(top_srcdir)/src/lib \ 16 -I$(top_srcdir)/src/lib \
17 -I$(top_srcdir)/src/modules \ 17 -I$(top_srcdir)/src/modules \
18 @e_cflags@ 18 @e_cflags@ \
19 @EINA_CFLAGS@
19pkgdir = $(libdir)/enlightenment/modules/$(MODULE)/$(MODULE_ARCH) 20pkgdir = $(libdir)/enlightenment/modules/$(MODULE)/$(MODULE_ARCH)
20pkg_LTLIBRARIES = module.la 21pkg_LTLIBRARIES = module.la
21module_la_SOURCES = e_mod_main.c \ 22module_la_SOURCES = e_mod_main.c \
22 e_mod_main.h \ 23 e_mod_main.h \
23 e_int_config_performance.c \ 24 e_int_config_performance.c \
24 e_int_config_performance.h 25 e_int_config_performance.h
25 26
26module_la_LIBADD = @e_libs@ @dlopen_libs@ 27module_la_LIBADD = @e_libs@ @dlopen_libs@ @EINA_LIBS@
27module_la_LDFLAGS = -module -avoid-version 28module_la_LDFLAGS = -module -avoid-version
28module_la_DEPENDENCIES = $(top_builddir)/config.h 29module_la_DEPENDENCIES = $(top_builddir)/config.h
29 30
diff --git a/src/modules/conf_profiles/Makefile.am b/src/modules/conf_profiles/Makefile.am
index 2313f0a20..f920d4019 100644
--- a/src/modules/conf_profiles/Makefile.am
+++ b/src/modules/conf_profiles/Makefile.am
@@ -15,15 +15,16 @@ INCLUDES = -I. \
15 -I$(top_srcdir)/src/bin \ 15 -I$(top_srcdir)/src/bin \
16 -I$(top_srcdir)/src/lib \ 16 -I$(top_srcdir)/src/lib \
17 -I$(top_srcdir)/src/modules \ 17 -I$(top_srcdir)/src/modules \
18 @e_cflags@ 18 @e_cflags@ \
19 @EINA_CFLAGS@
19pkgdir = $(libdir)/enlightenment/modules/$(MODULE)/$(MODULE_ARCH) 20pkgdir = $(libdir)/enlightenment/modules/$(MODULE)/$(MODULE_ARCH)
20pkg_LTLIBRARIES = module.la 21pkg_LTLIBRARIES = module.la
21module_la_SOURCES = e_mod_main.c \ 22module_la_SOURCES = e_mod_main.c \
22 e_mod_main.h \ 23 e_mod_main.h \
23 e_int_config_profiles.c \ 24 e_int_config_profiles.c \
24 e_int_config_profiles.h 25 e_int_config_profiles.h
25 26
26module_la_LIBADD = @e_libs@ @dlopen_libs@ 27module_la_LIBADD = @e_libs@ @dlopen_libs@ @EINA_LIBS@
27module_la_LDFLAGS = -module -avoid-version 28module_la_LDFLAGS = -module -avoid-version
28module_la_DEPENDENCIES = $(top_builddir)/config.h 29module_la_DEPENDENCIES = $(top_builddir)/config.h
29 30
diff --git a/src/modules/conf_scale/Makefile.am b/src/modules/conf_scale/Makefile.am
index a92a33912..44c79785a 100644
--- a/src/modules/conf_scale/Makefile.am
+++ b/src/modules/conf_scale/Makefile.am
@@ -15,7 +15,8 @@ INCLUDES = -I. \
15 -I$(top_srcdir)/src/bin \ 15 -I$(top_srcdir)/src/bin \
16 -I$(top_srcdir)/src/lib \ 16 -I$(top_srcdir)/src/lib \
17 -I$(top_srcdir)/src/modules \ 17 -I$(top_srcdir)/src/modules \
18 @e_cflags@ 18 @e_cflags@ \
19 @EINA_CFLAGS@
19pkgdir = $(libdir)/enlightenment/modules/$(MODULE)/$(MODULE_ARCH) 20pkgdir = $(libdir)/enlightenment/modules/$(MODULE)/$(MODULE_ARCH)
20pkg_LTLIBRARIES = module.la 21pkg_LTLIBRARIES = module.la
21module_la_SOURCES = e_mod_main.c \ 22module_la_SOURCES = e_mod_main.c \
@@ -23,7 +24,7 @@ module_la_SOURCES = e_mod_main.c \
23 e_int_config_scale.c \ 24 e_int_config_scale.c \
24 e_int_config_scale.h 25 e_int_config_scale.h
25 26
26module_la_LIBADD = @e_libs@ @dlopen_libs@ 27module_la_LIBADD = @e_libs@ @dlopen_libs@ @EINA_LIBS@
27module_la_LDFLAGS = -module -avoid-version 28module_la_LDFLAGS = -module -avoid-version
28module_la_DEPENDENCIES = $(top_builddir)/config.h 29module_la_DEPENDENCIES = $(top_builddir)/config.h
29 30
diff --git a/src/modules/conf_screensaver/Makefile.am b/src/modules/conf_screensaver/Makefile.am
index d48d82627..1cbbcf02f 100644
--- a/src/modules/conf_screensaver/Makefile.am
+++ b/src/modules/conf_screensaver/Makefile.am
@@ -15,7 +15,8 @@ INCLUDES = -I. \
15 -I$(top_srcdir)/src/bin \ 15 -I$(top_srcdir)/src/bin \
16 -I$(top_srcdir)/src/lib \ 16 -I$(top_srcdir)/src/lib \
17 -I$(top_srcdir)/src/modules \ 17 -I$(top_srcdir)/src/modules \
18 @e_cflags@ 18 @e_cflags@ \
19 @EINA_CFLAGS@
19pkgdir = $(libdir)/enlightenment/modules/$(MODULE)/$(MODULE_ARCH) 20pkgdir = $(libdir)/enlightenment/modules/$(MODULE)/$(MODULE_ARCH)
20pkg_LTLIBRARIES = module.la 21pkg_LTLIBRARIES = module.la
21module_la_SOURCES = e_mod_main.c \ 22module_la_SOURCES = e_mod_main.c \
@@ -23,7 +24,7 @@ module_la_SOURCES = e_mod_main.c \
23 e_int_config_screensaver.c \ 24 e_int_config_screensaver.c \
24 e_int_config_screensaver.h 25 e_int_config_screensaver.h
25 26
26module_la_LIBADD = @e_libs@ @dlopen_libs@ 27module_la_LIBADD = @e_libs@ @dlopen_libs@ @EINA_LIBS@
27module_la_LDFLAGS = -module -avoid-version 28module_la_LDFLAGS = -module -avoid-version
28module_la_DEPENDENCIES = $(top_builddir)/config.h 29module_la_DEPENDENCIES = $(top_builddir)/config.h
29 30
diff --git a/src/modules/conf_shelves/Makefile.am b/src/modules/conf_shelves/Makefile.am
index 8a3b3893e..443912639 100644
--- a/src/modules/conf_shelves/Makefile.am
+++ b/src/modules/conf_shelves/Makefile.am
@@ -15,7 +15,8 @@ INCLUDES = -I. \
15 -I$(top_srcdir)/src/bin \ 15 -I$(top_srcdir)/src/bin \
16 -I$(top_srcdir)/src/lib \ 16 -I$(top_srcdir)/src/lib \
17 -I$(top_srcdir)/src/modules \ 17 -I$(top_srcdir)/src/modules \
18 @e_cflags@ 18 @e_cflags@ \
19 @EINA_CFLAGS@
19pkgdir = $(libdir)/enlightenment/modules/$(MODULE)/$(MODULE_ARCH) 20pkgdir = $(libdir)/enlightenment/modules/$(MODULE)/$(MODULE_ARCH)
20pkg_LTLIBRARIES = module.la 21pkg_LTLIBRARIES = module.la
21module_la_SOURCES = e_mod_main.c \ 22module_la_SOURCES = e_mod_main.c \
@@ -23,7 +24,7 @@ module_la_SOURCES = e_mod_main.c \
23 e_int_config_shelf.c \ 24 e_int_config_shelf.c \
24 e_int_config_shelf.h 25 e_int_config_shelf.h
25 26
26module_la_LIBADD = @e_libs@ @dlopen_libs@ 27module_la_LIBADD = @e_libs@ @dlopen_libs@ @EINA_LIBS@
27module_la_LDFLAGS = -module -avoid-version 28module_la_LDFLAGS = -module -avoid-version
28module_la_DEPENDENCIES = $(top_builddir)/config.h 29module_la_DEPENDENCIES = $(top_builddir)/config.h
29 30
diff --git a/src/modules/conf_startup/Makefile.am b/src/modules/conf_startup/Makefile.am
index 48262eb92..114474b6b 100644
--- a/src/modules/conf_startup/Makefile.am
+++ b/src/modules/conf_startup/Makefile.am
@@ -15,7 +15,8 @@ INCLUDES = -I. \
15 -I$(top_srcdir)/src/bin \ 15 -I$(top_srcdir)/src/bin \
16 -I$(top_srcdir)/src/lib \ 16 -I$(top_srcdir)/src/lib \
17 -I$(top_srcdir)/src/modules \ 17 -I$(top_srcdir)/src/modules \
18 @e_cflags@ 18 @e_cflags@ \
19 @EINA_CFLAGS@
19pkgdir = $(libdir)/enlightenment/modules/$(MODULE)/$(MODULE_ARCH) 20pkgdir = $(libdir)/enlightenment/modules/$(MODULE)/$(MODULE_ARCH)
20pkg_LTLIBRARIES = module.la 21pkg_LTLIBRARIES = module.la
21module_la_SOURCES = e_mod_main.c \ 22module_la_SOURCES = e_mod_main.c \
@@ -23,7 +24,7 @@ module_la_SOURCES = e_mod_main.c \
23 e_int_config_startup.c \ 24 e_int_config_startup.c \
24 e_int_config_startup.h 25 e_int_config_startup.h
25 26
26module_la_LIBADD = @e_libs@ @dlopen_libs@ 27module_la_LIBADD = @e_libs@ @dlopen_libs@ @EINA_LIBS@
27module_la_LDFLAGS = -module -avoid-version 28module_la_LDFLAGS = -module -avoid-version
28module_la_DEPENDENCIES = $(top_builddir)/config.h 29module_la_DEPENDENCIES = $(top_builddir)/config.h
29 30
diff --git a/src/modules/conf_theme/Makefile.am b/src/modules/conf_theme/Makefile.am
index 25f4445db..dbdd2303d 100644
--- a/src/modules/conf_theme/Makefile.am
+++ b/src/modules/conf_theme/Makefile.am
@@ -15,7 +15,8 @@ INCLUDES = -I. \
15 -I$(top_srcdir)/src/bin \ 15 -I$(top_srcdir)/src/bin \
16 -I$(top_srcdir)/src/lib \ 16 -I$(top_srcdir)/src/lib \
17 -I$(top_srcdir)/src/modules \ 17 -I$(top_srcdir)/src/modules \
18 @e_cflags@ 18 @e_cflags@ \
19 @EINA_CFLAGS@
19pkgdir = $(libdir)/enlightenment/modules/$(MODULE)/$(MODULE_ARCH) 20pkgdir = $(libdir)/enlightenment/modules/$(MODULE)/$(MODULE_ARCH)
20pkg_LTLIBRARIES = module.la 21pkg_LTLIBRARIES = module.la
21module_la_SOURCES = e_mod_main.c \ 22module_la_SOURCES = e_mod_main.c \
@@ -27,7 +28,7 @@ module_la_SOURCES = e_mod_main.c \
27 e_int_config_theme_web.c \ 28 e_int_config_theme_web.c \
28 e_int_config_theme_web.h 29 e_int_config_theme_web.h
29 30
30module_la_LIBADD = @e_libs@ @dlopen_libs@ 31module_la_LIBADD = @e_libs@ @dlopen_libs@ @EINA_LIBS@
31module_la_LDFLAGS = -module -avoid-version 32module_la_LDFLAGS = -module -avoid-version
32module_la_DEPENDENCIES = $(top_builddir)/config.h 33module_la_DEPENDENCIES = $(top_builddir)/config.h
33 34
diff --git a/src/modules/conf_transitions/Makefile.am b/src/modules/conf_transitions/Makefile.am
index 00b59b6d8..c092221bc 100644
--- a/src/modules/conf_transitions/Makefile.am
+++ b/src/modules/conf_transitions/Makefile.am
@@ -15,7 +15,8 @@ INCLUDES = -I. \
15 -I$(top_srcdir)/src/bin \ 15 -I$(top_srcdir)/src/bin \
16 -I$(top_srcdir)/src/lib \ 16 -I$(top_srcdir)/src/lib \
17 -I$(top_srcdir)/src/modules \ 17 -I$(top_srcdir)/src/modules \
18 @e_cflags@ 18 @e_cflags@ \
19 @EINA_CFLAGS@
19pkgdir = $(libdir)/enlightenment/modules/$(MODULE)/$(MODULE_ARCH) 20pkgdir = $(libdir)/enlightenment/modules/$(MODULE)/$(MODULE_ARCH)
20pkg_LTLIBRARIES = module.la 21pkg_LTLIBRARIES = module.la
21module_la_SOURCES = e_mod_main.c \ 22module_la_SOURCES = e_mod_main.c \
@@ -23,7 +24,7 @@ module_la_SOURCES = e_mod_main.c \
23 e_int_config_transitions.c \ 24 e_int_config_transitions.c \
24 e_int_config_transitions.h 25 e_int_config_transitions.h
25 26
26module_la_LIBADD = @e_libs@ @dlopen_libs@ 27module_la_LIBADD = @e_libs@ @dlopen_libs@ @EINA_LIBS@
27module_la_LDFLAGS = -module -avoid-version 28module_la_LDFLAGS = -module -avoid-version
28module_la_DEPENDENCIES = $(top_builddir)/config.h 29module_la_DEPENDENCIES = $(top_builddir)/config.h
29 30
diff --git a/src/modules/conf_wallpaper/Makefile.am b/src/modules/conf_wallpaper/Makefile.am
index 73a1a6da0..72c42391c 100644
--- a/src/modules/conf_wallpaper/Makefile.am
+++ b/src/modules/conf_wallpaper/Makefile.am
@@ -15,7 +15,8 @@ INCLUDES = -I. \
15 -I$(top_srcdir)/src/bin \ 15 -I$(top_srcdir)/src/bin \
16 -I$(top_srcdir)/src/lib \ 16 -I$(top_srcdir)/src/lib \
17 -I$(top_srcdir)/src/modules \ 17 -I$(top_srcdir)/src/modules \
18 @e_cflags@ 18 @e_cflags@ \
19 @EINA_CFLAGS@
19pkgdir = $(libdir)/enlightenment/modules/$(MODULE)/$(MODULE_ARCH) 20pkgdir = $(libdir)/enlightenment/modules/$(MODULE)/$(MODULE_ARCH)
20pkg_LTLIBRARIES = module.la 21pkg_LTLIBRARIES = module.la
21module_la_SOURCES = e_mod_main.c \ 22module_la_SOURCES = e_mod_main.c \
@@ -29,7 +30,7 @@ module_la_SOURCES = e_mod_main.c \
29 e_int_config_wallpaper_web.c \ 30 e_int_config_wallpaper_web.c \
30 e_int_config_wallpaper_web.h 31 e_int_config_wallpaper_web.h
31 32
32module_la_LIBADD = @e_libs@ @dlopen_libs@ 33module_la_LIBADD = @e_libs@ @dlopen_libs@ @EINA_LIBS@
33module_la_LDFLAGS = -module -avoid-version 34module_la_LDFLAGS = -module -avoid-version
34module_la_DEPENDENCIES = $(top_builddir)/config.h 35module_la_DEPENDENCIES = $(top_builddir)/config.h
35 36
diff --git a/src/modules/conf_window_display/Makefile.am b/src/modules/conf_window_display/Makefile.am
index 58506a036..23eb1119e 100644
--- a/src/modules/conf_window_display/Makefile.am
+++ b/src/modules/conf_window_display/Makefile.am
@@ -15,7 +15,8 @@ INCLUDES = -I. \
15 -I$(top_srcdir)/src/bin \ 15 -I$(top_srcdir)/src/bin \
16 -I$(top_srcdir)/src/lib \ 16 -I$(top_srcdir)/src/lib \
17 -I$(top_srcdir)/src/modules \ 17 -I$(top_srcdir)/src/modules \
18 @e_cflags@ 18 @e_cflags@ \
19 @EINA_CFLAGS@
19pkgdir = $(libdir)/enlightenment/modules/$(MODULE)/$(MODULE_ARCH) 20pkgdir = $(libdir)/enlightenment/modules/$(MODULE)/$(MODULE_ARCH)
20pkg_LTLIBRARIES = module.la 21pkg_LTLIBRARIES = module.la
21module_la_SOURCES = e_mod_main.c \ 22module_la_SOURCES = e_mod_main.c \
@@ -23,7 +24,7 @@ module_la_SOURCES = e_mod_main.c \
23 e_int_config_window_display.c \ 24 e_int_config_window_display.c \
24 e_int_config_window_display.h 25 e_int_config_window_display.h
25 26
26module_la_LIBADD = @e_libs@ @dlopen_libs@ 27module_la_LIBADD = @e_libs@ @dlopen_libs@ @EINA_LIBS@
27module_la_LDFLAGS = -module -avoid-version 28module_la_LDFLAGS = -module -avoid-version
28module_la_DEPENDENCIES = $(top_builddir)/config.h 29module_la_DEPENDENCIES = $(top_builddir)/config.h
29 30
diff --git a/src/modules/conf_window_focus/Makefile.am b/src/modules/conf_window_focus/Makefile.am
index e746f9a86..db7fc66d6 100644
--- a/src/modules/conf_window_focus/Makefile.am
+++ b/src/modules/conf_window_focus/Makefile.am
@@ -15,15 +15,16 @@ INCLUDES = -I. \
15 -I$(top_srcdir)/src/bin \ 15 -I$(top_srcdir)/src/bin \
16 -I$(top_srcdir)/src/lib \ 16 -I$(top_srcdir)/src/lib \
17 -I$(top_srcdir)/src/modules \ 17 -I$(top_srcdir)/src/modules \
18 @e_cflags@ 18 @e_cflags@ \
19 @EINA_CFLAGS@
19pkgdir = $(libdir)/enlightenment/modules/$(MODULE)/$(MODULE_ARCH) 20pkgdir = $(libdir)/enlightenment/modules/$(MODULE)/$(MODULE_ARCH)
20pkg_LTLIBRARIES = module.la 21pkg_LTLIBRARIES = module.la
21module_la_SOURCES = e_mod_main.c \ 22module_la_SOURCES = e_mod_main.c \
22 e_mod_main.h \ 23 e_mod_main.h \
23 e_int_config_focus.c \ 24 e_int_config_focus.c \
24 e_int_config_focus.h 25 e_int_config_focus.h
25 26
26module_la_LIBADD = @e_libs@ @dlopen_libs@ 27module_la_LIBADD = @e_libs@ @dlopen_libs@ @EINA_LIBS@
27module_la_LDFLAGS = -module -avoid-version 28module_la_LDFLAGS = -module -avoid-version
28module_la_DEPENDENCIES = $(top_builddir)/config.h 29module_la_DEPENDENCIES = $(top_builddir)/config.h
29 30
diff --git a/src/modules/conf_window_manipulation/Makefile.am b/src/modules/conf_window_manipulation/Makefile.am
index 3a19f0fa1..fd701d2d0 100644
--- a/src/modules/conf_window_manipulation/Makefile.am
+++ b/src/modules/conf_window_manipulation/Makefile.am
@@ -15,7 +15,8 @@ INCLUDES = -I. \
15 -I$(top_srcdir)/src/bin \ 15 -I$(top_srcdir)/src/bin \
16 -I$(top_srcdir)/src/lib \ 16 -I$(top_srcdir)/src/lib \
17 -I$(top_srcdir)/src/modules \ 17 -I$(top_srcdir)/src/modules \
18 @e_cflags@ 18 @e_cflags@ \
19 @EINA_CFLAGS@
19pkgdir = $(libdir)/enlightenment/modules/$(MODULE)/$(MODULE_ARCH) 20pkgdir = $(libdir)/enlightenment/modules/$(MODULE)/$(MODULE_ARCH)
20pkg_LTLIBRARIES = module.la 21pkg_LTLIBRARIES = module.la
21module_la_SOURCES = e_mod_main.c \ 22module_la_SOURCES = e_mod_main.c \
@@ -25,7 +26,7 @@ module_la_SOURCES = e_mod_main.c \
25 e_int_config_window_stacking.c \ 26 e_int_config_window_stacking.c \
26 e_int_config_window_manipulation.h 27 e_int_config_window_manipulation.h
27 28
28module_la_LIBADD = @e_libs@ @dlopen_libs@ 29module_la_LIBADD = @e_libs@ @dlopen_libs@ @EINA_LIBS@
29module_la_LDFLAGS = -module -avoid-version 30module_la_LDFLAGS = -module -avoid-version
30module_la_DEPENDENCIES = $(top_builddir)/config.h 31module_la_DEPENDENCIES = $(top_builddir)/config.h
31 32
diff --git a/src/modules/conf_window_remembers/Makefile.am b/src/modules/conf_window_remembers/Makefile.am
index 7ea4b1fc3..830a91300 100644
--- a/src/modules/conf_window_remembers/Makefile.am
+++ b/src/modules/conf_window_remembers/Makefile.am
@@ -15,15 +15,16 @@ INCLUDES = -I. \
15 -I$(top_srcdir)/src/bin \ 15 -I$(top_srcdir)/src/bin \
16 -I$(top_srcdir)/src/lib \ 16 -I$(top_srcdir)/src/lib \
17 -I$(top_srcdir)/src/modules \ 17 -I$(top_srcdir)/src/modules \
18 @e_cflags@ 18 @e_cflags@ \
19 @EINA_CFLAGS@
19pkgdir = $(libdir)/enlightenment/modules/$(MODULE)/$(MODULE_ARCH) 20pkgdir = $(libdir)/enlightenment/modules/$(MODULE)/$(MODULE_ARCH)
20pkg_LTLIBRARIES = module.la 21pkg_LTLIBRARIES = module.la
21module_la_SOURCES = e_mod_main.c \ 22module_la_SOURCES = e_mod_main.c \
22 e_mod_main.h \ 23 e_mod_main.h \
23 e_int_config_remembers.c \ 24 e_int_config_remembers.c \
24 e_int_config_remembers.h 25 e_int_config_remembers.h
25 26
26module_la_LIBADD = @e_libs@ @dlopen_libs@ 27module_la_LIBADD = @e_libs@ @dlopen_libs@ @EINA_LIBS@
27module_la_LDFLAGS = -module -avoid-version 28module_la_LDFLAGS = -module -avoid-version
28module_la_DEPENDENCIES = $(top_builddir)/config.h 29module_la_DEPENDENCIES = $(top_builddir)/config.h
29 30
diff --git a/src/modules/conf_winlist/Makefile.am b/src/modules/conf_winlist/Makefile.am
index d5636c55b..ec499211b 100644
--- a/src/modules/conf_winlist/Makefile.am
+++ b/src/modules/conf_winlist/Makefile.am
@@ -15,15 +15,16 @@ INCLUDES = -I. \
15 -I$(top_srcdir)/src/bin \ 15 -I$(top_srcdir)/src/bin \
16 -I$(top_srcdir)/src/lib \ 16 -I$(top_srcdir)/src/lib \
17 -I$(top_srcdir)/src/modules \ 17 -I$(top_srcdir)/src/modules \
18 @e_cflags@ 18 @e_cflags@ \
19 @EINA_CFLAGS@
19pkgdir = $(libdir)/enlightenment/modules/$(MODULE)/$(MODULE_ARCH) 20pkgdir = $(libdir)/enlightenment/modules/$(MODULE)/$(MODULE_ARCH)
20pkg_LTLIBRARIES = module.la 21pkg_LTLIBRARIES = module.la
21module_la_SOURCES = e_mod_main.c \ 22module_la_SOURCES = e_mod_main.c \
22 e_mod_main.h \ 23 e_mod_main.h \
23 e_int_config_winlist.c \ 24 e_int_config_winlist.c \
24 e_int_config_winlist.h 25 e_int_config_winlist.h
25 26
26module_la_LIBADD = @e_libs@ @dlopen_libs@ 27module_la_LIBADD = @e_libs@ @dlopen_libs@ @EINA_LIBS@
27module_la_LDFLAGS = -module -avoid-version 28module_la_LDFLAGS = -module -avoid-version
28module_la_DEPENDENCIES = $(top_builddir)/config.h 29module_la_DEPENDENCIES = $(top_builddir)/config.h
29 30
diff --git a/src/modules/connman/Makefile.am b/src/modules/connman/Makefile.am
index 4714c712b..74a46f88f 100644
--- a/src/modules/connman/Makefile.am
+++ b/src/modules/connman/Makefile.am
@@ -15,7 +15,8 @@ INCLUDES = -I. \
15 -I$(top_srcdir)/src/bin \ 15 -I$(top_srcdir)/src/bin \
16 -I$(top_srcdir)/src/lib \ 16 -I$(top_srcdir)/src/lib \
17 -I$(top_srcdir)/src/modules \ 17 -I$(top_srcdir)/src/modules \
18 @e_cflags@ 18 @e_cflags@ \
19 @EINA_CFLAGS@
19 20
20pkgdir = $(libdir)/enlightenment/modules/$(MODULE)/$(MODULE_ARCH) 21pkgdir = $(libdir)/enlightenment/modules/$(MODULE)/$(MODULE_ARCH)
21 22
@@ -27,7 +28,7 @@ module_la_SOURCES = e_mod_main.h \
27 e_iface.h \ 28 e_iface.h \
28 e_iface.c 29 e_iface.c
29 30
30module_la_LIBADD = @e_libs@ @dlopen_libs@ @E_DBUS_LIBS@ 31module_la_LIBADD = @e_libs@ @dlopen_libs@ @E_DBUS_LIBS@ @EINA_LIBS@
31module_la_LDFLAGS = -module -avoid-version 32module_la_LDFLAGS = -module -avoid-version
32module_la_DEPENDENCIES = $(top_builddir)/config.h 33module_la_DEPENDENCIES = $(top_builddir)/config.h
33endif 34endif
diff --git a/src/modules/cpufreq/Makefile.am b/src/modules/cpufreq/Makefile.am
index 3aa7080d5..367c042fe 100644
--- a/src/modules/cpufreq/Makefile.am
+++ b/src/modules/cpufreq/Makefile.am
@@ -15,12 +15,13 @@ INCLUDES = -I. \
15 -I$(top_srcdir)/src/bin \ 15 -I$(top_srcdir)/src/bin \
16 -I$(top_srcdir)/src/lib \ 16 -I$(top_srcdir)/src/lib \
17 -I$(top_srcdir)/src/modules \ 17 -I$(top_srcdir)/src/modules \
18 @e_cflags@ 18 @e_cflags@ \
19 @EINA_CFLAGS@
19pkgdir = $(libdir)/enlightenment/modules/$(MODULE)/$(MODULE_ARCH) 20pkgdir = $(libdir)/enlightenment/modules/$(MODULE)/$(MODULE_ARCH)
20pkg_LTLIBRARIES = module.la 21pkg_LTLIBRARIES = module.la
21module_la_SOURCES = e_mod_main.c \ 22module_la_SOURCES = e_mod_main.c \
22 e_mod_main.h 23 e_mod_main.h
23module_la_LIBADD = @e_libs@ @dlopen_libs@ 24module_la_LIBADD = @e_libs@ @dlopen_libs@ @EINA_LIBS@
24module_la_LDFLAGS = -module -avoid-version 25module_la_LDFLAGS = -module -avoid-version
25module_la_DEPENDENCIES = $(top_builddir)/config.h 26module_la_DEPENDENCIES = $(top_builddir)/config.h
26 27
diff --git a/src/modules/dropshadow/Makefile.am b/src/modules/dropshadow/Makefile.am
index 9f8482811..de6a8e1e2 100644
--- a/src/modules/dropshadow/Makefile.am
+++ b/src/modules/dropshadow/Makefile.am
@@ -15,14 +15,15 @@ INCLUDES = -I. \
15 -I$(top_srcdir)/src/bin \ 15 -I$(top_srcdir)/src/bin \
16 -I$(top_srcdir)/src/lib \ 16 -I$(top_srcdir)/src/lib \
17 -I$(top_srcdir)/src/modules \ 17 -I$(top_srcdir)/src/modules \
18 @e_cflags@ 18 @e_cflags@ \
19 @EINA_CFLAGS@
19pkgdir = $(libdir)/enlightenment/modules/$(MODULE)/$(MODULE_ARCH) 20pkgdir = $(libdir)/enlightenment/modules/$(MODULE)/$(MODULE_ARCH)
20pkg_LTLIBRARIES = module.la 21pkg_LTLIBRARIES = module.la
21module_la_SOURCES = e_mod_main.c \ 22module_la_SOURCES = e_mod_main.c \
22 e_mod_main.h \ 23 e_mod_main.h \
23 e_mod_config.c \ 24 e_mod_config.c \
24 e_mod_config.h 25 e_mod_config.h
25module_la_LIBADD = @e_libs@ @dlopen_libs@ 26module_la_LIBADD = @e_libs@ @dlopen_libs@ @EINA_LIBS@
26module_la_LDFLAGS = -module -avoid-version 27module_la_LDFLAGS = -module -avoid-version
27module_la_DEPENDENCIES = $(top_builddir)/config.h 28module_la_DEPENDENCIES = $(top_builddir)/config.h
28 29
diff --git a/src/modules/exebuf/Makefile.am b/src/modules/exebuf/Makefile.am
index 33a01df29..0f0d9829d 100644
--- a/src/modules/exebuf/Makefile.am
+++ b/src/modules/exebuf/Makefile.am
@@ -15,7 +15,8 @@ INCLUDES = -I. \
15 -I$(top_srcdir)/src/bin \ 15 -I$(top_srcdir)/src/bin \
16 -I$(top_srcdir)/src/lib \ 16 -I$(top_srcdir)/src/lib \
17 -I$(top_srcdir)/src/modules \ 17 -I$(top_srcdir)/src/modules \
18 @e_cflags@ 18 @e_cflags@ \
19 @EINA_CFLAGS@
19pkgdir = $(libdir)/enlightenment/modules/$(MODULE)/$(MODULE_ARCH) 20pkgdir = $(libdir)/enlightenment/modules/$(MODULE)/$(MODULE_ARCH)
20pkg_LTLIBRARIES = module.la 21pkg_LTLIBRARIES = module.la
21module_la_SOURCES = e_mod_main.c \ 22module_la_SOURCES = e_mod_main.c \
@@ -23,7 +24,7 @@ module_la_SOURCES = e_mod_main.c \
23 e_exebuf.c \ 24 e_exebuf.c \
24 e_exebuf.h 25 e_exebuf.h
25 26
26module_la_LIBADD = @e_libs@ @dlopen_libs@ 27module_la_LIBADD = @e_libs@ @dlopen_libs@ @EINA_LIBS@
27module_la_LDFLAGS = -module -avoid-version 28module_la_LDFLAGS = -module -avoid-version
28module_la_DEPENDENCIES = $(top_builddir)/config.h 29module_la_DEPENDENCIES = $(top_builddir)/config.h
29 30
diff --git a/src/modules/fileman/Makefile.am b/src/modules/fileman/Makefile.am
index 4cca967ec..11e1a0df3 100644
--- a/src/modules/fileman/Makefile.am
+++ b/src/modules/fileman/Makefile.am
@@ -15,7 +15,8 @@ INCLUDES = -I. \
15 -I$(top_srcdir)/src/bin \ 15 -I$(top_srcdir)/src/bin \
16 -I$(top_srcdir)/src/lib \ 16 -I$(top_srcdir)/src/lib \
17 -I$(top_srcdir)/src/modules \ 17 -I$(top_srcdir)/src/modules \
18 @e_cflags@ 18 @e_cflags@ \
19 @EINA_CFLAGS@
19pkgdir = $(libdir)/enlightenment/modules/$(MODULE)/$(MODULE_ARCH) 20pkgdir = $(libdir)/enlightenment/modules/$(MODULE)/$(MODULE_ARCH)
20pkg_LTLIBRARIES = module.la 21pkg_LTLIBRARIES = module.la
21module_la_SOURCES = e_mod_main.c \ 22module_la_SOURCES = e_mod_main.c \
@@ -25,7 +26,7 @@ module_la_SOURCES = e_mod_main.c \
25 e_fwin.c \ 26 e_fwin.c \
26 e_fwin.h 27 e_fwin.h
27 28
28module_la_LIBADD = @e_libs@ @dlopen_libs@ 29module_la_LIBADD = @e_libs@ @dlopen_libs@ @EINA_LIBS@
29module_la_LDFLAGS = -module -avoid-version 30module_la_LDFLAGS = -module -avoid-version
30module_la_DEPENDENCIES = $(top_builddir)/config.h 31module_la_DEPENDENCIES = $(top_builddir)/config.h
31 32
diff --git a/src/modules/gadman/Makefile.am b/src/modules/gadman/Makefile.am
index 6b17b9169..7083a4a29 100644
--- a/src/modules/gadman/Makefile.am
+++ b/src/modules/gadman/Makefile.am
@@ -14,7 +14,8 @@ INCLUDES = -I. \
14 -I$(top_srcdir)/src/bin \ 14 -I$(top_srcdir)/src/bin \
15 -I$(top_srcdir)/src/lib \ 15 -I$(top_srcdir)/src/lib \
16 -I$(top_srcdir)/src/modules \ 16 -I$(top_srcdir)/src/modules \
17 @e_cflags@ 17 @e_cflags@ \
18 @EINA_CFLAGS@
18pkgdir = $(libdir)/enlightenment/modules/$(MODULE)/$(MODULE_ARCH) 19pkgdir = $(libdir)/enlightenment/modules/$(MODULE)/$(MODULE_ARCH)
19pkg_LTLIBRARIES = module.la 20pkg_LTLIBRARIES = module.la
20module_la_SOURCES = e_mod_main.c \ 21module_la_SOURCES = e_mod_main.c \
@@ -23,7 +24,7 @@ module_la_SOURCES = e_mod_main.c \
23 e_mod_config.h \ 24 e_mod_config.h \
24 e_mod_gadman.c \ 25 e_mod_gadman.c \
25 e_mod_gadman.h 26 e_mod_gadman.h
26module_la_LIBADD = @e_libs@ @dlopen_libs@ 27module_la_LIBADD = @e_libs@ @dlopen_libs@ @EINA_LIBS@
27module_la_LDFLAGS = -module -avoid-version 28module_la_LDFLAGS = -module -avoid-version
28module_la_DEPENDENCIES = $(top_builddir)/config.h 29module_la_DEPENDENCIES = $(top_builddir)/config.h
29 30
diff --git a/src/modules/ibar/Makefile.am b/src/modules/ibar/Makefile.am
index e0abf1532..58b7dcac3 100644
--- a/src/modules/ibar/Makefile.am
+++ b/src/modules/ibar/Makefile.am
@@ -14,13 +14,14 @@ INCLUDES = -I. \
14 -I$(top_srcdir)/src/modules/$(MODULE) \ 14 -I$(top_srcdir)/src/modules/$(MODULE) \
15 -I$(top_srcdir)/src/bin \ 15 -I$(top_srcdir)/src/bin \
16 -I$(top_srcdir)/src/lib \ 16 -I$(top_srcdir)/src/lib \
17 @e_cflags@ 17 @e_cflags@ \
18 @EINA_CFLAGS@
18pkgdir = $(libdir)/enlightenment/modules/$(MODULE)/$(MODULE_ARCH) 19pkgdir = $(libdir)/enlightenment/modules/$(MODULE)/$(MODULE_ARCH)
19pkg_LTLIBRARIES = module.la 20pkg_LTLIBRARIES = module.la
20module_la_SOURCES = e_mod_main.c \ 21module_la_SOURCES = e_mod_main.c \
21 e_mod_main.h \ 22 e_mod_main.h \
22 e_mod_config.c 23 e_mod_config.c
23module_la_LIBADD = @e_libs@ @dlopen_libs@ 24module_la_LIBADD = @e_libs@ @dlopen_libs@ @EINA_LIBS@
24module_la_LDFLAGS = -module -avoid-version 25module_la_LDFLAGS = -module -avoid-version
25module_la_DEPENDENCIES = $(top_builddir)/config.h 26module_la_DEPENDENCIES = $(top_builddir)/config.h
26 27
diff --git a/src/modules/ibox/Makefile.am b/src/modules/ibox/Makefile.am
index 7d13d14bb..de6b67902 100644
--- a/src/modules/ibox/Makefile.am
+++ b/src/modules/ibox/Makefile.am
@@ -15,13 +15,14 @@ INCLUDES = -I. \
15 -I$(top_srcdir)/src/bin \ 15 -I$(top_srcdir)/src/bin \
16 -I$(top_srcdir)/src/lib \ 16 -I$(top_srcdir)/src/lib \
17 -I$(top_srcdir)/src/modules \ 17 -I$(top_srcdir)/src/modules \
18 @e_cflags@ 18 @e_cflags@ \
19 @EINA_CFLAGS@
19pkgdir = $(libdir)/enlightenment/modules/$(MODULE)/$(MODULE_ARCH) 20pkgdir = $(libdir)/enlightenment/modules/$(MODULE)/$(MODULE_ARCH)
20pkg_LTLIBRARIES = module.la 21pkg_LTLIBRARIES = module.la
21module_la_SOURCES = e_mod_main.c \ 22module_la_SOURCES = e_mod_main.c \
22 e_mod_main.h \ 23 e_mod_main.h \
23 e_mod_config.c 24 e_mod_config.c
24module_la_LIBADD = @e_libs@ @dlopen_libs@ 25module_la_LIBADD = @e_libs@ @dlopen_libs@ @EINA_LIBS@
25module_la_LDFLAGS = -module -avoid-version 26module_la_LDFLAGS = -module -avoid-version
26module_la_DEPENDENCIES = $(top_builddir)/config.h 27module_la_DEPENDENCIES = $(top_builddir)/config.h
27 28
diff --git a/src/modules/layout/Makefile.am b/src/modules/layout/Makefile.am
index 763c2d4c9..cb46a338d 100644
--- a/src/modules/layout/Makefile.am
+++ b/src/modules/layout/Makefile.am
@@ -15,12 +15,13 @@ INCLUDES = -I. \
15 -I$(top_srcdir)/src/bin \ 15 -I$(top_srcdir)/src/bin \
16 -I$(top_srcdir)/src/lib \ 16 -I$(top_srcdir)/src/lib \
17 -I$(top_srcdir)/src/modules \ 17 -I$(top_srcdir)/src/modules \
18 @e_cflags@ 18 @e_cflags@ \
19 @EINA_CFLAGS@
19pkgdir = $(libdir)/enlightenment/modules/$(MODULE)/$(MODULE_ARCH) 20pkgdir = $(libdir)/enlightenment/modules/$(MODULE)/$(MODULE_ARCH)
20pkg_LTLIBRARIES = module.la 21pkg_LTLIBRARIES = module.la
21module_la_SOURCES = e_mod_main.c \ 22module_la_SOURCES = e_mod_main.c \
22 e_mod_main.h 23 e_mod_main.h
23module_la_LIBADD = @e_libs@ @dlopen_libs@ 24module_la_LIBADD = @e_libs@ @dlopen_libs@ @EINA_LIBS@
24module_la_LDFLAGS = -module -avoid-version 25module_la_LDFLAGS = -module -avoid-version
25module_la_DEPENDENCIES = $(top_builddir)/config.h 26module_la_DEPENDENCIES = $(top_builddir)/config.h
26 27
diff --git a/src/modules/mixer/Makefile.am b/src/modules/mixer/Makefile.am
index cb550e7ae..de1417edb 100644
--- a/src/modules/mixer/Makefile.am
+++ b/src/modules/mixer/Makefile.am
@@ -14,7 +14,8 @@ INCLUDES = -I. \
14 -I$(top_srcdir)/src/bin \ 14 -I$(top_srcdir)/src/bin \
15 -I$(top_srcdir)/src/lib \ 15 -I$(top_srcdir)/src/lib \
16 -I$(top_srcdir)/src/modules \ 16 -I$(top_srcdir)/src/modules \
17 @e_cflags@ @SOUND_CFLAGS@ 17 @e_cflags@ @SOUND_CFLAGS@ \
18 @EINA_CFLAGS@
18pkgdir = $(libdir)/enlightenment/modules/$(MODULE)/$(MODULE_ARCH) 19pkgdir = $(libdir)/enlightenment/modules/$(MODULE)/$(MODULE_ARCH)
19pkg_LTLIBRARIES = module.la 20pkg_LTLIBRARIES = module.la
20 21
@@ -31,7 +32,7 @@ else
31module_la_SOURCES += sys_dummy.c 32module_la_SOURCES += sys_dummy.c
32endif 33endif
33 34
34module_la_LIBADD = @SOUND_LDFLAGS@ @e_libs@ @dlopen_libs@ 35module_la_LIBADD = @SOUND_LDFLAGS@ @e_libs@ @dlopen_libs@ @EINA_LIBS@
35module_la_LDFLAGS = -module -avoid-version 36module_la_LDFLAGS = -module -avoid-version
36module_la_DEPENDENCIES = $(top_builddir)/config.h 37module_la_DEPENDENCIES = $(top_builddir)/config.h
37 38
diff --git a/src/modules/msgbus_lang/Makefile.am b/src/modules/msgbus_lang/Makefile.am
index 30e66dbed..855645ce6 100644
--- a/src/modules/msgbus_lang/Makefile.am
+++ b/src/modules/msgbus_lang/Makefile.am
@@ -11,7 +11,8 @@ INCLUDES = -I. \
11 -I$(top_srcdir)/src/bin \ 11 -I$(top_srcdir)/src/bin \
12 -I$(top_srcdir)/src/lib \ 12 -I$(top_srcdir)/src/lib \
13 -I$(top_srcdir)/src/modules \ 13 -I$(top_srcdir)/src/modules \
14 @e_cflags@ 14 @e_cflags@ \
15 @EINA_CFLAGS@
15 16
16pkgdir = $(libdir)/enlightenment/modules/$(MODULE)/$(MODULE_ARCH) 17pkgdir = $(libdir)/enlightenment/modules/$(MODULE)/$(MODULE_ARCH)
17 18
@@ -25,8 +26,8 @@ EXTRA_DIST = $(files_DATA)
25pkg_LTLIBRARIES = module.la 26pkg_LTLIBRARIES = module.la
26module_la_SOURCES = e_mod_main.c \ 27module_la_SOURCES = e_mod_main.c \
27 e_mod_main.h 28 e_mod_main.h
28 29
29module_la_LIBADD = @e_libs@ @dlopen_libs@ @E_DBUS_LIBS@ 30module_la_LIBADD = @e_libs@ @dlopen_libs@ @E_DBUS_LIBS@ @EINA_LIBS@
30module_la_LDFLAGS = -module -avoid-version 31module_la_LDFLAGS = -module -avoid-version
31module_la_DEPENDENCIES = $(top_builddir)/config.h 32module_la_DEPENDENCIES = $(top_builddir)/config.h
32endif 33endif
diff --git a/src/modules/pager/Makefile.am b/src/modules/pager/Makefile.am
index 59ebd59e0..ce5add047 100644
--- a/src/modules/pager/Makefile.am
+++ b/src/modules/pager/Makefile.am
@@ -15,13 +15,14 @@ INCLUDES = -I. \
15 -I$(top_srcdir)/src/bin \ 15 -I$(top_srcdir)/src/bin \
16 -I$(top_srcdir)/src/lib \ 16 -I$(top_srcdir)/src/lib \
17 -I$(top_srcdir)/src/modules \ 17 -I$(top_srcdir)/src/modules \
18 @e_cflags@ 18 @e_cflags@ \
19 @EINA_CFLAGS@
19pkgdir = $(libdir)/enlightenment/modules/$(MODULE)/$(MODULE_ARCH) 20pkgdir = $(libdir)/enlightenment/modules/$(MODULE)/$(MODULE_ARCH)
20pkg_LTLIBRARIES = module.la 21pkg_LTLIBRARIES = module.la
21module_la_SOURCES = e_mod_main.c \ 22module_la_SOURCES = e_mod_main.c \
22 e_mod_main.h \ 23 e_mod_main.h \
23 e_mod_config.c 24 e_mod_config.c
24module_la_LIBADD = @e_libs@ @dlopen_libs@ 25module_la_LIBADD = @e_libs@ @dlopen_libs@ @EINA_LIBS@
25module_la_LDFLAGS = -module -avoid-version 26module_la_LDFLAGS = -module -avoid-version
26module_la_DEPENDENCIES = $(top_builddir)/config.h 27module_la_DEPENDENCIES = $(top_builddir)/config.h
27 28
diff --git a/src/modules/start/Makefile.am b/src/modules/start/Makefile.am
index f9afb3b38..d8c007006 100644
--- a/src/modules/start/Makefile.am
+++ b/src/modules/start/Makefile.am
@@ -15,12 +15,13 @@ INCLUDES = -I. \
15 -I$(top_srcdir)/src/bin \ 15 -I$(top_srcdir)/src/bin \
16 -I$(top_srcdir)/src/lib \ 16 -I$(top_srcdir)/src/lib \
17 -I$(top_srcdir)/src/modules \ 17 -I$(top_srcdir)/src/modules \
18 @e_cflags@ 18 @e_cflags@ \
19 @EINA_CFLAGS@
19pkgdir = $(libdir)/enlightenment/modules/$(MODULE)/$(MODULE_ARCH) 20pkgdir = $(libdir)/enlightenment/modules/$(MODULE)/$(MODULE_ARCH)
20pkg_LTLIBRARIES = module.la 21pkg_LTLIBRARIES = module.la
21module_la_SOURCES = e_mod_main.c \ 22module_la_SOURCES = e_mod_main.c \
22 e_mod_main.h 23 e_mod_main.h
23module_la_LIBADD = @e_libs@ @dlopen_libs@ 24module_la_LIBADD = @e_libs@ @dlopen_libs@ @EINA_LIBS@
24module_la_LDFLAGS = -module -avoid-version 25module_la_LDFLAGS = -module -avoid-version
25module_la_DEPENDENCIES = $(top_builddir)/config.h 26module_la_DEPENDENCIES = $(top_builddir)/config.h
26 27
diff --git a/src/modules/temperature/Makefile.am b/src/modules/temperature/Makefile.am
index 4cb65fa4a..1a7f46d36 100644
--- a/src/modules/temperature/Makefile.am
+++ b/src/modules/temperature/Makefile.am
@@ -15,13 +15,14 @@ INCLUDES = -I. \
15 -I$(top_srcdir)/src/bin \ 15 -I$(top_srcdir)/src/bin \
16 -I$(top_srcdir)/src/lib \ 16 -I$(top_srcdir)/src/lib \
17 -I$(top_srcdir)/src/modules \ 17 -I$(top_srcdir)/src/modules \
18 @e_cflags@ @ECORE_TXT_CFLAGS@ 18 @e_cflags@ @ECORE_TXT_CFLAGS@ \
19 @EINA_CFLAGS@
19pkgdir = $(libdir)/enlightenment/modules/$(MODULE)/$(MODULE_ARCH) 20pkgdir = $(libdir)/enlightenment/modules/$(MODULE)/$(MODULE_ARCH)
20pkg_LTLIBRARIES = module.la 21pkg_LTLIBRARIES = module.la
21module_la_SOURCES = e_mod_main.c \ 22module_la_SOURCES = e_mod_main.c \
22 e_mod_main.h \ 23 e_mod_main.h \
23 e_mod_config.c 24 e_mod_config.c
24module_la_LIBADD = @e_libs@ @dlopen_libs@ @ECORE_TXT_LIBS@ 25module_la_LIBADD = @e_libs@ @dlopen_libs@ @ECORE_TXT_LIBS@ @EINA_LIBS@
25module_la_LDFLAGS = -module -avoid-version 26module_la_LDFLAGS = -module -avoid-version
26module_la_DEPENDENCIES = $(top_builddir)/config.h 27module_la_DEPENDENCIES = $(top_builddir)/config.h
27 28
diff --git a/src/modules/winlist/Makefile.am b/src/modules/winlist/Makefile.am
index c29d3018e..f87121f9b 100644
--- a/src/modules/winlist/Makefile.am
+++ b/src/modules/winlist/Makefile.am
@@ -15,7 +15,8 @@ INCLUDES = -I. \
15 -I$(top_srcdir)/src/bin \ 15 -I$(top_srcdir)/src/bin \
16 -I$(top_srcdir)/src/lib \ 16 -I$(top_srcdir)/src/lib \
17 -I$(top_srcdir)/src/modules \ 17 -I$(top_srcdir)/src/modules \
18 @e_cflags@ 18 @e_cflags@ \
19 @EINA_CFLAGS@
19pkgdir = $(libdir)/enlightenment/modules/$(MODULE)/$(MODULE_ARCH) 20pkgdir = $(libdir)/enlightenment/modules/$(MODULE)/$(MODULE_ARCH)
20pkg_LTLIBRARIES = module.la 21pkg_LTLIBRARIES = module.la
21module_la_SOURCES = e_mod_main.c \ 22module_la_SOURCES = e_mod_main.c \
@@ -23,7 +24,7 @@ module_la_SOURCES = e_mod_main.c \
23 e_winlist.c \ 24 e_winlist.c \
24 e_winlist.h 25 e_winlist.h
25 26
26module_la_LIBADD = @e_libs@ @dlopen_libs@ 27module_la_LIBADD = @e_libs@ @dlopen_libs@ @EINA_LIBS@
27module_la_LDFLAGS = -module -avoid-version 28module_la_LDFLAGS = -module -avoid-version
28module_la_DEPENDENCIES = $(top_builddir)/config.h 29module_la_DEPENDENCIES = $(top_builddir)/config.h
29 30
diff --git a/src/modules/wizard/Makefile.am b/src/modules/wizard/Makefile.am
index 11ec7c537..0fb09d024 100644
--- a/src/modules/wizard/Makefile.am
+++ b/src/modules/wizard/Makefile.am
@@ -15,34 +15,35 @@ INCLUDES = -I. \
15 -I$(top_srcdir)/src/bin \ 15 -I$(top_srcdir)/src/bin \
16 -I$(top_srcdir)/src/lib \ 16 -I$(top_srcdir)/src/lib \
17 -I$(top_srcdir)/src/modules \ 17 -I$(top_srcdir)/src/modules \
18 @e_cflags@ 18 @e_cflags@ \
19 @EINA_CFLAGS@
19pkgdir = $(libdir)/enlightenment/modules/$(MODULE)/$(MODULE_ARCH) 20pkgdir = $(libdir)/enlightenment/modules/$(MODULE)/$(MODULE_ARCH)
20pkg_LTLIBRARIES = module.la \ 21pkg_LTLIBRARIES = module.la \
21 page_000.la \ 22 page_000.la \
22 page_010.la \ 23 page_010.la \
23 page_020.la 24 page_020.la
24 25
25module_la_SOURCES = e_mod_main.c \ 26module_la_SOURCES = e_mod_main.c \
26 e_mod_main.h \ 27 e_mod_main.h \
27 e_wizard.c \ 28 e_wizard.c \
28 e_wizard.h 29 e_wizard.h
29 30
30module_la_LIBADD = @e_libs@ @dlopen_libs@ 31module_la_LIBADD = @e_libs@ @dlopen_libs@ @EINA_LIBS@
31module_la_LDFLAGS = -module -avoid-version 32module_la_LDFLAGS = -module -avoid-version
32module_la_DEPENDENCIES = $(top_builddir)/config.h 33module_la_DEPENDENCIES = $(top_builddir)/config.h
33 34
34page_000_la_SOURCES = page_000.c 35page_000_la_SOURCES = page_000.c
35page_000_la_LIBADD = @e_libs@ @dlopen_libs@ 36page_000_la_LIBADD = @e_libs@ @dlopen_libs@ @EINA_LIBS@
36page_000_la_LDFLAGS = -module -avoid-version 37page_000_la_LDFLAGS = -module -avoid-version
37page_000_la_DEPENDENCIES = $(top_builddir)/config.h 38page_000_la_DEPENDENCIES = $(top_builddir)/config.h
38 39
39page_010_la_SOURCES = page_010.c 40page_010_la_SOURCES = page_010.c
40page_010_la_LIBADD = @e_libs@ @dlopen_libs@ 41page_010_la_LIBADD = @e_libs@ @dlopen_libs@ @EINA_LIBS@
41page_010_la_LDFLAGS = -module -avoid-version 42page_010_la_LDFLAGS = -module -avoid-version
42page_010_la_DEPENDENCIES = $(top_builddir)/config.h 43page_010_la_DEPENDENCIES = $(top_builddir)/config.h
43 44
44page_020_la_SOURCES = page_020.c 45page_020_la_SOURCES = page_020.c
45page_020_la_LIBADD = @e_libs@ @dlopen_libs@ 46page_020_la_LIBADD = @e_libs@ @dlopen_libs@ @EINA_LIBS@
46page_020_la_LDFLAGS = -module -avoid-version 47page_020_la_LDFLAGS = -module -avoid-version
47page_020_la_DEPENDENCIES = $(top_builddir)/config.h 48page_020_la_DEPENDENCIES = $(top_builddir)/config.h
48 49
diff --git a/src/preload/Makefile.am b/src/preload/Makefile.am
index 7e611ad59..efd6fc2bc 100644
--- a/src/preload/Makefile.am
+++ b/src/preload/Makefile.am
@@ -4,8 +4,9 @@ INCLUDES = -I. \
4 -I$(top_srcdir) \ 4 -I$(top_srcdir) \
5 -I$(top_srcdir)src/preload \ 5 -I$(top_srcdir)src/preload \
6 @x_cflags@ \ 6 @x_cflags@ \
7 @e_cflags@ 7 @e_cflags@ \
8 8 @EINA_CFLAGS@
9
9pkgdir = $(libdir)/enlightenment/preload 10pkgdir = $(libdir)/enlightenment/preload
10 11
11#pkg_LTLIBRARIES = e_hack.la e_precache.la 12#pkg_LTLIBRARIES = e_hack.la e_precache.la
@@ -14,13 +15,13 @@ pkg_LTLIBRARIES = e_precache.la
14#e_hack_la_SOURCES = \ 15#e_hack_la_SOURCES = \
15#e_hack.c \ 16#e_hack.c \
16#e_hack.h 17#e_hack.h
17#e_hack_la_LIBADD = @x_libs@ @dlopen_libs@ 18#e_hack_la_LIBADD = @x_libs@ @dlopen_libs@ @EINA_LIBS@
18#e_hack_la_LDFLAGS = -module -avoid-version 19#e_hack_la_LDFLAGS = -module -avoid-version
19#e_hack_la_DEPENDENCIES = $(top_builddir)/config.h 20#e_hack_la_DEPENDENCIES = $(top_builddir)/config.h
20 21
21e_precache_la_SOURCES = \ 22e_precache_la_SOURCES = \
22e_precache.c \ 23e_precache.c \
23e_precache.h 24e_precache.h
24e_precache_la_LIBADD = @e_libs@ @dlopen_libs@ 25e_precache_la_LIBADD = @e_libs@ @dlopen_libs@ @EINA_LIBS@
25e_precache_la_LDFLAGS = -module -avoid-version 26e_precache_la_LDFLAGS = -module -avoid-version
26e_precache_la_DEPENDENCIES = $(top_builddir)/config.h 27e_precache_la_DEPENDENCIES = $(top_builddir)/config.h