Merge branch 'v4-0-test' of ssh://git.samba.org/data/git/samba into v4-0-gmake3

Conflicts:

	source/build/smb_build/makefile.pm
(This used to be commit 391fea450b2e6664fcd4e4419858997c6094cf3e)

diff --cc source4/Makefile
index 859d168a6fc0078dddc2c3e32de78430f8ad7f01,914f15826a1fad450c66bd16154322ce7215aeeb..bdcdf2507eef8a832eda75482f28839cf660ed3f
--- 1/source4/Makefile
--- 2/source4/Makefile
+++ b/source4/Makefile
@@@ -19,28 -19,9 +19,28 @@@ BNLD_FLAGS = $(LDFLAGS) $(SYS_LDFLAGS
  HOSTCC_FLAGS = -D_SAMBA_HOSTCC_ $(CFLAGS)
  HOSTLD_FLAGS = $(LDFLAGS) $(SYS_LDFLAGS)
  
 +$(srcdir)/version.h: $(srcdir)/VERSION
 +      @$(SHELL) script/mkversion.sh VERSION $(srcdir)/version.h $(srcdir)/
 +
 +.DEFAULT_GOAL := all
 +
 +ifneq ($(automatic_deps),yes)
 +ALL_PREDEP = proto
 +.NOTPARALLEL:
 +endif
 +
 +regen_version::
 +      @$(SHELL) script/mkversion.sh VERSION $(srcdir)/version.h $(srcdir)/
 +
 +clean_pch::
 +      @echo "Removing precompiled headers"
 +      @-rm -f include/includes.h.gch
 +
 +pch:: clean_pch include/includes.h.gch
 +
  .DEFAULT_GOAL := all
  
- ifneq ($(automatic_deps),yes)
+ ifneq ($(automatic_dependencies),yes)
  ALL_PREDEP = proto
  .NOTPARALLEL:
  endif