From 2a89e2300c3bb6164afca65faa205d6ba8b4f3cb Mon Sep 17 00:00:00 2001
From: Eric Andersen <andersen@codepoet.org>
Date: Mon, 10 Jul 2006 22:04:29 +0000
Subject: fixup some dependancies

---
 package/xorg/Config.in | 2 ++
 package/xorg/xorg.mk   | 8 +++++++-
 2 files changed, 9 insertions(+), 1 deletion(-)

(limited to 'package/xorg')

diff --git a/package/xorg/Config.in b/package/xorg/Config.in
index 0885549ad..87ec6be51 100644
--- 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 46220eb58..b99fe1c6d 100644
--- 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)
 
-- 
cgit v1.2.3