Merge branch 'u-boot-ti/master' into 'u-boot-arm/master'

[platform/kernel/u-boot.git] / tools / env / Makefile

diff --git a/tools/env/Makefile b/tools/env/Makefile
index 04dfe9c..0e798e0 100644 (file)
--- a/tools/env/Makefile
+++ b/tools/env/Makefile
@@ -12,7 +12,7 @@
 #
 # This program is distributed in the hope that it will be useful,
 # but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
 # GNU General Public License for more details.
 #
 # You should have received a copy of the GNU General Public License
@@ -23,14 +23,18 @@
 
 include $(TOPDIR)/config.mk
 
-HOSTSRCS := $(obj)crc32.c  fw_env.c  fw_env_main.c
-HEADERS        := fw_env.h
+HOSTSRCS := $(SRCTREE)/lib/crc32.c  fw_env.c  fw_env_main.c
+HOSTSRCS += $(SRCTREE)/lib/ctype.c $(SRCTREE)/lib/linux_string.c
+HOSTSRCS += $(SRCTREE)/common/env_attr.c $(SRCTREE)/common/env_flags.c
+HEADERS        := fw_env.h $(OBJTREE)/include/config.h
 
 # Compile for a hosted environment on the target
 HOSTCPPFLAGS  = -idirafter $(SRCTREE)/include \
-                -idirafter $(OBJTREE)/include2 \
-                -idirafter $(OBJTREE)/include \
-                -DUSE_HOSTCC
+               -idirafter $(OBJTREE)/include2 \
+               -idirafter $(OBJTREE)/include \
+               -idirafter $(SRCTREE)/tools/env \
+               -DUSE_HOSTCC \
+               -DTEXT_BASE=$(TEXT_BASE)
 
 ifeq ($(MTD_VERSION),old)
 HOSTCPPFLAGS += -DMTD_OLD
@@ -41,12 +45,10 @@ all:        $(obj)fw_printenv
 # Some files complain if compiled with -pedantic, use HOSTCFLAGS_NOPED
 $(obj)fw_printenv:     $(HOSTSRCS) $(HEADERS)
        $(HOSTCC) $(HOSTCFLAGS_NOPED) $(HOSTLDFLAGS) -o $@ $(HOSTSRCS)
+       $(HOSTSTRIP) $@
 
 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
 
 #########################################################################