mtd-utils: Build mkfs.ubifs

SVN-Revision: 19096

diff --git a/tools/mtd-utils/Makefile b/tools/mtd-utils/Makefile
index 06be6c7b8d4439b8b7bc0d9c9512f13acec374fb..68d58ea903f91416c42887c85b64f2a3d58cc4aa 100644 (file)
--- 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,7 +21,7 @@ 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)
 ifneq ($(HOST_OS),Linux)
 CFLAGS += -Dloff_t=off_t -D__BYTE_ORDER=BYTE_ORDER -include getline.h -include endian.h
 endif
@@ -39,17 +39,21 @@ define Host/Compile
        $(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 \
+               $(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))