From cbb8096076cad57293ea9ad334750227e8d4b9ff Mon Sep 17 00:00:00 2001 From: "Yann E. MORIN" Date: Wed, 3 Jun 2015 22:41:26 +0200 Subject: [PATCH] package/matchbox: make match-startup-monitor a real package Currently, matchbox-startup-monitor is missing a Kconfig entry, but is so far solely a build-time dependency of matchbox-panel. So, make it a real package, and only build-depend on it when enabled. Fix the condition to build-depend on it. To keep the existing behaviour, default to 'y' when startup-notification is enabled. Signed-off-by: "Yann E. MORIN" Cc: Arnout Vandecappelle Reviewed-by: Arnout Vandecappelle Signed-off-by: Thomas Petazzoni --- package/matchbox/Config.in | 1 + package/matchbox/matchbox-panel/matchbox-panel.mk | 4 ++-- package/matchbox/matchbox-startup-monitor/Config.in | 3 +++ 3 files changed, 6 insertions(+), 2 deletions(-) create mode 100644 package/matchbox/matchbox-startup-monitor/Config.in diff --git a/package/matchbox/Config.in b/package/matchbox/Config.in index 9b27d4dc87..2f9b73dbd0 100644 --- a/package/matchbox/Config.in +++ b/package/matchbox/Config.in @@ -26,5 +26,6 @@ source "package/matchbox/matchbox-desktop/Config.in" source "package/matchbox/matchbox-common/Config.in" source "package/matchbox/matchbox-fakekey/Config.in" source "package/matchbox/matchbox-keyboard/Config.in" +source "package/matchbox/matchbox-startup-monitor/Config.in" endif diff --git a/package/matchbox/matchbox-panel/matchbox-panel.mk b/package/matchbox/matchbox-panel/matchbox-panel.mk index d3efed9fca..f7d699bdac 100644 --- a/package/matchbox/matchbox-panel/matchbox-panel.mk +++ b/package/matchbox/matchbox-panel/matchbox-panel.mk @@ -13,9 +13,9 @@ MATCHBOX_PANEL_LICENSE_FILES = COPYING MATCHBOX_PANEL_DEPENDENCIES = matchbox-lib MATCHBOX_PANEL_CONF_OPTS = --enable-expat -ifeq ($(BR2_PACKAGE_STARTUP_NOTIFICATION),y) +ifeq ($(BR2_PACKAGE_MATCHBOX_STARTUP_MONITOR),y) MATCHBOX_PANEL_CONF_OPTS += --enable-startup-notification -MATCHBOX_PANEL_DEPENDENCIES += startup-notification matchbox-startup-monitor +MATCHBOX_PANEL_DEPENDENCIES += matchbox-startup-monitor else MATCHBOX_PANEL_CONF_OPTS += --disable-startup-notification endif diff --git a/package/matchbox/matchbox-startup-monitor/Config.in b/package/matchbox/matchbox-startup-monitor/Config.in new file mode 100644 index 0000000000..95af5fc842 --- /dev/null +++ b/package/matchbox/matchbox-startup-monitor/Config.in @@ -0,0 +1,3 @@ +config BR2_PACKAGE_MATCHBOX_STARTUP_MONITOR + bool + default y if BR2_PACKAGE_STARTUP_NOTIFICATION -- 2.30.2