Merge branch 'kbuild' of git://git.kernel.org/pub/scm/linux/kernel/git/mmarek/kbuild
authorLinus Torvalds <torvalds@linux-foundation.org>
Tue, 8 Apr 2014 00:52:31 +0000 (17:52 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 8 Apr 2014 00:52:31 +0000 (17:52 -0700)
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

1  2 
Documentation/DocBook/Makefile
Makefile
scripts/Kbuild.include
scripts/Makefile.lib

@@@ -14,9 -14,9 +14,9 @@@ DOCBOOKS := z8530book.xml device-driver
            genericirq.xml s390-drivers.xml uio-howto.xml scsi.xml \
            80211.xml debugobjects.xml sh.xml regulator.xml \
            alsa-driver-api.xml writing-an-alsa-driver.xml \
 -          tracepoint.xml drm.xml media_api.xml
 +          tracepoint.xml drm.xml media_api.xml w1.xml
  
- include $(srctree)/Documentation/DocBook/media/Makefile
+ include Documentation/DocBook/media/Makefile
  
  ###
  # The build process is as follows (targets):
diff --cc Makefile
Simple merge
Simple merge
Simple merge