tools: host/include/getline.h: Remove

[openwrt/staging/wigyori.git] / tools / mtd-utils / Makefile

diff --git a/tools/mtd-utils/Makefile b/tools/mtd-utils/Makefile
index 49f1ad021f639bc1423c864a3e3fca32c3f8e094..7b4a91a73dee09b0c3cb005f953970d5ea658bf4 100644 (file)
--- a/tools/mtd-utils/Makefile
+++ b/tools/mtd-utils/Makefile
@@ -1,58 +1,50 @@
 #
-# Copyright (C) 2006-2010 OpenWrt.org
+# Copyright (C) 2006-2015 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:=mtd
-PKG_VERSION:=20101002
+PKG_NAME:=mtd-utils
+PKG_VERSION:=1.5.2
 
-PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
+PKG_SOURCE_VERSION:=aea36417067dade75192bafa03af70b6eb2677b1
 PKG_SOURCE_URL:=git://git.infradead.org/mtd-utils.git
 PKG_SOURCE_PROTO:=git
-PKG_SOURCE_VERSION:=b8bbd73bb5bd0b1f5f2c6a3441486d69a45cc79c
-PKG_SOURCE_SUBDIR:=$(PKG_NAME)-$(PKG_VERSION)
-PKG_MD5SUM:=475a6bd4b26bdde63f759f9e1f7bc461
-PKG_CAT:=zcat
-
-HOST_BUILD_DIR:=$(BUILD_DIR_HOST)/$(PKG_NAME)-$(PKG_VERSION)
+PKG_MIRROR_HASH:=e11b342b85a36b2e438a8412ec52f87621d3046aec1a93039f8c72de9990b2a7
 
 include $(INCLUDE_DIR)/host-build.mk
 
+HOST_CFLAGS += -I$(STAGING_DIR_HOST)/include/e2fsprogs
 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 -I$(CURDIR)/include -include fls.h
+CFLAGS += -Dloff_t=off_t -D__BYTE_ORDER=BYTE_ORDER -include endian.h -I$(CURDIR)/include -include fls.h
+MTD_STATIC := 0
+else
+MTD_STATIC := 1
 endif
 
 MTD_MAKEOPTS = \
        CFLAGS="$(CFLAGS)" \
-       NO_LZO=1 WITHOUT_XATTR=1 \
+       LDFLAGS="$(HOST_LDFLAGS)" \
+       WITHOUT_LZO=1 WITHOUT_XATTR=1 \
        SUBDIRS="" \
-       BUILDDIR="$(HOST_BUILD_DIR)"
+       BUILDDIR="$(HOST_BUILD_DIR)" \
+       STATIC=$(MTD_STATIC) \
+       V=$(if $(findstring c,$(OPENWRT_VERBOSE)),1)
 
 define Host/Compile
-       $(MAKE) -C $(HOST_BUILD_DIR)/lib \
-               $(MTD_MAKEOPTS) \
-               TARGETS="libmtd.a libcrc32.a" \
-               LIBS="libmtd libcrc32"
        $(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"
+               TARGETS="mkfs.jffs2 ubi-utils/ubinize mkfs.ubifs/mkfs.ubifs"
 endef
 
 define Host/Install
        $(CP) \
                $(HOST_BUILD_DIR)/mkfs.jffs2 \
                $(HOST_BUILD_DIR)/mkfs.ubifs/mkfs.ubifs \
-               $(HOST_BUILD_DIR)/ubinize \
+               $(HOST_BUILD_DIR)/ubi-utils/ubinize \
                $(STAGING_DIR_HOST)/bin/
 endef