From 2d8153655cfc1671a731c68ac584d862ccc20e09 Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Fri, 17 Jul 2009 14:46:19 +0200 Subject: xorg server: beautify list of dependencies Reorganize the list of depencies with a sane indentation level, and one dependency per line. Yes, the list is long, but is easier to read, and future patches modifying this list will be easier to review. Signed-off-by: Thomas Petazzoni --- .../xserver_xorg-server/xserver_xorg-server.mk | 66 +++++++++++++++++----- 1 file changed, 53 insertions(+), 13 deletions(-) (limited to 'package/x11r7/xserver_xorg-server') diff --git a/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk b/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk index 77c8208da..0c7044166 100644 --- a/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk +++ b/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk @@ -12,19 +12,59 @@ XSERVER_XORG_SERVER_INSTALL_STAGING = YES XSERVER_XORG_SERVER_USE_CONFIG_CACHE = NO # overrides CFLAGS XSERVER_XORG_SERVER_INSTALL_STAGING_OPT = DESTDIR=$(STAGING_DIR) install install-data -XSERVER_XORG_SERVER_DEPENDENCIES = xutil_util-macros xlib_libXfont libdrm xlib_libxkbui openssl \ - xproto_compositeproto xproto_damageproto xproto_fixesproto \ - xproto_glproto xproto_kbproto xproto_randrproto \ - xlib_libX11 xlib_libXau xlib_libXaw xlib_libXdmcp xlib_libXScrnSaver \ - xlib_libXext xlib_libXfixes xlib_libXi xlib_libXmu xlib_libXpm \ - xlib_libXrender xlib_libXres xlib_libXft xlib_libXcursor \ - xlib_libXinerama xlib_libXrandr xlib_libXdamage xlib_libXxf86misc xlib_libXxf86vm \ - xlib_liblbxutil xlib_libxkbfile xlib_xtrans xdata_xbitmaps xproto_bigreqsproto \ - xproto_evieext xproto_fontsproto xproto_inputproto xproto_renderproto \ - xproto_resourceproto xproto_videoproto xproto_xcmiscproto \ - xproto_xextproto xproto_xf86bigfontproto xproto_xf86dgaproto xproto_xf86driproto \ - xproto_xf86miscproto xproto_xf86rushproto xproto_xf86vidmodeproto xproto_xproto \ - pixman mcookie +XSERVER_XORG_SERVER_DEPENDENCIES = \ + xutil_util-macros \ + xlib_libXfont \ + xlib_libxkbui \ + xlib_libX11 \ + xlib_libXau \ + xlib_libXaw \ + xlib_libXdmcp \ + xlib_libXScrnSaver \ + xlib_libXext \ + xlib_libXfixes \ + xlib_libXi \ + xlib_libXmu \ + xlib_libXpm \ + xlib_libXrender \ + xlib_libXres \ + xlib_libXft \ + xlib_libXcursor \ + xlib_libXinerama \ + xlib_libXrandr \ + xlib_libXdamage \ + xlib_libXxf86misc \ + xlib_libXxf86vm \ + xlib_liblbxutil \ + xlib_libxkbfile \ + xlib_xtrans \ + xdata_xbitmaps \ + xproto_bigreqsproto \ + xproto_compositeproto \ + xproto_damageproto \ + xproto_evieext \ + xproto_fixesproto \ + xproto_fontsproto \ + xproto_glproto \ + xproto_inputproto \ + xproto_kbproto \ + xproto_randrproto \ + xproto_renderproto \ + xproto_resourceproto \ + xproto_videoproto \ + xproto_xcmiscproto \ + xproto_xextproto \ + xproto_xf86bigfontproto \ + xproto_xf86dgaproto \ + xproto_xf86driproto \ + xproto_xf86miscproto \ + xproto_xf86rushproto \ + xproto_xf86vidmodeproto \ + xproto_xproto \ + libdrm \ + pixman \ + openssl \ + mcookie XSERVER_XORG_SERVER_CONF_OPT = --disable-config-hal \ --disable-xnest --disable-xephyr --disable-xvfb \ -- cgit v1.2.3 From ae8bbdf891c8343313cd2d3be2df079214576a4a Mon Sep 17 00:00:00 2001 From: Thomas Petazzoni Date: Fri, 17 Jul 2009 15:27:47 +0200 Subject: xorg server: remove dependencies Currently, the X.org server selection always trigger the compilation and installation of libXt (the X toolkit) and libXaw (Athena Widget toolkits), which is are legacy toolkits not used by modern toolkits (Gtk, Qt, etc.). They are only used by old X11 applications that are typically not used on embedded systems. Not compiling them save compilation time, and more importantly, space on the target. We also remove the compilation on xlib_libxkbui, libxmu and libxpm, because they all depend on libXt. Signed-off-by: Thomas Petazzoni --- package/x11r7/xserver_xorg-server/Config.in | 4 ---- package/x11r7/xserver_xorg-server/xserver_xorg-server.mk | 4 ---- 2 files changed, 8 deletions(-) (limited to 'package/x11r7/xserver_xorg-server') diff --git a/package/x11r7/xserver_xorg-server/Config.in b/package/x11r7/xserver_xorg-server/Config.in index 58bd8d2b4..105c79069 100644 --- a/package/x11r7/xserver_xorg-server/Config.in +++ b/package/x11r7/xserver_xorg-server/Config.in @@ -2,7 +2,6 @@ config BR2_PACKAGE_XSERVER_XORG_SERVER bool "xorg-server" select BR2_PACKAGE_XLIB_LIBXFONT select BR2_PACKAGE_LIBDRM - select BR2_PACKAGE_XLIB_LIBXKBUI select BR2_PACKAGE_OPENSSL select BR2_PACKAGE_XPROTO_COMPOSITEPROTO select BR2_PACKAGE_XPROTO_DAMAGEPROTO @@ -15,13 +14,10 @@ config BR2_PACKAGE_XSERVER_XORG_SERVER select BR2_PACKAGE_XFONT_FONT_CURSOR_MISC if !BR2_PACKAGE_XSERVER_XORG_SERVER_BUILTIN_FONTS select BR2_PACKAGE_XLIB_LIBX11 select BR2_PACKAGE_XLIB_LIBXAU - select BR2_PACKAGE_XLIB_LIBXAW select BR2_PACKAGE_XLIB_LIBXDMCP select BR2_PACKAGE_XLIB_LIBXEXT select BR2_PACKAGE_XLIB_LIBXFIXES select BR2_PACKAGE_XLIB_LIBXI - select BR2_PACKAGE_XLIB_LIBXMU - select BR2_PACKAGE_XLIB_LIBXPM select BR2_PACKAGE_XLIB_LIBXRENDER select BR2_PACKAGE_XLIB_LIBXRES select BR2_PACKAGE_XLIB_LIBXXF86MISC diff --git a/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk b/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk index 0c7044166..e2af32459 100644 --- a/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk +++ b/package/x11r7/xserver_xorg-server/xserver_xorg-server.mk @@ -15,17 +15,13 @@ XSERVER_XORG_SERVER_INSTALL_STAGING_OPT = DESTDIR=$(STAGING_DIR) install install XSERVER_XORG_SERVER_DEPENDENCIES = \ xutil_util-macros \ xlib_libXfont \ - xlib_libxkbui \ xlib_libX11 \ xlib_libXau \ - xlib_libXaw \ xlib_libXdmcp \ xlib_libXScrnSaver \ xlib_libXext \ xlib_libXfixes \ xlib_libXi \ - xlib_libXmu \ - xlib_libXpm \ xlib_libXrender \ xlib_libXres \ xlib_libXft \ -- cgit v1.2.3