diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2014-04-07 20:52:31 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-04-07 20:52:31 -0400 |
| commit | b003d7706abc5d75cb58de0c9de8f1fc77e57008 (patch) | |
| tree | 2cb773a113d2300a1f5a8b706ecc890ffe8a7338 /scripts/Makefile | |
| parent | 3573d3869de475cca9f2d4998fc3c2871a4cc2db (diff) | |
| parent | b12f73740b8764952a112a677991300545e98c06 (diff) | |
Merge branch 'kbuild' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild
Pull kbuild changes from Michal Marek:
- cleanups in the main Makefiles and Documentation/DocBook/Makefile
- make O=... directory is automatically created if needed
- mrproper/distclean removes the old include/linux/version.h to make
life easier when bisecting across the commit that moved the version.h
file
* 'kbuild' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild:
kbuild: docbook: fix the include error when executing "make help"
kbuild: create a build directory automatically for out-of-tree build
kbuild: remove redundant '.*.cmd' pattern from make distclean
kbuild: move "quote" to Kbuild.include to be consistent
kbuild: docbook: use $(obj) and $(src) rather than specific path
kbuild: unconditionally clobber include/linux/version.h on distclean
kbuild: docbook: specify KERNELDOC dependency correctly
kbuild: docbook: include cmd files more simply
kbuild: specify build_docproc as a phony target
Diffstat (limited to 'scripts/Makefile')
| -rw-r--r-- | scripts/Makefile | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/scripts/Makefile b/scripts/Makefile index 01e7adb838d9..1d07860f6c42 100644 --- a/scripts/Makefile +++ b/scripts/Makefile | |||
| @@ -27,10 +27,10 @@ always := $(hostprogs-y) $(hostprogs-m) | |||
| 27 | hostprogs-y += unifdef docproc | 27 | hostprogs-y += unifdef docproc |
| 28 | 28 | ||
| 29 | # These targets are used internally to avoid "is up to date" messages | 29 | # These targets are used internally to avoid "is up to date" messages |
| 30 | PHONY += build_unifdef | 30 | PHONY += build_unifdef build_docproc |
| 31 | build_unifdef: scripts/unifdef FORCE | 31 | build_unifdef: $(obj)/unifdef |
| 32 | @: | 32 | @: |
| 33 | build_docproc: scripts/docproc FORCE | 33 | build_docproc: $(obj)/docproc |
| 34 | @: | 34 | @: |
| 35 | 35 | ||
| 36 | subdir-$(CONFIG_MODVERSIONS) += genksyms | 36 | subdir-$(CONFIG_MODVERSIONS) += genksyms |
