diff options
author | Sascha Hauer <s.hauer@pengutronix.de> | 2012-05-03 20:10:13 +0200 |
---|---|---|
committer | Sascha Hauer <s.hauer@pengutronix.de> | 2012-05-03 20:10:13 +0200 |
commit | ce38019845b1f3813c6aabd1cc6bdeac14c9ac3e (patch) | |
tree | 150c1d09c84b4bef643249f0cd262059d68ca726 /Makefile | |
parent | 71fadbafe2274e29787e666f1d6b6529bb897ef8 (diff) | |
parent | bd20ba67987875283cabba9e9e813e6dc355281a (diff) | |
download | barebox-ce38019845b1f3813c6aabd1cc6bdeac14c9ac3e.tar.gz barebox-ce38019845b1f3813c6aabd1cc6bdeac14c9ac3e.tar.xz |
Merge branch 'next'
Conflicts:
common/hush.c
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'Makefile')
-rw-r--r-- | Makefile | 4 |
1 files changed, 3 insertions, 1 deletions
@@ -531,6 +531,7 @@ quiet_cmd_barebox_version = GEN .version mv .version .old_version; \ expr 0$$(cat .old_version) + 1 >.version; \ fi; \ + $(MAKE) $(build)=common # Check size of a file quiet_cmd_check_file_size = CHKSIZE $@ @@ -1001,7 +1002,8 @@ endif # CONFIG_MODULES CLEAN_DIRS += $(MODVERDIR) CLEAN_FILES += barebox System.map include/generated/barebox_default_env.h \ .tmp_version .tmp_barebox* barebox.bin barebox.map barebox.S \ - .tmp_kallsyms* barebox_default_env* barebox.ldr Doxyfile.version + .tmp_kallsyms* barebox_default_env* barebox.ldr \ + Doxyfile.version barebox.srec # Directories & files removed with 'make mrproper' MRPROPER_DIRS += include/config include2 usr/include |