aboutsummaryrefslogtreecommitdiff
path: root/package
diff options
context:
space:
mode:
authorGravatar Yann E. MORIN <yann.morin.1998@free.fr>2015-06-03 22:41:19 +0200
committerGravatar Thomas Petazzoni <thomas.petazzoni@free-electrons.com>2015-06-09 22:55:48 +0200
commit4c1280ed853f1340fc8c07a62807879abc6ba3a2 (patch)
tree8783b75eff27ea00dd6f39f28c9846df9a31c881 /package
parentb95a85d4abaa7e0c6fb7e1a4fd3f5a5be90a965f (diff)
downloadbuildroot-4c1280ed853f1340fc8c07a62807879abc6ba3a2.tar.gz
buildroot-4c1280ed853f1340fc8c07a62807879abc6ba3a2.tar.bz2
package/matchbox: make matchbox-lib a real package
Currently, the matchbox package is using weird, legacy constructs to build its different parts. Notably, it adds matchbox-lib to the list of packages to build, even though it is not a real package since it does not have a Kconfig entry. Fix that: - add a Kconfig entry for matchbox-lib - select it from the top-level matchbox package Note that matchbox-common already depends on matchbox-lib. Signed-off-by: "Yann E. MORIN" <yann.morin.1998@free.fr> Reviewed-by: Arnout Vandecappelle (Essensium/Mind) <arnout@mind.be> Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Diffstat (limited to 'package')
-rw-r--r--package/matchbox/Config.in3
-rw-r--r--package/matchbox/matchbox-lib/Config.in2
-rw-r--r--package/matchbox/matchbox.mk2
3 files changed, 6 insertions, 1 deletions
diff --git a/package/matchbox/Config.in b/package/matchbox/Config.in
index 7867ae3881..70cc168ba0 100644
--- a/package/matchbox/Config.in
+++ b/package/matchbox/Config.in
@@ -7,6 +7,7 @@ config BR2_PACKAGE_MATCHBOX
select BR2_PACKAGE_XLIB_LIBXEXT
select BR2_PACKAGE_XLIB_LIBXDAMAGE
select BR2_PACKAGE_XLIB_LIBXCURSOR
+ select BR2_PACKAGE_MATCHBOX_LIB
help
Matchbox is an Open Source base environment for the X Window
System running on non-desktop embedded platforms such as
@@ -17,6 +18,8 @@ config BR2_PACKAGE_MATCHBOX
if BR2_PACKAGE_MATCHBOX
+source "package/matchbox/matchbox-lib/Config.in"
+
config BR2_PACKAGE_MATCHBOX_PANEL
bool "Matchbox Panel"
help
diff --git a/package/matchbox/matchbox-lib/Config.in b/package/matchbox/matchbox-lib/Config.in
new file mode 100644
index 0000000000..480e6fe4b2
--- /dev/null
+++ b/package/matchbox/matchbox-lib/Config.in
@@ -0,0 +1,2 @@
+config BR2_PACKAGE_MATCHBOX_LIB
+ bool
diff --git a/package/matchbox/matchbox.mk b/package/matchbox/matchbox.mk
index fe1a7db59c..e367df2f93 100644
--- a/package/matchbox/matchbox.mk
+++ b/package/matchbox/matchbox.mk
@@ -1,4 +1,4 @@
ifeq ($(BR2_PACKAGE_MATCHBOX),y)
include $(sort $(wildcard package/matchbox/*/*.mk))
-PACKAGES += matchbox-lib matchbox-wm
+PACKAGES += matchbox-wm
endif