diff options
author | Sascha Hauer <s.hauer@pengutronix.de> | 2010-12-03 16:25:32 +0100 |
---|---|---|
committer | Sascha Hauer <s.hauer@pengutronix.de> | 2010-12-03 16:25:32 +0100 |
commit | e987040bc914e0677e62600d2b510389632a2605 (patch) | |
tree | fe9062cb560f1fd5d46e97d2110800b758334b47 /Makefile | |
parent | ff3bea7fedd62a0c11b6b9468cf7e5c71b0f1a1a (diff) | |
parent | 615076e1fc11a86efdc76c64ce65cd336684c742 (diff) | |
download | barebox-e987040bc914e0677e62600d2b510389632a2605.tar.gz barebox-e987040bc914e0677e62600d2b510389632a2605.tar.xz |
Merge branch 'next'
Diffstat (limited to 'Makefile')
-rw-r--r-- | Makefile | 7 |
1 files changed, 5 insertions, 2 deletions
@@ -762,6 +762,9 @@ include/config/kernel.release: include/config/auto.conf FORCE $(Q)rm -f $@ $(Q)echo $(kernelrelease) > $@ +Doxyfile.version: include/config/auto.conf FORCE + $(Q)rm -f $@ + $(Q)echo "PROJECT_NUMBER = $(KERNELRELEASE)" > $@ # Things we need to do before we recursively start building the kernel # or the modules are listed in "prepare". @@ -973,7 +976,7 @@ endif # CONFIG_MODULES CLEAN_DIRS += $(MODVERDIR) CLEAN_FILES += barebox System.map include/generated/barebox_default_env.h \ .tmp_version .tmp_barebox* barebox.bin barebox.S \ - .tmp_kallsyms* barebox_default_env barebox.ldr + .tmp_kallsyms* barebox_default_env barebox.ldr Doxyfile.version # Directories & files removed with 'make mrproper' MRPROPER_DIRS += include/config include2 usr/include @@ -1098,7 +1101,7 @@ help: docs : htmldocs -htmldocs: +htmldocs: Doxyfile.version @echo 'Running doxygen with local Doxyfile' $(Q)doxygen Doxyfile |