svn commit: trunk/buildroot/package/xorg

[andersen at uclibc.org]

Author: andersen
Date: 2006-07-10 15:04:29 -0700 (Mon, 10 Jul 2006)
New Revision: 15676

Log:
fixup some dependancies


Modified:
   trunk/buildroot/package/xorg/Config.in
   trunk/buildroot/package/xorg/xorg.mk


Changeset:
Modified: trunk/buildroot/package/xorg/Config.in
===================================================================
--- trunk/buildroot/package/xorg/Config.in	2006-07-10 19:45:20 UTC (rev 15675)
+++ trunk/buildroot/package/xorg/Config.in	2006-07-10 22:04:29 UTC (rev 15676)
@@ -2,6 +2,8 @@
 	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.
 

Modified: trunk/buildroot/package/xorg/xorg.mk
===================================================================
--- trunk/buildroot/package/xorg/xorg.mk	2006-07-10 19:45:20 UTC (rev 15675)
+++ trunk/buildroot/package/xorg/xorg.mk	2006-07-10 22:04:29 UTC (rev 15676)
@@ -102,8 +102,14 @@
 	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)
 
 xorg-clean: