From 345fb3f0e20e7d33f00defb7ca421305ad708d96 Mon Sep 17 00:00:00 2001 From: agb Date: Sun, 15 Jun 2008 18:18:34 +0000 Subject: [PATCH] [packages] libXpm: depends on libX11 git-svn-id: svn://svn.openwrt.org/openwrt/packages@11478 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- XOrg/lib/libXpm/Makefile | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) 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 -- 2.11.0