From 1ef69fcf21400a72ad34198aaa9cf8a1afbbb9ec Mon Sep 17 00:00:00 2001
From: Michael Adam <obnox@samba.org>
Date: Sun, 18 May 2008 22:58:07 +0200
Subject: build: freeze proto.h

Michael
(This used to be commit ff7f0cad2eb108daa61a910cd9171ab0811a5f60)
---
 source3/Makefile.in | 11 ++---------
 1 file changed, 2 insertions(+), 9 deletions(-)

(limited to 'source3/Makefile.in')

diff --git a/source3/Makefile.in b/source3/Makefile.in
index 7e316ee886..85dde39de4 100644
--- a/source3/Makefile.in
+++ b/source3/Makefile.in
@@ -2299,7 +2299,7 @@ clean: delheaders
 # exist, not necessarily that they are up to date.  Since they're
 # removed by "make clean" this will always be run when you do anything
 # afterwards.
-proto_exists: include/proto.h include/build_env.h \
+proto_exists: include/build_env.h \
 	winbindd/winbindd_proto.h web/swat_proto.h \
 	libnet/libnet_proto.h \
 	client/client_proto.h utils/net_proto.h utils/ntlm_auth_proto.h smbd/build_options.c
@@ -2307,7 +2307,7 @@ proto_exists: include/proto.h include/build_env.h \
 
 delheaders:
 	@echo Removing prototype headers
-	@rm -f include/proto.h include/build_env.h \
+	@rm -f include/build_env.h \
 		winbindd/winbindd_proto.h web/swat_proto.h \
 		client/client_proto.h utils/net_proto.h \
 		smbd/build_options.c utils/ntlm_auth_proto.h \
@@ -2315,12 +2315,6 @@ delheaders:
 
 MKPROTO_SH = $(srcdir)/script/mkproto.sh
 
-include/proto.h: smbd/build_options.c
-	@echo Building include/proto.h
-	@cd $(srcdir) && $(SHELL) $(MKPROTO_SH) $(AWK) \
-	  -h _PROTO_H_ $(builddir)/include/proto.h \
-	  $(PROTO_OBJ)
-
 include/build_env.h: script/build_env.sh
 	@echo Building include/build_env.h
 	@$(SHELL) $(srcdir)/script/build_env.sh $(srcdir) $(builddir) $(CC) \
@@ -2367,7 +2361,6 @@ libnet/libnet_proto.h:
 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; \
-- 
cgit 


From 03dcad0b271ab348149431340317d053308614bd Mon Sep 17 00:00:00 2001
From: Michael Adam <obnox@samba.org>
Date: Sun, 18 May 2008 23:09:34 +0200
Subject: winbindd: freeze winbindd_proto.h

Michael
(This used to be commit 467b8f0f4d58fc00d07264c651016087bd00b233)
---
 source3/Makefile.in | 10 ++--------
 1 file changed, 2 insertions(+), 8 deletions(-)

(limited to 'source3/Makefile.in')

diff --git a/source3/Makefile.in b/source3/Makefile.in
index 85dde39de4..3f59491806 100644
--- a/source3/Makefile.in
+++ b/source3/Makefile.in
@@ -2300,7 +2300,7 @@ clean: delheaders
 # removed by "make clean" this will always be run when you do anything
 # afterwards.
 proto_exists: include/build_env.h \
-	winbindd/winbindd_proto.h web/swat_proto.h \
+	web/swat_proto.h \
 	libnet/libnet_proto.h \
 	client/client_proto.h utils/net_proto.h utils/ntlm_auth_proto.h smbd/build_options.c
 	@touch proto_exists
@@ -2308,7 +2308,7 @@ proto_exists: include/build_env.h \
 delheaders:
 	@echo Removing prototype headers
 	@rm -f include/build_env.h \
-		winbindd/winbindd_proto.h web/swat_proto.h \
+		web/swat_proto.h \
 		client/client_proto.h utils/net_proto.h \
 		smbd/build_options.c utils/ntlm_auth_proto.h \
 		utils/passwd_proto.h libnet/libnet_proto.h
@@ -2320,11 +2320,6 @@ include/build_env.h: script/build_env.sh
 	@$(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 \
@@ -2362,7 +2357,6 @@ headers:
 	$(MAKE) delheaders; \
 	$(MAKE) smbd/build_options.c; \
 	$(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; \
-- 
cgit 


From 611c96d078dc533690a8a1ebafa89a1b76296cc0 Mon Sep 17 00:00:00 2001
From: Michael Adam <obnox@samba.org>
Date: Sun, 18 May 2008 23:16:38 +0200
Subject: swat: freeze swat_proto.h from "make proto"

Michael
(This used to be commit 372c58cc220efc01af4b90b82b75191296a62e81)
---
 source3/Makefile.in | 8 --------
 1 file changed, 8 deletions(-)

(limited to 'source3/Makefile.in')

diff --git a/source3/Makefile.in b/source3/Makefile.in
index 3f59491806..3eaba942d2 100644
--- a/source3/Makefile.in
+++ b/source3/Makefile.in
@@ -2300,7 +2300,6 @@ clean: delheaders
 # removed by "make clean" this will always be run when you do anything
 # afterwards.
 proto_exists: include/build_env.h \
-	web/swat_proto.h \
 	libnet/libnet_proto.h \
 	client/client_proto.h utils/net_proto.h utils/ntlm_auth_proto.h smbd/build_options.c
 	@touch proto_exists
@@ -2308,7 +2307,6 @@ proto_exists: include/build_env.h \
 delheaders:
 	@echo Removing prototype headers
 	@rm -f include/build_env.h \
-		web/swat_proto.h \
 		client/client_proto.h utils/net_proto.h \
 		smbd/build_options.c utils/ntlm_auth_proto.h \
 		utils/passwd_proto.h libnet/libnet_proto.h
@@ -2320,11 +2318,6 @@ include/build_env.h: script/build_env.sh
 	@$(SHELL) $(srcdir)/script/build_env.sh $(srcdir) $(builddir) $(CC) \
 	  > $(builddir)/include/build_env.h
 
-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 \
@@ -2357,7 +2350,6 @@ headers:
 	$(MAKE) delheaders; \
 	$(MAKE) smbd/build_options.c; \
 	$(MAKE) include/build_env.h; \
-	$(MAKE) web/swat_proto.h; \
 	$(MAKE) client/client_proto.h; \
 	$(MAKE) utils/ntlm_auth_proto.h; \
 	$(MAKE) utils/net_proto.h; \
-- 
cgit 


From 7a1b7a14e42ae186a22321c611cba8cf4c7ccc49 Mon Sep 17 00:00:00 2001
From: Michael Adam <obnox@samba.org>
Date: Sun, 18 May 2008 23:26:51 +0200
Subject: smbclient: freeze client_proto.h from "make proto"

Michael
(This used to be commit f8c0710165ee1ede46d7ed34daa5564d20d3f069)
---
 source3/Makefile.in | 10 ++--------
 1 file changed, 2 insertions(+), 8 deletions(-)

(limited to 'source3/Makefile.in')

diff --git a/source3/Makefile.in b/source3/Makefile.in
index 3eaba942d2..8777919f69 100644
--- a/source3/Makefile.in
+++ b/source3/Makefile.in
@@ -2301,13 +2301,13 @@ clean: delheaders
 # afterwards.
 proto_exists: include/build_env.h \
 	libnet/libnet_proto.h \
-	client/client_proto.h utils/net_proto.h utils/ntlm_auth_proto.h smbd/build_options.c
+	utils/net_proto.h utils/ntlm_auth_proto.h smbd/build_options.c
 	@touch proto_exists
 
 delheaders:
 	@echo Removing prototype headers
 	@rm -f include/build_env.h \
-		client/client_proto.h utils/net_proto.h \
+		utils/net_proto.h \
 		smbd/build_options.c utils/ntlm_auth_proto.h \
 		utils/passwd_proto.h libnet/libnet_proto.h
 
@@ -2318,11 +2318,6 @@ include/build_env.h: script/build_env.sh
 	@$(SHELL) $(srcdir)/script/build_env.sh $(srcdir) $(builddir) $(CC) \
 	  > $(builddir)/include/build_env.h
 
-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 \
@@ -2350,7 +2345,6 @@ headers:
 	$(MAKE) delheaders; \
 	$(MAKE) smbd/build_options.c; \
 	$(MAKE) include/build_env.h; \
-	$(MAKE) client/client_proto.h; \
 	$(MAKE) utils/ntlm_auth_proto.h; \
 	$(MAKE) utils/net_proto.h; \
 	$(MAKE) utils/passwd_proto.h; \
-- 
cgit 


From beca01f402ac53b02e2f6e98c9e17a67ae0c987a Mon Sep 17 00:00:00 2001
From: Michael Adam <obnox@samba.org>
Date: Sun, 18 May 2008 23:29:01 +0200
Subject: ntlm_auth: freeze ntlm_auth_proto.h from "make proto"

Michael
(This used to be commit 35a517315b83aa7ccea34ec725b15c04ceb5e70e)
---
 source3/Makefile.in | 10 ++--------
 1 file changed, 2 insertions(+), 8 deletions(-)

(limited to 'source3/Makefile.in')

diff --git a/source3/Makefile.in b/source3/Makefile.in
index 8777919f69..b6ef25e2c8 100644
--- a/source3/Makefile.in
+++ b/source3/Makefile.in
@@ -2301,14 +2301,14 @@ clean: delheaders
 # afterwards.
 proto_exists: include/build_env.h \
 	libnet/libnet_proto.h \
-	utils/net_proto.h utils/ntlm_auth_proto.h smbd/build_options.c
+	utils/net_proto.h smbd/build_options.c
 	@touch proto_exists
 
 delheaders:
 	@echo Removing prototype headers
 	@rm -f include/build_env.h \
 		utils/net_proto.h \
-		smbd/build_options.c utils/ntlm_auth_proto.h \
+		smbd/build_options.c \
 		utils/passwd_proto.h libnet/libnet_proto.h
 
 MKPROTO_SH = $(srcdir)/script/mkproto.sh
@@ -2328,11 +2328,6 @@ utils/passwd_proto.h:
 	  -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 \
@@ -2345,7 +2340,6 @@ headers:
 	$(MAKE) delheaders; \
 	$(MAKE) smbd/build_options.c; \
 	$(MAKE) include/build_env.h; \
-	$(MAKE) utils/ntlm_auth_proto.h; \
 	$(MAKE) utils/net_proto.h; \
 	$(MAKE) utils/passwd_proto.h; \
 	$(MAKE) libnet/libnet_proto.h;
-- 
cgit 


From b189fe9154d209e2183c6212be74eb9f97bd49f2 Mon Sep 17 00:00:00 2001
From: Michael Adam <obnox@samba.org>
Date: Sun, 18 May 2008 23:31:42 +0200
Subject: net: freeze net_proto.h from "make proto"

Michael
(This used to be commit 673b24052a6864579683e9adb56522a12447abca)
---
 source3/Makefile.in | 9 +--------
 1 file changed, 1 insertion(+), 8 deletions(-)

(limited to 'source3/Makefile.in')

diff --git a/source3/Makefile.in b/source3/Makefile.in
index b6ef25e2c8..dd9b7c011b 100644
--- a/source3/Makefile.in
+++ b/source3/Makefile.in
@@ -2301,13 +2301,12 @@ clean: delheaders
 # afterwards.
 proto_exists: include/build_env.h \
 	libnet/libnet_proto.h \
-	utils/net_proto.h smbd/build_options.c
+	smbd/build_options.c
 	@touch proto_exists
 
 delheaders:
 	@echo Removing prototype headers
 	@rm -f include/build_env.h \
-		utils/net_proto.h \
 		smbd/build_options.c \
 		utils/passwd_proto.h libnet/libnet_proto.h
 
@@ -2318,11 +2317,6 @@ include/build_env.h: script/build_env.sh
 	@$(SHELL) $(srcdir)/script/build_env.sh $(srcdir) $(builddir) $(CC) \
 	  > $(builddir)/include/build_env.h
 
-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 \
@@ -2340,7 +2334,6 @@ headers:
 	$(MAKE) delheaders; \
 	$(MAKE) smbd/build_options.c; \
 	$(MAKE) include/build_env.h; \
-	$(MAKE) utils/net_proto.h; \
 	$(MAKE) utils/passwd_proto.h; \
 	$(MAKE) libnet/libnet_proto.h;
 
-- 
cgit 


From 20e9c5bea1b86cdb05dd1a0b2702d4ef7f154623 Mon Sep 17 00:00:00 2001
From: Michael Adam <obnox@samba.org>
Date: Sun, 18 May 2008 23:33:20 +0200
Subject: build: freeze passwd_proto.h from "make proto"

Michael
(This used to be commit 00cff301071fe2670e8358195b937de49aa2aa14)
---
 source3/Makefile.in | 8 +-------
 1 file changed, 1 insertion(+), 7 deletions(-)

(limited to 'source3/Makefile.in')

diff --git a/source3/Makefile.in b/source3/Makefile.in
index dd9b7c011b..dbefd4add0 100644
--- a/source3/Makefile.in
+++ b/source3/Makefile.in
@@ -2308,7 +2308,7 @@ delheaders:
 	@echo Removing prototype headers
 	@rm -f include/build_env.h \
 		smbd/build_options.c \
-		utils/passwd_proto.h libnet/libnet_proto.h
+		libnet/libnet_proto.h
 
 MKPROTO_SH = $(srcdir)/script/mkproto.sh
 
@@ -2317,11 +2317,6 @@ include/build_env.h: script/build_env.sh
 	@$(SHELL) $(srcdir)/script/build_env.sh $(srcdir) $(builddir) $(CC) \
 	  > $(builddir)/include/build_env.h
 
-utils/passwd_proto.h:
-	@cd $(srcdir) && $(SHELL) $(MKPROTO_SH) $(AWK) \
-	  -h _PASSWD_PROTO_H_ $(builddir)/utils/passwd_proto.h \
-	  $(PASSWD_UTIL_OBJ)
-
 libnet/libnet_proto.h:
 	@cd $(srcdir) && $(SHELL) $(MKPROTO_SH) $(AWK) \
 	  -h _LIBNET_PROTO_H_ $(builddir)/libnet/libnet_proto.h \
@@ -2334,7 +2329,6 @@ headers:
 	$(MAKE) delheaders; \
 	$(MAKE) smbd/build_options.c; \
 	$(MAKE) include/build_env.h; \
-	$(MAKE) utils/passwd_proto.h; \
 	$(MAKE) libnet/libnet_proto.h;
 
 proto: headers
-- 
cgit 


From 04da4453ab1340c0b5bcad98c1f3710a291e9c90 Mon Sep 17 00:00:00 2001
From: Michael Adam <obnox@samba.org>
Date: Sun, 18 May 2008 23:35:42 +0200
Subject: libnet: freeze libnet_proto.h from "make proto"

Michael
(This used to be commit b455cd1a619a1f1922e2e7bc07f1af246e3201e6)
---
 source3/Makefile.in | 10 +---------
 1 file changed, 1 insertion(+), 9 deletions(-)

(limited to 'source3/Makefile.in')

diff --git a/source3/Makefile.in b/source3/Makefile.in
index dbefd4add0..f6709e07d0 100644
--- a/source3/Makefile.in
+++ b/source3/Makefile.in
@@ -2300,15 +2300,13 @@ clean: delheaders
 # removed by "make clean" this will always be run when you do anything
 # afterwards.
 proto_exists: include/build_env.h \
-	libnet/libnet_proto.h \
 	smbd/build_options.c
 	@touch proto_exists
 
 delheaders:
 	@echo Removing prototype headers
 	@rm -f include/build_env.h \
-		smbd/build_options.c \
-		libnet/libnet_proto.h
+		smbd/build_options.c
 
 MKPROTO_SH = $(srcdir)/script/mkproto.sh
 
@@ -2317,11 +2315,6 @@ include/build_env.h: script/build_env.sh
 	@$(SHELL) $(srcdir)/script/build_env.sh $(srcdir) $(builddir) $(CC) \
 	  > $(builddir)/include/build_env.h
 
-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.
@@ -2329,7 +2322,6 @@ headers:
 	$(MAKE) delheaders; \
 	$(MAKE) smbd/build_options.c; \
 	$(MAKE) include/build_env.h; \
-	$(MAKE) libnet/libnet_proto.h;
 
 proto: headers
 
-- 
cgit 


From 76977cbf6a8d97408d320981340f0b2ad5f1ef2c Mon Sep 17 00:00:00 2001
From: Michael Adam <obnox@samba.org>
Date: Sun, 18 May 2008 23:37:10 +0200
Subject: build: remove reference to mkproto.sh from Makefile

No generated prototypes anymore...

Michael
(This used to be commit 4c7362f2b7ec5e6a60c96925e2c877c5a99a51bc)
---
 source3/Makefile.in | 2 --
 1 file changed, 2 deletions(-)

(limited to 'source3/Makefile.in')

diff --git a/source3/Makefile.in b/source3/Makefile.in
index f6709e07d0..bc2d6c287d 100644
--- a/source3/Makefile.in
+++ b/source3/Makefile.in
@@ -2308,8 +2308,6 @@ delheaders:
 	@rm -f include/build_env.h \
 		smbd/build_options.c
 
-MKPROTO_SH = $(srcdir)/script/mkproto.sh
-
 include/build_env.h: script/build_env.sh
 	@echo Building include/build_env.h
 	@$(SHELL) $(srcdir)/script/build_env.sh $(srcdir) $(builddir) $(CC) \
-- 
cgit 


From cf6f4cfefa88565bebaf7e14ca0836c80b9c0512 Mon Sep 17 00:00:00 2001
From: Michael Adam <obnox@samba.org>
Date: Mon, 19 May 2008 00:51:45 +0200
Subject: build: remove "headers" and "proto" make targets.

Replace "proto" target by a message.

Michael
(This used to be commit 16fb26d73a2bf3520e3b4e6c6bead7321bf41fd3)
---
 source3/Makefile.in | 16 ++++++----------
 1 file changed, 6 insertions(+), 10 deletions(-)

(limited to 'source3/Makefile.in')

diff --git a/source3/Makefile.in b/source3/Makefile.in
index bc2d6c287d..baec0e6cf7 100644
--- a/source3/Makefile.in
+++ b/source3/Makefile.in
@@ -2313,17 +2313,13 @@ include/build_env.h: script/build_env.sh
 	@$(SHELL) $(srcdir)/script/build_env.sh $(srcdir) $(builddir) $(CC) \
 	  > $(builddir)/include/build_env.h
 
-# "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/build_env.h; \
+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
 
-proto: headers
-
-.PHONY: headers proto
+.PHONY: proto
 
 etags:
 	etags `find $(srcdir) -name "*.[ch]" | grep -v /.svn/`
-- 
cgit 


From aef2828831b3762b85a0a261fd99b74c68e3a4c9 Mon Sep 17 00:00:00 2001
From: Michael Adam <obnox@samba.org>
Date: Mon, 19 May 2008 00:54:45 +0200
Subject: build: remove the "delheaders" target.

Michael
(This used to be commit 0fe47c3c76eb15fee62115f7f21b77bd9e3236c7)
---
 source3/Makefile.in | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

(limited to 'source3/Makefile.in')

diff --git a/source3/Makefile.in b/source3/Makefile.in
index baec0e6cf7..a38535101e 100644
--- a/source3/Makefile.in
+++ b/source3/Makefile.in
@@ -2280,7 +2280,9 @@ uninstallpammodules:
 # Toplevel clean files
 TOPFILES=dynconfig.o
 
-clean: delheaders 
+clean:
+	-rm -f include/build_env.h
+	-rm -f smbd/build_options.c
 	-rm -f $(PRECOMPILED_HEADER)
 	-rm -f core */*~ *~ \
 		*/*.o */*/*.o */*/*/*.o \
@@ -2303,11 +2305,6 @@ proto_exists: include/build_env.h \
 	smbd/build_options.c
 	@touch proto_exists
 
-delheaders:
-	@echo Removing prototype headers
-	@rm -f include/build_env.h \
-		smbd/build_options.c
-
 include/build_env.h: script/build_env.sh
 	@echo Building include/build_env.h
 	@$(SHELL) $(srcdir)/script/build_env.sh $(srcdir) $(builddir) $(CC) \
-- 
cgit 


From 78b84179307f1be7a772d9c22ca714ee454b7581 Mon Sep 17 00:00:00 2001
From: Michael Adam <obnox@samba.org>
Date: Mon, 19 May 2008 01:22:14 +0200
Subject: build: remove the proto_exists target - it is not needed anymore.

Michael
(This used to be commit 35f4df7ab86a1b0a920003398043f0b77c75b0a8)
---
 source3/Makefile.in | 14 +++-----------
 1 file changed, 3 insertions(+), 11 deletions(-)

(limited to 'source3/Makefile.in')

diff --git a/source3/Makefile.in b/source3/Makefile.in
index a38535101e..e22f9657f8 100644
--- a/source3/Makefile.in
+++ b/source3/Makefile.in
@@ -1272,14 +1272,14 @@ PRECOMPILED_HEADER = $(builddir)/include/includes.h.gch
 
 # 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:
 	rm -f $(PRECOMPILED_HEADER)
 	$(MAKE) $(PRECOMPILED_HEADER)
 
 $(PRECOMPILED_HEADER): $(srcdir)/include/includes.h
 	$(COMPILE)
 
-BINARY_PREREQS = proto_exists bin/.dummy
+BINARY_PREREQS = bin/.dummy
 
 # These dependencies are only approximately correct: we want to make
 # sure Samba's paths are updated if ./configure is re-run.  Really it
@@ -2293,18 +2293,10 @@ clean:
 		$(LIBTALLOC) $(LIBSMBCLIENT) $(LIBADDNS) \
 		$(LIBSMBSHAREMODES) $(EVERYTHING_PROGS) $(LIBNETAPI) \
 		bin/libwbclient.so.0 bin/timelimit \
-		.headers.stamp */src/*.o proto_exists \
+		.headers.stamp */src/*.o \
 		$(LIBTDB_SYMS)
 	-rm -rf t_dir
 
-# Making this target will just make sure that the prototype files
-# exist, not necessarily that they are up to date.  Since they're
-# removed by "make clean" this will always be run when you do anything
-# afterwards.
-proto_exists: include/build_env.h \
-	smbd/build_options.c
-	@touch proto_exists
-
 include/build_env.h: script/build_env.sh
 	@echo Building include/build_env.h
 	@$(SHELL) $(srcdir)/script/build_env.sh $(srcdir) $(builddir) $(CC) \
-- 
cgit 


From 45653bd1b1a59435dbb2f3d8f19e485f4c20e2fb Mon Sep 17 00:00:00 2001
From: Kai Blin <kai@samba.org>
Date: Mon, 12 May 2008 14:38:21 +0200
Subject: net: Split out common help functions. (This used to be commit
 efc863e3758501a4c62dc9762eb0aded2dad01ff)

---
 source3/Makefile.in | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'source3/Makefile.in')

diff --git a/source3/Makefile.in b/source3/Makefile.in
index e22f9657f8..817cd1f0d2 100644
--- a/source3/Makefile.in
+++ b/source3/Makefile.in
@@ -885,7 +885,7 @@ NET_OBJ1 = utils/net.o utils/net_ads.o utils/net_help.o \
 	   auth/token_util.o utils/net_dom.o
 
 # these are not processed by make proto
-NET_OBJ2 = utils/net_registry_util.o
+NET_OBJ2 = utils/net_registry_util.o utils/net_help_common.o
 
 NET_OBJ = $(NET_OBJ1) \
 	  $(NET_OBJ2) \
-- 
cgit 


From 666292129b1cb7df2f3162736d40b53513313139 Mon Sep 17 00:00:00 2001
From: Kai Blin <kai@samba.org>
Date: Tue, 13 May 2008 11:11:35 +0200
Subject: net: Move "net join" handling into a separate file. (This used to be
 commit d0237a736858a48494583ce7f960ea980768aa6c)

---
 source3/Makefile.in | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'source3/Makefile.in')

diff --git a/source3/Makefile.in b/source3/Makefile.in
index 817cd1f0d2..acb22d8596 100644
--- a/source3/Makefile.in
+++ b/source3/Makefile.in
@@ -880,7 +880,7 @@ NET_OBJ1 = utils/net.o utils/net_ads.o utils/net_help.o \
 	   utils/netlookup.o utils/net_sam.o utils/net_rpc_shell.o \
 	   utils/net_util.o utils/net_rpc_sh_acct.o utils/net_rpc_audit.o \
 	   $(PASSWD_UTIL_OBJ) utils/net_dns.o utils/net_ads_gpo.o \
-	   utils/net_conf.o \
+	   utils/net_conf.o utils/net_join.o\
 	   utils/net_registry.o \
 	   auth/token_util.o utils/net_dom.o
 
-- 
cgit 


From 572de942c780910195c124dc2c4a0f2192668321 Mon Sep 17 00:00:00 2001
From: Kai Blin <kai@samba.org>
Date: Tue, 13 May 2008 12:51:09 +0200
Subject: net: Split out "net user" (This used to be commit
 4ca08a5acc90c77d56f8f3e38443f23f43f034e8)

---
 source3/Makefile.in | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'source3/Makefile.in')

diff --git a/source3/Makefile.in b/source3/Makefile.in
index acb22d8596..c752b09629 100644
--- a/source3/Makefile.in
+++ b/source3/Makefile.in
@@ -880,7 +880,7 @@ NET_OBJ1 = utils/net.o utils/net_ads.o utils/net_help.o \
 	   utils/netlookup.o utils/net_sam.o utils/net_rpc_shell.o \
 	   utils/net_util.o utils/net_rpc_sh_acct.o utils/net_rpc_audit.o \
 	   $(PASSWD_UTIL_OBJ) utils/net_dns.o utils/net_ads_gpo.o \
-	   utils/net_conf.o utils/net_join.o\
+	   utils/net_conf.o utils/net_join.o utils/net_user.o \
 	   utils/net_registry.o \
 	   auth/token_util.o utils/net_dom.o
 
-- 
cgit 


From 007f0e19dc4c6afc2d5f97d7f89932d4eff7d354 Mon Sep 17 00:00:00 2001
From: Kai Blin <kai@samba.org>
Date: Tue, 13 May 2008 13:44:28 +0200
Subject: net: Split out "net group" (This used to be commit
 3ddd9c09e3b51df01ac34a9a1537e8954d2b1167)

---
 source3/Makefile.in | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'source3/Makefile.in')

diff --git a/source3/Makefile.in b/source3/Makefile.in
index c752b09629..592abe01bf 100644
--- a/source3/Makefile.in
+++ b/source3/Makefile.in
@@ -881,7 +881,7 @@ NET_OBJ1 = utils/net.o utils/net_ads.o utils/net_help.o \
 	   utils/net_util.o utils/net_rpc_sh_acct.o utils/net_rpc_audit.o \
 	   $(PASSWD_UTIL_OBJ) utils/net_dns.o utils/net_ads_gpo.o \
 	   utils/net_conf.o utils/net_join.o utils/net_user.o \
-	   utils/net_registry.o \
+	   utils/net_group.o utils/net_registry.o \
 	   auth/token_util.o utils/net_dom.o
 
 # these are not processed by make proto
-- 
cgit 


From c9ca6092fe040751b4aaaeb2b7bfe8800bdb0daf Mon Sep 17 00:00:00 2001
From: Kai Blin <kai@samba.org>
Date: Tue, 13 May 2008 13:52:58 +0200
Subject: net: Split out "net file" (This used to be commit
 84a116be9c849900678e6e0a4b012e819e697c78)

---
 source3/Makefile.in | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'source3/Makefile.in')

diff --git a/source3/Makefile.in b/source3/Makefile.in
index 592abe01bf..51c5ea1393 100644
--- a/source3/Makefile.in
+++ b/source3/Makefile.in
@@ -881,7 +881,7 @@ NET_OBJ1 = utils/net.o utils/net_ads.o utils/net_help.o \
 	   utils/net_util.o utils/net_rpc_sh_acct.o utils/net_rpc_audit.o \
 	   $(PASSWD_UTIL_OBJ) utils/net_dns.o utils/net_ads_gpo.o \
 	   utils/net_conf.o utils/net_join.o utils/net_user.o \
-	   utils/net_group.o utils/net_registry.o \
+	   utils/net_group.o utils/net_file.o utils/net_registry.o \
 	   auth/token_util.o utils/net_dom.o
 
 # these are not processed by make proto
-- 
cgit 


From 00f6ad7b5a7ea684b329c2ce68ada77036c94b08 Mon Sep 17 00:00:00 2001
From: Kai Blin <kai@samba.org>
Date: Wed, 14 May 2008 09:01:53 +0200
Subject: net: Split out "net afs" (This used to be commit
 3f10527f79dddff703d31588cad3e9f37176565b)

---
 source3/Makefile.in | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'source3/Makefile.in')

diff --git a/source3/Makefile.in b/source3/Makefile.in
index 51c5ea1393..6a1bd8dd10 100644
--- a/source3/Makefile.in
+++ b/source3/Makefile.in
@@ -888,7 +888,7 @@ NET_OBJ1 = utils/net.o utils/net_ads.o utils/net_help.o \
 NET_OBJ2 = utils/net_registry_util.o utils/net_help_common.o
 
 NET_OBJ = $(NET_OBJ1) \
-	  $(NET_OBJ2) \
+	  $(NET_OBJ2) @FAKE_KASERVER_OBJ@\
 	  $(PARAM_WITHOUT_REG_OBJ) $(LIBSMB_OBJ) \
 	  $(RPC_PARSE_OBJ) $(PASSDB_OBJ) $(GROUPDB_OBJ) \
 	  $(KRBCLIENT_OBJ) $(LIB_NONSMBD_OBJ) $(LIBADDNS_OBJ0) \
-- 
cgit 


From f9a6d1f2645eef2654a8ff1fc59e83ee762d4014 Mon Sep 17 00:00:00 2001
From: Kai Blin <kai@samba.org>
Date: Wed, 14 May 2008 14:24:21 +0200
Subject: net: Split out "net share" (This used to be commit
 25d4c6f692cf50d675a1de7c6eaeed271f349289)

---
 source3/Makefile.in | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

(limited to 'source3/Makefile.in')

diff --git a/source3/Makefile.in b/source3/Makefile.in
index 6a1bd8dd10..85385f6b01 100644
--- a/source3/Makefile.in
+++ b/source3/Makefile.in
@@ -882,7 +882,7 @@ NET_OBJ1 = utils/net.o utils/net_ads.o utils/net_help.o \
 	   $(PASSWD_UTIL_OBJ) utils/net_dns.o utils/net_ads_gpo.o \
 	   utils/net_conf.o utils/net_join.o utils/net_user.o \
 	   utils/net_group.o utils/net_file.o utils/net_registry.o \
-	   auth/token_util.o utils/net_dom.o
+	   auth/token_util.o utils/net_dom.o utils/net_share.o
 
 # these are not processed by make proto
 NET_OBJ2 = utils/net_registry_util.o utils/net_help_common.o
-- 
cgit