From 1be76d599ca27f820b58b8186c5f73d9844c67ca Mon Sep 17 00:00:00 2001 From: Mike Blumenkrantz Date: Tue, 20 Aug 2013 09:40:36 +0100 Subject: [PATCH] disable illume building, blacklist illume modules illume 100% requires X, thus illume is dead. replacements are semi-underway. --- configure.ac | 23 ++++++++++++----------- src/bin/e_module.c | 9 --------- src/modules/Makefile.mk | 22 +++++++++++----------- 3 files changed, 23 insertions(+), 31 deletions(-) diff --git a/configure.ac b/configure.ac index b0f430de8..99d1f01a2 100644 --- a/configure.ac +++ b/configure.ac @@ -860,7 +860,7 @@ AC_E_OPTIONAL_MODULE([gadman], true) AC_E_OPTIONAL_MODULE([mixer], true, [CHECK_MODULE_MIXER]) AC_E_OPTIONAL_MODULE([connman], true, [CHECK_MODULE_CONNMAN]) AC_E_OPTIONAL_MODULE([bluez4], true, [CHECK_MODULE_BLUEZ4]) -AC_E_OPTIONAL_MODULE([illume2], true) +#AC_E_OPTIONAL_MODULE([illume2], true) AC_E_OPTIONAL_MODULE([syscon], true) AC_E_OPTIONAL_MODULE([everything], true) AC_E_OPTIONAL_MODULE([systray], true) @@ -968,16 +968,6 @@ src/modules/gadman/module.desktop src/modules/mixer/module.desktop src/modules/connman/module.desktop src/modules/bluez4/module.desktop -src/modules/illume2/doc/illume.dox -src/modules/illume2/module.desktop -src/modules/illume-home/module.desktop -src/modules/illume-home-toggle/module.desktop -src/modules/illume-softkey/module.desktop -src/modules/illume-keyboard/module.desktop -src/modules/illume-indicator/module.desktop -src/modules/illume-kbd-toggle/module.desktop -src/modules/illume-mode-toggle/module.desktop -src/modules/illume-bluetooth/module.desktop src/modules/syscon/module.desktop src/modules/everything/module.desktop src/modules/everything/everything.pc @@ -1003,6 +993,17 @@ doc/e.dox $po_makefile_in ]) +#src/modules/illume2/doc/illume.dox +#src/modules/illume2/module.desktop +#src/modules/illume-home/module.desktop +#src/modules/illume-home-toggle/module.desktop +#src/modules/illume-softkey/module.desktop +#src/modules/illume-keyboard/module.desktop +#src/modules/illume-indicator/module.desktop +#src/modules/illume-kbd-toggle/module.desktop +#src/modules/illume-mode-toggle/module.desktop +#src/modules/illume-bluetooth/module.desktop + # report txt_strip() { echo "[$]@" | sed -e 's/^[[ \t]]*\([[^ \t]]*\)[[ \t]]*$/\1/g' diff --git a/src/bin/e_module.c b/src/bin/e_module.c index 6184934c4..0b7cb27c3 100644 --- a/src/bin/e_module.c +++ b/src/bin/e_module.c @@ -894,15 +894,6 @@ _e_module_whitelist_check(void) "gadman", "ibar", "ibox", - "illume2", - "illume-bluetooth", - "illume-home", - "illume-home-toggle", - "illume-indicator", - "illume-kbd-toggle", - "illume-keyboard", - "illume-mode-toggle", - "illume-softkey", "layout", "mixer", "msgbus", diff --git a/src/modules/Makefile.mk b/src/modules/Makefile.mk index e1788c232..f37f0a169 100644 --- a/src/modules/Makefile.mk +++ b/src/modules/Makefile.mk @@ -146,17 +146,17 @@ if USE_MODULE_MIXER include src/modules/Makefile_mixer.mk endif -if USE_MODULE_ILLUME2 -include src/modules/Makefile_illume2.mk -include src/modules/Makefile_illume-home.mk -include src/modules/Makefile_illume-home-toggle.mk -include src/modules/Makefile_illume-softkey.mk -include src/modules/Makefile_illume-keyboard.mk -include src/modules/Makefile_illume-indicator.mk -include src/modules/Makefile_illume-kbd-toggle.mk -include src/modules/Makefile_illume-mode-toggle.mk -include src/modules/Makefile_illume-bluetooth.mk -endif +#if USE_MODULE_ILLUME2 +#include src/modules/Makefile_illume2.mk +#include src/modules/Makefile_illume-home.mk +#include src/modules/Makefile_illume-home-toggle.mk +#include src/modules/Makefile_illume-softkey.mk +#include src/modules/Makefile_illume-keyboard.mk +#include src/modules/Makefile_illume-indicator.mk +#include src/modules/Makefile_illume-kbd-toggle.mk +#include src/modules/Makefile_illume-mode-toggle.mk +#include src/modules/Makefile_illume-bluetooth.mk +#endif if USE_MODULE_SYSCON include src/modules/Makefile_syscon.mk