Commit cbb80960 authored by Yann E. MORIN's avatar Yann E. MORIN Committed by Thomas Petazzoni
Browse files

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: default avatar"Yann E. MORIN" <yann.morin.1998@free.fr>
Cc: Arnout Vandecappelle <arnout@mind.be>
Reviewed-by: default avatarArnout Vandecappelle <arnout@mind.be>
Signed-off-by: default avatarThomas Petazzoni <thomas.petazzoni@free-electrons.com>
parent 4be826c2

package/matchbox/Config.in

+1 −0
Original line number Diff line number Diff line
@@ -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

package/matchbox/matchbox-panel/matchbox-panel.mk

+2 −2
Original line number Diff line number Diff line
@@ -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

package/matchbox/matchbox-startup-monitor/Config.in

0 → 100644
+3 −0
Original line number Diff line number Diff line 
config BR2_PACKAGE_MATCHBOX_STARTUP_MONITOR

	bool

	default y if BR2_PACKAGE_STARTUP_NOTIFICATION