Changeset 24452


Ignore:
Timestamp:
2010-12-10T21:23:48+01:00 (6 years ago)
Author:
jow
Message:

[tools] turn util-macros into tools/xorg-macros host build, provides global xorg m4 macros

Location:
trunk/tools
Files:
2 edited
1 moved

Legend:

Unmodified
Added
Removed
  • trunk/tools/Makefile

    r24422 r24452  
    1818tools-y += sstrip ipkg-utils genext2fs e2fsprogs mtd-utils mkimage 
    1919tools-y += firmware-utils patch-cmdline quilt yaffs2 flock 
     20tools-y += xorg-macros 
    2021tools-$(CONFIG_TARGET_orion_generic) += wrt350nv2-builder upslug2 
    2122tools-$(CONFIG_TARGET_x86) += qemu 
     
    4748$(curdir)/qemu/compile := $(curdir)/e2fsprogs/install 
    4849$(curdir)/upslug2/compile := $(curdir)/automake/install 
     50$(curdir)/xorg-macros/compile := $(curdir)/autoconf/install 
    4951 
    5052$(curdir)/builddirs := $(tools-y) $(tools-dep) $(tools-) 
  • trunk/tools/xorg-macros/Makefile

    r24410 r24452  
    11# 
    2 # Copyright (C) 2006-2010 OpenWrt.org 
     2# Copyright (C) 2010 OpenWrt.org 
    33# 
    44# This is free software, licensed under the GNU General Public License v2. 
    55# See /LICENSE for more information. 
    66# 
    7 # blogic@openwrt.org 
    87 
    98include $(TOPDIR)/rules.mk 
    109 
    11 PKG_NAME:=util-macros 
    12 PKG_RELEASE:=1 
    13 PKG_VERSION:=1.3.0 
     10PKG_NAME:=xorg-macros 
     11PKG_VERSION:=1.11.0 
    1412 
    1513PKG_SOURCE_URL:=http://xorg.freedesktop.org/releases/individual/util/ 
    16 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 
    17 PKG_BUILD_DIR:=$(BUILD_DIR)/Xorg/$(PKG_NAME)-$(PKG_VERSION)/ 
    18 PKG_MD5SUM:=0837fe88af7d692308b25815457a3288 
     14PKG_SOURCE:=util-macros-$(PKG_VERSION).tar.bz2 
     15PKG_MD5SUM:=22d5cdff672450cb6902e0d68c200dcb 
    1916 
    20 include $(INCLUDE_DIR)/package.mk 
     17HOST_BUILD_DIR:=$(BUILD_DIR)/util-macros-$(PKG_VERSION) 
    2118 
    22 define Package/util-macros 
    23   SECTION:=xorg-utils 
    24   CATEGORY:=Xorg 
    25   SUBMENU:=utils 
    26   DEPENDS:= 
    27   TITLE:=${PKG_NAME} 
    28   URL:=http://xorg.freedesktop.org/ 
     19include $(INCLUDE_DIR)/host-build.mk 
     20 
     21define Host/Install 
     22        $(INSTALL_DIR) $(STAGING_DIR_HOST)/share/aclocal 
     23        $(INSTALL_DATA) $(HOST_BUILD_DIR)/xorg-macros.m4 $(STAGING_DIR_HOST)/share/aclocal/ 
    2924endef 
    3025 
    31 define Build/Configure 
    32         cd $(PKG_BUILD_DIR); \ 
    33                 ./configure \ 
    34                         --prefix=${STAGING_DIR} \ 
    35                         --sysconfdir=/etc \ 
    36                         --mandir=${STAGING_DIR}/share/man \ 
    37                         --localstatedir=/var 
     26define Host/Clean 
     27        -$(MAKE) -C $(HOST_BUILD_DIR) uninstall 
     28        $(call Host/Clean/Default) 
    3829endef 
    3930 
    40 #define Build/Compile 
    41 #       DESTDIR=$(PKG_INSTALL_DIR) $(MAKE) -C $(PKG_BUILD_DIR) $(MAKE_FLAGS) install 
    42 #endef 
    43  
    44 define Build/InstallDev 
    45         $(INSTALL_DIR) $(STAGING_DIR)/host/share/aclocal 
    46         $(INSTALL_DATA) $(PKG_BUILD_DIR)/xorg-macros.m4 $(STAGING_DIR)/host/share/aclocal/ 
    47 endef 
    48  
    49 $(eval $(call BuildPackage,util-macros)) 
     31$(eval $(call HostBuild)) 
Note: See TracChangeset for help on using the changeset viewer.