From: Andy Boyett <agb@openwrt.org>
Date: Sun, 15 Jun 2008 18:18:34 +0000 (+0000)
Subject: libXpm: depends on libX11
X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=0985c877826047253cb9642fc905338ce184577d;p=openwrt%2Fsvn-archive%2Fpackages.git

libXpm: depends on libX11

SVN-Revision: 11478
---

diff --git a/XOrg/lib/libXpm/Makefile b/XOrg/lib/libXpm/Makefile
index 463dcb878..db9c250f7 100644
--- a/XOrg/lib/libXpm/Makefile
+++ b/XOrg/lib/libXpm/Makefile
@@ -1,10 +1,10 @@
-# 
-# Copyright (C) 2007 OpenWrt.org
+#
+# Copyright (C) 2007-2008 OpenWrt.org
 #
 # This is free software, licensed under the GNU General Public License v2.
 # See /LICENSE for more information.
 #
-# blogic@openwrt.org 
+# blogic@openwrt.org
 include $(TOPDIR)/rules.mk
 
 PKG_BASE_NAME:=libXpm
@@ -21,7 +21,7 @@ define Package/libXpm
   SECTION:=xorg-libraries
   CATEGORY:=Xorg
   SUBMENU:=libraries
-  DEPENDS:=+xorg-headers-native +util-macros  @DISPLAY_SUPPORT
+  DEPENDS:=+xorg-headers-native +util-macros +libX11 @DISPLAY_SUPPORT
   TITLE:=libXpm
   URL:=http://xorg.freedesktop.org/
 endef
@@ -36,12 +36,12 @@ endif
 
 define libX11/Compile
 	$(MAKE_VARS) \
-		$(MAKE) -C $(PKG_BUILD_DIR)/src/util CFLAGS="" LDFLAGS="" CC="cc" makekeys 
+		$(MAKE) -C $(PKG_BUILD_DIR)/src/util CFLAGS="" LDFLAGS="" CC="cc" makekeys
 endef
 
 define libXt/Compile
 	$(MAKE_VARS) \
-		$(MAKE) -C $(PKG_BUILD_DIR)/util CFLAGS="" LDFLAGS="" CC="cc" 
+		$(MAKE) -C $(PKG_BUILD_DIR)/util CFLAGS="" LDFLAGS="" CC="cc"
 endef
 
 define Build/Compile
@@ -67,7 +67,7 @@ endef
 
 define Package/libXpm/install/Default
 	$(INSTALL_DIR) $(1)/usr/lib
-	find $(PKG_INSTALL_DIR)/usr/lib/ -name lib*so* | $(XARGS) -I % -t cp -P % $(1)/usr/lib 
+	find $(PKG_INSTALL_DIR)/usr/lib/ -name lib*so* | $(XARGS) -I % -t cp -P % $(1)/usr/lib
 endef
 
 define Package/libXpm/install