r14110: make ndr interface parsing code libraries,

so it will not included in multiple modules or binaries

metze
(This used to be commit 13c105974744c510a62a7c8db2230b60c11b2315)

5 files changed, 284 insertions, 66 deletions

diff --git a/source4/librpc/config.mk b/source4/librpc/config.mk
index 6296272dfe..1f2153f3fb 100644
--- a/source4/librpc/config.mk
+++ b/source4/librpc/config.mk
@@ -19,7 +19,11 @@ REQUIRED_SUBSYSTEMS = LIBCLI_UTILS LIBTALLOC
 
 ################################################
 # Start SUBSYSTEM NDR_COMPRESSION
-[SUBSYSTEM::NDR_COMPRESSION]
+[LIBRARY::NDR_COMPRESSION]
+MAJOR_VERSION = 0
+MINOR_VERSION = 0
+RELEASE_VERSION = 1
+DESCRIPTION =
 OBJ_FILES = \
 		ndr/ndr_compression.o
 REQUIRED_SUBSYSTEMS = LIBCOMPRESSION
@@ -29,77 +33,128 @@ REQUIRED_SUBSYSTEMS = LIBCOMPRESSION
 [SUBSYSTEM::NDR_SECURITY_HELPER]
 OBJ_FILES = ndr/ndr_sec_helper.o ndr/ndr_sec.o
 
-[SUBSYSTEM::NDR_SECURITY]
+[LIBRARY::NDR_SECURITY]
+MAJOR_VERSION = 0
+MINOR_VERSION = 0
+RELEASE_VERSION = 1
+DESCRIPTION =
 OBJ_FILES = gen_ndr/ndr_security.o
 NOPROTO = YES
 REQUIRED_SUBSYSTEMS = NDR_MISC NDR_SECURITY_HELPER
 
-[SUBSYSTEM::NDR_AUDIOSRV]
+[LIBRARY::NDR_AUDIOSRV]
+MAJOR_VERSION = 0
+MINOR_VERSION = 0
+RELEASE_VERSION = 1
+DESCRIPTION =
 OBJ_FILES = gen_ndr/ndr_audiosrv.o
 NOPROTO = YES
 REQUIRED_SUBSYSTEMS = LIBNDR
 
-[SUBSYSTEM::NDR_DNSSERVER]
+[LIBRARY::NDR_DNSSERVER]
+MAJOR_VERSION = 0
+MINOR_VERSION = 0
+RELEASE_VERSION = 1
+DESCRIPTION =
 OBJ_FILES = gen_ndr/ndr_dnsserver.o
 NOPROTO = YES
 REQUIRED_SUBSYSTEMS = LIBNDR
 
-[SUBSYSTEM::NDR_WINSTATION]
+[LIBRARY::NDR_WINSTATION]
+MAJOR_VERSION = 0
+MINOR_VERSION = 0
+RELEASE_VERSION = 1
+DESCRIPTION =
 OBJ_FILES = gen_ndr/ndr_winstation.o
 NOPROTO = YES
 REQUIRED_SUBSYSTEMS = LIBNDR
 
-[SUBSYSTEM::NDR_DCERPC]
-OBJ_FILES = gen_ndr/ndr_dcerpc.o
-NOPROTO = YES
-REQUIRED_SUBSYSTEMS = LIBNDR
-
-[SUBSYSTEM::NDR_ECHO]
+[LIBRARY::NDR_ECHO]
+MAJOR_VERSION = 0
+MINOR_VERSION = 0
+RELEASE_VERSION = 1
+DESCRIPTION =
 OBJ_FILES = gen_ndr/ndr_echo.o
 NOPROTO = YES
 REQUIRED_SUBSYSTEMS = LIBNDR
 
-[SUBSYSTEM::NDR_IRPC]
+[LIBRARY::NDR_IRPC]
+MAJOR_VERSION = 0
+MINOR_VERSION = 0
+RELEASE_VERSION = 1
+DESCRIPTION =
 OBJ_FILES = gen_ndr/ndr_irpc.o
 NOPROTO = YES
 REQUIRED_SUBSYSTEMS = LIBNDR
 
-[SUBSYSTEM::NDR_EXCHANGE]
+[LIBRARY::NDR_EXCHANGE]
+MAJOR_VERSION = 0
+MINOR_VERSION = 0
+RELEASE_VERSION = 1
+DESCRIPTION =
 OBJ_FILES = gen_ndr/ndr_exchange.o
 NOPROTO = YES
 REQUIRED_SUBSYSTEMS = LIBNDR
 
-[SUBSYSTEM::NDR_DSBACKUP]
+[LIBRARY::NDR_DSBACKUP]
+MAJOR_VERSION = 0
+MINOR_VERSION = 0
+RELEASE_VERSION = 1
+DESCRIPTION =
 OBJ_FILES = gen_ndr/ndr_dsbackup.o
 NOPROTO = YES
 REQUIRED_SUBSYSTEMS = LIBNDR
 
-[SUBSYSTEM::NDR_EFS]
+[LIBRARY::NDR_EFS]
+MAJOR_VERSION = 0
+MINOR_VERSION = 0
+RELEASE_VERSION = 1
+DESCRIPTION =
 OBJ_FILES = gen_ndr/ndr_efs.o
 NOPROTO = YES
 REQUIRED_SUBSYSTEMS = LIBNDR
 
-[SUBSYSTEM::NDR_MISC]
+[LIBRARY::NDR_MISC]
+MAJOR_VERSION = 0
+MINOR_VERSION = 0
+RELEASE_VERSION = 1
+DESCRIPTION =
 OBJ_FILES = gen_ndr/ndr_misc.o
 NOPROTO = YES
 REQUIRED_SUBSYSTEMS = LIBNDR
 
-[SUBSYSTEM::NDR_ROT]
+[LIBRARY::NDR_ROT]
+MAJOR_VERSION = 0
+MINOR_VERSION = 0
+RELEASE_VERSION = 1
+DESCRIPTION =
 OBJ_FILES = gen_ndr/ndr_rot.o
 NOPROTO = YES
 REQUIRED_SUBSYSTEMS = LIBNDR
 
-[SUBSYSTEM::NDR_LSA]
+[LIBRARY::NDR_LSA]
+MAJOR_VERSION = 0
+MINOR_VERSION = 0
+RELEASE_VERSION = 1
+DESCRIPTION =
 OBJ_FILES = gen_ndr/ndr_lsa.o
 NOPROTO = YES
 REQUIRED_SUBSYSTEMS = LIBNDR
 
-[SUBSYSTEM::NDR_DFS]
+[LIBRARY::NDR_DFS]
+MAJOR_VERSION = 0
+MINOR_VERSION = 0
+RELEASE_VERSION = 1
+DESCRIPTION =
 OBJ_FILES = gen_ndr/ndr_dfs.o
 NOPROTO = YES
 REQUIRED_SUBSYSTEMS = LIBNDR
 
-[SUBSYSTEM::NDR_DRSUAPI]
+[LIBRARY::NDR_DRSUAPI]
+MAJOR_VERSION = 0
+MINOR_VERSION = 0
+RELEASE_VERSION = 1
+DESCRIPTION =
 OBJ_FILES = gen_ndr/ndr_drsuapi.o
 NOPROTO = YES
 REQUIRED_SUBSYSTEMS = LIBNDR NDR_DRSUAPI_PRINT NDR_COMPRESSION NDR_SECURITY
@@ -107,32 +162,56 @@ REQUIRED_SUBSYSTEMS = LIBNDR NDR_DRSUAPI_PRINT NDR_COMPRESSION NDR_SECURITY
 [SUBSYSTEM::NDR_DRSUAPI_PRINT]
 OBJ_FILES = ndr/ndr_drsuapi.o
 
-[SUBSYSTEM::NDR_DRSBLOBS]
+[LIBRARY::NDR_DRSBLOBS]
+MAJOR_VERSION = 0
+MINOR_VERSION = 0
+RELEASE_VERSION = 1
+DESCRIPTION =
 OBJ_FILES = gen_ndr/ndr_drsblobs.o
 NOPROTO = YES
 REQUIRED_SUBSYSTEMS = LIBNDR
 
-[SUBSYSTEM::NDR_SASL_HELPERS]
+[LIBRARY::NDR_SASL_HELPERS]
+MAJOR_VERSION = 0
+MINOR_VERSION = 0
+RELEASE_VERSION = 1
+DESCRIPTION =
 OBJ_FILES = gen_ndr/ndr_sasl_helpers.o
 NOPROTO = YES
 REQUIRED_SUBSYSTEMS = LIBNDR
 
-[SUBSYSTEM::NDR_POLICYAGENT]
+[LIBRARY::NDR_POLICYAGENT]
+MAJOR_VERSION = 0
+MINOR_VERSION = 0
+RELEASE_VERSION = 1
+DESCRIPTION =
 OBJ_FILES = gen_ndr/ndr_policyagent.o
 NOPROTO = YES
 REQUIRED_SUBSYSTEMS = LIBNDR
 
-[SUBSYSTEM::NDR_UNIXINFO]
+[LIBRARY::NDR_UNIXINFO]
+MAJOR_VERSION = 0
+MINOR_VERSION = 0
+RELEASE_VERSION = 1
+DESCRIPTION =
 OBJ_FILES = gen_ndr/ndr_unixinfo.o
 NOPROTO = YES
 REQUIRED_SUBSYSTEMS = LIBNDR
 
-[SUBSYSTEM::NDR_SAMR]
+[LIBRARY::NDR_SAMR]
+MAJOR_VERSION = 0
+MINOR_VERSION = 0
+RELEASE_VERSION = 1
+DESCRIPTION =
 OBJ_FILES = gen_ndr/ndr_samr.o
 NOPROTO = YES
 REQUIRED_SUBSYSTEMS = LIBNDR NDR_MISC NDR_LSA NDR_SECURITY
 
-[SUBSYSTEM::NDR_SPOOLSS]
+[LIBRARY::NDR_SPOOLSS]
+MAJOR_VERSION = 0
+MINOR_VERSION = 0
+RELEASE_VERSION = 1
+DESCRIPTION =
 OBJ_FILES = gen_ndr/ndr_spoolss.o
 NOPROTO = YES
 REQUIRED_SUBSYSTEMS = LIBNDR NDR_SPOOLSS_BUF
@@ -140,77 +219,137 @@ REQUIRED_SUBSYSTEMS = LIBNDR NDR_SPOOLSS_BUF
 [SUBSYSTEM::NDR_SPOOLSS_BUF]
 OBJ_FILES = ndr/ndr_spoolss_buf.o
 
-[SUBSYSTEM::NDR_WKSSVC]
+[LIBRARY::NDR_WKSSVC]
+MAJOR_VERSION = 0
+MINOR_VERSION = 0
+RELEASE_VERSION = 1
+DESCRIPTION =
 OBJ_FILES = gen_ndr/ndr_wkssvc.o
 NOPROTO = YES
 REQUIRED_SUBSYSTEMS = LIBNDR
 
-[SUBSYSTEM::NDR_SRVSVC]
+[LIBRARY::NDR_SRVSVC]
+MAJOR_VERSION = 0
+MINOR_VERSION = 0
+RELEASE_VERSION = 1
+DESCRIPTION =
 OBJ_FILES = gen_ndr/ndr_srvsvc.o
 NOPROTO = YES
 REQUIRED_SUBSYSTEMS = LIBNDR NDR_SVCCTL
 
-[SUBSYSTEM::NDR_SVCCTL]
+[LIBRARY::NDR_SVCCTL]
+MAJOR_VERSION = 0
+MINOR_VERSION = 0
+RELEASE_VERSION = 1
+DESCRIPTION =
 OBJ_FILES = gen_ndr/ndr_svcctl.o
 NOPROTO = YES
 REQUIRED_SUBSYSTEMS = LIBNDR
 
-[SUBSYSTEM::NDR_ATSVC]
+[LIBRARY::NDR_ATSVC]
+MAJOR_VERSION = 0
+MINOR_VERSION = 0
+RELEASE_VERSION = 1
+DESCRIPTION =
 OBJ_FILES = gen_ndr/ndr_atsvc.o
 NOPROTO = YES
 REQUIRED_SUBSYSTEMS = LIBNDR
 
-[SUBSYSTEM::NDR_EVENTLOG]
+[LIBRARY::NDR_EVENTLOG]
+MAJOR_VERSION = 0
+MINOR_VERSION = 0
+RELEASE_VERSION = 1
+DESCRIPTION =
 OBJ_FILES = gen_ndr/ndr_eventlog.o
 NOPROTO = YES
 REQUIRED_SUBSYSTEMS = LIBNDR
 
-[SUBSYSTEM::NDR_EPMAPPER]
+[LIBRARY::NDR_EPMAPPER]
+MAJOR_VERSION = 0
+MINOR_VERSION = 0
+RELEASE_VERSION = 1
+DESCRIPTION =
 OBJ_FILES = gen_ndr/ndr_epmapper.o
 NOPROTO = YES
 REQUIRED_SUBSYSTEMS = LIBNDR
 
-[SUBSYSTEM::NDR_DBGIDL]
+[LIBRARY::NDR_DBGIDL]
+MAJOR_VERSION = 0
+MINOR_VERSION = 0
+RELEASE_VERSION = 1
+DESCRIPTION =
 OBJ_FILES = gen_ndr/ndr_dbgidl.o
 NOPROTO = YES
 REQUIRED_SUBSYSTEMS = LIBNDR
 
-[SUBSYSTEM::NDR_DSSETUP]
+[LIBRARY::NDR_DSSETUP]
+MAJOR_VERSION = 0
+MINOR_VERSION = 0
+RELEASE_VERSION = 1
+DESCRIPTION =
 OBJ_FILES = gen_ndr/ndr_dssetup.o
 NOPROTO = YES
 REQUIRED_SUBSYSTEMS = LIBNDR
 
-[SUBSYSTEM::NDR_MSGSVC]
+[LIBRARY::NDR_MSGSVC]
+MAJOR_VERSION = 0
+MINOR_VERSION = 0
+RELEASE_VERSION = 1
+DESCRIPTION =
 OBJ_FILES = gen_ndr/ndr_msgsvc.o
 NOPROTO = YES
 REQUIRED_SUBSYSTEMS = LIBNDR
 
-[SUBSYSTEM::NDR_WINS]
+[LIBRARY::NDR_WINS]
+MAJOR_VERSION = 0
+MINOR_VERSION = 0
+RELEASE_VERSION = 1
+DESCRIPTION =
 OBJ_FILES = gen_ndr/ndr_wins.o
 NOPROTO = YES
 REQUIRED_SUBSYSTEMS = LIBNDR
 
-[SUBSYSTEM::NDR_WINREG]
+[LIBRARY::NDR_WINREG]
+MAJOR_VERSION = 0
+MINOR_VERSION = 0
+RELEASE_VERSION = 1
+DESCRIPTION =
 OBJ_FILES = gen_ndr/ndr_winreg.o
 NOPROTO = YES
 REQUIRED_SUBSYSTEMS = LIBNDR NDR_INITSHUTDOWN
 
-[SUBSYSTEM::NDR_INITSHUTDOWN]
+[LIBRARY::NDR_INITSHUTDOWN]
+MAJOR_VERSION = 0
+MINOR_VERSION = 0
+RELEASE_VERSION = 1
+DESCRIPTION =
 OBJ_FILES = gen_ndr/ndr_initshutdown.o
 NOPROTO = YES
 REQUIRED_SUBSYSTEMS = LIBNDR
 
-[SUBSYSTEM::NDR_MGMT]
+[LIBRARY::NDR_MGMT]
+MAJOR_VERSION = 0
+MINOR_VERSION = 0
+RELEASE_VERSION = 1
+DESCRIPTION =
 OBJ_FILES = gen_ndr/ndr_mgmt.o
 NOPROTO = YES
 REQUIRED_SUBSYSTEMS = LIBNDR
 
-[SUBSYSTEM::NDR_PROTECTED_STORAGE]
+[LIBRARY::NDR_PROTECTED_STORAGE]
+MAJOR_VERSION = 0
+MINOR_VERSION = 0
+RELEASE_VERSION = 1
+DESCRIPTION =
 OBJ_FILES = gen_ndr/ndr_protected_storage.o
 NOPROTO = YES
 REQUIRED_SUBSYSTEMS = LIBNDR
 
-[SUBSYSTEM::NDR_DCOM]
+[LIBRARY::NDR_DCOM]
+MAJOR_VERSION = 0
+MINOR_VERSION = 0
+RELEASE_VERSION = 1
+DESCRIPTION =
 OBJ_FILES = gen_ndr/ndr_dcom.o
 NOPROTO = YES
 REQUIRED_SUBSYSTEMS = LIBNDR NDR_ORPC
@@ -218,62 +357,110 @@ REQUIRED_SUBSYSTEMS = LIBNDR NDR_ORPC
 [SUBSYSTEM::NDR_ORPC_MANUAL]
 OBJ_FILES = ndr/ndr_orpc.o 
 
-[SUBSYSTEM::NDR_ORPC]
+[LIBRARY::NDR_ORPC]
+MAJOR_VERSION = 0
+MINOR_VERSION = 0
+RELEASE_VERSION = 1
+DESCRIPTION =
 OBJ_FILES = gen_ndr/ndr_orpc.o
 NOPROTO = YES
 REQUIRED_SUBSYSTEMS = LIBNDR NDR_ORPC_MANUAL
 
-[SUBSYSTEM::NDR_OXIDRESOLVER]
+[LIBRARY::NDR_OXIDRESOLVER]
+MAJOR_VERSION = 0
+MINOR_VERSION = 0
+RELEASE_VERSION = 1
+DESCRIPTION =
 OBJ_FILES = gen_ndr/ndr_oxidresolver.o
 NOPROTO = YES
 REQUIRED_SUBSYSTEMS = LIBNDR NDR_ORPC
 
-[SUBSYSTEM::NDR_REMACT]
+[LIBRARY::NDR_REMACT]
+MAJOR_VERSION = 0
+MINOR_VERSION = 0
+RELEASE_VERSION = 1
+DESCRIPTION =
 OBJ_FILES = gen_ndr/ndr_remact.o
 NOPROTO = YES
 REQUIRED_SUBSYSTEMS = LIBNDR NDR_ORPC
 
-[SUBSYSTEM::NDR_WZCSVC]
+[LIBRARY::NDR_WZCSVC]
+MAJOR_VERSION = 0
+MINOR_VERSION = 0
+RELEASE_VERSION = 1
+DESCRIPTION =
 OBJ_FILES = gen_ndr/ndr_wzcsvc.o
 NOPROTO = YES
 REQUIRED_SUBSYSTEMS = LIBNDR
 
-[SUBSYSTEM::NDR_BROWSER]
+[LIBRARY::NDR_BROWSER]
+MAJOR_VERSION = 0
+MINOR_VERSION = 0
+RELEASE_VERSION = 1
+DESCRIPTION =
 OBJ_FILES = gen_ndr/ndr_browser.o
 NOPROTO = YES
 REQUIRED_SUBSYSTEMS = LIBNDR
 
-[SUBSYSTEM::NDR_W32TIME]
+[LIBRARY::NDR_W32TIME]
+MAJOR_VERSION = 0
+MINOR_VERSION = 0
+RELEASE_VERSION = 1
+DESCRIPTION =
 OBJ_FILES = gen_ndr/ndr_w32time.o
 NOPROTO = YES
 REQUIRED_SUBSYSTEMS = LIBNDR
 
-[SUBSYSTEM::NDR_SCERPC]
+[LIBRARY::NDR_SCERPC]
+MAJOR_VERSION = 0
+MINOR_VERSION = 0
+RELEASE_VERSION = 1
+DESCRIPTION =
 OBJ_FILES = gen_ndr/ndr_scerpc.o
 NOPROTO = YES
 REQUIRED_SUBSYSTEMS = LIBNDR
 
-[SUBSYSTEM::NDR_NTSVCS]
+[LIBRARY::NDR_NTSVCS]
+MAJOR_VERSION = 0
+MINOR_VERSION = 0
+RELEASE_VERSION = 1
+DESCRIPTION =
 OBJ_FILES = gen_ndr/ndr_ntsvcs.o
 NOPROTO = YES
 REQUIRED_SUBSYSTEMS = LIBNDR
 
-[SUBSYSTEM::NDR_NETLOGON]
+[LIBRARY::NDR_NETLOGON]
+MAJOR_VERSION = 0
+MINOR_VERSION = 0
+RELEASE_VERSION = 1
+DESCRIPTION =
 OBJ_FILES = gen_ndr/ndr_netlogon.o
 NOPROTO = YES
 REQUIRED_SUBSYSTEMS = LIBNDR NDR_SAMR NDR_LSA
 
-[SUBSYSTEM::NDR_TRKWKS]
+[LIBRARY::NDR_TRKWKS]
+MAJOR_VERSION = 0
+MINOR_VERSION = 0
+RELEASE_VERSION = 1
+DESCRIPTION =
 OBJ_FILES = gen_ndr/ndr_trkwks.o
 NOPROTO = YES
 REQUIRED_SUBSYSTEMS = LIBNDR
 
-[SUBSYSTEM::NDR_KEYSVC]
+[LIBRARY::NDR_KEYSVC]
+MAJOR_VERSION = 0
+MINOR_VERSION = 0
+RELEASE_VERSION = 1
+DESCRIPTION =
 OBJ_FILES = gen_ndr/ndr_keysvc.o
 NOPROTO = YES
 REQUIRED_SUBSYSTEMS = LIBNDR
 
-[SUBSYSTEM::NDR_KRB5PAC]
+[LIBRARY::NDR_KRB5PAC]
+MAJOR_VERSION = 0
+MINOR_VERSION = 0
+RELEASE_VERSION = 1
+DESCRIPTION =
 OBJ_FILES = gen_ndr/ndr_krb5pac.o
 NOPROTO = YES
 REQUIRED_SUBSYSTEMS = LIBNDR NDR_KRB5PAC_UTIL NDR_NETLOGON
@@ -281,27 +468,47 @@ REQUIRED_SUBSYSTEMS = LIBNDR NDR_KRB5PAC_UTIL NDR_NETLOGON
 [SUBSYSTEM::NDR_KRB5PAC_UTIL]
 OBJ_FILES = ndr/ndr_krb5pac.o
 
-[SUBSYSTEM::NDR_XATTR]
+[LIBRARY::NDR_XATTR]
+MAJOR_VERSION = 0
+MINOR_VERSION = 0
+RELEASE_VERSION = 1
+DESCRIPTION =
 OBJ_FILES = gen_ndr/ndr_xattr.o
 NOPROTO = YES
 REQUIRED_SUBSYSTEMS = LIBNDR NDR_SECURITY
 
-[SUBSYSTEM::NDR_OPENDB]
+[LIBRARY::NDR_OPENDB]
+MAJOR_VERSION = 0
+MINOR_VERSION = 0
+RELEASE_VERSION = 1
+DESCRIPTION =
 OBJ_FILES = gen_ndr/ndr_opendb.o
 NOPROTO = YES
 REQUIRED_SUBSYSTEMS = LIBNDR
 
-[SUBSYSTEM::NDR_SCHANNEL]
+[LIBRARY::NDR_SCHANNEL]
+MAJOR_VERSION = 0
+MINOR_VERSION = 0
+RELEASE_VERSION = 1
+DESCRIPTION =
 OBJ_FILES = gen_ndr/ndr_schannel.o
 NOPROTO = YES
 REQUIRED_SUBSYSTEMS = LIBNDR
 
-[SUBSYSTEM::NDR_NBT]
+[LIBRARY::NDR_NBT]
+MAJOR_VERSION = 0
+MINOR_VERSION = 0
+RELEASE_VERSION = 1
+DESCRIPTION =
 OBJ_FILES = gen_ndr/ndr_nbt.o
 NOPROTO = YES
 REQUIRED_SUBSYSTEMS = LIBNDR NDR_MISC NDR_NBT_BUF NDR_SVCCTL
 
-[SUBSYSTEM::NDR_WINSREPL]
+[LIBRARY::NDR_WINSREPL]
+MAJOR_VERSION = 0
+MINOR_VERSION = 0
+RELEASE_VERSION = 1
+DESCRIPTION =
 OBJ_FILES = gen_ndr/ndr_winsrepl.o
 NOPROTO = YES
 REQUIRED_SUBSYSTEMS = LIBNDR NDR_NBT
@@ -313,10 +520,16 @@ librpc/gen_ndr/tables.c: $(IDL_NDR_HEADER_FILES)
 OBJ_FILES = gen_ndr/tables.o
 NOPROTO = YES
 
-[SUBSYSTEM::NDR_ALL]
+[LIBRARY::NDR_TABLE]
+MAJOR_VERSION = 0
+MINOR_VERSION = 0
+RELEASE_VERSION = 1
+DESCRIPTION =
 OBJ_FILES = rpc/table.o 
 PRIVATE_PROTO_HEADER = rpc/dcerpc_table.h
-REQUIRED_SUBSYSTEMS = NDR_IFACE_TABLE NDR_AUDIOSRV NDR_ECHO NDR_DCERPC NDR_EXCHANGE \
+REQUIRED_SUBSYSTEMS = \
+	NDR_IFACE_TABLE \
+	NDR_AUDIOSRV NDR_ECHO NDR_DCERPC NDR_EXCHANGE \
 	NDR_DSBACKUP NDR_EFS NDR_MISC NDR_LSA NDR_DFS NDR_DRSUAPI \
 	NDR_POLICYAGENT NDR_UNIXINFO NDR_SAMR NDR_SPOOLSS NDR_WKSSVC NDR_SRVSVC NDR_ATSVC \
 	NDR_EVENTLOG NDR_EPMAPPER NDR_DBGIDL NDR_DSSETUP NDR_MSGSVC NDR_WINS \
@@ -522,6 +735,11 @@ 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
+
 ################################################
 # Start SUBSYSTEM dcerpc
 [LIBRARY::dcerpc]
diff --git a/source4/rpc_server/config.mk b/source4/rpc_server/config.mk
index 94b65d63c4..8a5328d294 100644
--- a/source4/rpc_server/config.mk
+++ b/source4/rpc_server/config.mk
@@ -59,7 +59,7 @@ SUBSYSTEM = dcerpc_server
 OBJ_FILES = \
 		remote/dcesrv_remote.o
 REQUIRED_SUBSYSTEMS = \
-		LIBSMB NDR_ALL
+		LIBSMB NDR_TABLE
 # End MODULE dcerpc_remote
 ################################################
 
diff --git a/source4/scripting/ejs/config.mk b/source4/scripting/ejs/config.mk
index e330e022a4..aae428cbff 100644
--- a/source4/scripting/ejs/config.mk
+++ b/source4/scripting/ejs/config.mk
@@ -79,7 +79,7 @@ REQUIRED_SUBSYSTEMS = \
 		LIBNET LIBSMB LIBPOPT \
 		POPT_CREDENTIALS POPT_SAMBA \
 		dcerpc \
-		NDR_ALL \
+		NDR_TABLE \
 		RPC_EJS_SECURITY \
 		RPC_EJS_LSA \
 		RPC_EJS_ECHO \
diff --git a/source4/torture/config.mk b/source4/torture/config.mk
index 40a8a088ca..1407089f2a 100644
--- a/source4/torture/config.mk
+++ b/source4/torture/config.mk
@@ -119,7 +119,7 @@ OBJ_FILES = \
 		rpc/alter_context.o \
 		rpc/bench.o
 REQUIRED_SUBSYSTEMS = \
-		NDR_ALL RPC_NDR_UNIXINFO RPC_NDR_SAMR RPC_NDR_WINREG RPC_NDR_INITSHUTDOWN \
+		NDR_TABLE RPC_NDR_UNIXINFO RPC_NDR_SAMR RPC_NDR_WINREG RPC_NDR_INITSHUTDOWN \
 		RPC_NDR_OXIDRESOLVER RPC_NDR_EVENTLOG RPC_NDR_ECHO RPC_NDR_SVCCTL \
 		RPC_NDR_MGMT RPC_NDR_NETLOGON RPC_NDR_ATSVC RPC_NDR_DRSUAPI \
 		RPC_NDR_LSA RPC_NDR_EPMAPPER RPC_NDR_DFS RPC_NDR_SPOOLSS \
@@ -213,7 +213,7 @@ OBJ_FILES = \
 		libnet/libnet_share.o \
 		libnet/libnet_rpc.o
 REQUIRED_SUBSYSTEMS = \
-		NDR_ALL RPC_NDR_SAMR LIBNET
+		LIBNET
 # End SUBSYSTEM TORTURE_NET
 #################################
 
diff --git a/source4/utils/config.mk b/source4/utils/config.mk
index 61d11cb3af..0a1139de2b 100644
--- a/source4/utils/config.mk
+++ b/source4/utils/config.mk
@@ -9,9 +9,9 @@ OBJ_FILES = \
 REQUIRED_SUBSYSTEMS = \
 		CONFIG \
 		LIBBASIC \
-		NDR_ALL \
 		LIBPOPT \
-		POPT_SAMBA
+		POPT_SAMBA \
+		NDR_TABLE
 MANPAGE = man/ndrdump.1
 # FIXME: ndrdump shouldn't have to depend on RPC...
 # End BINARY ndrdump