aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorFelix Fietkau <nbd@openwrt.org>2010-11-22 14:26:06 +0000
committerFelix Fietkau <nbd@openwrt.org>2010-11-22 14:26:06 +0000
commit5b2df455f014d18944cfd737a5d0ba7d2e207d57 (patch)
tree6ead5bfd819754fb6d64e49f31c32969aef18c84
parent66b08771ff843f42da6e8eb44ff05b69c9b5f735 (diff)
downloadupstream-5b2df455f014d18944cfd737a5d0ba7d2e207d57.tar.gz
upstream-5b2df455f014d18944cfd737a5d0ba7d2e207d57.tar.bz2
upstream-5b2df455f014d18944cfd737a5d0ba7d2e207d57.zip
e2fsprogs: clean up the makefile and install libuuid
SVN-Revision: 24091
-rw-r--r--tools/e2fsprogs/Makefile32
1 files changed, 3 insertions, 29 deletions
diff --git a/tools/e2fsprogs/Makefile b/tools/e2fsprogs/Makefile
index 2a7eb6a4e7..e13160b2f3 100644
--- a/tools/e2fsprogs/Makefile
+++ b/tools/e2fsprogs/Makefile
@@ -17,45 +17,19 @@ PKG_SOURCE_URL:=@SF/e2fsprogs
include $(INCLUDE_DIR)/host-build.mk
-define Host/Configure
- ( cd $(HOST_BUILD_DIR); \
- ./configure \
- --target=$(GNU_HOST_NAME) \
- --host=$(GNU_HOST_NAME) \
- --build=$(GNU_HOST_NAME) \
- --program-prefix="" \
- --program-suffix="" \
- --prefix=/usr \
- --exec-prefix=/usr \
- --bindir=/usr/bin \
- --sbindir=/usr/sbin \
- --libexecdir=/usr/lib \
- --sysconfdir=/etc \
- --datadir=/usr/share \
- --localstatedir=/var \
- --mandir=/usr/man \
- --infodir=/usr/info \
- )
-endef
-
TARGET_CFLAGS += $(FPIC)
CONFIGURE_ARGS += \
- --enable-shared \
+ --disable-shared \
--enable-static \
--disable-rpath \
--enable-elf-shlibs \
--enable-dynamic-e2fsck \
--disable-tls
-define Host/Compile
- $(MAKE) -C $(HOST_BUILD_DIR) \
- CFLAGS="$(HOST_CFLAGS)" all
-endef
-
define Host/Install
- install -m0755 $(HOST_BUILD_DIR)/e2fsck/e2fsck $(STAGING_DIR_HOST)/bin/
- install -m0755 $(HOST_BUILD_DIR)/misc/tune2fs $(STAGING_DIR_HOST)/bin/
+ $(Host/Install/Default)
+ $(INSTALL_DATA) $(HOST_BUILD_DIR)/lib/uuid/libuuid.a $(STAGING_DIR_HOST)/lib/
endef
define Host/Clean