Merge branch 'v3-3-test' of ssh://git.samba.org/data/git/samba into docbook

Conflicts:

	source/Makefile.in
(This used to be commit 01987778a123f853fccdcb7fe9566143e2d7c490)

diff --cc source3/Makefile.in
index bbee0fd1dfc079bf573d2ff5d224e96d409bbe5e,85385f6b011ce97f9ee7bc4f7833ffa9bed1b47c..21b4b1c5e9ff1aa55479a62850016d0e4aaa7341
--- 1/source3/Makefile.in
--- 2/source3/Makefile.in
+++ b/source3/Makefile.in
@@@ -1270,7 -1272,7 +1270,7 @@@ PRECOMPILED_HEADER = $(builddir)/includ
  
  # this adds support for precompiled headers. To use it, install a snapshot
  # of gcc-3.4 and run 'make pch' before you do the main build.
- pch:: proto_exists
 -pch:
++pch::
        rm -f $(PRECOMPILED_HEADER)
        $(MAKE) $(PRECOMPILED_HEADER)
  
@@@ -2278,7 -2280,9 +2278,9 @@@ uninstallpammodules:
  # Toplevel clean files
  TOPFILES=dynconfig.o
  
- clean:: delheaders 
 -clean:
++clean::
+       -rm -f include/build_env.h
+       -rm -f smbd/build_options.c
        -rm -f $(PRECOMPILED_HEADER)
        -rm -f core */*~ *~ \
                */*.o */*/*.o */*/*/*.o \
@@@ -2324,60 -2302,13 +2300,13 @@@ include/build_env.h: script/build_env.s
        @$(SHELL) $(srcdir)/script/build_env.sh $(srcdir) $(builddir) $(CC) \
          > $(builddir)/include/build_env.h
  
- winbindd/winbindd_proto.h:
-       @cd $(srcdir) && $(SHELL) $(MKPROTO_SH) $(AWK) \
-         -h _WINBINDD_PROTO_H_ $(builddir)/winbindd/winbindd_proto.h \
-         $(WINBINDD_OBJ1)
- 
- web/swat_proto.h:
-       @cd $(srcdir) && $(SHELL) $(MKPROTO_SH) $(AWK) \
-         -h _SWAT_PROTO_H_ $(builddir)/web/swat_proto.h \
-         $(SWAT_OBJ1)
- 
- client/client_proto.h:
-       @cd $(srcdir) && $(SHELL) $(MKPROTO_SH) $(AWK) \
-         -h _CLIENT_PROTO_H_ $(builddir)/client/client_proto.h \
-         $(CLIENT_OBJ1)
- 
- utils/net_proto.h:
-       @cd $(srcdir) && $(SHELL) $(MKPROTO_SH) $(AWK) \
-         -h _NET_PROTO_H_ $(builddir)/utils/net_proto.h \
-         $(NET_OBJ1)
- 
- utils/passwd_proto.h:
-       @cd $(srcdir) && $(SHELL) $(MKPROTO_SH) $(AWK) \
-         -h _PASSWD_PROTO_H_ $(builddir)/utils/passwd_proto.h \
-         $(PASSWD_UTIL_OBJ)
- 
- utils/ntlm_auth_proto.h:
-       @cd $(srcdir) && $(SHELL) $(MKPROTO_SH) $(AWK) \
-         -h _NTLM_AUTH_PROTO_H_ $(builddir)/utils/ntlm_auth_proto.h \
-         $(NTLM_AUTH_OBJ1)
- 
- libnet/libnet_proto.h:
-       @cd $(srcdir) && $(SHELL) $(MKPROTO_SH) $(AWK) \
-         -h _LIBNET_PROTO_H_ $(builddir)/libnet/libnet_proto.h \
-         $(LIBNET_OBJ)
- 
- # "make headers" or "make proto" calls a subshell because we need to
- # make sure these commands are executed in sequence even for a
- # parallel make.
- headers::
-       $(MAKE) delheaders; \
-       $(MAKE) smbd/build_options.c; \
-       $(MAKE) include/proto.h; \
-       $(MAKE) include/build_env.h; \
-       $(MAKE) winbindd/winbindd_proto.h; \
-       $(MAKE) web/swat_proto.h; \
-       $(MAKE) client/client_proto.h; \
-       $(MAKE) utils/ntlm_auth_proto.h; \
-       $(MAKE) utils/net_proto.h; \
-       $(MAKE) utils/passwd_proto.h; \
-       $(MAKE) libnet/libnet_proto.h;
- 
- proto:: headers
- 
- .PHONY: headers proto
 -proto:
++proto::
+       @echo
+       @echo "NOTE: 'proto' is no longer a valid make target as proto.h"
+       @echo "and other prototype headers are not generated anymore."
+       @echo
+ 
+ .PHONY: proto
  
  etags:
        etags `find $(srcdir) -name "*.[ch]" | grep -v /.svn/`