styx
/
enlightenment
forked from enlightenment/enlightenment
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

disable illume building, blacklist illume modules 

illume 100% requires X, thus illume is dead. replacements are semi-underway.
This commit is contained in:
Mike Blumenkrantz 2013-08-20 09:40:36 +01:00
parent 1b22c40555
commit 1be76d599c
3 changed files with 23 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
configure.ac
View File

@ -860,7 +860,7 @@ AC_E_OPTIONAL_MODULE([gadman], true)
AC_E_OPTIONAL_MODULE([mixer], true, [CHECK_MODULE_MIXER]) AC_E_OPTIONAL_MODULE([mixer], true, [CHECK_MODULE_MIXER])
AC_E_OPTIONAL_MODULE([connman], true, [CHECK_MODULE_CONNMAN]) AC_E_OPTIONAL_MODULE([connman], true, [CHECK_MODULE_CONNMAN])
AC_E_OPTIONAL_MODULE([bluez4], true, [CHECK_MODULE_BLUEZ4]) 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([syscon], true)
AC_E_OPTIONAL_MODULE([everything], true) AC_E_OPTIONAL_MODULE([everything], true)
AC_E_OPTIONAL_MODULE([systray], true) AC_E_OPTIONAL_MODULE([systray], true)
@ -968,16 +968,6 @@ src/modules/gadman/module.desktop
src/modules/mixer/module.desktop src/modules/mixer/module.desktop
src/modules/connman/module.desktop src/modules/connman/module.desktop
src/modules/bluez4/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/syscon/module.desktop
src/modules/everything/module.desktop src/modules/everything/module.desktop
src/modules/everything/everything.pc src/modules/everything/everything.pc
@ -1003,6 +993,17 @@ doc/e.dox
$po_makefile_in $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 # report
txt_strip() { txt_strip() {
echo "[$]@" | sed -e 's/^[[ \t]]*\([[^ \t]]*\)[[ \t]]*$/\1/g' echo "[$]@" | sed -e 's/^[[ \t]]*\([[^ \t]]*\)[[ \t]]*$/\1/g'

9
src/bin/e_module.c
View File

@ -894,15 +894,6 @@ _e_module_whitelist_check(void)
"gadman", "gadman",
"ibar", "ibar",
"ibox", "ibox",
"illume2",
"illume-bluetooth",
"illume-home",
"illume-home-toggle",
"illume-indicator",
"illume-kbd-toggle",
"illume-keyboard",
"illume-mode-toggle",
"illume-softkey",
"layout", "layout",
"mixer", "mixer",
"msgbus", "msgbus",

22
src/modules/Makefile.mk
View File

@ -146,17 +146,17 @@ if USE_MODULE_MIXER
include src/modules/Makefile_mixer.mk include src/modules/Makefile_mixer.mk
endif endif
if USE_MODULE_ILLUME2 #if USE_MODULE_ILLUME2
include src/modules/Makefile_illume2.mk #include src/modules/Makefile_illume2.mk
include src/modules/Makefile_illume-home.mk #include src/modules/Makefile_illume-home.mk
include src/modules/Makefile_illume-home-toggle.mk #include src/modules/Makefile_illume-home-toggle.mk
include src/modules/Makefile_illume-softkey.mk #include src/modules/Makefile_illume-softkey.mk
include src/modules/Makefile_illume-keyboard.mk #include src/modules/Makefile_illume-keyboard.mk
include src/modules/Makefile_illume-indicator.mk #include src/modules/Makefile_illume-indicator.mk
include src/modules/Makefile_illume-kbd-toggle.mk #include src/modules/Makefile_illume-kbd-toggle.mk
include src/modules/Makefile_illume-mode-toggle.mk #include src/modules/Makefile_illume-mode-toggle.mk
include src/modules/Makefile_illume-bluetooth.mk #include src/modules/Makefile_illume-bluetooth.mk
endif #endif
if USE_MODULE_SYSCON if USE_MODULE_SYSCON
include src/modules/Makefile_syscon.mk include src/modules/Makefile_syscon.mk