r14477: Remove the NOPROTO property - it's no longer used as proto.h is gone.

(This used to be commit 9c37f847d32d2f327a88c53a90af0c73126b76be)

24 files changed, 0 insertions, 158 deletions

diff --git a/source4/auth/ntlmssp/config.mk b/source4/auth/ntlmssp/config.mk
index 22cd373a8a..07b1fad1c7 100644
--- a/source4/auth/ntlmssp/config.mk
+++ b/source4/auth/ntlmssp/config.mk
@@ -6,7 +6,6 @@ OBJ_FILES = ntlmssp_parse.o
 # Start MODULE gensec_ntlmssp
 [MODULE::gensec_ntlmssp]
 SUBSYSTEM = gensec
-NOPROTO = NO
 INIT_FUNCTION = gensec_ntlmssp_init
 PRIVATE_PROTO_HEADER = proto.h
 OBJ_FILES = ntlmssp.o \
diff --git a/source4/build/smb_build/config_mk.pm b/source4/build/smb_build/config_mk.pm
index c0d05a4e6f..2bc2953567 100644
--- a/source4/build/smb_build/config_mk.pm
+++ b/source4/build/smb_build/config_mk.pm
@@ -25,7 +25,6 @@ my $section_types = {
 		"REQUIRED_SUBSYSTEMS"	=> "list",
 
 		"ENABLE"		=> "bool",
-		"NOPROTO"		=> "bool",
 
 		"MANPAGE"		=> "string",
 
@@ -46,7 +45,6 @@ my $section_types = {
 		"REQUIRED_SUBSYSTEMS"	=> "list",
 
 		"ENABLE"		=> "bool",
-		"NOPROTO"		=> "bool",
 
 		"OUTPUT_TYPE"		=> "string",
 
@@ -61,7 +59,6 @@ my $section_types = {
 		"REQUIRED_SUBSYSTEMS"	=> "list",
 
 		"ENABLE"		=> "bool",
-		"NOPROTO"		=> "bool",
 
 		"MANPAGE"		=> "string",
 		"INSTALLDIR"		=> "string",
@@ -83,7 +80,6 @@ my $section_types = {
 		"REQUIRED_SUBSYSTEMS"	=> "list",
 
 		"ENABLE"		=> "bool",
-		"NOPROTO"		=> "bool",
 
 		"MANPAGE"		=> "string",
 
diff --git a/source4/gtk/config.mk b/source4/gtk/config.mk
index 72563aaac4..e344a2260e 100644
--- a/source4/gtk/config.mk
+++ b/source4/gtk/config.mk
@@ -4,7 +4,6 @@
 VERSION = 0.0.1
 SO_VERSION = 0.0.1
 DESCRIPTION = Common Samba-related widgets for GTK+ applications
-NOPROTO = YES
 PUBLIC_HEADERS = common/gtk-smb.h common/select.h
 OBJ_FILES = common/gtk-smb.o \
 		common/select.o \
diff --git a/source4/heimdal_build/config.mk b/source4/heimdal_build/config.mk
index fef7f8105d..81d6a99f18 100644
--- a/source4/heimdal_build/config.mk
+++ b/source4/heimdal_build/config.mk
@@ -11,7 +11,6 @@ OBJ_FILES = \
 	../heimdal/kdc/kerberos4.o \
 	../heimdal/kdc/kaserver.o \
 	../heimdal/kdc/process.o
-NOPROTO = YES
 # End SUBSYSTEM HEIMDAL_KDC
 #######################
 
@@ -42,7 +41,6 @@ OBJ_FILES = \
 	../heimdal/lib/hdb/asn1_hdb_entry.o \
 	../heimdal/lib/hdb/hdb_err.o
 REQUIRED_SUBSYSTEMS = HDB_LDB
-NOPROTO = YES
 # End SUBSYSTEM HEIMDAL_HDB
 #######################
 
@@ -90,7 +88,6 @@ OBJ_FILES = \
 	../heimdal/lib/gssapi/import_name.o \
 	../heimdal/lib/gssapi/init.o
 REQUIRED_SUBSYSTEMS = KERBEROS HEIMDAL_KRB5
-NOPROTO = YES
 # End SUBSYSTEM HEIMDAL_GSSAPI
 #######################
 
@@ -183,7 +180,6 @@ OBJ_FILES = \
 	../heimdal/lib/krb5/krb5_err.o \
 	../heimdal/lib/krb5/heim_err.o \
 	../heimdal/lib/krb5/k524_err.o
-NOPROTO = YES
 # End SUBSYSTEM HEIMDAL_KRB5
 #######################
 
@@ -263,7 +259,6 @@ OBJ_FILES = \
 	../heimdal/lib/asn1/asn1_err.o \
 	../heimdal/lib/asn1/asn1_krb5int32.o \
 	../heimdal/lib/asn1/asn1_krb5uint32.o
-NOPROTO = YES
 # End SUBSYSTEM HEIMDAL_KRB5
 #######################
 
@@ -289,7 +284,6 @@ OBJ_FILES = \
 	../heimdal/lib/des/evp.o \
 	../heimdal/lib/des/pkcs5.o \
 	../heimdal/lib/des/hmac.o
-NOPROTO = YES
 # End SUBSYSTEM HEIMDAL_DES
 #######################
 
@@ -297,13 +291,11 @@ NOPROTO = YES
 # Start SUBSYSTEM HEIMDAL_ROKEN_GAI_STRERROR
 [SUBSYSTEM::HEIMDAL_ROKEN_GAI_STRERROR]
 OBJ_FILES = ../heimdal/lib/roken/gai_strerror.o
-NOPROTO = YES
 
 #######################
 # Start SUBSYSTEM HEIMDAL_ROKEN_GAI_STRERROR
 [SUBSYSTEM::HEIMDAL_ROKEN_INET_ATON]
 OBJ_FILES = ../heimdal/lib/roken/inet_aton.o
-NOPROTO = YES
 
 #######################
 # Start SUBSYSTEM HEIMDAL_ROKEN_ADDRINFO
@@ -316,7 +308,6 @@ OBJ_FILES = \
 	../heimdal/lib/roken/freehostent.o \
 	../heimdal/lib/roken/copyhostent.o \
 	../heimdal/lib/roken/hostent_find_fqdn.o
-NOPROTO = YES
 
 #######################
 # Start SUBSYSTEM HEIMDAL_ROKEN
@@ -350,7 +341,6 @@ REQUIRED_SUBSYSTEMS = \
 			HEIMDAL_ROKEN_GAI_STRERROR \
 			HEIMDAL_ROKEN_INET_ATON \
 			EXT_LIB_XNET
-NOPROTO = YES
 # End SUBSYSTEM HEIMDAL_ROKEN
 #######################
 
@@ -362,7 +352,6 @@ EXTRA_CFLAGS = \
 	-Iheimdal/lib/des -Iheimdal/lib/roken \
 	-DNO_PRINTF_ATTRIBUTE
 OBJ_FILES = ../heimdal/lib/vers/print_version.o
-NOPROTO = YES
 # End SUBSYSTEM HEIMDAL_VERS
 #######################
 
@@ -384,7 +373,6 @@ EXTRA_CFLAGS = \
 OBJ_FILES = \
 	../heimdal/lib/com_err/com_err.o \
 	../heimdal/lib/com_err/error.o
-NOPROTO = YES
 # End SUBSYSTEM HEIMDAL_COM_ERR
 #######################
 
@@ -483,7 +471,6 @@ heimdal_clean:	hdb_asn1_clean spnego_asn1_clean krb5_asn1_clean
 [LIBRARY::HEIMDAL]
 VERSION = 0.0.1
 SO_VERSION = 0.0.1
-NOPROTO = YES
 REQUIRED_SUBSYSTEMS = \
 		HEIMDAL_GSSAPI HEIMDAL_KRB5 KERBEROS \
 		HEIMDAL_ASN1 HEIMDAL_DES HEIMDAL_ROKEN HEIMDAL_COM_ERR HEIMDAL_VERS HEIMDAL_GLUE EXT_LIB_RESOLV
diff --git a/source4/kdc/config.mk b/source4/kdc/config.mk
index 8a62e8be63..b6e9bd9b6c 100644
--- a/source4/kdc/config.mk
+++ b/source4/kdc/config.mk
@@ -3,7 +3,6 @@
 #######################
 # Start SUBSYSTEM KDC
 [SUBSYSTEM::KDC]
-NOPROTO = YES
 OBJ_FILES = \
 		kdc.o \
 		kpasswdd.o
@@ -15,7 +14,6 @@ REQUIRED_SUBSYSTEMS = \
 #######################
 # Start SUBSYSTEM KDC
 [SUBSYSTEM::HDB_LDB]
-NOPROTO = YES
 OBJ_FILES = \
 		hdb-ldb.o \
 		pac-glue.o 
diff --git a/source4/kdc/heimdal_config.mk b/source4/kdc/heimdal_config.mk
index 0d4ce73e40..1149c96b4b 100644
--- a/source4/kdc/heimdal_config.mk
+++ b/source4/kdc/heimdal_config.mk
@@ -334,7 +334,6 @@ OBJ_FILES = \
 	../heimdal/lib/roken/strsep_copy.o \
 	../heimdal/lib/sl/strupr.o \
 	../heimdal/lib/roken/strupr.o
-NOPROTO = YES
 TARGET_CFLAGS = -Iheimdal/lib/krb5 -Iheimdal/kdc -Iheimdal/lib/asn1 -Iheimdal/lib/des
 # End SUBSYSTEM HEIMDAL
 #######################
diff --git a/source4/lib/appweb/config.mk b/source4/lib/appweb/config.mk
index 4035840d47..5362043d3d 100644
--- a/source4/lib/appweb/config.mk
+++ b/source4/lib/appweb/config.mk
@@ -4,7 +4,6 @@
 OBJ_FILES = \
 		mpr/miniMpr.o \
 		mpr/var.o
-NOPROTO=YES
 # End SUBSYSTEM MPR
 #######################
 
@@ -18,7 +17,6 @@ OBJ_FILES = \
 		ejs/ejsParser.o \
 		ejs/ejsProcs.o
 REQUIRED_SUBSYSTEMS = MPR
-NOPROTO=YES
 # End SUBSYSTEM EJS
 #######################
 
@@ -29,6 +27,5 @@ OBJ_FILES = \
 		esp/esp.o  \
 		esp/espProcs.o
 REQUIRED_SUBSYSTEMS = EJS
-NOPROTO=YES
 # End SUBSYSTEM ESP
 #######################
diff --git a/source4/lib/basic.mk b/source4/lib/basic.mk
index 0ed7a69146..81d49e20c2 100644
--- a/source4/lib/basic.mk
+++ b/source4/lib/basic.mk
@@ -32,7 +32,6 @@ OBJ_FILES = \
 ##############################
 # Start SUBSYSTEM LIBCRYPTO
 [SUBSYSTEM::LIBCRYPTO]
-NOPROTO = YES
 OBJ_FILES = \
 		crypto/crc32.o \
 		crypto/md5.o \
@@ -45,7 +44,6 @@ OBJ_FILES = \
 ################################################
 # Start SUBSYSTEM LIBCOMPRESSION
 [SUBSYSTEM::LIBCOMPRESSION]
-NOPROTO = YES
 OBJ_FILES = \
 		compression/mszip.o
 # End SUBSYSTEM LIBCOMPRESION
diff --git a/source4/lib/events/config.mk b/source4/lib/events/config.mk
index 16ee74c29e..607a7da130 100644
--- a/source4/lib/events/config.mk
+++ b/source4/lib/events/config.mk
@@ -1,7 +1,6 @@
 ##############################
 # Start SUBSYSTEM LIBEVENTS
 [SUBSYSTEM::LIBEVENTS]
-NOPROTO = YES
 OBJ_FILES = events.o events_standard.o
 REQUIRED_SUBSYSTEMS = LIBTALLOC
 # End SUBSYSTEM LIBEVENTS
diff --git a/source4/lib/ldb/config.mk b/source4/lib/ldb/config.mk
index 44e6bbd43b..f8f1086396 100644
--- a/source4/lib/ldb/config.mk
+++ b/source4/lib/ldb/config.mk
@@ -77,7 +77,6 @@ OBJ_FILES = \
 		ldb_ildap/ldb_ildap.o
 REQUIRED_SUBSYSTEMS = \
 		LIBCLI_LDAP
-NOPROTO = YES
 # End MODULE ldb_ildap
 ################################################
 
@@ -107,7 +106,6 @@ OBJ_FILES = \
 		ldb_sqlite3/ldb_sqlite3.o
 REQUIRED_SUBSYSTEMS = \
 		EXT_LIB_SQLITE3
-NOPROTO = YES
 # End MODULE ldb_sqlite3
 ################################################
 
@@ -125,7 +123,6 @@ OBJ_FILES = \
 		ldb_tdb/ldb_tdb_wrap.o
 REQUIRED_SUBSYSTEMS = \
 		LIBTDB
-NOPROTO = YES
 # End MODULE ldb_tdb
 ################################################
 
@@ -152,7 +149,6 @@ OBJ_FILES = \
 		common/qsort.o
 REQUIRED_SUBSYSTEMS = \
 		LIBREPLACE LIBTALLOC 
-NOPROTO = YES
 MANPAGE = man/ldb.3
 PUBLIC_HEADERS = include/ldb.h
 #
@@ -172,7 +168,6 @@ OBJ_FILES = \
 ################################################
 # Start SUBSYSTEM LIBLDB_CMDLINE
 [SUBSYSTEM::LIBLDB_CMDLINE]
-NOPROTO = YES
 OBJ_FILES= \
 		tools/cmdline.o
 REQUIRED_SUBSYSTEMS = ldb LIBBASIC LIBPOPT POPT_SAMBA POPT_CREDENTIALS
diff --git a/source4/lib/messaging/config.mk b/source4/lib/messaging/config.mk
index 5e53b49903..62a120907f 100644
--- a/source4/lib/messaging/config.mk
+++ b/source4/lib/messaging/config.mk
@@ -4,7 +4,6 @@
 [SUBSYSTEM::MESSAGING]
 OBJ_FILES = \
 		messaging.o
-NOPROTO = YES
 REQUIRED_SUBSYSTEMS = \
 		NDR_IRPC \
 		UNIX_PRIVS
diff --git a/source4/lib/popt/config.mk b/source4/lib/popt/config.mk
index f65831bbed..123b12e5d2 100644
--- a/source4/lib/popt/config.mk
+++ b/source4/lib/popt/config.mk
@@ -6,6 +6,5 @@ OBJ_FILES = findme.o \
 				poptconfig.o \
 				popthelp.o \
 				poptparse.o
-NOPROTO = YES
 # End SUBSYSTEM INT_LIB_POPT
 ##############################
diff --git a/source4/lib/registry/config.mk b/source4/lib/registry/config.mk
index 4456d57ccc..02071d721b 100644
--- a/source4/lib/registry/config.mk
+++ b/source4/lib/registry/config.mk
@@ -13,7 +13,6 @@ REQUIRED_SUBSYSTEMS = TDR_REGF
 
 [SUBSYSTEM::TDR_REGF]
 REQUIRED_SUBSYSTEMS = TDR 
-NOPROTO = YES
 OBJ_FILES = tdr_regf.o
 
 lib/registry/reg_backend_nt4.c: lib/registry/tdr_regf.c
diff --git a/source4/lib/replace/config.mk b/source4/lib/replace/config.mk
index 386029a7eb..002fd3b1c4 100644
--- a/source4/lib/replace/config.mk
+++ b/source4/lib/replace/config.mk
@@ -3,7 +3,6 @@
 [SUBSYSTEM::REPLACE_READDIR]
 OBJ_FILES = \
 		repdir/repdir.o
-NOPROTO = YES
 # End SUBSYSTEM REPLACE_READDIR
 ##############################
 
@@ -14,7 +13,6 @@ OBJ_FILES = replace.o \
 		snprintf.o \
 		dlfcn.o \
 		getpass.o
-NOPROTO = YES
 REQUIRED_SUBSYSTEMS = REPLACE_READDIR
 # End SUBSYSTEM LIBREPLACE
 ##############################
diff --git a/source4/lib/socket/config.mk b/source4/lib/socket/config.mk
index e9f29b0790..d5ae81d837 100644
--- a/source4/lib/socket/config.mk
+++ b/source4/lib/socket/config.mk
@@ -6,7 +6,6 @@ SUBSYSTEM = SOCKET
 OUTPUT_TYPE = MERGEDOBJ
 OBJ_FILES = \
 		socket_ipv4.o
-NOPROTO=YES
 REQUIRED_SUBSYSTEMS = EXT_LIB_SOCKET
 # End MODULE socket_ipv4
 ################################################
@@ -18,7 +17,6 @@ SUBSYSTEM = SOCKET
 OUTPUT_TYPE = MERGEDOBJ
 OBJ_FILES = \
 		socket_ipv6.o
-NOPROTO=YES
 REQUIRED_SUBSYSTEMS = EXT_LIB_SOCKET
 # End MODULE socket_ipv6
 ################################################
@@ -30,7 +28,6 @@ SUBSYSTEM = SOCKET
 OUTPUT_TYPE = MERGEDOBJ
 OBJ_FILES = \
 		socket_unix.o
-NOPROTO=YES
 REQUIRED_SUBSYSTEMS = EXT_LIB_SOCKET
 # End MODULE socket_unix
 ################################################
@@ -43,7 +40,6 @@ OBJ_FILES = \
 		access.o \
 		connect_multi.o \
 		connect.o
-NOPROTO=YES
 REQUIRED_SUBSYSTEMS = LIBCLI_RESOLVE SOCKET_WRAPPER LIBTALLOC
 # End SUBSYSTEM SOCKET
 ################################################
diff --git a/source4/lib/socket_wrapper/config.mk b/source4/lib/socket_wrapper/config.mk
index dcc3835194..fd2fc92b31 100644
--- a/source4/lib/socket_wrapper/config.mk
+++ b/source4/lib/socket_wrapper/config.mk
@@ -3,7 +3,6 @@
 [LIBRARY::SOCKET_WRAPPER]
 VERSION = 0.0.1
 SO_VERSION = 0.0.1
-NOPROTO = YES
 DESCRIPTION = Wrapper library for testing TCP/IP connections using Unix Sockets
 PUBLIC_HEADERS = socket_wrapper.h
 OBJ_FILES = socket_wrapper.o
diff --git a/source4/lib/stream/config.mk b/source4/lib/stream/config.mk
index 923447e4d2..18ba0d077b 100644
--- a/source4/lib/stream/config.mk
+++ b/source4/lib/stream/config.mk
@@ -4,6 +4,5 @@
 [SUBSYSTEM::LIBPACKET]
 OBJ_FILES = \
 		packet.o
-NOPROTO=YES
 # End SUBSYSTEM LIBPACKET
 ################################################
diff --git a/source4/lib/talloc/config.mk b/source4/lib/talloc/config.mk
index e63edb0139..86a6f4bd56 100644
--- a/source4/lib/talloc/config.mk
+++ b/source4/lib/talloc/config.mk
@@ -5,7 +5,6 @@ VERSION = 0.0.1
 SO_VERSION = 0.0.1
 OBJ_FILES = talloc.o
 REQUIRED_SUBSYSTEMS = LIBREPLACE
-NOPROTO = YES
 MANPAGE = talloc.3
 PUBLIC_HEADERS = talloc.h
 DESCRIPTION = A hierarchical pool based memory system with destructors
diff --git a/source4/lib/tdb/config.mk b/source4/lib/tdb/config.mk
index b6595ea2ba..8eb127f8ae 100644
--- a/source4/lib/tdb/config.mk
+++ b/source4/lib/tdb/config.mk
@@ -8,7 +8,6 @@ OBJ_FILES = \
 	common/tdb.o common/dump.o common/io.o common/lock.o \
 	common/open.o common/traverse.o common/freelist.o \
 	common/error.o common/transaction.o common/tdbutil.o
-NOPROTO=YES
 REQUIRED_SUBSYSTEMS = \
 		LIBREPLACE
 PUBLIC_HEADERS = include/tdb.h
diff --git a/source4/lib/tls/config.mk b/source4/lib/tls/config.mk
index ea1bd5be55..8e59bb33e5 100644
--- a/source4/lib/tls/config.mk
+++ b/source4/lib/tls/config.mk
@@ -6,7 +6,6 @@ OBJ_FILES = \
 		tlscert.o
 REQUIRED_SUBSYSTEMS = \
 		LIBTALLOC EXT_LIB_GNUTLS
-NOPROTO = YES
 #
 # End SUBSYSTEM LIBTLS
 ################################################
diff --git a/source4/libcli/config.mk b/source4/libcli/config.mk
index 0ccf1d7126..6d88b3bd06 100644
--- a/source4/libcli/config.mk
+++ b/source4/libcli/config.mk
@@ -60,7 +60,6 @@ OBJ_FILES = \
 	dgram/netlogon.o \
 	dgram/ntlogon.o \
 	dgram/browse.o
-NOPROTO=YES
 REQUIRED_SUBSYSTEMS = LIBCLI_NBT
 
 [LIBRARY::LIBCLI_CLDAP]
@@ -69,7 +68,6 @@ SO_VERSION = 0.0.1
 DESCRIPTION = CLDAP client library
 OBJ_FILES = cldap/cldap.o
 PUBLIC_HEADERS = cldap/cldap.h
-NOPROTO=YES
 REQUIRED_SUBSYSTEMS = LIBCLI_LDAP
 
 [LIBRARY::LIBCLI_WREPL]
diff --git a/source4/librpc/config.mk b/source4/librpc/config.mk
index afcb59bbf5..ce2abca006 100644
--- a/source4/librpc/config.mk
+++ b/source4/librpc/config.mk
@@ -38,7 +38,6 @@ VERSION = 0.0.1
 SO_VERSION = 0.0.1
 DESCRIPTION =
 OBJ_FILES = gen_ndr/ndr_security.o
-NOPROTO = YES
 REQUIRED_SUBSYSTEMS = NDR_MISC NDR_SECURITY_HELPER
 
 [LIBRARY::NDR_AUDIOSRV]
@@ -46,7 +45,6 @@ VERSION = 0.0.1
 SO_VERSION = 0.0.1
 DESCRIPTION =
 OBJ_FILES = gen_ndr/ndr_audiosrv.o
-NOPROTO = YES
 REQUIRED_SUBSYSTEMS = LIBNDR
 
 [LIBRARY::NDR_DNSSERVER]
@@ -54,7 +52,6 @@ VERSION = 0.0.1
 SO_VERSION = 0.0.1
 DESCRIPTION =
 OBJ_FILES = gen_ndr/ndr_dnsserver.o
-NOPROTO = YES
 REQUIRED_SUBSYSTEMS = LIBNDR
 
 [LIBRARY::NDR_WINSTATION]
@@ -62,7 +59,6 @@ VERSION = 0.0.1
 SO_VERSION = 0.0.1
 DESCRIPTION =
 OBJ_FILES = gen_ndr/ndr_winstation.o
-NOPROTO = YES
 REQUIRED_SUBSYSTEMS = LIBNDR
 
 [LIBRARY::NDR_ECHO]
@@ -70,7 +66,6 @@ VERSION = 0.0.1
 SO_VERSION = 0.0.1
 DESCRIPTION =
 OBJ_FILES = gen_ndr/ndr_echo.o
-NOPROTO = YES
 REQUIRED_SUBSYSTEMS = LIBNDR
 
 [LIBRARY::NDR_IRPC]
@@ -78,7 +73,6 @@ VERSION = 0.0.1
 SO_VERSION = 0.0.1
 DESCRIPTION =
 OBJ_FILES = gen_ndr/ndr_irpc.o
-NOPROTO = YES
 REQUIRED_SUBSYSTEMS = LIBNDR
 
 [LIBRARY::NDR_EXCHANGE]
@@ -86,7 +80,6 @@ VERSION = 0.0.1
 SO_VERSION = 0.0.1
 DESCRIPTION =
 OBJ_FILES = gen_ndr/ndr_exchange.o
-NOPROTO = YES
 REQUIRED_SUBSYSTEMS = LIBNDR
 
 [LIBRARY::NDR_DSBACKUP]
@@ -94,7 +87,6 @@ VERSION = 0.0.1
 SO_VERSION = 0.0.1
 DESCRIPTION =
 OBJ_FILES = gen_ndr/ndr_dsbackup.o
-NOPROTO = YES
 REQUIRED_SUBSYSTEMS = LIBNDR
 
 [LIBRARY::NDR_EFS]
@@ -102,7 +94,6 @@ VERSION = 0.0.1
 SO_VERSION = 0.0.1
 DESCRIPTION =
 OBJ_FILES = gen_ndr/ndr_efs.o
-NOPROTO = YES
 REQUIRED_SUBSYSTEMS = LIBNDR
 
 [LIBRARY::NDR_MISC]
@@ -110,7 +101,6 @@ VERSION = 0.0.1
 SO_VERSION = 0.0.1
 DESCRIPTION =
 OBJ_FILES = gen_ndr/ndr_misc.o
-NOPROTO = YES
 REQUIRED_SUBSYSTEMS = LIBNDR
 
 [LIBRARY::NDR_ROT]
@@ -118,7 +108,6 @@ VERSION = 0.0.1
 SO_VERSION = 0.0.1
 DESCRIPTION =
 OBJ_FILES = gen_ndr/ndr_rot.o
-NOPROTO = YES
 REQUIRED_SUBSYSTEMS = LIBNDR
 
 [LIBRARY::NDR_LSA]
@@ -126,7 +115,6 @@ VERSION = 0.0.1
 SO_VERSION = 0.0.1
 DESCRIPTION =
 OBJ_FILES = gen_ndr/ndr_lsa.o
-NOPROTO = YES
 REQUIRED_SUBSYSTEMS = LIBNDR
 
 [LIBRARY::NDR_DFS]
@@ -134,7 +122,6 @@ VERSION = 0.0.1
 SO_VERSION = 0.0.1
 DESCRIPTION =
 OBJ_FILES = gen_ndr/ndr_dfs.o
-NOPROTO = YES
 REQUIRED_SUBSYSTEMS = LIBNDR
 
 [LIBRARY::NDR_DRSUAPI]
@@ -142,7 +129,6 @@ VERSION = 0.0.1
 SO_VERSION = 0.0.1
 DESCRIPTION =
 OBJ_FILES = gen_ndr/ndr_drsuapi.o
-NOPROTO = YES
 REQUIRED_SUBSYSTEMS = LIBNDR NDR_DRSUAPI_PRINT NDR_COMPRESSION NDR_SECURITY
 
 [SUBSYSTEM::NDR_DRSUAPI_PRINT]
@@ -154,7 +140,6 @@ VERSION = 0.0.1
 SO_VERSION = 0.0.1
 DESCRIPTION =
 OBJ_FILES = gen_ndr/ndr_drsblobs.o
-NOPROTO = YES
 REQUIRED_SUBSYSTEMS = LIBNDR
 
 [LIBRARY::NDR_SASL_HELPERS]
@@ -162,7 +147,6 @@ VERSION = 0.0.1
 SO_VERSION = 0.0.1
 DESCRIPTION =
 OBJ_FILES = gen_ndr/ndr_sasl_helpers.o
-NOPROTO = YES
 REQUIRED_SUBSYSTEMS = LIBNDR
 
 [LIBRARY::NDR_POLICYAGENT]
@@ -170,7 +154,6 @@ VERSION = 0.0.1
 SO_VERSION = 0.0.1
 DESCRIPTION =
 OBJ_FILES = gen_ndr/ndr_policyagent.o
-NOPROTO = YES
 REQUIRED_SUBSYSTEMS = LIBNDR
 
 [LIBRARY::NDR_UNIXINFO]
@@ -178,7 +161,6 @@ VERSION = 0.0.1
 SO_VERSION = 0.0.1
 DESCRIPTION =
 OBJ_FILES = gen_ndr/ndr_unixinfo.o
-NOPROTO = YES
 REQUIRED_SUBSYSTEMS = LIBNDR
 
 [LIBRARY::NDR_SAMR]
@@ -186,7 +168,6 @@ VERSION = 0.0.1
 SO_VERSION = 0.0.1
 DESCRIPTION =
 OBJ_FILES = gen_ndr/ndr_samr.o
-NOPROTO = YES
 REQUIRED_SUBSYSTEMS = LIBNDR NDR_MISC NDR_LSA NDR_SECURITY
 
 [LIBRARY::NDR_SPOOLSS]
@@ -194,7 +175,6 @@ VERSION = 0.0.1
 SO_VERSION = 0.0.1
 DESCRIPTION =
 OBJ_FILES = gen_ndr/ndr_spoolss.o
-NOPROTO = YES
 REQUIRED_SUBSYSTEMS = LIBNDR NDR_SPOOLSS_BUF
 
 [SUBSYSTEM::NDR_SPOOLSS_BUF]
@@ -206,7 +186,6 @@ VERSION = 0.0.1
 SO_VERSION = 0.0.1
 DESCRIPTION =
 OBJ_FILES = gen_ndr/ndr_wkssvc.o
-NOPROTO = YES
 REQUIRED_SUBSYSTEMS = LIBNDR
 
 [LIBRARY::NDR_SRVSVC]
@@ -214,7 +193,6 @@ VERSION = 0.0.1
 SO_VERSION = 0.0.1
 DESCRIPTION =
 OBJ_FILES = gen_ndr/ndr_srvsvc.o
-NOPROTO = YES
 REQUIRED_SUBSYSTEMS = LIBNDR NDR_SVCCTL
 
 [LIBRARY::NDR_SVCCTL]
@@ -222,7 +200,6 @@ VERSION = 0.0.1
 SO_VERSION = 0.0.1
 DESCRIPTION =
 OBJ_FILES = gen_ndr/ndr_svcctl.o
-NOPROTO = YES
 REQUIRED_SUBSYSTEMS = LIBNDR
 
 [LIBRARY::NDR_ATSVC]
@@ -230,7 +207,6 @@ VERSION = 0.0.1
 SO_VERSION = 0.0.1
 DESCRIPTION =
 OBJ_FILES = gen_ndr/ndr_atsvc.o
-NOPROTO = YES
 REQUIRED_SUBSYSTEMS = LIBNDR
 
 [LIBRARY::NDR_EVENTLOG]
@@ -238,7 +214,6 @@ VERSION = 0.0.1
 SO_VERSION = 0.0.1
 DESCRIPTION =
 OBJ_FILES = gen_ndr/ndr_eventlog.o
-NOPROTO = YES
 REQUIRED_SUBSYSTEMS = LIBNDR
 
 [LIBRARY::NDR_EPMAPPER]
@@ -246,7 +221,6 @@ VERSION = 0.0.1
 SO_VERSION = 0.0.1
 DESCRIPTION =
 OBJ_FILES = gen_ndr/ndr_epmapper.o
-NOPROTO = YES
 REQUIRED_SUBSYSTEMS = LIBNDR
 
 [LIBRARY::NDR_DBGIDL]
@@ -254,7 +228,6 @@ VERSION = 0.0.1
 SO_VERSION = 0.0.1
 DESCRIPTION =
 OBJ_FILES = gen_ndr/ndr_dbgidl.o
-NOPROTO = YES
 REQUIRED_SUBSYSTEMS = LIBNDR
 
 [LIBRARY::NDR_DSSETUP]
@@ -262,7 +235,6 @@ VERSION = 0.0.1
 SO_VERSION = 0.0.1
 DESCRIPTION =
 OBJ_FILES = gen_ndr/ndr_dssetup.o
-NOPROTO = YES
 REQUIRED_SUBSYSTEMS = LIBNDR
 
 [LIBRARY::NDR_MSGSVC]
@@ -270,7 +242,6 @@ VERSION = 0.0.1
 SO_VERSION = 0.0.1
 DESCRIPTION =
 OBJ_FILES = gen_ndr/ndr_msgsvc.o
-NOPROTO = YES
 REQUIRED_SUBSYSTEMS = LIBNDR
 
 [LIBRARY::NDR_WINS]
@@ -278,7 +249,6 @@ VERSION = 0.0.1
 SO_VERSION = 0.0.1
 DESCRIPTION =
 OBJ_FILES = gen_ndr/ndr_wins.o
-NOPROTO = YES
 REQUIRED_SUBSYSTEMS = LIBNDR
 
 [LIBRARY::NDR_WINREG]
@@ -286,7 +256,6 @@ VERSION = 0.0.1
 SO_VERSION = 0.0.1
 DESCRIPTION =
 OBJ_FILES = gen_ndr/ndr_winreg.o
-NOPROTO = YES
 REQUIRED_SUBSYSTEMS = LIBNDR NDR_INITSHUTDOWN
 
 [LIBRARY::NDR_INITSHUTDOWN]
@@ -294,7 +263,6 @@ VERSION = 0.0.1
 SO_VERSION = 0.0.1
 DESCRIPTION =
 OBJ_FILES = gen_ndr/ndr_initshutdown.o
-NOPROTO = YES
 REQUIRED_SUBSYSTEMS = LIBNDR
 
 [LIBRARY::NDR_MGMT]
@@ -302,7 +270,6 @@ VERSION = 0.0.1
 SO_VERSION = 0.0.1
 DESCRIPTION =
 OBJ_FILES = gen_ndr/ndr_mgmt.o
-NOPROTO = YES
 REQUIRED_SUBSYSTEMS = LIBNDR
 
 [LIBRARY::NDR_PROTECTED_STORAGE]
@@ -310,7 +277,6 @@ VERSION = 0.0.1
 SO_VERSION = 0.0.1
 DESCRIPTION =
 OBJ_FILES = gen_ndr/ndr_protected_storage.o
-NOPROTO = YES
 REQUIRED_SUBSYSTEMS = LIBNDR
 
 [LIBRARY::NDR_DCOM]
@@ -318,7 +284,6 @@ VERSION = 0.0.1
 SO_VERSION = 0.0.1
 DESCRIPTION =
 OBJ_FILES = gen_ndr/ndr_dcom.o
-NOPROTO = YES
 REQUIRED_SUBSYSTEMS = LIBNDR NDR_ORPC
 
 [SUBSYSTEM::NDR_ORPC_MANUAL]
@@ -330,7 +295,6 @@ VERSION = 0.0.1
 SO_VERSION = 0.0.1
 DESCRIPTION =
 OBJ_FILES = gen_ndr/ndr_orpc.o
-NOPROTO = YES
 REQUIRED_SUBSYSTEMS = LIBNDR NDR_ORPC_MANUAL
 
 [LIBRARY::NDR_OXIDRESOLVER]
@@ -338,7 +302,6 @@ VERSION = 0.0.1
 SO_VERSION = 0.0.1
 DESCRIPTION =
 OBJ_FILES = gen_ndr/ndr_oxidresolver.o
-NOPROTO = YES
 REQUIRED_SUBSYSTEMS = LIBNDR NDR_ORPC
 
 [LIBRARY::NDR_REMACT]
@@ -346,7 +309,6 @@ VERSION = 0.0.1
 SO_VERSION = 0.0.1
 DESCRIPTION =
 OBJ_FILES = gen_ndr/ndr_remact.o
-NOPROTO = YES
 REQUIRED_SUBSYSTEMS = LIBNDR NDR_ORPC
 
 [LIBRARY::NDR_WZCSVC]
@@ -354,7 +316,6 @@ VERSION = 0.0.1
 SO_VERSION = 0.0.1
 DESCRIPTION =
 OBJ_FILES = gen_ndr/ndr_wzcsvc.o
-NOPROTO = YES
 REQUIRED_SUBSYSTEMS = LIBNDR
 
 [LIBRARY::NDR_BROWSER]
@@ -362,7 +323,6 @@ VERSION = 0.0.1
 SO_VERSION = 0.0.1
 DESCRIPTION =
 OBJ_FILES = gen_ndr/ndr_browser.o
-NOPROTO = YES
 REQUIRED_SUBSYSTEMS = LIBNDR
 
 [LIBRARY::NDR_W32TIME]
@@ -370,7 +330,6 @@ VERSION = 0.0.1
 SO_VERSION = 0.0.1
 DESCRIPTION =
 OBJ_FILES = gen_ndr/ndr_w32time.o
-NOPROTO = YES
 REQUIRED_SUBSYSTEMS = LIBNDR
 
 [LIBRARY::NDR_SCERPC]
@@ -378,7 +337,6 @@ VERSION = 0.0.1
 SO_VERSION = 0.0.1
 DESCRIPTION =
 OBJ_FILES = gen_ndr/ndr_scerpc.o
-NOPROTO = YES
 REQUIRED_SUBSYSTEMS = LIBNDR
 
 [LIBRARY::NDR_NTSVCS]
@@ -386,7 +344,6 @@ VERSION = 0.0.1
 SO_VERSION = 0.0.1
 DESCRIPTION =
 OBJ_FILES = gen_ndr/ndr_ntsvcs.o
-NOPROTO = YES
 REQUIRED_SUBSYSTEMS = LIBNDR
 
 [LIBRARY::NDR_NETLOGON]
@@ -394,7 +351,6 @@ VERSION = 0.0.1
 SO_VERSION = 0.0.1
 DESCRIPTION =
 OBJ_FILES = gen_ndr/ndr_netlogon.o
-NOPROTO = YES
 REQUIRED_SUBSYSTEMS = LIBNDR NDR_SAMR NDR_LSA
 
 [LIBRARY::NDR_TRKWKS]
@@ -402,7 +358,6 @@ VERSION = 0.0.1
 SO_VERSION = 0.0.1
 DESCRIPTION =
 OBJ_FILES = gen_ndr/ndr_trkwks.o
-NOPROTO = YES
 REQUIRED_SUBSYSTEMS = LIBNDR
 
 [LIBRARY::NDR_KEYSVC]
@@ -410,7 +365,6 @@ VERSION = 0.0.1
 SO_VERSION = 0.0.1
 DESCRIPTION =
 OBJ_FILES = gen_ndr/ndr_keysvc.o
-NOPROTO = YES
 REQUIRED_SUBSYSTEMS = LIBNDR
 
 [LIBRARY::NDR_KRB5PAC]
@@ -418,7 +372,6 @@ VERSION = 0.0.1
 SO_VERSION = 0.0.1
 DESCRIPTION =
 OBJ_FILES = gen_ndr/ndr_krb5pac.o
-NOPROTO = YES
 REQUIRED_SUBSYSTEMS = LIBNDR NDR_KRB5PAC_UTIL NDR_NETLOGON
 
 [SUBSYSTEM::NDR_KRB5PAC_UTIL]
@@ -430,7 +383,6 @@ VERSION = 0.0.1
 SO_VERSION = 0.0.1
 DESCRIPTION =
 OBJ_FILES = gen_ndr/ndr_xattr.o
-NOPROTO = YES
 REQUIRED_SUBSYSTEMS = LIBNDR NDR_SECURITY
 
 [LIBRARY::NDR_OPENDB]
@@ -438,7 +390,6 @@ VERSION = 0.0.1
 SO_VERSION = 0.0.1
 DESCRIPTION =
 OBJ_FILES = gen_ndr/ndr_opendb.o
-NOPROTO = YES
 REQUIRED_SUBSYSTEMS = LIBNDR
 
 [LIBRARY::NDR_SCHANNEL]
@@ -446,7 +397,6 @@ VERSION = 0.0.1
 SO_VERSION = 0.0.1
 DESCRIPTION =
 OBJ_FILES = gen_ndr/ndr_schannel.o
-NOPROTO = YES
 REQUIRED_SUBSYSTEMS = LIBNDR
 
 [LIBRARY::NDR_NBT]
@@ -454,7 +404,6 @@ VERSION = 0.0.1
 SO_VERSION = 0.0.1
 DESCRIPTION =
 OBJ_FILES = gen_ndr/ndr_nbt.o
-NOPROTO = YES
 REQUIRED_SUBSYSTEMS = LIBNDR NDR_MISC NDR_NBT_BUF NDR_SVCCTL
 
 [LIBRARY::NDR_WINSREPL]
@@ -462,7 +411,6 @@ VERSION = 0.0.1
 SO_VERSION = 0.0.1
 DESCRIPTION =
 OBJ_FILES = gen_ndr/ndr_winsrepl.o
-NOPROTO = YES
 REQUIRED_SUBSYSTEMS = LIBNDR NDR_NBT
 
 librpc/gen_ndr/tables.c: $(IDL_NDR_HEADER_FILES)
@@ -470,7 +418,6 @@ librpc/gen_ndr/tables.c: $(IDL_NDR_HEADER_FILES)
 
 [SUBSYSTEM::NDR_IFACE_TABLE]
 OBJ_FILES = gen_ndr/tables.o
-NOPROTO = YES
 
 [LIBRARY::NDR_TABLE]
 VERSION = 0.0.1
@@ -497,7 +444,6 @@ SO_VERSION = 0.0.1
 DESCRIPTION =
 OBJ_FILES = gen_ndr/ndr_rot_c.o
 REQUIRED_SUBSYSTEMS = NDR_ROT dcerpc
-NOPROTO = YES
 
 [LIBRARY::RPC_NDR_AUDIOSRV]
 VERSION = 0.0.1
@@ -505,7 +451,6 @@ SO_VERSION = 0.0.1
 DESCRIPTION =
 OBJ_FILES = gen_ndr/ndr_audiosrv_c.o
 REQUIRED_SUBSYSTEMS = NDR_AUDIOSRV dcerpc
-NOPROTO = YES
 
 [LIBRARY::RPC_NDR_ECHO]
 VERSION = 0.0.1
@@ -513,7 +458,6 @@ SO_VERSION = 0.0.1
 DESCRIPTION =
 OBJ_FILES = gen_ndr/ndr_echo_c.o
 REQUIRED_SUBSYSTEMS = dcerpc NDR_ECHO
-NOPROTO = YES
 
 [LIBRARY::RPC_NDR_EXCHANGE]
 VERSION = 0.0.1
@@ -521,7 +465,6 @@ SO_VERSION = 0.0.1
 DESCRIPTION =
 OBJ_FILES = gen_ndr/ndr_exchange_c.o
 REQUIRED_SUBSYSTEMS = dcerpc NDR_EXCHANGE
-NOPROTO = YES
 
 [LIBRARY::RPC_NDR_DSBACKUP]
 VERSION = 0.0.1
@@ -529,7 +472,6 @@ SO_VERSION = 0.0.1
 DESCRIPTION =
 OBJ_FILES = gen_ndr/ndr_dsbackup_c.o
 REQUIRED_SUBSYSTEMS = dcerpc NDR_DSBACKUP
-NOPROTO = YES
 
 [LIBRARY::RPC_NDR_EFS]
 VERSION = 0.0.1
@@ -537,7 +479,6 @@ SO_VERSION = 0.0.1
 DESCRIPTION =
 OBJ_FILES = gen_ndr/ndr_efs_c.o
 REQUIRED_SUBSYSTEMS = dcerpc NDR_EFS
-NOPROTO = YES
 
 [LIBRARY::RPC_NDR_LSA]
 VERSION = 0.0.1
@@ -545,7 +486,6 @@ SO_VERSION = 0.0.1
 DESCRIPTION =
 OBJ_FILES = gen_ndr/ndr_lsa_c.o
 REQUIRED_SUBSYSTEMS = dcerpc NDR_LSA
-NOPROTO = YES
 
 [LIBRARY::RPC_NDR_DFS]
 VERSION = 0.0.1
@@ -553,7 +493,6 @@ SO_VERSION = 0.0.1
 DESCRIPTION =
 OBJ_FILES = gen_ndr/ndr_dfs_c.o
 REQUIRED_SUBSYSTEMS = dcerpc NDR_DFS
-NOPROTO = YES
 
 [LIBRARY::RPC_NDR_DRSUAPI]
 VERSION = 0.0.1
@@ -561,7 +500,6 @@ SO_VERSION = 0.0.1
 DESCRIPTION =
 OBJ_FILES = gen_ndr/ndr_drsuapi_c.o
 REQUIRED_SUBSYSTEMS = dcerpc NDR_DRSUAPI
-NOPROTO = YES
 
 [LIBRARY::RPC_NDR_POLICYAGENT]
 VERSION = 0.0.1
@@ -569,7 +507,6 @@ SO_VERSION = 0.0.1
 DESCRIPTION =
 OBJ_FILES = gen_ndr/ndr_policyagent_c.o
 REQUIRED_SUBSYSTEMS = dcerpc NDR_POLICYAGENT
-NOPROTO = YES
 
 [LIBRARY::RPC_NDR_UNIXINFO]
 VERSION = 0.0.1
@@ -577,7 +514,6 @@ SO_VERSION = 0.0.1
 DESCRIPTION =
 OBJ_FILES = gen_ndr/ndr_unixinfo_c.o
 REQUIRED_SUBSYSTEMS = dcerpc NDR_UNIXINFO
-NOPROTO = YES
 
 [LIBRARY::RPC_NDR_SAMR]
 VERSION = 0.0.1
@@ -585,7 +521,6 @@ SO_VERSION = 0.0.1
 DESCRIPTION =
 OBJ_FILES = gen_ndr/ndr_samr_c.o
 REQUIRED_SUBSYSTEMS = dcerpc NDR_SAMR
-NOPROTO = YES
 
 [LIBRARY::RPC_NDR_SPOOLSS]
 VERSION = 0.0.1
@@ -593,7 +528,6 @@ SO_VERSION = 0.0.1
 DESCRIPTION =
 OBJ_FILES = gen_ndr/ndr_spoolss_c.o
 REQUIRED_SUBSYSTEMS = dcerpc NDR_SPOOLSS
-NOPROTO = YES
 
 [LIBRARY::RPC_NDR_WKSSVC]
 VERSION = 0.0.1
@@ -601,7 +535,6 @@ SO_VERSION = 0.0.1
 DESCRIPTION =
 OBJ_FILES = gen_ndr/ndr_wkssvc_c.o
 REQUIRED_SUBSYSTEMS = dcerpc NDR_WKSSVC
-NOPROTO = YES
 
 [LIBRARY::RPC_NDR_SRVSVC]
 VERSION = 0.0.1
@@ -609,7 +542,6 @@ SO_VERSION = 0.0.1
 DESCRIPTION =
 OBJ_FILES = gen_ndr/ndr_srvsvc_c.o
 REQUIRED_SUBSYSTEMS = dcerpc NDR_SRVSVC
-NOPROTO = YES
 
 [LIBRARY::RPC_NDR_SVCCTL]
 VERSION = 0.0.1
@@ -617,7 +549,6 @@ SO_VERSION = 0.0.1
 DESCRIPTION =
 OBJ_FILES = gen_ndr/ndr_svcctl_c.o
 REQUIRED_SUBSYSTEMS = dcerpc NDR_SVCCTL
-NOPROTO = YES
 
 [LIBRARY::RPC_NDR_ATSVC]
 VERSION = 0.0.1
@@ -625,7 +556,6 @@ SO_VERSION = 0.0.1
 DESCRIPTION =
 OBJ_FILES = gen_ndr/ndr_atsvc_c.o
 REQUIRED_SUBSYSTEMS = dcerpc NDR_ATSVC
-NOPROTO = YES
 
 [LIBRARY::RPC_NDR_EVENTLOG]
 VERSION = 0.0.1
@@ -633,7 +563,6 @@ SO_VERSION = 0.0.1
 DESCRIPTION =
 OBJ_FILES = gen_ndr/ndr_eventlog_c.o
 REQUIRED_SUBSYSTEMS = dcerpc NDR_EVENTLOG
-NOPROTO = YES
 
 [LIBRARY::RPC_NDR_EPMAPPER]
 VERSION = 0.0.1
@@ -641,7 +570,6 @@ SO_VERSION = 0.0.1
 DESCRIPTION =
 OBJ_FILES = gen_ndr/ndr_epmapper_c.o
 REQUIRED_SUBSYSTEMS = NDR_EPMAPPER
-NOPROTO = YES
 
 [LIBRARY::RPC_NDR_DBGIDL]
 VERSION = 0.0.1
@@ -649,7 +577,6 @@ SO_VERSION = 0.0.1
 DESCRIPTION =
 OBJ_FILES = gen_ndr/ndr_dbgidl_c.o
 REQUIRED_SUBSYSTEMS = dcerpc NDR_DBGIDL
-NOPROTO = YES
 
 [LIBRARY::RPC_NDR_DSSETUP]
 VERSION = 0.0.1
@@ -657,7 +584,6 @@ SO_VERSION = 0.0.1
 DESCRIPTION =
 OBJ_FILES = gen_ndr/ndr_dssetup_c.o
 REQUIRED_SUBSYSTEMS = dcerpc NDR_DSSETUP
-NOPROTO = YES
 
 [LIBRARY::RPC_NDR_MSGSVC]
 VERSION = 0.0.1
@@ -665,7 +591,6 @@ SO_VERSION = 0.0.1
 DESCRIPTION =
 OBJ_FILES = gen_ndr/ndr_msgsvc_c.o
 REQUIRED_SUBSYSTEMS = dcerpc NDR_MSGSVC
-NOPROTO = YES
 
 [LIBRARY::RPC_NDR_WINS]
 VERSION = 0.0.1
@@ -673,7 +598,6 @@ SO_VERSION = 0.0.1
 DESCRIPTION =
 OBJ_FILES = gen_ndr/ndr_wins_c.o
 REQUIRED_SUBSYSTEMS = dcerpc NDR_WINS
-NOPROTO = YES
 
 [LIBRARY::RPC_NDR_WINREG]
 VERSION = 0.0.1
@@ -681,7 +605,6 @@ SO_VERSION = 0.0.1
 DESCRIPTION =
 OBJ_FILES = gen_ndr/ndr_winreg_c.o
 REQUIRED_SUBSYSTEMS = dcerpc NDR_WINREG
-NOPROTO = YES
 
 [LIBRARY::RPC_NDR_INITSHUTDOWN]
 VERSION = 0.0.1
@@ -689,7 +612,6 @@ SO_VERSION = 0.0.1
 DESCRIPTION =
 OBJ_FILES = gen_ndr/ndr_initshutdown_c.o
 REQUIRED_SUBSYSTEMS = dcerpc NDR_INITSHUTDOWN
-NOPROTO = YES
 
 [LIBRARY::RPC_NDR_MGMT]
 VERSION = 0.0.1
@@ -697,7 +619,6 @@ SO_VERSION = 0.0.1
 DESCRIPTION =
 OBJ_FILES = gen_ndr/ndr_mgmt_c.o
 REQUIRED_SUBSYSTEMS = dcerpc NDR_MGMT
-NOPROTO = YES
 
 [LIBRARY::RPC_NDR_PROTECTED_STORAGE]
 VERSION = 0.0.1
@@ -705,7 +626,6 @@ SO_VERSION = 0.0.1
 DESCRIPTION =
 OBJ_FILES = gen_ndr/ndr_protected_storage_c.o
 REQUIRED_SUBSYSTEMS = dcerpc NDR_PROTECTED_STORAGE
-NOPROTO = YES
 
 [LIBRARY::DCOM_PROXY_DCOM]
 VERSION = 0.0.1
@@ -713,7 +633,6 @@ SO_VERSION = 0.0.1
 DESCRIPTION =
 OBJ_FILES = gen_ndr/ndr_dcom_c.o
 REQUIRED_SUBSYSTEMS = dcerpc NDR_DCOM
-NOPROTO = YES
 
 [LIBRARY::RPC_NDR_OXIDRESOLVER]
 VERSION = 0.0.1
@@ -721,7 +640,6 @@ SO_VERSION = 0.0.1
 DESCRIPTION =
 OBJ_FILES = gen_ndr/ndr_oxidresolver_c.o
 REQUIRED_SUBSYSTEMS = dcerpc NDR_OXIDRESOLVER
-NOPROTO = YES
 
 [LIBRARY::RPC_NDR_REMACT]
 VERSION = 0.0.1
@@ -729,7 +647,6 @@ SO_VERSION = 0.0.1
 DESCRIPTION =
 OBJ_FILES = gen_ndr/ndr_remact_c.o
 REQUIRED_SUBSYSTEMS = dcerpc NDR_REMACT
-NOPROTO = YES
 
 [LIBRARY::RPC_NDR_WZCSVC]
 VERSION = 0.0.1
@@ -737,7 +654,6 @@ SO_VERSION = 0.0.1
 DESCRIPTION =
 OBJ_FILES = gen_ndr/ndr_wzcsvc_c.o
 REQUIRED_SUBSYSTEMS = dcerpc NDR_WZCSVC
-NOPROTO = YES
 
 [LIBRARY::RPC_NDR_W32TIME]
 VERSION = 0.0.1
@@ -745,7 +661,6 @@ SO_VERSION = 0.0.1
 DESCRIPTION =
 OBJ_FILES = gen_ndr/ndr_w32time_c.o
 REQUIRED_SUBSYSTEMS = dcerpc NDR_W32TIME
-NOPROTO = YES
 
 [LIBRARY::RPC_NDR_SCERPC]
 VERSION = 0.0.1
@@ -753,7 +668,6 @@ SO_VERSION = 0.0.1
 DESCRIPTION =
 OBJ_FILES = gen_ndr/ndr_scerpc_c.o
 REQUIRED_SUBSYSTEMS = dcerpc NDR_SCERPC
-NOPROTO = YES
 
 [LIBRARY::RPC_NDR_NTSVCS]
 VERSION = 0.0.1
@@ -761,7 +675,6 @@ SO_VERSION = 0.0.1
 DESCRIPTION =
 OBJ_FILES = gen_ndr/ndr_ntsvcs_c.o
 REQUIRED_SUBSYSTEMS = dcerpc NDR_NTSVCS
-NOPROTO = YES
 
 [LIBRARY::RPC_NDR_NETLOGON]
 VERSION = 0.0.1
@@ -769,7 +682,6 @@ SO_VERSION = 0.0.1
 DESCRIPTION =
 OBJ_FILES = gen_ndr/ndr_netlogon_c.o
 REQUIRED_SUBSYSTEMS = NDR_NETLOGON
-NOPROTO = YES
 
 [LIBRARY::RPC_NDR_TRKWKS]
 VERSION = 0.0.1
@@ -777,7 +689,6 @@ SO_VERSION = 0.0.1
 DESCRIPTION =
 OBJ_FILES = gen_ndr/ndr_trkwks_c.o
 REQUIRED_SUBSYSTEMS = dcerpc NDR_TRKWKS
-NOPROTO = YES
 
 [LIBRARY::RPC_NDR_KEYSVC]
 VERSION = 0.0.1
@@ -785,11 +696,9 @@ SO_VERSION = 0.0.1
 DESCRIPTION =
 OBJ_FILES = gen_ndr/ndr_keysvc_c.o
 REQUIRED_SUBSYSTEMS = dcerpc NDR_KEYSVC
-NOPROTO = YES
 
 [SUBSYSTEM::NDR_DCERPC]
 OBJ_FILES = gen_ndr/ndr_dcerpc.o
-NOPROTO = YES
 REQUIRED_SUBSYSTEMS = LIBNDR NDR_MISC
 
 ################################################
@@ -824,49 +733,42 @@ INIT_FUNCTION = ejs_init_rpcecho
 OBJ_FILES = gen_ndr/ndr_echo_ejs.o
 SUBSYSTEM = smbcalls
 REQUIRED_SUBSYSTEMS = dcerpc NDR_ECHO
-NOPROTO = YES
 
 [MODULE::RPC_EJS_MISC]
 INIT_FUNCTION = ejs_init_misc
 OBJ_FILES = gen_ndr/ndr_misc_ejs.o
 SUBSYSTEM = smbcalls
 REQUIRED_SUBSYSTEMS = dcerpc NDR_MISC
-NOPROTO = YES
 
 [MODULE::RPC_EJS_SAMR]
 INIT_FUNCTION = ejs_init_samr
 OBJ_FILES = gen_ndr/ndr_samr_ejs.o
 SUBSYSTEM = smbcalls
 REQUIRED_SUBSYSTEMS = dcerpc NDR_SAMR
-NOPROTO = YES
 
 [MODULE::RPC_EJS_SECURITY]
 INIT_FUNCTION = ejs_init_security
 OBJ_FILES = gen_ndr/ndr_security_ejs.o
 SUBSYSTEM = smbcalls
 REQUIRED_SUBSYSTEMS = dcerpc NDR_SECURITY
-NOPROTO = YES
 
 [MODULE::RPC_EJS_LSA]
 INIT_FUNCTION = ejs_init_lsarpc
 OBJ_FILES = gen_ndr/ndr_lsa_ejs.o
 SUBSYSTEM = smbcalls
 REQUIRED_SUBSYSTEMS = dcerpc NDR_LSA
-NOPROTO = YES
 
 [MODULE::RPC_EJS_DFS]
 INIT_FUNCTION = ejs_init_netdfs
 OBJ_FILES = gen_ndr/ndr_dfs_ejs.o
 SUBSYSTEM = smbcalls
 REQUIRED_SUBSYSTEMS = dcerpc NDR_DFS
-NOPROTO = YES
 
 [MODULE::RPC_EJS_DRSUAPI]
 INIT_FUNCTION = ejs_init_drsuapi
 OBJ_FILES = gen_ndr/ndr_drsuapi_ejs.o
 SUBSYSTEM = smbcalls
 REQUIRED_SUBSYSTEMS = dcerpc NDR_DRSUAPI
-NOPROTO = YES
 
 [MODULE::RPC_EJS_SPOOLSS]
 INIT_FUNCTION = ejs_init_spoolss
@@ -874,60 +776,51 @@ OBJ_FILES = gen_ndr/ndr_spoolss_ejs.o
 SUBSYSTEM = smbcalls
 ENABLE = NO
 REQUIRED_SUBSYSTEMS = dcerpc NDR_SPOOLSS
-NOPROTO = YES
 
 [MODULE::RPC_EJS_WKSSVC]
 INIT_FUNCTION = ejs_init_wkssvc
 OBJ_FILES = gen_ndr/ndr_wkssvc_ejs.o
 SUBSYSTEM = smbcalls
 REQUIRED_SUBSYSTEMS = dcerpc NDR_WKSSVC
-NOPROTO = YES
 
 [MODULE::RPC_EJS_SRVSVC]
 INIT_FUNCTION = ejs_init_srvsvc
 OBJ_FILES = gen_ndr/ndr_srvsvc_ejs.o
 SUBSYSTEM = smbcalls
 REQUIRED_SUBSYSTEMS = dcerpc NDR_SRVSVC
-NOPROTO = YES
 
 [MODULE::RPC_EJS_EVENTLOG]
 INIT_FUNCTION = ejs_init_eventlog
 OBJ_FILES = gen_ndr/ndr_eventlog_ejs.o
 SUBSYSTEM = smbcalls
 REQUIRED_SUBSYSTEMS = dcerpc NDR_EVENTLOG
-NOPROTO = YES
 
 [MODULE::RPC_EJS_WINREG]
 INIT_FUNCTION = ejs_init_winreg
 OBJ_FILES = gen_ndr/ndr_winreg_ejs.o
 SUBSYSTEM = smbcalls
 REQUIRED_SUBSYSTEMS = dcerpc NDR_WINREG
-NOPROTO = YES
 
 [MODULE::RPC_EJS_INITSHUTDOWN]
 INIT_FUNCTION = ejs_init_initshutdown
 OBJ_FILES = gen_ndr/ndr_initshutdown_ejs.o
 SUBSYSTEM = smbcalls
 REQUIRED_SUBSYSTEMS = dcerpc NDR_INITSHUTDOWN
-NOPROTO = YES
 
 [MODULE::RPC_EJS_NETLOGON]
 INIT_FUNCTION = ejs_init_netlogon
 OBJ_FILES = gen_ndr/ndr_netlogon_ejs.o
 SUBSYSTEM = smbcalls
 REQUIRED_SUBSYSTEMS = dcerpc NDR_NETLOGON
-NOPROTO = YES
 
 [MODULE::RPC_EJS_SVCCTL]
 INIT_FUNCTION = ejs_init_svcctl
 OBJ_FILES = gen_ndr/ndr_svcctl_ejs.o
 SUBSYSTEM = smbcalls
 REQUIRED_SUBSYSTEMS = dcerpc NDR_SVCCTL
-NOPROTO = YES
 
 [MODULE::RPC_EJS_IRPC]
 INIT_FUNCTION = ejs_init_irpc
 OBJ_FILES = gen_ndr/ndr_irpc_ejs.o
 SUBSYSTEM = smbcalls
 REQUIRED_SUBSYSTEMS = dcerpc NDR_IRPC
-NOPROTO = YES
diff --git a/source4/nsswitch/config.mk b/source4/nsswitch/config.mk
index 0279f447c5..19e3fae0bb 100644
--- a/source4/nsswitch/config.mk
+++ b/source4/nsswitch/config.mk
@@ -5,6 +5,5 @@ VERSION = 0.0.1
 SO_VERSION = 0.0.1
 DESCRIPTION = Client library for communicating with winbind
 OBJ_FILES = wb_common.o
-NOPROTO=YES
 # End SUBSYSTEM LIBWINBIND_CLIENT
 #################################
diff --git a/source4/scripting/ejs/config.mk b/source4/scripting/ejs/config.mk
index 7111f307ff..ffda803f47 100644
--- a/source4/scripting/ejs/config.mk
+++ b/source4/scripting/ejs/config.mk
@@ -3,7 +3,6 @@
 [SUBSYSTEM::EJSRPC]
 OBJ_FILES = \
 		ejsrpc.o
-NOPROTO = YES
 # End SUBSYSTEM EJSRPC
 #######################