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

Conflicts:

	source/Makefile
	source/build/smb_build/makefile.pm
	source/librpc/config.mk
(This used to be commit 3e02fcfd3fb6683f51417ba39f4ec177494eff3e)

diff --cc source4/Makefile
index 65f8c2de29e35358b51d451b8bfa9143ec5f2020,97518ebcb695ea71f16b726b74c6d227a949e105..859d168a6fc0078dddc2c3e32de78430f8ad7f01
--- 1/source4/Makefile
--- 2/source4/Makefile
+++ b/source4/Makefile
@@@ -19,18 -19,6 +19,25 @@@ 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)

diff --cc source4/build/smb_build/makefile.pm
Simple merge