aboutsummaryrefslogtreecommitdiff
path: root/package
diff options
context:
space:
mode:
authorGravatar Yann E. MORIN <yann.morin.1998@free.fr>2015-06-03 22:41:26 +0200
committerGravatar Thomas Petazzoni <thomas.petazzoni@free-electrons.com>2015-06-09 22:58:16 +0200
commitcbb8096076cad57293ea9ad334750227e8d4b9ff (patch)
treee63055cec25025472275d3194f7f64878415791f /package
parent4be826c225ed803b9794391feb1d37f0026e0f81 (diff)
downloadbuildroot-cbb8096076cad57293ea9ad334750227e8d4b9ff.tar.gz
buildroot-cbb8096076cad57293ea9ad334750227e8d4b9ff.tar.bz2
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" <yann.morin.1998@free.fr> Cc: Arnout Vandecappelle <arnout@mind.be> Reviewed-by: Arnout Vandecappelle <arnout@mind.be> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Diffstat (limited to 'package')
-rw-r--r--package/matchbox/Config.in1
-rw-r--r--package/matchbox/matchbox-panel/matchbox-panel.mk4
-rw-r--r--package/matchbox/matchbox-startup-monitor/Config.in3
3 files changed, 6 insertions, 2 deletions
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