summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWolfgang Denk <wd@denx.de>2008-05-13 23:15:52 +0200
committerWolfgang Denk <wd@denx.de>2008-05-13 23:15:52 +0200
commit1510b82d50615f344e89d42533e8224cce067dc0 (patch)
treee6ccd31bbe4ea4c9201f054118eb3ce31e737d06
parent65dcfa79204f4750b905a173a5365e0b2eb6c2f6 (diff)
Makefile: fix "error: version_autogenerated.h: No such file or directory"
Signed-off-by: Wolfgang Denk <wd@denx.de>
-rw-r--r--Makefile14
-rw-r--r--include/version.h2
2 files changed, 12 insertions, 4 deletions
diff --git a/Makefile b/Makefile
index 6783fec407c..6548f8eb057 100644
--- a/Makefile
+++ b/Makefile
@@ -424,13 +424,19 @@ $(obj)System.map: $(obj)u-boot
# This target actually generates 2 files; autoconf.mk and autoconf.mk.dep.
# the dep file is only include in this top level makefile to determine when
# to regenerate the autoconf.mk file.
-$(obj)include/autoconf.mk: $(obj)include/config.h
- @$(XECHO) Generating include/autoconf.mk ; \
+$(obj)include/autoconf.mk.dep: $(obj)include/config.h include/common.h
+ @$(XECHO) Generating $@ ; \
set -e ; \
: Generate the dependancies ; \
- $(CC) -x c -M $(HOST_CFLAGS) $(CPPFLAGS) -MQ $@ include/common.h > $@.dep ; \
+ $(CC) -x c -DDO_DEPS_ONLY -M $(HOST_CFLAGS) $(CPPFLAGS) \
+ -MQ $(obj)include/autoconf.mk include/common.h > $@
+
+$(obj)include/autoconf.mk: $(obj)include/config.h
+ @$(XECHO) Generating $@ ; \
+ set -e ; \
: Extract the config macros ; \
- $(CPP) $(CFLAGS) -dM include/common.h | sed -n -f tools/scripts/define2mk.sed > $@
+ $(CPP) $(CFLAGS) -DDO_DEPS_ONLY -dM include/common.h | \
+ sed -n -f tools/scripts/define2mk.sed > $@
sinclude $(obj)include/autoconf.mk.dep
diff --git a/include/version.h b/include/version.h
index b56d2e9900b..a34291adc5d 100644
--- a/include/version.h
+++ b/include/version.h
@@ -24,6 +24,8 @@
#ifndef __VERSION_H__
#define __VERSION_H__
+#ifndef DO_DEPS_ONLY
#include "version_autogenerated.h"
+#endif
#endif /* __VERSION_H__ */