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

package/matchbox: get rid of intermediate non-package matchbox 



Currently, the matchbox entry in the menu is a non-package entry, that
forcibly selects the matchbox-wm package, which is the real matchbox WM.

So, get rid of the current matchbox option, rename the existing
matchbox-wm to simply matchbox, so we have a real package from the
onset.

Since we're re-using the previous option for the WM package, there is no
need for an entry in the legacy menu.

Signed-off-by: default avatar"Yann E. MORIN" <yann.morin.1998@free.fr>
Reviewed-by: default avatarArnout Vandecappelle (Essensium/Mind) <arnout@mind.be>
Signed-off-by: default avatarThomas Petazzoni <thomas.petazzoni@free-electrons.com>
parent 02994456

package/matchbox/Config.in

+0 −2
Original line number Diff line number Diff line
@@ -8,7 +8,6 @@ config BR2_PACKAGE_MATCHBOX 
	select BR2_PACKAGE_XLIB_LIBXDAMAGE

	select BR2_PACKAGE_XLIB_LIBXCURSOR

	select BR2_PACKAGE_MATCHBOX_LIB

	select BR2_PACKAGE_MATCHBOX_WM

	help

	  Matchbox is an Open Source base environment for the X Window

	  System running on non-desktop embedded platforms such as
@@ -20,7 +19,6 @@ config BR2_PACKAGE_MATCHBOX 
if BR2_PACKAGE_MATCHBOX



source "package/matchbox/matchbox-lib/Config.in"

source "package/matchbox/matchbox-wm/Config.in"

source "package/matchbox/matchbox-panel/Config.in"

source "package/matchbox/matchbox-desktop/Config.in"

source "package/matchbox/matchbox-common/Config.in"

package/matchbox/matchbox-wm/Config.in

deleted100644 → 0
+0 −3
Original line number Diff line number Diff line 
config BR2_PACKAGE_MATCHBOX_WM

	bool

	select BR2_PACKAGE_MATCHBOX_LIB

package/matchbox/matchbox-wm/matchbox-wm.mk

deleted100644 → 0
+0 −38
Original line number Diff line number Diff line 
################################################################################

#

# matchbox-wm

#

################################################################################



MATCHBOX_WM_VERSION = 1.2

MATCHBOX_WM_SOURCE = matchbox-window-manager-$(MATCHBOX_WM_VERSION).tar.bz2

MATCHBOX_WM_SITE = http://downloads.yoctoproject.org/releases/matchbox/matchbox-window-manager/$(MATCHBOX_WM_VERSION)

MATCHBOX_WM_LICENSE = GPLv2+

MATCHBOX_WM_LICENSE_FILES = COPYING



MATCHBOX_WM_DEPENDENCIES = matchbox-lib

MATCHBOX_WM_CONF_OPTS = --enable-expat



# Workaround bug in configure script

MATCHBOX_WM_CONF_ENV = expat=yes



ifeq ($(BR2_PACKAGE_X11R7_LIBXCOMPOSITE),y)

ifeq ($(BR2_PACKAGE_X11R7_LIBXPM),y)

MATCHBOX_WM_CONF_OPTS += --enable-composite

MATCHBOX_WM_DEPENDENCIES += xlib_libXcomposite

MATCHBOX_WM_DEPENDENCIES += xlib_libXpm

endif

endif



ifeq ($(BR2_PACKAGE_XLIB_LIBXFT),y)

MATCHBOX_WM_DEPENDENCIES += xlib_libXft

endif



ifeq ($(BR2_PACKAGE_STARTUP_NOTIFICATION),y)

MATCHBOX_WM_CONF_OPTS += --enable-startup-notification

MATCHBOX_WM_DEPENDENCIES += startup-notification

else

MATCHBOX_WM_CONF_OPTS += --disable-startup-notification

endif



$(eval $(autotools-package))