From: Jo-Philipp Wich <jow@openwrt.org>
Date: Fri, 10 Dec 2010 10:44:58 +0000 (+0000)
Subject: revert r24407, its already packaged in the xorg feed
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=7da7badd3e87db5333bc47e4b1bfc7a9809843d0;p=openwrt%2Fstaging%2F981213.git

revert r24407, its already packaged in the xorg feed

SVN-Revision: 24409
---

diff --git a/tools/Makefile b/tools/Makefile
index b94ce4b535..9306601c7a 100644
--- a/tools/Makefile
+++ b/tools/Makefile
@@ -17,7 +17,6 @@ endif
 tools-y += m4 autoconf automake bison pkg-config sed mklibs
 tools-y += sstrip ipkg-utils genext2fs e2fsprogs mtd-utils mkimage
 tools-y += firmware-utils patch-cmdline quilt yaffs2 flock
-tools-y += xorg-macros
 tools-$(CONFIG_TARGET_orion_generic) += wrt350nv2-builder upslug2
 tools-$(CONFIG_TARGET_x86) += qemu
 ifneq ($(CONFIG_TARGET_ar71xx),)
@@ -47,7 +46,6 @@ $(curdir)/mtd-utils/compile := $(curdir)/e2fsprogs/install
 $(curdir)/mkimage/compile := $(curdir)/sed/install
 $(curdir)/qemu/compile := $(curdir)/e2fsprogs/install
 $(curdir)/upslug2/compile := $(curdir)/automake/install
-$(curdir)/xorg-macros/compile := $(curdir)/autoconf/install
 
 $(curdir)/builddirs := $(tools-y) $(tools-dep) $(tools-)
 $(curdir)/builddirs-default := $(tools-y)
diff --git a/tools/xorg-macros/Makefile b/tools/xorg-macros/Makefile
deleted file mode 100644
index 020dadb079..0000000000
--- a/tools/xorg-macros/Makefile
+++ /dev/null
@@ -1,34 +0,0 @@
-# 
-# Copyright (C) 2010 OpenWrt.org
-#
-# This is free software, licensed under the GNU General Public License v2.
-# See /LICENSE for more information.
-#
-include $(TOPDIR)/rules.mk
-
-PKG_NAME:=xorg-macros
-PKG_VERSION:=1.11.0
-
-PKG_SOURCE:=util-macros-$(PKG_VERSION).tar.gz
-PKG_SOURCE_URL:=http://cgit.freedesktop.org/xorg/util/macros/snapshot/
-PKG_MD5SUM:=2bb2645cfc2cc6768dd46f9406cab1d7
-
-HOST_BUILD_DIR:=$(BUILD_DIR)/util-macros-$(PKG_VERSION)
-
-include $(INCLUDE_DIR)/host-build.mk
-
-define Host/Compile
-	( cd $(HOST_BUILD_DIR); ./autogen.sh )
-endef
-
-define Host/Install
-	$(INSTALL_DIR) $(STAGING_DIR)/host/share/aclocal
-	$(INSTALL_DATA) $(HOST_BUILD_DIR)/xorg-macros.m4 $(STAGING_DIR)/host/share/aclocal/
-endef
-
-define Host/Clean
-	-$(MAKE) -C $(HOST_BUILD_DIR) uninstall
-	$(call Host/Clean/Default)
-endef
-
-$(eval $(call HostBuild))