X-Git-Url: https://git.rohieb.name/openwrt.git/blobdiff_plain/7b2c9d0ed3314c336d84bfe752fc9078e1687e56..f047eb681484f8d1f6034f67732a6bdab3d66cd7:/tools/Makefile diff --git a/tools/Makefile b/tools/Makefile index 4a39663cd..ce405e7ad 100644 --- a/tools/Makefile +++ b/tools/Makefile @@ -17,12 +17,13 @@ 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 xz tools-$(CONFIG_TARGET_orion_generic) += wrt350nv2-builder upslug2 tools-$(CONFIG_TARGET_x86) += qemu ifneq ($(CONFIG_TARGET_ar71xx),) -tools-y += squashfs lzma-old +tools-y += lzma-old squashfs endif -tools-y += squashfs4 lzma +tools-y += lzma squashfs4 tools-$(CONFIG_CCACHE) += ccache ifdef CONFIG_GCC_USE_GRAPHITE @@ -46,6 +47,7 @@ $(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)/automake/install $(curdir)/builddirs := $(tools-y) $(tools-dep) $(tools-) $(curdir)/builddirs-default := $(tools-y) @@ -61,11 +63,8 @@ define PrepareStaging endef # preparatory work -$(STAGING_DIR)/.prepared: $(TMP_DIR)/.build $(STAGING_DIR_HOST)/.prepared +$(STAGING_DIR)/.prepared: $(TMP_DIR)/.build $(call PrepareStaging,$(STAGING_DIR)) - mkdir -p $(STAGING_DIR)/host/share - rm -rf $(STAGING_DIR)/host/share/aclocal - ln -s $(STAGING_DIR_HOST)/share/aclocal $(STAGING_DIR)/host/share/ mkdir -p $(BUILD_DIR)/stamp touch $@