fltk: replace dependency on X.org server with dependency on libraries

fltk is a X client library, so it doesn't make sense for it to depend
on the X.org server. Instead, it depends on libX11, libXext and libXt,
so we use those libraries as fltk dependencies.

Signed-off-by: Thomas Petazzoni <thomas.petazzoni@free-electrons.com>
Signed-off-by: Peter Korsgaard <jacmet@sunsite.dk>

diff --git a/package/fltk/Config.in b/package/fltk/Config.in
index eff72b56e83b55bb9e6c30601a158b922bc13285..20851922ae6570dde8855b90840742d04b53df55 100644 (file)
--- a/package/fltk/Config.in
+++ b/package/fltk/Config.in
@@ -3,6 +3,8 @@ config BR2_PACKAGE_FLTK
        depends on BR2_INSTALL_LIBSTDCPP
        depends on BR2_PACKAGE_XORG7
        select BR2_PACKAGE_XLIB_LIBXT
+       select BR2_PACKAGE_XLIB_LIBX11
+       select BR2_PACKAGE_XLIB_LIBXEXT
        help
          A cross-platform C++ GUI toolkit for UNIX/Linux (X11),
          Microsoft Windows, and MacOS X.

diff --git a/package/fltk/fltk.mk b/package/fltk/fltk.mk
index a5dac37b55e1605337364e53b8237fd981c992e4..3f192cdb489f4f2e07f61c114bfb3bef332825b7 100644 (file)
--- a/package/fltk/fltk.mk
+++ b/package/fltk/fltk.mk
@@ -11,6 +11,6 @@ FLTK_INSTALL_STAGING = YES
 FLTK_INSTALL_STAGING_OPT = DESTDIR=$(STAGING_DIR) STRIP=$(TARGET_STRIP) install
 FLTK_INSTALL_TARGET_OPT = DESTDIR=$(TARGET_DIR) STRIP=$(TARGET_STRIP) install
 FLTK_CONF_OPT = --enable-threads --with-x
-FLTK_DEPENDENCIES = xserver_xorg-server xlib_libXt
+FLTK_DEPENDENCIES = xlib_libX11 xlib_libXext xlib_libXt
 
 $(eval $(autotools-package))