X-Git-Url: https://git.rohieb.name/openwrt.git/blobdiff_plain/9f28e5bd03c15cbb0f9b1c534d16e065127aaeb2..abe312efd5fbeee4423d991b0f690a267f098714:/tools/mtd-utils/Makefile diff --git a/tools/mtd-utils/Makefile b/tools/mtd-utils/Makefile index a74c94155..45bceaf83 100644 --- a/tools/mtd-utils/Makefile +++ b/tools/mtd-utils/Makefile @@ -1,5 +1,5 @@ -# -# Copyright (C) 2006 OpenWrt.org +# +# Copyright (C) 2006-2010 OpenWrt.org # # This is free software, licensed under the GNU General Public License v2. # See /LICENSE for more information. @@ -21,9 +21,9 @@ HOST_BUILD_DIR:=$(BUILD_DIR_HOST)/$(PKG_NAME)-$(PKG_VERSION) include $(INCLUDE_DIR)/host-build.mk -CFLAGS := $(HOST_CFLAGS) -I../include +CFLAGS := $(HOST_CFLAGS) -I$(HOST_BUILD_DIR)/include -L$(HOST_BUILD_DIR) -L$(STAGING_DIR_HOST)/lib -DNO_NATIVE_SUPPORT ifneq ($(HOST_OS),Linux) -CFLAGS += -Dloff_t=off_t -D__BYTE_ORDER=BYTE_ORDER -include getline.h -include endian.h +CFLAGS += -Dloff_t=off_t -D__BYTE_ORDER=BYTE_ORDER -include getline.h -include endian.h -I$(CURDIR)/include -include fls.h endif MTD_MAKEOPTS = \ @@ -36,14 +36,24 @@ define Host/Compile $(MAKE) -C $(HOST_BUILD_DIR) \ $(MTD_MAKEOPTS) \ TARGETS=mkfs.jffs2 + $(MAKE) -C $(HOST_BUILD_DIR)/ubi-utils \ + $(MTD_MAKEOPTS) \ + TARGETS=ubinize + $(MAKE) -C $(HOST_BUILD_DIR)/mkfs.ubifs \ + $(MTD_MAKEOPTS) \ + BUILDDIR="$(HOST_BUILD_DIR)/mkfs.ubifs" endef define Host/Install - $(CP) $(HOST_BUILD_DIR)/mkfs.jffs2 $(STAGING_DIR_HOST)/bin/ + $(CP) \ + $(HOST_BUILD_DIR)/mkfs.jffs2 \ + $(HOST_BUILD_DIR)/mkfs.ubifs/mkfs.ubifs \ + $(HOST_BUILD_DIR)/ubinize \ + $(STAGING_DIR_HOST)/bin/ endef define Host/Clean - rm -f $(STAGING_DIR_HOST)/bin/mkfs.jffs2 + rm -f $(STAGING_DIR_HOST)/bin/{mkfs.jffs2,mkfs.ubifs,ubinize} endef $(eval $(call HostBuild))