summaryrefslogtreecommitdiff
path: root/Makefile
diff options
context:
space:
mode:
authorWolfgang Denk <wd@denx.de>2006-10-25 00:43:17 +0200
committerWolfgang Denk <wd@denx.de>2006-10-25 00:43:17 +0200
commit4e53a25855701c312e84404e183e7159e0766a23 (patch)
tree2c3f6d07c47f9cd08cd189a226744fdfaf4c0d84 /Makefile
parent7c52c4b943ff52bbe8796a7e2d3e476ceaf3f512 (diff)
parentaf9e1f5b9e6f9ce810f5e8bf2961c9542a5865c2 (diff)
Fix Makefile for "CHANGELOG" target
Merge with /home/sr/git/u-boot/4xx-idcr
Diffstat (limited to 'Makefile')
-rw-r--r--Makefile7
1 files changed, 4 insertions, 3 deletions
diff --git a/Makefile b/Makefile
index 0af26bf73f..dec6355217 100644
--- a/Makefile
+++ b/Makefile
@@ -318,9 +318,6 @@ $(obj)System.map: $(obj)u-boot
grep -v '\(compiled\)\|\(\.o$$\)\|\( [aUw] \)\|\(\.\.ng$$\)\|\(LASH[RL]DI\)' | \
sort > $(obj)System.map
-CHANGELOG:
- git log --no-merges U-Boot-1_1_5.. > $@
-
#########################################################################
else
all $(obj)u-boot.hex $(obj)u-boot.srec $(obj)u-boot.bin \
@@ -331,6 +328,10 @@ dep tags ctags etags $(obj)System.map:
@ exit 1
endif
+.PHONY : CHANGELOG
+CHANGELOG:
+ git log --no-merges U-Boot-1_1_5.. > $@
+
#########################################################################
unconfig: