From d2f7e4da0d1a979ae6d279ab1a4483d1d979e28c Mon Sep 17 00:00:00 2001 From: Cedric BAIL Date: Mon, 13 Oct 2008 16:00:58 +0000 Subject: [PATCH] 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 --- configure.ac | 2 ++ src/bin/Makefile.am | 19 ++++++++++--------- src/modules/battery/Makefile.am | 5 +++-- src/modules/clock/Makefile.am | 5 +++-- src/modules/conf/Makefile.am | 7 ++++--- src/modules/conf_applications/Makefile.am | 9 +++++---- src/modules/conf_borders/Makefile.am | 7 ++++--- src/modules/conf_clientlist/Makefile.am | 9 +++++---- src/modules/conf_colors/Makefile.am | 5 +++-- src/modules/conf_desk/Makefile.am | 9 +++++---- src/modules/conf_desklock/Makefile.am | 7 ++++--- src/modules/conf_desks/Makefile.am | 9 +++++---- src/modules/conf_dialogs/Makefile.am | 5 +++-- src/modules/conf_display/Makefile.am | 5 +++-- src/modules/conf_dpms/Makefile.am | 4 ++-- src/modules/conf_engine/Makefile.am | 7 ++++--- src/modules/conf_exebuf/Makefile.am | 5 +++-- src/modules/conf_fonts/Makefile.am | 7 ++++--- src/modules/conf_icon_theme/Makefile.am | 5 +++-- src/modules/conf_imc/Makefile.am | 5 +++-- src/modules/conf_interaction/Makefile.am | 5 +++-- src/modules/conf_intl/Makefile.am | 5 +++-- src/modules/conf_keybindings/Makefile.am | 5 +++-- src/modules/conf_menus/Makefile.am | 5 +++-- src/modules/conf_mime/Makefile.am | 7 ++++--- src/modules/conf_mouse/Makefile.am | 5 +++-- src/modules/conf_mouse_cursor/Makefile.am | 5 +++-- src/modules/conf_mousebindings/Makefile.am | 7 ++++--- src/modules/conf_paths/Makefile.am | 9 +++++---- src/modules/conf_performance/Makefile.am | 9 +++++---- src/modules/conf_profiles/Makefile.am | 7 ++++--- src/modules/conf_scale/Makefile.am | 5 +++-- src/modules/conf_screensaver/Makefile.am | 5 +++-- src/modules/conf_shelves/Makefile.am | 5 +++-- src/modules/conf_startup/Makefile.am | 5 +++-- src/modules/conf_theme/Makefile.am | 5 +++-- src/modules/conf_transitions/Makefile.am | 5 +++-- src/modules/conf_wallpaper/Makefile.am | 5 +++-- src/modules/conf_window_display/Makefile.am | 5 +++-- src/modules/conf_window_focus/Makefile.am | 7 ++++--- .../conf_window_manipulation/Makefile.am | 5 +++-- src/modules/conf_window_remembers/Makefile.am | 7 ++++--- src/modules/conf_winlist/Makefile.am | 9 +++++---- src/modules/connman/Makefile.am | 5 +++-- src/modules/cpufreq/Makefile.am | 5 +++-- src/modules/dropshadow/Makefile.am | 5 +++-- src/modules/exebuf/Makefile.am | 5 +++-- src/modules/fileman/Makefile.am | 5 +++-- src/modules/gadman/Makefile.am | 5 +++-- src/modules/ibar/Makefile.am | 5 +++-- src/modules/ibox/Makefile.am | 5 +++-- src/modules/layout/Makefile.am | 5 +++-- src/modules/mixer/Makefile.am | 5 +++-- src/modules/msgbus_lang/Makefile.am | 7 ++++--- src/modules/pager/Makefile.am | 5 +++-- src/modules/start/Makefile.am | 5 +++-- src/modules/temperature/Makefile.am | 5 +++-- src/modules/winlist/Makefile.am | 5 +++-- src/modules/wizard/Makefile.am | 13 +++++++------ src/preload/Makefile.am | 9 +++++---- 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 fi AC_MSG_RESULT([$e_cv_enable_files]) +PKG_CHECK_MODULES([EINA], [eina-0]) + PKG_CHECK_MODULES(E, [ evas 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) \ @cf_cflags@ \ @VALGRIND_CFLAGS@ \ @EDJE_DEF@ \ + @EINA_CFLAGS@ \ -DPACKAGE_BIN_DIR=\"@PACKAGE_BIN_DIR@\" \ -DPACKAGE_LIB_DIR=\"@PACKAGE_LIB_DIR@\" \ -DPACKAGE_DATA_DIR=\"@PACKAGE_DATA_DIR@\" \ @@ -308,14 +309,14 @@ enlightenment_SOURCES = \ e_main.c \ $(enlightenment_src) -enlightenment_LDFLAGS = -export-dynamic @e_libs@ @x_libs@ @dlopen_libs@ @cf_libs@ @VALGRIND_LIBS@ @E_DBUS_LIBS@ +enlightenment_LDFLAGS = -export-dynamic @e_libs@ @x_libs@ @dlopen_libs@ @cf_libs@ @VALGRIND_LIBS@ @E_DBUS_LIBS@ @EINA_LIBS@ enlightenment_remote_SOURCES = \ e.h \ e_ipc_codec.c \ e_remote_main.c -enlightenment_remote_LDFLAGS = @e_libs@ +enlightenment_remote_LDFLAGS = @e_libs@ @EINA_LIBS@ enlightenment_imc_SOURCES = \ e.h \ @@ -324,19 +325,19 @@ e_config_data.c \ e_imc_main.c # $(enlightenment_src) -enlightenment_imc_LDFLAGS = @e_libs@ @dlopen_libs@ +enlightenment_imc_LDFLAGS = @e_libs@ @dlopen_libs@ @EINA_LIBS@ enlightenment_start_SOURCES = \ e_start_main.c -enlightenment_start_LDFLAGS = @dlopen_libs@ +enlightenment_start_LDFLAGS = @dlopen_libs@ @EINA_LIBS@ enlightenment_thumb_SOURCES = \ e_thumb_main.c \ e_user.c \ e_sha1.c -enlightenment_thumb_LDFLAGS = @e_libs@ +enlightenment_thumb_LDFLAGS = @e_libs@ @EINA_LIBS@ enlightenment_fm_SOURCES = \ e_fm_main.c \ @@ -344,25 +345,25 @@ e_user.c \ e_sha1.c \ e_prefix.c -enlightenment_fm_LDFLAGS = @e_libs@ @dlopen_libs@ @E_DBUS_LIBS@ @E_HAL_LIBS@ +enlightenment_fm_LDFLAGS = @e_libs@ @dlopen_libs@ @E_DBUS_LIBS@ @E_HAL_LIBS@ @EINA_LIBS@ enlightenment_fm_CFLAGS = $(INCLUDES) @E_HAL_CFLAGS@ enlightenment_fm_op_SOURCES = \ e_fm_op.c -enlightenment_fm_op_LDFLAGS = @e_libs@ +enlightenment_fm_op_LDFLAGS = @e_libs@ @EINA_LIBS@ enlightenment_fm_op_CFLAGS = $(INCLUDES) enlightenment_sys_SOURCES = \ e_sys_main.c -enlightenment_sys_LDFLAGS = @e_libs@ +enlightenment_sys_LDFLAGS = @e_libs@ @EINA_LIBS@ enlightenment_init_SOURCES = \ e_init_main.c \ e_xinerama.c -enlightenment_init_LDFLAGS = @e_libs@ +enlightenment_init_LDFLAGS = @e_libs@ @EINA_LIBS@ setuid_root_mode = a=rx,u+xs install-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. \ -I$(top_srcdir)/src/lib \ -I$(top_srcdir)/src/modules \ @e_cflags@ \ - @cf_cflags@ + @cf_cflags@ \ + @EINA_CFLAGS@ pkgdir = $(libdir)/enlightenment/modules/$(MODULE)/$(MODULE_ARCH) pkg_LTLIBRARIES = module.la module_la_SOURCES = e_mod_main.c \ e_mod_main.h \ e_mod_config.c -module_la_LIBADD = @e_libs@ @cf_libs@ @dlopen_libs@ +module_la_LIBADD = @e_libs@ @cf_libs@ @dlopen_libs@ @EINA_LIBS@ module_la_LDFLAGS = -module -avoid-version module_la_DEPENDENCIES = $(top_builddir)/config.h 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. \ -I$(top_srcdir)/src/bin \ -I$(top_srcdir)/src/lib \ -I$(top_srcdir)/src/modules \ - @e_cflags@ + @e_cflags@ \ + @EINA_CFLAGS@ pkgdir = $(libdir)/enlightenment/modules/$(MODULE)/$(MODULE_ARCH) pkg_LTLIBRARIES = module.la module_la_SOURCES = e_mod_main.c \ e_mod_main.h -module_la_LIBADD = @e_libs@ @dlopen_libs@ +module_la_LIBADD = @e_libs@ @dlopen_libs@ @EINA_LIBS@ module_la_LDFLAGS = -module -avoid-version module_la_DEPENDENCIES = $(top_builddir)/config.h 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. \ -I$(top_srcdir)/src/bin \ -I$(top_srcdir)/src/lib \ -I$(top_srcdir)/src/modules \ - @e_cflags@ + @e_cflags@ \ + @EINA_CFLAGS@ pkgdir = $(libdir)/enlightenment/modules/$(MODULE)/$(MODULE_ARCH) pkg_LTLIBRARIES = module.la module_la_SOURCES = e_mod_main.c \ e_mod_main.h \ e_conf.c \ e_conf.h - -module_la_LIBADD = @e_libs@ @dlopen_libs@ + +module_la_LIBADD = @e_libs@ @dlopen_libs@ @EINA_LIBS@ module_la_LDFLAGS = -module -avoid-version module_la_DEPENDENCIES = $(top_builddir)/config.h 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. \ -I$(top_srcdir)/src/bin \ -I$(top_srcdir)/src/lib \ -I$(top_srcdir)/src/modules \ - @e_cflags@ + @e_cflags@ \ + @EINA_CFLAGS@ pkgdir = $(libdir)/enlightenment/modules/$(MODULE)/$(MODULE_ARCH) pkg_LTLIBRARIES = module.la module_la_SOURCES = e_mod_main.c \ e_mod_main.h \ e_int_config_apps.c \ - e_int_config_apps.h - -module_la_LIBADD = @e_libs@ @dlopen_libs@ + e_int_config_apps.h + +module_la_LIBADD = @e_libs@ @dlopen_libs@ @EINA_LIBS@ module_la_LDFLAGS = -module -avoid-version module_la_DEPENDENCIES = $(top_builddir)/config.h 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. \ -I$(top_srcdir)/src/bin \ -I$(top_srcdir)/src/lib \ -I$(top_srcdir)/src/modules \ - @e_cflags@ + @e_cflags@ \ + @EINA_CFLAGS@ pkgdir = $(libdir)/enlightenment/modules/$(MODULE)/$(MODULE_ARCH) pkg_LTLIBRARIES = module.la module_la_SOURCES = e_mod_main.c \ e_mod_main.h \ e_int_config_borders.c \ e_int_config_borders.h - -module_la_LIBADD = @e_libs@ @dlopen_libs@ + +module_la_LIBADD = @e_libs@ @dlopen_libs@ @EINA_LIBS@ module_la_LDFLAGS = -module -avoid-version module_la_DEPENDENCIES = $(top_builddir)/config.h 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. \ -I$(top_srcdir)/src/bin \ -I$(top_srcdir)/src/lib \ -I$(top_srcdir)/src/modules \ - @e_cflags@ + @e_cflags@ \ + @EINA_CFLAGS@ pkgdir = $(libdir)/enlightenment/modules/$(MODULE)/$(MODULE_ARCH) pkg_LTLIBRARIES = module.la module_la_SOURCES = e_mod_main.c \ e_mod_main.h \ e_int_config_clientlist.c \ - e_int_config_clientlist.h - -module_la_LIBADD = @e_libs@ @dlopen_libs@ + e_int_config_clientlist.h + +module_la_LIBADD = @e_libs@ @dlopen_libs@ @EINA_LIBS@ module_la_LDFLAGS = -module -avoid-version module_la_DEPENDENCIES = $(top_builddir)/config.h 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. \ -I$(top_srcdir)/src/bin \ -I$(top_srcdir)/src/lib \ -I$(top_srcdir)/src/modules \ - @e_cflags@ + @e_cflags@ \ + @EINA_CFLAGS@ pkgdir = $(libdir)/enlightenment/modules/$(MODULE)/$(MODULE_ARCH) pkg_LTLIBRARIES = module.la module_la_SOURCES = e_mod_main.c \ @@ -23,7 +24,7 @@ module_la_SOURCES = e_mod_main.c \ e_int_config_color_classes.c \ e_int_config_color_classes.h -module_la_LIBADD = @e_libs@ @dlopen_libs@ +module_la_LIBADD = @e_libs@ @dlopen_libs@ @EINA_LIBS@ module_la_LDFLAGS = -module -avoid-version module_la_DEPENDENCIES = $(top_builddir)/config.h 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. \ -I$(top_srcdir)/src/bin \ -I$(top_srcdir)/src/lib \ -I$(top_srcdir)/src/modules \ - @e_cflags@ + @e_cflags@ \ + @EINA_CFLAGS@ pkgdir = $(libdir)/enlightenment/modules/$(MODULE)/$(MODULE_ARCH) pkg_LTLIBRARIES = module.la module_la_SOURCES = e_mod_main.c \ e_mod_main.h \ e_int_config_desk.c \ - e_int_config_desk.h - -module_la_LIBADD = @e_libs@ @dlopen_libs@ + e_int_config_desk.h + +module_la_LIBADD = @e_libs@ @dlopen_libs@ @EINA_LIBS@ module_la_LDFLAGS = -module -avoid-version module_la_DEPENDENCIES = $(top_builddir)/config.h 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. \ -I$(top_srcdir)/src/bin \ -I$(top_srcdir)/src/lib \ -I$(top_srcdir)/src/modules \ - @e_cflags@ + @e_cflags@ \ + @EINA_CFLAGS@ pkgdir = $(libdir)/enlightenment/modules/$(MODULE)/$(MODULE_ARCH) pkg_LTLIBRARIES = module.la module_la_SOURCES = e_mod_main.c \ e_mod_main.h \ e_int_config_desklock.c \ e_int_config_desklock.h - -module_la_LIBADD = @e_libs@ @dlopen_libs@ + +module_la_LIBADD = @e_libs@ @dlopen_libs@ @EINA_LIBS@ module_la_LDFLAGS = -module -avoid-version module_la_DEPENDENCIES = $(top_builddir)/config.h 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. \ -I$(top_srcdir)/src/bin \ -I$(top_srcdir)/src/lib \ -I$(top_srcdir)/src/modules \ - @e_cflags@ + @e_cflags@ \ + @EINA_CFLAGS@ pkgdir = $(libdir)/enlightenment/modules/$(MODULE)/$(MODULE_ARCH) pkg_LTLIBRARIES = module.la module_la_SOURCES = e_mod_main.c \ e_mod_main.h \ e_int_config_desks.c \ - e_int_config_desks.h - -module_la_LIBADD = @e_libs@ @dlopen_libs@ + e_int_config_desks.h + +module_la_LIBADD = @e_libs@ @dlopen_libs@ @EINA_LIBS@ module_la_LDFLAGS = -module -avoid-version module_la_DEPENDENCIES = $(top_builddir)/config.h 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. \ -I$(top_srcdir)/src/bin \ -I$(top_srcdir)/src/lib \ -I$(top_srcdir)/src/modules \ - @e_cflags@ + @e_cflags@ \ + @EINA_CFLAGS@ pkgdir = $(libdir)/enlightenment/modules/$(MODULE)/$(MODULE_ARCH) pkg_LTLIBRARIES = module.la module_la_SOURCES = e_mod_main.c \ @@ -23,7 +24,7 @@ module_la_SOURCES = e_mod_main.c \ e_int_config_dialogs.c \ e_int_config_dialogs.h -module_la_LIBADD = @e_libs@ @dlopen_libs@ +module_la_LIBADD = @e_libs@ @dlopen_libs@ @EINA_LIBS@ module_la_LDFLAGS = -module -avoid-version module_la_DEPENDENCIES = $(top_builddir)/config.h 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. \ -I$(top_srcdir)/src/bin \ -I$(top_srcdir)/src/lib \ -I$(top_srcdir)/src/modules \ - @e_cflags@ + @e_cflags@ \ + @EINA_CFLAGS@ pkgdir = $(libdir)/enlightenment/modules/$(MODULE)/$(MODULE_ARCH) pkg_LTLIBRARIES = module.la module_la_SOURCES = e_mod_main.c \ @@ -23,7 +24,7 @@ module_la_SOURCES = e_mod_main.c \ e_int_config_display.c \ e_int_config_display.h -module_la_LIBADD = @e_libs@ @dlopen_libs@ +module_la_LIBADD = @e_libs@ @dlopen_libs@ @EINA_LIBS@ module_la_LDFLAGS = -module -avoid-version module_la_DEPENDENCIES = $(top_builddir)/config.h 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. \ -I$(top_srcdir)/src/bin \ -I$(top_srcdir)/src/lib \ -I$(top_srcdir)/src/modules \ - @e_cflags@ + @e_cflags@ @EINA_CFLAGS@ pkgdir = $(libdir)/enlightenment/modules/$(MODULE)/$(MODULE_ARCH) pkg_LTLIBRARIES = module.la module_la_SOURCES = e_mod_main.c \ @@ -23,7 +23,7 @@ module_la_SOURCES = e_mod_main.c \ e_int_config_dpms.c \ e_int_config_dpms.h -module_la_LIBADD = @e_libs@ @dlopen_libs@ +module_la_LIBADD = @e_libs@ @dlopen_libs@ @EINA_LIBS@ module_la_LDFLAGS = -module -avoid-version module_la_DEPENDENCIES = $(top_builddir)/config.h 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. \ -I$(top_srcdir)/src/bin \ -I$(top_srcdir)/src/lib \ -I$(top_srcdir)/src/modules \ - @e_cflags@ + @e_cflags@ \ + @EINA_CFLAGS@ pkgdir = $(libdir)/enlightenment/modules/$(MODULE)/$(MODULE_ARCH) pkg_LTLIBRARIES = module.la module_la_SOURCES = e_mod_main.c \ e_mod_main.h \ e_int_config_engine.c \ e_int_config_engine.h - -module_la_LIBADD = @e_libs@ @dlopen_libs@ + +module_la_LIBADD = @e_libs@ @dlopen_libs@ @EINA_LIBS@ module_la_LDFLAGS = -module -avoid-version module_la_DEPENDENCIES = $(top_builddir)/config.h 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. \ -I$(top_srcdir)/src/bin \ -I$(top_srcdir)/src/lib \ -I$(top_srcdir)/src/modules \ - @e_cflags@ + @e_cflags@ \ + @EINA_CFLAGS@ pkgdir = $(libdir)/enlightenment/modules/$(MODULE)/$(MODULE_ARCH) pkg_LTLIBRARIES = module.la module_la_SOURCES = e_mod_main.c \ @@ -23,7 +24,7 @@ module_la_SOURCES = e_mod_main.c \ e_int_config_exebuf.c \ e_int_config_exebuf.h -module_la_LIBADD = @e_libs@ @dlopen_libs@ +module_la_LIBADD = @e_libs@ @dlopen_libs@ @EINA_LIBS@ module_la_LDFLAGS = -module -avoid-version module_la_DEPENDENCIES = $(top_builddir)/config.h 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. \ -I$(top_srcdir)/src/bin \ -I$(top_srcdir)/src/lib \ -I$(top_srcdir)/src/modules \ - @e_cflags@ + @e_cflags@ \ + @EINA_CFLAGS@ pkgdir = $(libdir)/enlightenment/modules/$(MODULE)/$(MODULE_ARCH) pkg_LTLIBRARIES = module.la module_la_SOURCES = e_mod_main.c \ e_mod_main.h \ e_int_config_fonts.c \ e_int_config_fonts.h - -module_la_LIBADD = @e_libs@ @dlopen_libs@ + +module_la_LIBADD = @e_libs@ @dlopen_libs@ @EINA_LIBS@ module_la_LDFLAGS = -module -avoid-version module_la_DEPENDENCIES = $(top_builddir)/config.h 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. \ -I$(top_srcdir)/src/bin \ -I$(top_srcdir)/src/lib \ -I$(top_srcdir)/src/modules \ - @e_cflags@ + @e_cflags@ \ + @EINA_CFLAGS@ pkgdir = $(libdir)/enlightenment/modules/$(MODULE)/$(MODULE_ARCH) pkg_LTLIBRARIES = module.la module_la_SOURCES = e_mod_main.c \ @@ -23,7 +24,7 @@ module_la_SOURCES = e_mod_main.c \ e_int_config_icon_themes.c \ e_int_config_icon_themes.h -module_la_LIBADD = @e_libs@ @dlopen_libs@ +module_la_LIBADD = @e_libs@ @dlopen_libs@ @EINA_LIBS@ module_la_LDFLAGS = -module -avoid-version module_la_DEPENDENCIES = $(top_builddir)/config.h 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. \ -I$(top_srcdir)/src/bin \ -I$(top_srcdir)/src/lib \ -I$(top_srcdir)/src/modules \ - @e_cflags@ + @e_cflags@ \ + @EINA_CFLAGS@ pkgdir = $(libdir)/enlightenment/modules/$(MODULE)/$(MODULE_ARCH) pkg_LTLIBRARIES = module.la module_la_SOURCES = e_mod_main.c \ @@ -25,7 +26,7 @@ module_la_SOURCES = e_mod_main.c \ e_int_config_imc.c \ e_int_config_imc.h -module_la_LIBADD = @e_libs@ @dlopen_libs@ +module_la_LIBADD = @e_libs@ @dlopen_libs@ @EINA_LIBS@ module_la_LDFLAGS = -module -avoid-version module_la_DEPENDENCIES = $(top_builddir)/config.h 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. \ -I$(top_srcdir)/src/bin \ -I$(top_srcdir)/src/lib \ -I$(top_srcdir)/src/modules \ - @e_cflags@ + @e_cflags@ \ + @EINA_CFLAGS@ pkgdir = $(libdir)/enlightenment/modules/$(MODULE)/$(MODULE_ARCH) pkg_LTLIBRARIES = module.la module_la_SOURCES = e_mod_main.c \ @@ -23,7 +24,7 @@ module_la_SOURCES = e_mod_main.c \ e_int_config_interaction.c \ e_int_config_interaction.h -module_la_LIBADD = @e_libs@ @dlopen_libs@ +module_la_LIBADD = @e_libs@ @dlopen_libs@ @EINA_LIBS@ module_la_LDFLAGS = -module -avoid-version module_la_DEPENDENCIES = $(top_builddir)/config.h 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. \ -I$(top_srcdir)/src/bin \ -I$(top_srcdir)/src/lib \ -I$(top_srcdir)/src/modules \ - @e_cflags@ + @e_cflags@ \ + @EINA_CFLAGS@ pkgdir = $(libdir)/enlightenment/modules/$(MODULE)/$(MODULE_ARCH) pkg_LTLIBRARIES = module.la module_la_SOURCES = e_mod_main.c \ @@ -23,7 +24,7 @@ module_la_SOURCES = e_mod_main.c \ e_int_config_intl.c \ e_int_config_intl.h -module_la_LIBADD = @e_libs@ @dlopen_libs@ +module_la_LIBADD = @e_libs@ @dlopen_libs@ @EINA_LIBS@ module_la_LDFLAGS = -module -avoid-version module_la_DEPENDENCIES = $(top_builddir)/config.h 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. \ -I$(top_srcdir)/src/bin \ -I$(top_srcdir)/src/lib \ -I$(top_srcdir)/src/modules \ - @e_cflags@ + @e_cflags@ \ + @EINA_CFLAGS@ pkgdir = $(libdir)/enlightenment/modules/$(MODULE)/$(MODULE_ARCH) pkg_LTLIBRARIES = module.la module_la_SOURCES = e_mod_main.c \ @@ -23,7 +24,7 @@ module_la_SOURCES = e_mod_main.c \ e_int_config_keybindings.c \ e_int_config_keybindings.h -module_la_LIBADD = @e_libs@ @dlopen_libs@ +module_la_LIBADD = @e_libs@ @dlopen_libs@ @EINA_LIBS@ module_la_LDFLAGS = -module -avoid-version module_la_DEPENDENCIES = $(top_builddir)/config.h 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. \ -I$(top_srcdir)/src/bin \ -I$(top_srcdir)/src/lib \ -I$(top_srcdir)/src/modules \ - @e_cflags@ + @e_cflags@ \ + @EINA_CFLAGS@ pkgdir = $(libdir)/enlightenment/modules/$(MODULE)/$(MODULE_ARCH) pkg_LTLIBRARIES = module.la module_la_SOURCES = e_mod_main.c \ @@ -23,7 +24,7 @@ module_la_SOURCES = e_mod_main.c \ e_int_config_menus.c \ e_int_config_menus.h -module_la_LIBADD = @e_libs@ @dlopen_libs@ +module_la_LIBADD = @e_libs@ @dlopen_libs@ @EINA_LIBS@ module_la_LDFLAGS = -module -avoid-version module_la_DEPENDENCIES = $(top_builddir)/config.h 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. \ -I$(top_srcdir)/src/bin \ -I$(top_srcdir)/src/lib \ -I$(top_srcdir)/src/modules \ - @e_cflags@ + @e_cflags@ \ + @EINA_CFLAGS@ pkgdir = $(libdir)/enlightenment/modules/$(MODULE)/$(MODULE_ARCH) pkg_LTLIBRARIES = module.la module_la_SOURCES = e_mod_main.c \ @@ -24,8 +25,8 @@ module_la_SOURCES = e_mod_main.c \ e_int_config_mime.h \ e_int_config_mime_edit.c \ e_int_config_mime_edit.h - -module_la_LIBADD = @e_libs@ @dlopen_libs@ + +module_la_LIBADD = @e_libs@ @dlopen_libs@ @EINA_LIBS@ module_la_LDFLAGS = -module -avoid-version module_la_DEPENDENCIES = $(top_builddir)/config.h 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. \ -I$(top_srcdir)/src/bin \ -I$(top_srcdir)/src/lib \ -I$(top_srcdir)/src/modules \ - @e_cflags@ + @e_cflags@ \ + @EINA_CFLAGS@ pkgdir = $(libdir)/enlightenment/modules/$(MODULE)/$(MODULE_ARCH) pkg_LTLIBRARIES = module.la module_la_SOURCES = e_mod_main.c \ @@ -23,7 +24,7 @@ module_la_SOURCES = e_mod_main.c \ e_int_config_mouse.c \ e_int_config_mouse.h -module_la_LIBADD = @e_libs@ @dlopen_libs@ +module_la_LIBADD = @e_libs@ @dlopen_libs@ @EINA_LIBS@ module_la_LDFLAGS = -module -avoid-version module_la_DEPENDENCIES = $(top_builddir)/config.h 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. \ -I$(top_srcdir)/src/bin \ -I$(top_srcdir)/src/lib \ -I$(top_srcdir)/src/modules \ - @e_cflags@ + @e_cflags@ \ + @EINA_CFLAGS@ pkgdir = $(libdir)/enlightenment/modules/$(MODULE)/$(MODULE_ARCH) pkg_LTLIBRARIES = module.la module_la_SOURCES = e_mod_main.c \ @@ -23,7 +24,7 @@ module_la_SOURCES = e_mod_main.c \ e_int_config_cursor.c \ e_int_config_cursor.h -module_la_LIBADD = @e_libs@ @dlopen_libs@ +module_la_LIBADD = @e_libs@ @dlopen_libs@ @EINA_LIBS@ module_la_LDFLAGS = -module -avoid-version module_la_DEPENDENCIES = $(top_builddir)/config.h 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. \ -I$(top_srcdir)/src/bin \ -I$(top_srcdir)/src/lib \ -I$(top_srcdir)/src/modules \ - @e_cflags@ + @e_cflags@ \ + @EINA_CFLAGS@ pkgdir = $(libdir)/enlightenment/modules/$(MODULE)/$(MODULE_ARCH) pkg_LTLIBRARIES = module.la module_la_SOURCES = e_mod_main.c \ e_mod_main.h \ e_int_config_mousebindings.c \ e_int_config_mousebindings.h - -module_la_LIBADD = @e_libs@ @dlopen_libs@ + +module_la_LIBADD = @e_libs@ @dlopen_libs@ @EINA_LIBS@ module_la_LDFLAGS = -module -avoid-version module_la_DEPENDENCIES = $(top_builddir)/config.h 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. \ -I$(top_srcdir)/src/bin \ -I$(top_srcdir)/src/lib \ -I$(top_srcdir)/src/modules \ - @e_cflags@ + @e_cflags@ \ + @EINA_CFLAGS@ pkgdir = $(libdir)/enlightenment/modules/$(MODULE)/$(MODULE_ARCH) pkg_LTLIBRARIES = module.la module_la_SOURCES = e_mod_main.c \ e_mod_main.h \ e_int_config_paths.c \ - e_int_config_paths.h - -module_la_LIBADD = @e_libs@ @dlopen_libs@ + e_int_config_paths.h + +module_la_LIBADD = @e_libs@ @dlopen_libs@ @EINA_LIBS@ module_la_LDFLAGS = -module -avoid-version module_la_DEPENDENCIES = $(top_builddir)/config.h 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. \ -I$(top_srcdir)/src/bin \ -I$(top_srcdir)/src/lib \ -I$(top_srcdir)/src/modules \ - @e_cflags@ + @e_cflags@ \ + @EINA_CFLAGS@ pkgdir = $(libdir)/enlightenment/modules/$(MODULE)/$(MODULE_ARCH) pkg_LTLIBRARIES = module.la module_la_SOURCES = e_mod_main.c \ e_mod_main.h \ e_int_config_performance.c \ - e_int_config_performance.h - -module_la_LIBADD = @e_libs@ @dlopen_libs@ + e_int_config_performance.h + +module_la_LIBADD = @e_libs@ @dlopen_libs@ @EINA_LIBS@ module_la_LDFLAGS = -module -avoid-version module_la_DEPENDENCIES = $(top_builddir)/config.h 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. \ -I$(top_srcdir)/src/bin \ -I$(top_srcdir)/src/lib \ -I$(top_srcdir)/src/modules \ - @e_cflags@ + @e_cflags@ \ + @EINA_CFLAGS@ pkgdir = $(libdir)/enlightenment/modules/$(MODULE)/$(MODULE_ARCH) pkg_LTLIBRARIES = module.la module_la_SOURCES = e_mod_main.c \ e_mod_main.h \ e_int_config_profiles.c \ e_int_config_profiles.h - -module_la_LIBADD = @e_libs@ @dlopen_libs@ + +module_la_LIBADD = @e_libs@ @dlopen_libs@ @EINA_LIBS@ module_la_LDFLAGS = -module -avoid-version module_la_DEPENDENCIES = $(top_builddir)/config.h 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. \ -I$(top_srcdir)/src/bin \ -I$(top_srcdir)/src/lib \ -I$(top_srcdir)/src/modules \ - @e_cflags@ + @e_cflags@ \ + @EINA_CFLAGS@ pkgdir = $(libdir)/enlightenment/modules/$(MODULE)/$(MODULE_ARCH) pkg_LTLIBRARIES = module.la module_la_SOURCES = e_mod_main.c \ @@ -23,7 +24,7 @@ module_la_SOURCES = e_mod_main.c \ e_int_config_scale.c \ e_int_config_scale.h -module_la_LIBADD = @e_libs@ @dlopen_libs@ +module_la_LIBADD = @e_libs@ @dlopen_libs@ @EINA_LIBS@ module_la_LDFLAGS = -module -avoid-version module_la_DEPENDENCIES = $(top_builddir)/config.h 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. \ -I$(top_srcdir)/src/bin \ -I$(top_srcdir)/src/lib \ -I$(top_srcdir)/src/modules \ - @e_cflags@ + @e_cflags@ \ + @EINA_CFLAGS@ pkgdir = $(libdir)/enlightenment/modules/$(MODULE)/$(MODULE_ARCH) pkg_LTLIBRARIES = module.la module_la_SOURCES = e_mod_main.c \ @@ -23,7 +24,7 @@ module_la_SOURCES = e_mod_main.c \ e_int_config_screensaver.c \ e_int_config_screensaver.h -module_la_LIBADD = @e_libs@ @dlopen_libs@ +module_la_LIBADD = @e_libs@ @dlopen_libs@ @EINA_LIBS@ module_la_LDFLAGS = -module -avoid-version module_la_DEPENDENCIES = $(top_builddir)/config.h 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. \ -I$(top_srcdir)/src/bin \ -I$(top_srcdir)/src/lib \ -I$(top_srcdir)/src/modules \ - @e_cflags@ + @e_cflags@ \ + @EINA_CFLAGS@ pkgdir = $(libdir)/enlightenment/modules/$(MODULE)/$(MODULE_ARCH) pkg_LTLIBRARIES = module.la module_la_SOURCES = e_mod_main.c \ @@ -23,7 +24,7 @@ module_la_SOURCES = e_mod_main.c \ e_int_config_shelf.c \ e_int_config_shelf.h -module_la_LIBADD = @e_libs@ @dlopen_libs@ +module_la_LIBADD = @e_libs@ @dlopen_libs@ @EINA_LIBS@ module_la_LDFLAGS = -module -avoid-version module_la_DEPENDENCIES = $(top_builddir)/config.h 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. \ -I$(top_srcdir)/src/bin \ -I$(top_srcdir)/src/lib \ -I$(top_srcdir)/src/modules \ - @e_cflags@ + @e_cflags@ \ + @EINA_CFLAGS@ pkgdir = $(libdir)/enlightenment/modules/$(MODULE)/$(MODULE_ARCH) pkg_LTLIBRARIES = module.la module_la_SOURCES = e_mod_main.c \ @@ -23,7 +24,7 @@ module_la_SOURCES = e_mod_main.c \ e_int_config_startup.c \ e_int_config_startup.h -module_la_LIBADD = @e_libs@ @dlopen_libs@ +module_la_LIBADD = @e_libs@ @dlopen_libs@ @EINA_LIBS@ module_la_LDFLAGS = -module -avoid-version module_la_DEPENDENCIES = $(top_builddir)/config.h 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. \ -I$(top_srcdir)/src/bin \ -I$(top_srcdir)/src/lib \ -I$(top_srcdir)/src/modules \ - @e_cflags@ + @e_cflags@ \ + @EINA_CFLAGS@ pkgdir = $(libdir)/enlightenment/modules/$(MODULE)/$(MODULE_ARCH) pkg_LTLIBRARIES = module.la module_la_SOURCES = e_mod_main.c \ @@ -27,7 +28,7 @@ module_la_SOURCES = e_mod_main.c \ e_int_config_theme_web.c \ e_int_config_theme_web.h -module_la_LIBADD = @e_libs@ @dlopen_libs@ +module_la_LIBADD = @e_libs@ @dlopen_libs@ @EINA_LIBS@ module_la_LDFLAGS = -module -avoid-version module_la_DEPENDENCIES = $(top_builddir)/config.h 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. \ -I$(top_srcdir)/src/bin \ -I$(top_srcdir)/src/lib \ -I$(top_srcdir)/src/modules \ - @e_cflags@ + @e_cflags@ \ + @EINA_CFLAGS@ pkgdir = $(libdir)/enlightenment/modules/$(MODULE)/$(MODULE_ARCH) pkg_LTLIBRARIES = module.la module_la_SOURCES = e_mod_main.c \ @@ -23,7 +24,7 @@ module_la_SOURCES = e_mod_main.c \ e_int_config_transitions.c \ e_int_config_transitions.h -module_la_LIBADD = @e_libs@ @dlopen_libs@ +module_la_LIBADD = @e_libs@ @dlopen_libs@ @EINA_LIBS@ module_la_LDFLAGS = -module -avoid-version module_la_DEPENDENCIES = $(top_builddir)/config.h 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. \ -I$(top_srcdir)/src/bin \ -I$(top_srcdir)/src/lib \ -I$(top_srcdir)/src/modules \ - @e_cflags@ + @e_cflags@ \ + @EINA_CFLAGS@ pkgdir = $(libdir)/enlightenment/modules/$(MODULE)/$(MODULE_ARCH) pkg_LTLIBRARIES = module.la module_la_SOURCES = e_mod_main.c \ @@ -29,7 +30,7 @@ module_la_SOURCES = e_mod_main.c \ e_int_config_wallpaper_web.c \ e_int_config_wallpaper_web.h -module_la_LIBADD = @e_libs@ @dlopen_libs@ +module_la_LIBADD = @e_libs@ @dlopen_libs@ @EINA_LIBS@ module_la_LDFLAGS = -module -avoid-version module_la_DEPENDENCIES = $(top_builddir)/config.h 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. \ -I$(top_srcdir)/src/bin \ -I$(top_srcdir)/src/lib \ -I$(top_srcdir)/src/modules \ - @e_cflags@ + @e_cflags@ \ + @EINA_CFLAGS@ pkgdir = $(libdir)/enlightenment/modules/$(MODULE)/$(MODULE_ARCH) pkg_LTLIBRARIES = module.la module_la_SOURCES = e_mod_main.c \ @@ -23,7 +24,7 @@ module_la_SOURCES = e_mod_main.c \ e_int_config_window_display.c \ e_int_config_window_display.h -module_la_LIBADD = @e_libs@ @dlopen_libs@ +module_la_LIBADD = @e_libs@ @dlopen_libs@ @EINA_LIBS@ module_la_LDFLAGS = -module -avoid-version module_la_DEPENDENCIES = $(top_builddir)/config.h 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. \ -I$(top_srcdir)/src/bin \ -I$(top_srcdir)/src/lib \ -I$(top_srcdir)/src/modules \ - @e_cflags@ + @e_cflags@ \ + @EINA_CFLAGS@ pkgdir = $(libdir)/enlightenment/modules/$(MODULE)/$(MODULE_ARCH) pkg_LTLIBRARIES = module.la module_la_SOURCES = e_mod_main.c \ e_mod_main.h \ e_int_config_focus.c \ e_int_config_focus.h - -module_la_LIBADD = @e_libs@ @dlopen_libs@ + +module_la_LIBADD = @e_libs@ @dlopen_libs@ @EINA_LIBS@ module_la_LDFLAGS = -module -avoid-version module_la_DEPENDENCIES = $(top_builddir)/config.h 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. \ -I$(top_srcdir)/src/bin \ -I$(top_srcdir)/src/lib \ -I$(top_srcdir)/src/modules \ - @e_cflags@ + @e_cflags@ \ + @EINA_CFLAGS@ pkgdir = $(libdir)/enlightenment/modules/$(MODULE)/$(MODULE_ARCH) pkg_LTLIBRARIES = module.la module_la_SOURCES = e_mod_main.c \ @@ -25,7 +26,7 @@ module_la_SOURCES = e_mod_main.c \ e_int_config_window_stacking.c \ e_int_config_window_manipulation.h -module_la_LIBADD = @e_libs@ @dlopen_libs@ +module_la_LIBADD = @e_libs@ @dlopen_libs@ @EINA_LIBS@ module_la_LDFLAGS = -module -avoid-version module_la_DEPENDENCIES = $(top_builddir)/config.h 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. \ -I$(top_srcdir)/src/bin \ -I$(top_srcdir)/src/lib \ -I$(top_srcdir)/src/modules \ - @e_cflags@ + @e_cflags@ \ + @EINA_CFLAGS@ pkgdir = $(libdir)/enlightenment/modules/$(MODULE)/$(MODULE_ARCH) pkg_LTLIBRARIES = module.la module_la_SOURCES = e_mod_main.c \ e_mod_main.h \ e_int_config_remembers.c \ e_int_config_remembers.h - -module_la_LIBADD = @e_libs@ @dlopen_libs@ + +module_la_LIBADD = @e_libs@ @dlopen_libs@ @EINA_LIBS@ module_la_LDFLAGS = -module -avoid-version module_la_DEPENDENCIES = $(top_builddir)/config.h 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. \ -I$(top_srcdir)/src/bin \ -I$(top_srcdir)/src/lib \ -I$(top_srcdir)/src/modules \ - @e_cflags@ + @e_cflags@ \ + @EINA_CFLAGS@ pkgdir = $(libdir)/enlightenment/modules/$(MODULE)/$(MODULE_ARCH) pkg_LTLIBRARIES = module.la module_la_SOURCES = e_mod_main.c \ e_mod_main.h \ e_int_config_winlist.c \ - e_int_config_winlist.h - -module_la_LIBADD = @e_libs@ @dlopen_libs@ + e_int_config_winlist.h + +module_la_LIBADD = @e_libs@ @dlopen_libs@ @EINA_LIBS@ module_la_LDFLAGS = -module -avoid-version module_la_DEPENDENCIES = $(top_builddir)/config.h 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. \ -I$(top_srcdir)/src/bin \ -I$(top_srcdir)/src/lib \ -I$(top_srcdir)/src/modules \ - @e_cflags@ + @e_cflags@ \ + @EINA_CFLAGS@ pkgdir = $(libdir)/enlightenment/modules/$(MODULE)/$(MODULE_ARCH) @@ -27,7 +28,7 @@ module_la_SOURCES = e_mod_main.h \ e_iface.h \ e_iface.c -module_la_LIBADD = @e_libs@ @dlopen_libs@ @E_DBUS_LIBS@ +module_la_LIBADD = @e_libs@ @dlopen_libs@ @E_DBUS_LIBS@ @EINA_LIBS@ module_la_LDFLAGS = -module -avoid-version module_la_DEPENDENCIES = $(top_builddir)/config.h endif 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. \ -I$(top_srcdir)/src/bin \ -I$(top_srcdir)/src/lib \ -I$(top_srcdir)/src/modules \ - @e_cflags@ + @e_cflags@ \ + @EINA_CFLAGS@ pkgdir = $(libdir)/enlightenment/modules/$(MODULE)/$(MODULE_ARCH) pkg_LTLIBRARIES = module.la module_la_SOURCES = e_mod_main.c \ e_mod_main.h -module_la_LIBADD = @e_libs@ @dlopen_libs@ +module_la_LIBADD = @e_libs@ @dlopen_libs@ @EINA_LIBS@ module_la_LDFLAGS = -module -avoid-version module_la_DEPENDENCIES = $(top_builddir)/config.h 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. \ -I$(top_srcdir)/src/bin \ -I$(top_srcdir)/src/lib \ -I$(top_srcdir)/src/modules \ - @e_cflags@ + @e_cflags@ \ + @EINA_CFLAGS@ pkgdir = $(libdir)/enlightenment/modules/$(MODULE)/$(MODULE_ARCH) pkg_LTLIBRARIES = module.la module_la_SOURCES = e_mod_main.c \ e_mod_main.h \ e_mod_config.c \ e_mod_config.h -module_la_LIBADD = @e_libs@ @dlopen_libs@ +module_la_LIBADD = @e_libs@ @dlopen_libs@ @EINA_LIBS@ module_la_LDFLAGS = -module -avoid-version module_la_DEPENDENCIES = $(top_builddir)/config.h 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. \ -I$(top_srcdir)/src/bin \ -I$(top_srcdir)/src/lib \ -I$(top_srcdir)/src/modules \ - @e_cflags@ + @e_cflags@ \ + @EINA_CFLAGS@ pkgdir = $(libdir)/enlightenment/modules/$(MODULE)/$(MODULE_ARCH) pkg_LTLIBRARIES = module.la module_la_SOURCES = e_mod_main.c \ @@ -23,7 +24,7 @@ module_la_SOURCES = e_mod_main.c \ e_exebuf.c \ e_exebuf.h -module_la_LIBADD = @e_libs@ @dlopen_libs@ +module_la_LIBADD = @e_libs@ @dlopen_libs@ @EINA_LIBS@ module_la_LDFLAGS = -module -avoid-version module_la_DEPENDENCIES = $(top_builddir)/config.h 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. \ -I$(top_srcdir)/src/bin \ -I$(top_srcdir)/src/lib \ -I$(top_srcdir)/src/modules \ - @e_cflags@ + @e_cflags@ \ + @EINA_CFLAGS@ pkgdir = $(libdir)/enlightenment/modules/$(MODULE)/$(MODULE_ARCH) pkg_LTLIBRARIES = module.la module_la_SOURCES = e_mod_main.c \ @@ -25,7 +26,7 @@ module_la_SOURCES = e_mod_main.c \ e_fwin.c \ e_fwin.h -module_la_LIBADD = @e_libs@ @dlopen_libs@ +module_la_LIBADD = @e_libs@ @dlopen_libs@ @EINA_LIBS@ module_la_LDFLAGS = -module -avoid-version module_la_DEPENDENCIES = $(top_builddir)/config.h 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. \ -I$(top_srcdir)/src/bin \ -I$(top_srcdir)/src/lib \ -I$(top_srcdir)/src/modules \ - @e_cflags@ + @e_cflags@ \ + @EINA_CFLAGS@ pkgdir = $(libdir)/enlightenment/modules/$(MODULE)/$(MODULE_ARCH) pkg_LTLIBRARIES = module.la module_la_SOURCES = e_mod_main.c \ @@ -23,7 +24,7 @@ module_la_SOURCES = e_mod_main.c \ e_mod_config.h \ e_mod_gadman.c \ e_mod_gadman.h -module_la_LIBADD = @e_libs@ @dlopen_libs@ +module_la_LIBADD = @e_libs@ @dlopen_libs@ @EINA_LIBS@ module_la_LDFLAGS = -module -avoid-version module_la_DEPENDENCIES = $(top_builddir)/config.h 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. \ -I$(top_srcdir)/src/modules/$(MODULE) \ -I$(top_srcdir)/src/bin \ -I$(top_srcdir)/src/lib \ - @e_cflags@ + @e_cflags@ \ + @EINA_CFLAGS@ pkgdir = $(libdir)/enlightenment/modules/$(MODULE)/$(MODULE_ARCH) pkg_LTLIBRARIES = module.la module_la_SOURCES = e_mod_main.c \ e_mod_main.h \ e_mod_config.c -module_la_LIBADD = @e_libs@ @dlopen_libs@ +module_la_LIBADD = @e_libs@ @dlopen_libs@ @EINA_LIBS@ module_la_LDFLAGS = -module -avoid-version module_la_DEPENDENCIES = $(top_builddir)/config.h 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. \ -I$(top_srcdir)/src/bin \ -I$(top_srcdir)/src/lib \ -I$(top_srcdir)/src/modules \ - @e_cflags@ + @e_cflags@ \ + @EINA_CFLAGS@ pkgdir = $(libdir)/enlightenment/modules/$(MODULE)/$(MODULE_ARCH) pkg_LTLIBRARIES = module.la module_la_SOURCES = e_mod_main.c \ e_mod_main.h \ e_mod_config.c -module_la_LIBADD = @e_libs@ @dlopen_libs@ +module_la_LIBADD = @e_libs@ @dlopen_libs@ @EINA_LIBS@ module_la_LDFLAGS = -module -avoid-version module_la_DEPENDENCIES = $(top_builddir)/config.h 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. \ -I$(top_srcdir)/src/bin \ -I$(top_srcdir)/src/lib \ -I$(top_srcdir)/src/modules \ - @e_cflags@ + @e_cflags@ \ + @EINA_CFLAGS@ pkgdir = $(libdir)/enlightenment/modules/$(MODULE)/$(MODULE_ARCH) pkg_LTLIBRARIES = module.la module_la_SOURCES = e_mod_main.c \ e_mod_main.h -module_la_LIBADD = @e_libs@ @dlopen_libs@ +module_la_LIBADD = @e_libs@ @dlopen_libs@ @EINA_LIBS@ module_la_LDFLAGS = -module -avoid-version module_la_DEPENDENCIES = $(top_builddir)/config.h 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. \ -I$(top_srcdir)/src/bin \ -I$(top_srcdir)/src/lib \ -I$(top_srcdir)/src/modules \ - @e_cflags@ @SOUND_CFLAGS@ + @e_cflags@ @SOUND_CFLAGS@ \ + @EINA_CFLAGS@ pkgdir = $(libdir)/enlightenment/modules/$(MODULE)/$(MODULE_ARCH) pkg_LTLIBRARIES = module.la @@ -31,7 +32,7 @@ else module_la_SOURCES += sys_dummy.c endif -module_la_LIBADD = @SOUND_LDFLAGS@ @e_libs@ @dlopen_libs@ +module_la_LIBADD = @SOUND_LDFLAGS@ @e_libs@ @dlopen_libs@ @EINA_LIBS@ module_la_LDFLAGS = -module -avoid-version module_la_DEPENDENCIES = $(top_builddir)/config.h 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. \ -I$(top_srcdir)/src/bin \ -I$(top_srcdir)/src/lib \ -I$(top_srcdir)/src/modules \ - @e_cflags@ + @e_cflags@ \ + @EINA_CFLAGS@ pkgdir = $(libdir)/enlightenment/modules/$(MODULE)/$(MODULE_ARCH) @@ -25,8 +26,8 @@ EXTRA_DIST = $(files_DATA) pkg_LTLIBRARIES = module.la module_la_SOURCES = e_mod_main.c \ e_mod_main.h - -module_la_LIBADD = @e_libs@ @dlopen_libs@ @E_DBUS_LIBS@ + +module_la_LIBADD = @e_libs@ @dlopen_libs@ @E_DBUS_LIBS@ @EINA_LIBS@ module_la_LDFLAGS = -module -avoid-version module_la_DEPENDENCIES = $(top_builddir)/config.h endif 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. \ -I$(top_srcdir)/src/bin \ -I$(top_srcdir)/src/lib \ -I$(top_srcdir)/src/modules \ - @e_cflags@ + @e_cflags@ \ + @EINA_CFLAGS@ pkgdir = $(libdir)/enlightenment/modules/$(MODULE)/$(MODULE_ARCH) pkg_LTLIBRARIES = module.la module_la_SOURCES = e_mod_main.c \ e_mod_main.h \ e_mod_config.c -module_la_LIBADD = @e_libs@ @dlopen_libs@ +module_la_LIBADD = @e_libs@ @dlopen_libs@ @EINA_LIBS@ module_la_LDFLAGS = -module -avoid-version module_la_DEPENDENCIES = $(top_builddir)/config.h 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. \ -I$(top_srcdir)/src/bin \ -I$(top_srcdir)/src/lib \ -I$(top_srcdir)/src/modules \ - @e_cflags@ + @e_cflags@ \ + @EINA_CFLAGS@ pkgdir = $(libdir)/enlightenment/modules/$(MODULE)/$(MODULE_ARCH) pkg_LTLIBRARIES = module.la module_la_SOURCES = e_mod_main.c \ e_mod_main.h -module_la_LIBADD = @e_libs@ @dlopen_libs@ +module_la_LIBADD = @e_libs@ @dlopen_libs@ @EINA_LIBS@ module_la_LDFLAGS = -module -avoid-version module_la_DEPENDENCIES = $(top_builddir)/config.h 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. \ -I$(top_srcdir)/src/bin \ -I$(top_srcdir)/src/lib \ -I$(top_srcdir)/src/modules \ - @e_cflags@ @ECORE_TXT_CFLAGS@ + @e_cflags@ @ECORE_TXT_CFLAGS@ \ + @EINA_CFLAGS@ pkgdir = $(libdir)/enlightenment/modules/$(MODULE)/$(MODULE_ARCH) pkg_LTLIBRARIES = module.la module_la_SOURCES = e_mod_main.c \ e_mod_main.h \ e_mod_config.c -module_la_LIBADD = @e_libs@ @dlopen_libs@ @ECORE_TXT_LIBS@ +module_la_LIBADD = @e_libs@ @dlopen_libs@ @ECORE_TXT_LIBS@ @EINA_LIBS@ module_la_LDFLAGS = -module -avoid-version module_la_DEPENDENCIES = $(top_builddir)/config.h 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. \ -I$(top_srcdir)/src/bin \ -I$(top_srcdir)/src/lib \ -I$(top_srcdir)/src/modules \ - @e_cflags@ + @e_cflags@ \ + @EINA_CFLAGS@ pkgdir = $(libdir)/enlightenment/modules/$(MODULE)/$(MODULE_ARCH) pkg_LTLIBRARIES = module.la module_la_SOURCES = e_mod_main.c \ @@ -23,7 +24,7 @@ module_la_SOURCES = e_mod_main.c \ e_winlist.c \ e_winlist.h -module_la_LIBADD = @e_libs@ @dlopen_libs@ +module_la_LIBADD = @e_libs@ @dlopen_libs@ @EINA_LIBS@ module_la_LDFLAGS = -module -avoid-version module_la_DEPENDENCIES = $(top_builddir)/config.h 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. \ -I$(top_srcdir)/src/bin \ -I$(top_srcdir)/src/lib \ -I$(top_srcdir)/src/modules \ - @e_cflags@ + @e_cflags@ \ + @EINA_CFLAGS@ pkgdir = $(libdir)/enlightenment/modules/$(MODULE)/$(MODULE_ARCH) pkg_LTLIBRARIES = module.la \ page_000.la \ page_010.la \ page_020.la - + module_la_SOURCES = e_mod_main.c \ e_mod_main.h \ e_wizard.c \ e_wizard.h -module_la_LIBADD = @e_libs@ @dlopen_libs@ +module_la_LIBADD = @e_libs@ @dlopen_libs@ @EINA_LIBS@ module_la_LDFLAGS = -module -avoid-version module_la_DEPENDENCIES = $(top_builddir)/config.h page_000_la_SOURCES = page_000.c -page_000_la_LIBADD = @e_libs@ @dlopen_libs@ +page_000_la_LIBADD = @e_libs@ @dlopen_libs@ @EINA_LIBS@ page_000_la_LDFLAGS = -module -avoid-version page_000_la_DEPENDENCIES = $(top_builddir)/config.h page_010_la_SOURCES = page_010.c -page_010_la_LIBADD = @e_libs@ @dlopen_libs@ +page_010_la_LIBADD = @e_libs@ @dlopen_libs@ @EINA_LIBS@ page_010_la_LDFLAGS = -module -avoid-version page_010_la_DEPENDENCIES = $(top_builddir)/config.h page_020_la_SOURCES = page_020.c -page_020_la_LIBADD = @e_libs@ @dlopen_libs@ +page_020_la_LIBADD = @e_libs@ @dlopen_libs@ @EINA_LIBS@ page_020_la_LDFLAGS = -module -avoid-version page_020_la_DEPENDENCIES = $(top_builddir)/config.h 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. \ -I$(top_srcdir) \ -I$(top_srcdir)src/preload \ @x_cflags@ \ - @e_cflags@ - + @e_cflags@ \ + @EINA_CFLAGS@ + pkgdir = $(libdir)/enlightenment/preload #pkg_LTLIBRARIES = e_hack.la e_precache.la @@ -14,13 +15,13 @@ pkg_LTLIBRARIES = e_precache.la #e_hack_la_SOURCES = \ #e_hack.c \ #e_hack.h -#e_hack_la_LIBADD = @x_libs@ @dlopen_libs@ +#e_hack_la_LIBADD = @x_libs@ @dlopen_libs@ @EINA_LIBS@ #e_hack_la_LDFLAGS = -module -avoid-version #e_hack_la_DEPENDENCIES = $(top_builddir)/config.h e_precache_la_SOURCES = \ e_precache.c \ e_precache.h -e_precache_la_LIBADD = @e_libs@ @dlopen_libs@ +e_precache_la_LIBADD = @e_libs@ @dlopen_libs@ @EINA_LIBS@ e_precache_la_LDFLAGS = -module -avoid-version e_precache_la_DEPENDENCIES = $(top_builddir)/config.h