diff options
| author | Paulius Zaleckas <paulius.zaleckas@gmail.com> | 2010-11-04 10:57:27 +0200 |
|---|---|---|
| committer | Peter Korsgaard <jacmet@sunsite.dk> | 2010-11-05 10:24:18 +0100 |
| commit | c2d6095f9ffb40d73ef0549412092447b7e7d1cc (patch) | |
| tree | e8dfc2e29d3c3d889843b44848f1846512eeda87 | |
| parent | 09c1b8bd6e072746fa4696f0aba03042c854585c (diff) | |
matchbox-common was missing in Config.in
While at it add option to install PDA style desktop folders.
Signed-off-by: Paulius Zaleckas <paulius.zaleckas@gmail.com>
Acked-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>
| -rw-r--r-- | CHANGES | 23 | ||||
| -rw-r--r-- | package/matchbox/Config.in | 10 | ||||
| -rw-r--r-- | package/matchbox/matchbox-common/matchbox-common.mk | 4 |
3 files changed, 26 insertions, 11 deletions
@@ -40,17 +40,18 @@ libglade, libgtk2, libiconv, libidn, libintl, libmms, libmpd, libnl, liboil, libosip2, libpcap, libpng, libtool, libungif, libxml2, libxslt, lighttpd, lite, lm-sensors, lockfile-progs, - logrotate, m4, mdadm, mesa3d, metacity, mplayer, mtd-utils, - mysql_client, nano, nbd, ncftp, neon, netperf, netsnmp, - ng-spice-rework, ntfsprogs, ntp, openntpd, openssh, openssl, - openvpn, oprofile, pango, patch, pcre, php, pkg-config, - portmap, pppd, pptp-linux, prboom, radvd, rdesktop, readline, - rp-pppoe, ruby, qt, quagga, samba, sawman, sdl_mixer, sdl_sound, - setserial, shared-mime-info, speex, sqlite, squashfs, - startup-notification, strace, sylpheed, sysstat, taglib, - tcpdump, thttpd, tiff, tn5250, torsmo, udev, udpcast, usbmount, - usbutils, vsftpd, vtun, which, wpa_supplicant, xapp_twm, - xapp_xbacklight, xapp_xcursorgen, xapp_xinput, xapp_xmore, + logrotate, m4, matchbox, mdadm, mesa3d, metacity, mplayer, + mtd-utils, mysql_client, nano, nbd, ncftp, neon, netperf, + netsnmp, ng-spice-rework, ntfsprogs, ntp, openntpd, openssh, + openssl, openvpn, oprofile, pango, patch, pcre, php, + pkg-config, portmap, pppd, pptp-linux, prboom, radvd, + rdesktop, readline, rp-pppoe, ruby, qt, quagga, samba, sawman, + sdl_mixer, sdl_sound, setserial, shared-mime-info, speex, + sqlite, squashfs, startup-notification, strace, sylpheed, + sysstat, taglib, tcpdump, thttpd, tiff, tn5250, torsmo, udev, + udpcast, usbmount, usbutils, vsftpd, vtun, which, + wpa_supplicant, xapp_twm, xapp_xbacklight, xapp_xcursorgen, + xapp_xinput, xapp_xmore, xdriver_xf86-input-{acecad,aiptek,evdev,joystick,keyboard}, xdriver-xf86-input-{mouse,synaptics,vmmouse,void}, xdriver-xf86-video-{apm,ark,ast,ati,chips,cirrus,dummy,fbdev}, diff --git a/package/matchbox/Config.in b/package/matchbox/Config.in index 43189caea..e4b6149d7 100644 --- a/package/matchbox/Config.in +++ b/package/matchbox/Config.in @@ -22,6 +22,16 @@ config BR2_PACKAGE_MATCHBOX_DESKTOP help A PDA style application launcher or 'item browser'. +config BR2_PACKAGE_MATCHBOX_COMMON + bool "Matchbox session common files" + depends on BR2_PACKAGE_MATCHBOX && BR2_PACKAGE_MATCHBOX_PANEL && BR2_PACKAGE_MATCHBOX_DESKTOP + help + Common desktop folders and matchbox-session script. + +config BR2_PACKAGE_MATCHBOX_COMMON_PDA + bool "PDA style desktop folders" + depends on BR2_PACKAGE_MATCHBOX_COMMON + config BR2_PACKAGE_MATCHBOX_KEYBOARD bool "Matchbox Virtual Keyboard" depends on BR2_PACKAGE_MATCHBOX diff --git a/package/matchbox/matchbox-common/matchbox-common.mk b/package/matchbox/matchbox-common/matchbox-common.mk index 81a172976..d35d11bca 100644 --- a/package/matchbox/matchbox-common/matchbox-common.mk +++ b/package/matchbox/matchbox-common/matchbox-common.mk @@ -9,6 +9,10 @@ MATCHBOX_COMMON_SOURCE = matchbox-common-$(MATCHBOX_COMMON_VERSION).tar.bz2 MATCHBOX_COMMON_SITE = http://matchbox-project.org/sources/matchbox-common/$(MATCHBOX_COMMON_VERSION) MATCHBOX_COMMON_DEPENDENCIES = matchbox-lib +ifeq ($(strip $(BR2_PACKAGE_MATCHBOX_COMMON_PDA)),y) + MATCHBOX_COMMON_CONF_OPT += --enable-pda-folders +endif + ############################################################# $(eval $(call AUTOTARGETS,package/matchbox,matchbox-common)) |