Commit 2a89e230 authored by Eric Andersen's avatar Eric Andersen
Browse files

fixup some dependancies

parent e33a0c14

package/xorg/Config.in

+2 −0
Original line number Diff line number Diff line
@@ -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.

package/xorg/xorg.mk

+7 −1
Original line number Diff line number Diff line
@@ -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)