From dca61f0128a15bfc4fdefbbdb4a5f6c10b0c8f0b Mon Sep 17 00:00:00 2001
From: =?utf8?q?Andreas=20Bie=C3=9Fmann?= <biessmann@corscience.de>
Date: Mon, 17 Oct 2011 22:11:12 +0000
Subject: [PATCH] tools/env: use lib/crc32.c directly
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit
Instead of linking the file into $(obj) tree use directly the source file.
This also prevents littered source tree if building not out-of-tree.
Signed-off-by: Andreas BieÃmann <biessmann@corscience.de>
Acked-by: Mike Frysinger <vapier@gentoo.org>
---
Makefile | 2 +-
tools/env/Makefile | 7 ++-----
2 files changed, 3 insertions(+), 6 deletions(-)
diff --git a/Makefile b/Makefile
index 7afd35b98c..d84b350205 100644
--- a/Makefile
+++ b/Makefile
@@ -790,7 +790,7 @@ clobber: clean
@rm -f $(obj)u-boot.ubl
@rm -f $(obj)u-boot.dtb
@rm -f $(obj)u-boot.sb
- @rm -f $(obj)tools/{env/crc32.c,inca-swap-bytes}
+ @rm -f $(obj)tools/inca-swap-bytes
@rm -f $(obj)arch/powerpc/cpu/mpc824x/bedbug_603e.c
@rm -fr $(obj)include/asm/proc $(obj)include/asm/arch $(obj)include/asm
@rm -fr $(obj)include/generated
diff --git a/tools/env/Makefile b/tools/env/Makefile
index 2f7a59c00b..28b73da4ad 100644
--- a/tools/env/Makefile
+++ b/tools/env/Makefile
@@ -23,7 +23,7 @@
include $(TOPDIR)/config.mk
-HOSTSRCS := $(obj)crc32.c fw_env.c fw_env_main.c
+HOSTSRCS := $(SRCTREE)/lib/crc32.c fw_env.c fw_env_main.c
HEADERS := fw_env.h
# Compile for a hosted environment on the target
@@ -43,10 +43,7 @@ $(obj)fw_printenv: $(HOSTSRCS) $(HEADERS)
$(HOSTCC) $(HOSTCFLAGS_NOPED) $(HOSTLDFLAGS) -o $@ $(HOSTSRCS)
clean:
- rm -f $(obj)fw_printenv $(obj)crc32.c
-
-$(obj)crc32.c:
- ln -s $(src)../../lib/crc32.c $(obj)crc32.c
+ rm -f $(obj)fw_printenv
#########################################################################
--
2.39.5