diff options
| -rw-r--r-- | rules/grep.make | 45 |
1 files changed, 4 insertions, 41 deletions
diff --git a/rules/grep.make b/rules/grep.make index 38b1736ec..ab35cf361 100644 --- a/rules/grep.make +++ b/rules/grep.make @@ -1,7 +1,7 @@ # -*-makefile-*- -# $Id: template-make 8785 2008-08-26 07:48:06Z wsa $ # # Copyright (C) 2008 by Luotao Fu <l.fu@pengutronix.de> +# (C) 2010 by Michael Olbrich <m.olbrich@pengutronix.de> # # See CREDITS for details about who has contributed to this project. # @@ -33,17 +33,6 @@ $(GREP_SOURCE): @$(call get, GREP) # ---------------------------------------------------------------------------- -# Extract -# ---------------------------------------------------------------------------- - -$(STATEDIR)/grep.extract: - @$(call targetinfo) - @$(call clean, $(GREP_DIR)) - @$(call extract, GREP) - @$(call patchin, GREP) - @$(call touch) - -# ---------------------------------------------------------------------------- # Prepare # ---------------------------------------------------------------------------- @@ -53,7 +42,7 @@ GREP_ENV := $(CROSS_ENV) # # autoconf # -GREP_AUTOCONF := $(CROSS_AUTOCONF_USR) +GREP_AUTOCONF := $(CROSS_AUTOCONF_ROOT) ifdef PTXCONF_GREP_PCRE GREP_AUTOCONF += --enable-perl-regexp @@ -61,32 +50,6 @@ else GREP_AUTOCONF += --disable-perl-regexp endif -$(STATEDIR)/grep.prepare: - @$(call targetinfo) - @$(call clean, $(GREP_DIR)/config.cache) - cd $(GREP_DIR) && \ - $(GREP_PATH) $(GREP_ENV) \ - ./configure $(GREP_AUTOCONF) - @$(call touch) - -# ---------------------------------------------------------------------------- -# Compile -# ---------------------------------------------------------------------------- - -$(STATEDIR)/grep.compile: - @$(call targetinfo) - cd $(GREP_DIR) && $(GREP_PATH) $(MAKE) $(PARALLELMFLAGS) - @$(call touch) - -# ---------------------------------------------------------------------------- -# Install -# ---------------------------------------------------------------------------- - -$(STATEDIR)/grep.install: - @$(call targetinfo) - @$(call install, GREP) - @$(call touch) - # ---------------------------------------------------------------------------- # Target-Install # ---------------------------------------------------------------------------- @@ -99,11 +62,11 @@ $(STATEDIR)/grep.targetinstall: @$(call install_fixup, grep,PRIORITY,optional) @$(call install_fixup, grep,VERSION,$(GREP_VERSION)) @$(call install_fixup, grep,SECTION,base) - @$(call install_fixup, grep,AUTHOR,"Luotao Fu <l.fu\@pengutronix.de>") + @$(call install_fixup, grep,AUTHOR,"Luotao Fu <l.fu@pengutronix.de>") @$(call install_fixup, grep,DEPENDS,) @$(call install_fixup, grep,DESCRIPTION,missing) - @$(call install_copy, grep, 0, 0, 0755, $(GREP_DIR)/src/grep, /bin/grep) + @$(call install_copy, grep, 0, 0, 0755, -, /bin/grep) @$(call install_finish, grep) |