From cc76043bd4db8670abd822d46e4a37838dec575d Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Fri, 17 Jul 2009 14:34:22 +0200 Subject: xorg: simplify dependencies on X.org Many packages used to depend on BR2_PACKAGE_XORG||BR2_PACKAGE_XORG7, but this is useless since BR2_PACKAGE_XORG is a non-existing configuration option. So, these depencies gets simplified to BR2_PACKAGE_XORG7 only. Some others were depending on BR2_PACKAGE_TINYX (which doesn't) exist or BR2_PACKAGE_XSERVER_xorg || BR2_PACKAGE_XSERVER_tiny || BR2_PACKAGE_XSERVER_x11r7. Replace all that mess by a simple dependency on BR2_PACKAGE_XORG7. Signed-off-by: Thomas Petazzoni --- package/dillo/Config.in | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'package/dillo/Config.in') diff --git a/package/dillo/Config.in b/package/dillo/Config.in index f0682d9fd..572469175 100644 --- a/package/dillo/Config.in +++ b/package/dillo/Config.in @@ -5,7 +5,7 @@ config BR2_PACKAGE_DILLO depends on BR2_PACKAGE_LIBGTK12 depends on BR2_PACKAGE_ZLIB depends on BR2_PACKAGE_LIBPNG - depends on BR2_PACKAGE_XORG||BR2_PACKAGE_XORG7 + depends on BR2_PACKAGE_XORG7 help Dillo is a small GTK+ based web browser written in C. -- cgit v1.2.3 From 1d5228acae2a124c84ae235fb5f39bcbab1e6312 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Fri, 17 Jul 2009 14:39:23 +0200 Subject: dillo: use select for library dependencies Use select independs of depends on for library dependencies. We keep the depends on for the X.org dependency so that dillo can only be selected once X.org is enabled (which, contrary to the library dependencies, is a pretty obvious dependency for the user). We then get rid of the configuration interface comment. Signed-off-by: Thomas Petazzoni --- package/dillo/Config.in | 13 +++++-------- 1 file changed, 5 insertions(+), 8 deletions(-) (limited to 'package/dillo/Config.in') diff --git a/package/dillo/Config.in b/package/dillo/Config.in index 572469175..87418d297 100644 --- a/package/dillo/Config.in +++ b/package/dillo/Config.in @@ -1,15 +1,12 @@ config BR2_PACKAGE_DILLO bool "dillo" - depends on BR2_PACKAGE_JPEG - depends on BR2_PACKAGE_LIBGLIB12 - depends on BR2_PACKAGE_LIBGTK12 - depends on BR2_PACKAGE_ZLIB - depends on BR2_PACKAGE_LIBPNG + select BR2_PACKAGE_JPEG + select BR2_PACKAGE_LIBGLIB12 + select BR2_PACKAGE_LIBGTK12 + select BR2_PACKAGE_ZLIB + select BR2_PACKAGE_LIBPNG depends on BR2_PACKAGE_XORG7 help Dillo is a small GTK+ based web browser written in C. http://www.dillo.org/ - -comment "dillo - disabled (requires jpeg,libglib12,libgtk12,zlib,libpng and Xorg(7))" - depends on !BR2_PACKAGE_JPEG || !BR2_PACKAGE_LIBGLIB12 || !BR2_PACKAGE_LIBGTK12 || !BR2_PACKAGE_ZLIB || !BR2_PACKAGE_LIBPNG || !(BR2_PACKAGE_XORG || BR2_PACKAGE_XORG7) -- cgit v1.2.3