fixup some dependancies

This commit is contained in:
Eric Andersen 2006-07-10 22:04:29 +00:00
parent e33a0c1400
commit 2a89e2300c
2 changed files with 9 additions and 1 deletions

View file

@ -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.

View file

@ -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)