fixup some dependancies

diff --git a/package/xorg/Config.in b/package/xorg/Config.in
index 0885549ad84abce406069bf38b81c1a6f2df5833..87ec6be513f0325e8eff47dd5ea6b6ffd4428f94 100644 (file)
--- a/package/xorg/Config.in
+++ b/package/xorg/Config.in
@@ -2,6 +2,8 @@ config BR2_PACKAGE_XORG
        bool "X.org X Window System"
        default n
        depends !BR2_PACKAGE_TINYX
+       depends BR2_PACKAGE_ZLIB
+       depends BR2_PACKAGE_LIBPNG
        help
          The official X Window system and server.
 

diff --git a/package/xorg/xorg.mk b/package/xorg/xorg.mk
index 46220eb58c7bf436a8639e1117b37420a23ac66b..b99fe1c6d0b44d2c3cd4388265451bcb34572814 100644 (file)
--- a/package/xorg/xorg.mk
+++ b/package/xorg/xorg.mk
@@ -102,7 +102,13 @@ $(XORG_LIBX)/libX11.so.6.2: $(XORG_XSERVER)
        echo "$(TARGET_LIBX)" >> $(TARGET_DIR)/etc/ld.so.conf
 
 
-xorg: zlib $(XORG_LIBX)/libX11.so.6.2 $(TARGET_XSERVER)
+$(STAGING_DIR)$(TARGET_LIBX)/libX11.so.6.2: $(XORG_LIBX)/libX11.so.6.2
+       -mkdir -p $(STAGING_DIR)$(TARGET_LIBX)
+       ( cd $(XORG_DIR); $(MAKE) \
+               DESTDIR=$(STAGING_DIR) install XCURSORGEN=xcursorgen MKFONTSCALE=mkfontscale )
+       touch -c $(STAGING_DIR)$(TARGET_LIBX)/libX11.so.6.2
+
+xorg: zlib png $(XORG_LIBX)/libX11.so.6.2 $(TARGET_XSERVER) $(STAGING_DIR)$(TARGET_LIBX)/libX11.so.6.2
 
 xorg-source: $(DL_DIR)/$(XORG_SOURCE)