From: Felix Fietkau <nbd@openwrt.org>
Date: Tue, 2 Sep 2008 18:51:33 +0000 (+0000)
Subject: fix compile of libmatchbox and possibly other packages by fixing up the libtool fixups
X-Git-Url: http://git.openwrt.org/?p=openwrt%2Fsvn-archive%2Farchive.git;a=commitdiff_plain;h=f282af262782e2f59873a415fdf186d79e2a252b

fix compile of libmatchbox and possibly other packages by fixing up the libtool fixups


SVN-Revision: 12506
---

diff --git a/XOrg/lib/libX11/Makefile b/XOrg/lib/libX11/Makefile
index bba1a3ebb6..4ae4fe6c50 100644
--- a/XOrg/lib/libX11/Makefile
+++ b/XOrg/lib/libX11/Makefile
@@ -15,6 +15,8 @@ PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/X11R7.3/src/lib/
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
 PKG_BUILD_DIR=$(BUILD_DIR)/Xorg/$(_CATEGORY)/${PKG_NAME}-$(PKG_VERSION)/
 
+PKG_FIXUP = libtool
+
 include $(INCLUDE_DIR)/package.mk
 
 define Package/libX11
@@ -49,7 +51,6 @@ define Build/Compile
 	make -C $(PKG_BUILD_DIR)
 	mkdir -p $(PKG_INSTALL_DIR)
 	DESTDIR=$(PKG_INSTALL_DIR) $(MAKE) -C $(PKG_BUILD_DIR) $(MAKE_FLAGS) install
-	find $(PKG_INSTALL_DIR) -name *.la | xargs rm -rf
 endef
 
 define Build/Configure
diff --git a/XOrg/lib/libXau/Makefile b/XOrg/lib/libXau/Makefile
index ffa277576c..f63f9e99b5 100644
--- a/XOrg/lib/libXau/Makefile
+++ b/XOrg/lib/libXau/Makefile
@@ -15,6 +15,8 @@ PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/X11R7.3/src/lib/
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
 PKG_BUILD_DIR=$(BUILD_DIR)/Xorg/$(_CATEGORY)/${PKG_NAME}-$(PKG_VERSION)/
 
+PKG_FIXUP = libtool
+
 include $(INCLUDE_DIR)/package.mk
 
 define Package/libXau
@@ -49,7 +51,6 @@ define Build/Compile
 	make -C $(PKG_BUILD_DIR)
 	mkdir -p $(PKG_INSTALL_DIR)
 	DESTDIR=$(PKG_INSTALL_DIR) $(MAKE) -C $(PKG_BUILD_DIR) $(MAKE_FLAGS) install
-	find $(PKG_INSTALL_DIR) -name *.la | xargs rm -rf
 endef
 
 define Build/Configure
diff --git a/XOrg/lib/libXdmcp/Makefile b/XOrg/lib/libXdmcp/Makefile
index 6f41cdc8d4..7d6d54c6eb 100644
--- a/XOrg/lib/libXdmcp/Makefile
+++ b/XOrg/lib/libXdmcp/Makefile
@@ -15,6 +15,8 @@ PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/X11R7.3/src/lib/
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
 PKG_BUILD_DIR=$(BUILD_DIR)/Xorg/$(_CATEGORY)/${PKG_NAME}-$(PKG_VERSION)/
 
+PKG_FIXUP = libtool
+
 include $(INCLUDE_DIR)/package.mk
 
 define Package/libXdmcp
@@ -49,7 +51,6 @@ define Build/Compile
 	make -C $(PKG_BUILD_DIR)
 	mkdir -p $(PKG_INSTALL_DIR)
 	DESTDIR=$(PKG_INSTALL_DIR) $(MAKE) -C $(PKG_BUILD_DIR) $(MAKE_FLAGS) install
-	find $(PKG_INSTALL_DIR) -name *.la | xargs rm -rf
 endef
 
 define Build/Configure
diff --git a/XOrg/lib/libXext/Makefile b/XOrg/lib/libXext/Makefile
index ee456865db..867d3e8709 100644
--- a/XOrg/lib/libXext/Makefile
+++ b/XOrg/lib/libXext/Makefile
@@ -15,6 +15,8 @@ PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/X11R7.3/src/lib/
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
 PKG_BUILD_DIR=$(BUILD_DIR)/Xorg/$(_CATEGORY)/${PKG_NAME}-$(PKG_VERSION)/
 
+PKG_FIXUP = libtool
+
 include $(INCLUDE_DIR)/package.mk
 
 define Package/libXext
@@ -49,7 +51,6 @@ define Build/Compile
 	make -C $(PKG_BUILD_DIR)
 	mkdir -p $(PKG_INSTALL_DIR)
 	DESTDIR=$(PKG_INSTALL_DIR) $(MAKE) -C $(PKG_BUILD_DIR) $(MAKE_FLAGS) install
-	find $(PKG_INSTALL_DIR) -name *.la | xargs rm -rf
 endef
 
 define Build/Configure
diff --git a/XOrg/lib/libmatchbox/Makefile b/XOrg/lib/libmatchbox/Makefile
index 9937cac75c..dbaeb6a8ff 100644
--- a/XOrg/lib/libmatchbox/Makefile
+++ b/XOrg/lib/libmatchbox/Makefile
@@ -23,7 +23,7 @@ define Package/libmatchbox
   SECTION:=xorg-libraries
   CATEGORY:=Xorg
   SUBMENU:=libraries
-  DEPENDS:=+libX11 +libXft +libpng +libjpeg @DISPLAY_SUPPORT
+  DEPENDS:=+libX11 +libXft +libpng +libjpeg +libXau +libXdmcp
   TITLE:=libmatchbox
   URL:=http://matchbox-project.org
 endef