r20300: Trim number of shared libs significantly.

(This used to be commit 40406355135d5bebd9dad27168ab695657271f4f)

1 files changed, 77 insertions, 232 deletions

diff --git a/source4/librpc/config.mk b/source4/librpc/config.mk
index 50bab003eb..811d044779 100644
--- a/source4/librpc/config.mk
+++ b/source4/librpc/config.mk
@@ -29,28 +29,20 @@ PUBLIC_DEPENDENCIES = LIBCOMPRESSION LIBSAMBA-ERRORS LIBNDR
 # End SUBSYSTEM NDR_COMPRESSION
 ################################################
 
-[LIBRARY::NDR_SECURITY]
-VERSION = 0.0.1
-SO_VERSION = 0
+[SUBSYSTEM::NDR_SECURITY]
 OBJ_FILES = gen_ndr/ndr_security.o ndr/ndr_sec_helper.o 
 PUBLIC_HEADERS = gen_ndr/security.h
 PUBLIC_DEPENDENCIES = NDR_MISC LIBSECURITY
 
-[LIBRARY::NDR_AUDIOSRV]
-VERSION = 0.0.1
-SO_VERSION = 0
+[SUBSYSTEM::NDR_AUDIOSRV]
 OBJ_FILES = gen_ndr/ndr_audiosrv.o
 PUBLIC_DEPENDENCIES = LIBNDR
 
-[LIBRARY::NDR_DNSSERVER]
-VERSION = 0.0.1
-SO_VERSION = 0
+[SUBSYSTEM::NDR_DNSSERVER]
 OBJ_FILES = gen_ndr/ndr_dnsserver.o
 PUBLIC_DEPENDENCIES = LIBNDR
 
-[LIBRARY::NDR_WINSTATION]
-VERSION = 0.0.1
-SO_VERSION = 0
+[SUBSYSTEM::NDR_WINSTATION]
 OBJ_FILES = gen_ndr/ndr_winstation.o
 PUBLIC_DEPENDENCIES = LIBNDR
 
@@ -58,21 +50,15 @@ PUBLIC_DEPENDENCIES = LIBNDR
 OBJ_FILES = gen_ndr/ndr_echo.o
 PUBLIC_DEPENDENCIES = LIBNDR
 
-[LIBRARY::NDR_IRPC]
-VERSION = 0.0.1
-SO_VERSION = 0
+[SUBSYSTEM::NDR_IRPC]
 OBJ_FILES = gen_ndr/ndr_irpc.o
 PUBLIC_DEPENDENCIES = LIBNDR NDR_SECURITY NDR_NBT
 
-[LIBRARY::NDR_DSBACKUP]
-VERSION = 0.0.1
-SO_VERSION = 0
+[SUBSYSTEM::NDR_DSBACKUP]
 OBJ_FILES = gen_ndr/ndr_dsbackup.o
 PUBLIC_DEPENDENCIES = LIBNDR
 
-[LIBRARY::NDR_EFS]
-VERSION = 0.0.1
-SO_VERSION = 0
+[SUBSYSTEM::NDR_EFS]
 OBJ_FILES = gen_ndr/ndr_efs.o
 PUBLIC_DEPENDENCIES = LIBNDR NDR_SECURITY
 
@@ -85,40 +71,28 @@ PUBLIC_DEPENDENCIES = LIBNDR
 OBJ_FILES = gen_ndr/ndr_rot.o
 PUBLIC_DEPENDENCIES = LIBNDR NDR_ORPC
 
-[LIBRARY::NDR_LSA]
-VERSION = 0.0.1
-SO_VERSION = 0
+[SUBSYSTEM::NDR_LSA]
 OBJ_FILES = gen_ndr/ndr_lsa.o
 PUBLIC_HEADERS = gen_ndr/lsa.h
 PUBLIC_DEPENDENCIES = LIBNDR NDR_SECURITY
 
-[LIBRARY::NDR_DFS]
-VERSION = 0.0.1
-SO_VERSION = 0
+[SUBSYSTEM::NDR_DFS]
 OBJ_FILES = gen_ndr/ndr_dfs.o
 PUBLIC_DEPENDENCIES = LIBNDR NDR_MISC
 
-[LIBRARY::NDR_FRSRPC]
-VERSION = 0.0.1
-SO_VERSION = 0
+[SUBSYSTEM::NDR_FRSRPC]
 OBJ_FILES = gen_ndr/ndr_frsrpc.o
 PUBLIC_DEPENDENCIES = LIBNDR
 
-[LIBRARY::NDR_FRSAPI]
-VERSION = 0.0.1
-SO_VERSION = 0
+[SUBSYSTEM::NDR_FRSAPI]
 OBJ_FILES = gen_ndr/ndr_frsapi.o
 PUBLIC_DEPENDENCIES = LIBNDR
 
-[LIBRARY::NDR_DRSUAPI]
-VERSION = 0.0.1
-SO_VERSION = 0
+[SUBSYSTEM::NDR_DRSUAPI]
 OBJ_FILES = gen_ndr/ndr_drsuapi.o ndr/ndr_drsuapi.o
 PUBLIC_DEPENDENCIES = LIBNDR NDR_COMPRESSION NDR_SECURITY NDR_SAMR ASN1_UTIL
 
-[LIBRARY::NDR_DRSBLOBS]
-VERSION = 0.0.1
-SO_VERSION = 0
+[SUBSYSTEM::NDR_DRSBLOBS]
 OBJ_FILES = gen_ndr/ndr_drsblobs.o
 PUBLIC_DEPENDENCIES = LIBNDR NDR_MISC NDR_DRSUAPI
 
@@ -126,34 +100,24 @@ PUBLIC_DEPENDENCIES = LIBNDR NDR_MISC NDR_DRSUAPI
 OBJ_FILES = gen_ndr/ndr_sasl_helpers.o
 PUBLIC_DEPENDENCIES = LIBNDR
 
-[LIBRARY::NDR_POLICYAGENT]
-VERSION = 0.0.1
-SO_VERSION = 0
+[SUBSYSTEM::NDR_POLICYAGENT]
 OBJ_FILES = gen_ndr/ndr_policyagent.o
 PUBLIC_DEPENDENCIES = LIBNDR
 
-[LIBRARY::NDR_UNIXINFO]
-VERSION = 0.0.1
-SO_VERSION = 0
+[SUBSYSTEM::NDR_UNIXINFO]
 OBJ_FILES = gen_ndr/ndr_unixinfo.o
 PUBLIC_DEPENDENCIES = LIBNDR NDR_SECURITY
 
-[LIBRARY::NDR_SAMR]
-VERSION = 0.0.1
-SO_VERSION = 0
+[SUBSYSTEM::NDR_SAMR]
 OBJ_FILES = gen_ndr/ndr_samr.o
 PUBLIC_HEADERS = gen_ndr/samr.h
 PUBLIC_DEPENDENCIES = LIBNDR NDR_MISC NDR_LSA NDR_SECURITY
 
-[LIBRARY::NDR_NFS4ACL]
-VERSION = 0.0.1
-SO_VERSION = 0
+[SUBSYSTEM::NDR_NFS4ACL]
 OBJ_FILES = gen_ndr/ndr_nfs4acl.o
 PUBLIC_DEPENDENCIES = LIBNDR NDR_MISC NDR_SECURITY
 
-[LIBRARY::NDR_SPOOLSS]
-VERSION = 0.0.1
-SO_VERSION = 0
+[SUBSYSTEM::NDR_SPOOLSS]
 OBJ_FILES = gen_ndr/ndr_spoolss.o
 PUBLIC_DEPENDENCIES = LIBNDR NDR_SPOOLSS_BUF NDR_SECURITY
 
@@ -161,34 +125,23 @@ PUBLIC_DEPENDENCIES = LIBNDR NDR_SPOOLSS_BUF NDR_SECURITY
 PRIVATE_PROTO_HEADER = ndr/ndr_spoolss_buf.h
 OBJ_FILES = ndr/ndr_spoolss_buf.o
 
-[LIBRARY::NDR_WKSSVC]
-VERSION = 0.0.1
-SO_VERSION = 0
+[SUBSYSTEM::NDR_WKSSVC]
 OBJ_FILES = gen_ndr/ndr_wkssvc.o
 PUBLIC_DEPENDENCIES = LIBNDR NDR_SRVSVC NDR_MISC NDR_SECURITY
 
-[LIBRARY::NDR_SRVSVC]
-VERSION = 0.0.1
-SO_VERSION = 0
+[SUBSYSTEM::NDR_SRVSVC]
 OBJ_FILES = gen_ndr/ndr_srvsvc.o
 PUBLIC_DEPENDENCIES = LIBNDR NDR_SVCCTL NDR_SECURITY
 
-[LIBRARY::NDR_SVCCTL]
-VERSION = 0.0.1
-PUBLIC_HEADERS = gen_ndr/svcctl.h
-SO_VERSION = 0
+[SUBSYSTEM::NDR_SVCCTL]
 OBJ_FILES = gen_ndr/ndr_svcctl.o
 PUBLIC_DEPENDENCIES = LIBNDR NDR_MISC
 
-[LIBRARY::NDR_ATSVC]
-VERSION = 0.0.1
-SO_VERSION = 0
+[SUBSYSTEM::NDR_ATSVC]
 OBJ_FILES = gen_ndr/ndr_atsvc.o
 PUBLIC_DEPENDENCIES = LIBNDR
 
-[LIBRARY::NDR_EVENTLOG]
-VERSION = 0.0.1
-SO_VERSION = 0
+[SUBSYSTEM::NDR_EVENTLOG]
 OBJ_FILES = gen_ndr/ndr_eventlog.o
 PUBLIC_DEPENDENCIES = LIBNDR NDR_LSA
 
@@ -196,51 +149,35 @@ PUBLIC_DEPENDENCIES = LIBNDR NDR_LSA
 OBJ_FILES = gen_ndr/ndr_epmapper.o
 PUBLIC_DEPENDENCIES = LIBNDR NDR_MISC
 
-[LIBRARY::NDR_DBGIDL]
-VERSION = 0.0.1
-SO_VERSION = 0
+[SUBSYSTEM::NDR_DBGIDL]
 OBJ_FILES = gen_ndr/ndr_dbgidl.o
 PUBLIC_DEPENDENCIES = LIBNDR
 
-[LIBRARY::NDR_DSSETUP]
-VERSION = 0.0.1
-SO_VERSION = 0
+[SUBSYSTEM::NDR_DSSETUP]
 OBJ_FILES = gen_ndr/ndr_dssetup.o
 PUBLIC_DEPENDENCIES = LIBNDR NDR_MISC
 
-[LIBRARY::NDR_MSGSVC]
-VERSION = 0.0.1
-SO_VERSION = 0
+[SUBSYSTEM::NDR_MSGSVC]
 OBJ_FILES = gen_ndr/ndr_msgsvc.o
 PUBLIC_DEPENDENCIES = LIBNDR
 
-[LIBRARY::NDR_WINS]
-VERSION = 0.0.1
-SO_VERSION = 0
+[SUBSYSTEM::NDR_WINS]
 OBJ_FILES = gen_ndr/ndr_wins.o
 PUBLIC_DEPENDENCIES = LIBNDR
 
-[LIBRARY::NDR_WINREG]
-VERSION = 0.0.1
-SO_VERSION = 0
+[SUBSYSTEM::NDR_WINREG]
 OBJ_FILES = gen_ndr/ndr_winreg.o
 PUBLIC_DEPENDENCIES = LIBNDR NDR_INITSHUTDOWN NDR_SECURITY NDR_MISC
 
-[LIBRARY::NDR_INITSHUTDOWN]
-VERSION = 0.0.1
-SO_VERSION = 0
+[SUBSYSTEM::NDR_INITSHUTDOWN]
 OBJ_FILES = gen_ndr/ndr_initshutdown.o
 PUBLIC_DEPENDENCIES = LIBNDR
 
-[LIBRARY::NDR_MGMT]
-VERSION = 0.0.1
-SO_VERSION = 0
+[SUBSYSTEM::NDR_MGMT]
 OBJ_FILES = gen_ndr/ndr_mgmt.o
 PUBLIC_DEPENDENCIES = LIBNDR NDR_DCERPC
 
-[LIBRARY::NDR_PROTECTED_STORAGE]
-VERSION = 0.0.1
-SO_VERSION = 0
+[SUBSYSTEM::NDR_PROTECTED_STORAGE]
 OBJ_FILES = gen_ndr/ndr_protected_storage.o
 PUBLIC_DEPENDENCIES = LIBNDR
 
@@ -252,45 +189,31 @@ PUBLIC_DEPENDENCIES = LIBNDR NDR_ORPC
 OBJ_FILES = gen_ndr/ndr_orpc.o ndr/ndr_orpc.o 
 PUBLIC_DEPENDENCIES = LIBNDR 
 
-[LIBRARY::NDR_OXIDRESOLVER]
-VERSION = 0.0.1
-SO_VERSION = 0
+[SUBSYSTEM::NDR_OXIDRESOLVER]
 OBJ_FILES = gen_ndr/ndr_oxidresolver.o
 PUBLIC_DEPENDENCIES = LIBNDR NDR_ORPC NDR_MISC
 
-[LIBRARY::NDR_REMACT]
-VERSION = 0.0.1
-SO_VERSION = 0
+[SUBSYSTEM::NDR_REMACT]
 OBJ_FILES = gen_ndr/ndr_remact.o
 PUBLIC_DEPENDENCIES = LIBNDR NDR_ORPC NDR_MISC
 
-[LIBRARY::NDR_WZCSVC]
-VERSION = 0.0.1
-SO_VERSION = 0
+[SUBSYSTEM::NDR_WZCSVC]
 OBJ_FILES = gen_ndr/ndr_wzcsvc.o
 PUBLIC_DEPENDENCIES = LIBNDR
 
-[LIBRARY::NDR_BROWSER]
-VERSION = 0.0.1
-SO_VERSION = 0
+[SUBSYSTEM::NDR_BROWSER]
 OBJ_FILES = gen_ndr/ndr_browser.o
 PUBLIC_DEPENDENCIES = LIBNDR
 
-[LIBRARY::NDR_W32TIME]
-VERSION = 0.0.1
-SO_VERSION = 0
+[SUBSYSTEM::NDR_W32TIME]
 OBJ_FILES = gen_ndr/ndr_w32time.o
 PUBLIC_DEPENDENCIES = LIBNDR
 
-[LIBRARY::NDR_SCERPC]
-VERSION = 0.0.1
-SO_VERSION = 0
+[SUBSYSTEM::NDR_SCERPC]
 OBJ_FILES = gen_ndr/ndr_scerpc.o
 PUBLIC_DEPENDENCIES = LIBNDR
 
-[LIBRARY::NDR_NTSVCS]
-VERSION = 0.0.1
-SO_VERSION = 0
+[SUBSYSTEM::NDR_NTSVCS]
 OBJ_FILES = gen_ndr/ndr_ntsvcs.o
 PUBLIC_DEPENDENCIES = LIBNDR
 
@@ -299,15 +222,11 @@ OBJ_FILES = gen_ndr/ndr_netlogon.o
 PUBLIC_HEADERS = gen_ndr/netlogon.h
 PUBLIC_DEPENDENCIES = LIBNDR NDR_SAMR NDR_LSA NDR_SECURITY
 
-[LIBRARY::NDR_TRKWKS]
-VERSION = 0.0.1
-SO_VERSION = 0
+[SUBSYSTEM::NDR_TRKWKS]
 OBJ_FILES = gen_ndr/ndr_trkwks.o
 PUBLIC_DEPENDENCIES = LIBNDR
 
-[LIBRARY::NDR_KEYSVC]
-VERSION = 0.0.1
-SO_VERSION = 0
+[SUBSYSTEM::NDR_KEYSVC]
 OBJ_FILES = gen_ndr/ndr_keysvc.o
 PUBLIC_DEPENDENCIES = LIBNDR
 
@@ -315,9 +234,7 @@ PUBLIC_DEPENDENCIES = LIBNDR
 OBJ_FILES = gen_ndr/ndr_krb5pac.o ndr/ndr_krb5pac.o
 PUBLIC_DEPENDENCIES = LIBNDR NDR_NETLOGON NDR_SECURITY
 
-[LIBRARY::NDR_XATTR]
-VERSION = 0.0.1
-SO_VERSION = 0
+[SUBSYSTEM::NDR_XATTR]
 OBJ_FILES = gen_ndr/ndr_xattr.o
 PUBLIC_DEPENDENCIES = LIBNDR NDR_SECURITY
 
@@ -338,15 +255,11 @@ OBJ_FILES = gen_ndr/ndr_nbt.o
 PUBLIC_HEADERS = gen_ndr/nbt.h
 PUBLIC_DEPENDENCIES = LIBNDR NDR_MISC NDR_NBT_BUF NDR_SVCCTL NDR_SECURITY
 
-[LIBRARY::NDR_WINSREPL]
-VERSION = 0.0.1
-SO_VERSION = 0
+[SUBSYSTEM::NDR_WINSREPL]
 OBJ_FILES = gen_ndr/ndr_winsrepl.o
 PUBLIC_DEPENDENCIES = LIBNDR NDR_NBT
 
-[LIBRARY::NDR_WINBIND]
-VERSION = 0.0.1
-SO_VERSION = 0
+[SUBSYSTEM::NDR_WINBIND]
 OBJ_FILES = gen_ndr/ndr_winbind.o
 PUBLIC_HEADERS = gen_ndr/winbind.h
 PUBLIC_DEPENDENCIES = LIBNDR NDR_NETLOGON
@@ -358,9 +271,7 @@ librpc/gen_ndr/tables.c: $(IDL_NDR_PARSE_H_FILES)
 	@$(PERL) $(srcdir)/librpc/tables.pl --output=librpc/gen_ndr/tables.c $(IDL_NDR_PARSE_H_FILES) > librpc/gen_ndr/tables.x
 	mv librpc/gen_ndr/tables.x librpc/gen_ndr/tables.c
 
-[LIBRARY::NDR_TABLE]
-VERSION = 0.0.1
-SO_VERSION = 0
+[SUBSYSTEM::NDR_TABLE]
 OBJ_FILES = rpc/table.o gen_ndr/tables.o
 PRIVATE_PROTO_HEADER = rpc/dcerpc_table.h
 PUBLIC_DEPENDENCIES = \
@@ -375,105 +286,71 @@ PUBLIC_DEPENDENCIES = \
 	NDR_INITSHUTDOWN NDR_DNSSERVER NDR_WINSTATION NDR_IRPC NDR_DCOM NDR_OPENDB \
 	NDR_SASL_HELPERS NDR_NOTIFY NDR_WINBIND NDR_FRSRPC NDR_FRSAPI NDR_NFS4ACL
 
-[LIBRARY::RPC_NDR_ROT]
-VERSION = 0.0.1
-SO_VERSION = 0
+[SUBSYSTEM::RPC_NDR_ROT]
 OBJ_FILES = gen_ndr/ndr_rot_c.o
 PUBLIC_DEPENDENCIES = NDR_ROT dcerpc
 
-[LIBRARY::RPC_NDR_AUDIOSRV]
-VERSION = 0.0.1
-SO_VERSION = 0
+[SUBSYSTEM::RPC_NDR_AUDIOSRV]
 OBJ_FILES = gen_ndr/ndr_audiosrv_c.o
 PUBLIC_DEPENDENCIES = NDR_AUDIOSRV dcerpc
 
-[LIBRARY::RPC_NDR_ECHO]
-VERSION = 0.0.1
-SO_VERSION = 0
+[SUBSYSTEM::RPC_NDR_ECHO]
 OBJ_FILES = gen_ndr/ndr_echo_c.o
 PUBLIC_DEPENDENCIES = dcerpc NDR_ECHO
 
-[LIBRARY::RPC_NDR_DSBACKUP]
-VERSION = 0.0.1
-SO_VERSION = 0
+[SUBSYSTEM::RPC_NDR_DSBACKUP]
 OBJ_FILES = gen_ndr/ndr_dsbackup_c.o
 PUBLIC_DEPENDENCIES = dcerpc NDR_DSBACKUP
 
-[LIBRARY::RPC_NDR_EFS]
-VERSION = 0.0.1
-SO_VERSION = 0
+[SUBSYSTEM::RPC_NDR_EFS]
 OBJ_FILES = gen_ndr/ndr_efs_c.o
 PUBLIC_DEPENDENCIES = dcerpc NDR_EFS
 
-[LIBRARY::RPC_NDR_LSA]
-VERSION = 0.0.1
-SO_VERSION = 0
+[SUBSYSTEM::RPC_NDR_LSA]
 OBJ_FILES = gen_ndr/ndr_lsa_c.o
 PUBLIC_DEPENDENCIES = dcerpc NDR_LSA
 
-[LIBRARY::RPC_NDR_DFS]
-VERSION = 0.0.1
-SO_VERSION = 0
+[SUBSYSTEM::RPC_NDR_DFS]
 OBJ_FILES = gen_ndr/ndr_dfs_c.o
 PUBLIC_DEPENDENCIES = dcerpc NDR_DFS
 
-[LIBRARY::RPC_NDR_DRSUAPI]
-VERSION = 0.0.1
-SO_VERSION = 0
+[SUBSYSTEM::RPC_NDR_DRSUAPI]
 OBJ_FILES = gen_ndr/ndr_drsuapi_c.o
 PUBLIC_DEPENDENCIES = dcerpc NDR_DRSUAPI
 
-[LIBRARY::RPC_NDR_POLICYAGENT]
-VERSION = 0.0.1
-SO_VERSION = 0
+[SUBSYSTEM::RPC_NDR_POLICYAGENT]
 OBJ_FILES = gen_ndr/ndr_policyagent_c.o
 PUBLIC_DEPENDENCIES = dcerpc NDR_POLICYAGENT
 
-[LIBRARY::RPC_NDR_UNIXINFO]
-VERSION = 0.0.1
-SO_VERSION = 0
+[SUBSYSTEM::RPC_NDR_UNIXINFO]
 OBJ_FILES = gen_ndr/ndr_unixinfo_c.o
 PUBLIC_DEPENDENCIES = dcerpc NDR_UNIXINFO
 
-[LIBRARY::RPC_NDR_SAMR]
-VERSION = 0.0.1
-SO_VERSION = 0
+[SUBSYSTEM::RPC_NDR_SAMR]
 OBJ_FILES = gen_ndr/ndr_samr_c.o
 PUBLIC_DEPENDENCIES = dcerpc NDR_SAMR 
 
-[LIBRARY::RPC_NDR_SPOOLSS]
-VERSION = 0.0.1
-SO_VERSION = 0
+[SUBSYSTEM::RPC_NDR_SPOOLSS]
 OBJ_FILES = gen_ndr/ndr_spoolss_c.o
 PUBLIC_DEPENDENCIES = dcerpc NDR_SPOOLSS
 
-[LIBRARY::RPC_NDR_WKSSVC]
-VERSION = 0.0.1
-SO_VERSION = 0
+[SUBSYSTEM::RPC_NDR_WKSSVC]
 OBJ_FILES = gen_ndr/ndr_wkssvc_c.o
 PUBLIC_DEPENDENCIES = dcerpc NDR_WKSSVC
 
-[LIBRARY::RPC_NDR_SRVSVC]
-VERSION = 0.0.1
-SO_VERSION = 0
+[SUBSYSTEM::RPC_NDR_SRVSVC]
 OBJ_FILES = gen_ndr/ndr_srvsvc_c.o
 PUBLIC_DEPENDENCIES = dcerpc NDR_SRVSVC
 
-[LIBRARY::RPC_NDR_SVCCTL]
-VERSION = 0.0.1
-SO_VERSION = 0
+[SUBSYSTEM::RPC_NDR_SVCCTL]
 OBJ_FILES = gen_ndr/ndr_svcctl_c.o
 PUBLIC_DEPENDENCIES = dcerpc NDR_SVCCTL
 
-[LIBRARY::RPC_NDR_ATSVC]
-VERSION = 0.0.1
-SO_VERSION = 0
+[SUBSYSTEM::RPC_NDR_ATSVC]
 OBJ_FILES = gen_ndr/ndr_atsvc_c.o
 PUBLIC_DEPENDENCIES = dcerpc NDR_ATSVC
 
-[LIBRARY::RPC_NDR_EVENTLOG]
-VERSION = 0.0.1
-SO_VERSION = 0
+[SUBSYSTEM::RPC_NDR_EVENTLOG]
 OBJ_FILES = gen_ndr/ndr_eventlog_c.o
 PUBLIC_DEPENDENCIES = dcerpc NDR_EVENTLOG
 
@@ -481,51 +358,35 @@ PUBLIC_DEPENDENCIES = dcerpc NDR_EVENTLOG
 OBJ_FILES = gen_ndr/ndr_epmapper_c.o
 PUBLIC_DEPENDENCIES = NDR_EPMAPPER 
 
-[LIBRARY::RPC_NDR_DBGIDL]
-VERSION = 0.0.1
-SO_VERSION = 0
+[SUBSYSTEM::RPC_NDR_DBGIDL]
 OBJ_FILES = gen_ndr/ndr_dbgidl_c.o
 PUBLIC_DEPENDENCIES = dcerpc NDR_DBGIDL
 
-[LIBRARY::RPC_NDR_DSSETUP]
-VERSION = 0.0.1
-SO_VERSION = 0
+[SUBSYSTEM::RPC_NDR_DSSETUP]
 OBJ_FILES = gen_ndr/ndr_dssetup_c.o
 PUBLIC_DEPENDENCIES = dcerpc NDR_DSSETUP
 
-[LIBRARY::RPC_NDR_MSGSVC]
-VERSION = 0.0.1
-SO_VERSION = 0
+[SUBSYSTEM::RPC_NDR_MSGSVC]
 OBJ_FILES = gen_ndr/ndr_msgsvc_c.o
 PUBLIC_DEPENDENCIES = dcerpc NDR_MSGSVC
 
-[LIBRARY::RPC_NDR_WINS]
-VERSION = 0.0.1
-SO_VERSION = 0
+[SUBSYSTEM::RPC_NDR_WINS]
 OBJ_FILES = gen_ndr/ndr_wins_c.o
 PUBLIC_DEPENDENCIES = dcerpc NDR_WINS
 
-[LIBRARY::RPC_NDR_WINREG]
-VERSION = 0.0.1
-SO_VERSION = 0
+[SUBSYSTEM::RPC_NDR_WINREG]
 OBJ_FILES = gen_ndr/ndr_winreg_c.o
 PUBLIC_DEPENDENCIES = dcerpc NDR_WINREG
 
-[LIBRARY::RPC_NDR_INITSHUTDOWN]
-VERSION = 0.0.1
-SO_VERSION = 0
+[SUBSYSTEM::RPC_NDR_INITSHUTDOWN]
 OBJ_FILES = gen_ndr/ndr_initshutdown_c.o
 PUBLIC_DEPENDENCIES = dcerpc NDR_INITSHUTDOWN
 
-[LIBRARY::RPC_NDR_MGMT]
-VERSION = 0.0.1
-SO_VERSION = 0
+[SUBSYSTEM::RPC_NDR_MGMT]
 OBJ_FILES = gen_ndr/ndr_mgmt_c.o
 PUBLIC_DEPENDENCIES = dcerpc NDR_MGMT
 
-[LIBRARY::RPC_NDR_PROTECTED_STORAGE]
-VERSION = 0.0.1
-SO_VERSION = 0
+[SUBSYSTEM::RPC_NDR_PROTECTED_STORAGE]
 OBJ_FILES = gen_ndr/ndr_protected_storage_c.o
 PUBLIC_DEPENDENCIES = dcerpc NDR_PROTECTED_STORAGE
 
@@ -533,39 +394,27 @@ PUBLIC_DEPENDENCIES = dcerpc NDR_PROTECTED_STORAGE
 OBJ_FILES = gen_ndr/ndr_dcom_c.o
 PUBLIC_DEPENDENCIES = dcerpc NDR_DCOM
 
-[LIBRARY::RPC_NDR_OXIDRESOLVER]
-VERSION = 0.0.1
-SO_VERSION = 0
+[SUBSYSTEM::RPC_NDR_OXIDRESOLVER]
 OBJ_FILES = gen_ndr/ndr_oxidresolver_c.o
 PUBLIC_DEPENDENCIES = dcerpc NDR_OXIDRESOLVER
 
-[LIBRARY::RPC_NDR_REMACT]
-VERSION = 0.0.1
-SO_VERSION = 0
+[SUBSYSTEM::RPC_NDR_REMACT]
 OBJ_FILES = gen_ndr/ndr_remact_c.o
 PUBLIC_DEPENDENCIES = dcerpc NDR_REMACT
 
-[LIBRARY::RPC_NDR_WZCSVC]
-VERSION = 0.0.1
-SO_VERSION = 0
+[SUBSYSTEM::RPC_NDR_WZCSVC]
 OBJ_FILES = gen_ndr/ndr_wzcsvc_c.o
 PUBLIC_DEPENDENCIES = dcerpc NDR_WZCSVC
 
-[LIBRARY::RPC_NDR_W32TIME]
-VERSION = 0.0.1
-SO_VERSION = 0
+[SUBSYSTEM::RPC_NDR_W32TIME]
 OBJ_FILES = gen_ndr/ndr_w32time_c.o
 PUBLIC_DEPENDENCIES = dcerpc NDR_W32TIME
 
-[LIBRARY::RPC_NDR_SCERPC]
-VERSION = 0.0.1
-SO_VERSION = 0
+[SUBSYSTEM::RPC_NDR_SCERPC]
 OBJ_FILES = gen_ndr/ndr_scerpc_c.o
 PUBLIC_DEPENDENCIES = dcerpc NDR_SCERPC
 
-[LIBRARY::RPC_NDR_NTSVCS]
-VERSION = 0.0.1
-SO_VERSION = 0
+[SUBSYSTEM::RPC_NDR_NTSVCS]
 OBJ_FILES = gen_ndr/ndr_ntsvcs_c.o
 PUBLIC_DEPENDENCIES = dcerpc NDR_NTSVCS
 
@@ -573,15 +422,11 @@ PUBLIC_DEPENDENCIES = dcerpc NDR_NTSVCS
 OBJ_FILES = gen_ndr/ndr_netlogon_c.o
 PUBLIC_DEPENDENCIES = NDR_NETLOGON
 
-[LIBRARY::RPC_NDR_TRKWKS]
-VERSION = 0.0.1
-SO_VERSION = 0
+[SUBSYSTEM::RPC_NDR_TRKWKS]
 OBJ_FILES = gen_ndr/ndr_trkwks_c.o
 PUBLIC_DEPENDENCIES = dcerpc NDR_TRKWKS
 
-[LIBRARY::RPC_NDR_KEYSVC]
-VERSION = 0.0.1
-SO_VERSION = 0
+[SUBSYSTEM::RPC_NDR_KEYSVC]
 OBJ_FILES = gen_ndr/ndr_keysvc_c.o
 PUBLIC_DEPENDENCIES = dcerpc NDR_KEYSVC