r7763: fixed some circular dependencies

[sfrench/samba-autobuild/.git] / source4 / librpc / config.mk

diff --git a/source4/librpc/config.mk b/source4/librpc/config.mk
index c997df7f7274b5dce5b4ee9df967751167cc47b8..c5c261c63fb55e8c3ed64337f333eaad0fb7fd0d 100644 (file)
--- a/source4/librpc/config.mk
+++ b/source4/librpc/config.mk
@@ -8,12 +8,18 @@ ADD_OBJ_FILES = \
                librpc/ndr/ndr_string.o \
                librpc/ndr/ndr_obfuscate.o \
                librpc/ndr/ndr_misc.o
-REQUIRED_SUBSYSTEMS = LIBCLI_UTILS LIBTALLOC LIBBASIC
+REQUIRED_SUBSYSTEMS = LIBCLI_UTILS LIBTALLOC
 # End SUBSYSTEM NDR_RAW
 ################################################
 
-[SUBSYSTEM::NDR]
-REQUIRED_SUBSYSTEMS = NDR_RAW
+################################################
+# Start SUBSYSTEM NDR_COMPRESSION
+[SUBSYSTEM::NDR_COMPRESSION]
+ADD_OBJ_FILES = \
+               librpc/ndr/ndr_compression.o
+REQUIRED_SUBSYSTEMS = LIBCOMPRESSION
+# End SUBSYSTEM NDR_COMPRESSION
+################################################
 
 ################################################
 # Start SUBSYSTEM RPC_RAW
@@ -31,80 +37,77 @@ REQUIRED_SUBSYSTEMS = SOCKET
 # End SUBSYSTEM RPC_RAW
 ################################################
 
-################################################
-# Start SUBSYSTEM RPC_COMPRESSION
-[SUBSYSTEM::RPC_COMPRESSION]
-ADD_OBJ_FILES = \
-               librpc/ndr/ndr_compression.o
-REQUIRED_SUBSYSTEMS = LIBCOMPRESSION
-# End SUBSYSTEM RPC_COMPRESSION
-################################################
-
 [SUBSYSTEM::NDR_AUDIOSRV]
 INIT_FUNCTION = dcerpc_audiosrv_init
 INIT_OBJ_FILES = librpc/gen_ndr/ndr_audiosrv.o
 NOPROTO = YES
-REQUIRED_SUBSYSTEMS = NDR
+REQUIRED_SUBSYSTEMS = NDR_RAW
 
 [SUBSYSTEM::NDR_DCERPC]
 INIT_FUNCTION = dcerpc_dcerpc_init
 INIT_OBJ_FILES = librpc/gen_ndr/ndr_dcerpc.o
 NOPROTO = YES
-REQUIRED_SUBSYSTEMS = NDR
+REQUIRED_SUBSYSTEMS = NDR_RAW
 
 [SUBSYSTEM::NDR_ECHO]
 INIT_FUNCTION = dcerpc_echo_init
 INIT_OBJ_FILES = librpc/gen_ndr/ndr_echo.o
 NOPROTO = YES
-REQUIRED_SUBSYSTEMS = NDR
+REQUIRED_SUBSYSTEMS = NDR_RAW
+
+[SUBSYSTEM::NDR_IRPC]
+INIT_FUNCTION = dcerpc_irpc_init
+INIT_OBJ_FILES = librpc/gen_ndr/ndr_irpc.o
+NOPROTO = YES
+REQUIRED_SUBSYSTEMS = NDR_RAW
 
 [SUBSYSTEM::NDR_EXCHANGE]
 INIT_FUNCTION = dcerpc_exchange_init
 INIT_OBJ_FILES = librpc/gen_ndr/ndr_exchange.o
 NOPROTO = YES
-REQUIRED_SUBSYSTEMS = NDR
+REQUIRED_SUBSYSTEMS = NDR_RAW
 
 [SUBSYSTEM::NDR_DSBACKUP]
 INIT_FUNCTION = dcerpc_dsbackup_init
 INIT_OBJ_FILES = librpc/gen_ndr/ndr_dsbackup.o
 NOPROTO = YES
-REQUIRED_SUBSYSTEMS = NDR
+REQUIRED_SUBSYSTEMS = NDR_RAW
 
 [SUBSYSTEM::NDR_EFS]
 INIT_FUNCTION = dcerpc_efs_init
 INIT_OBJ_FILES = librpc/gen_ndr/ndr_efs.o
 NOPROTO = YES
-REQUIRED_SUBSYSTEMS = NDR
+REQUIRED_SUBSYSTEMS = NDR_RAW
 
 [SUBSYSTEM::NDR_MISC]
 INIT_FUNCTION = dcerpc_misc_init
 INIT_OBJ_FILES = librpc/gen_ndr/ndr_misc.o
 NOPROTO = YES
-REQUIRED_SUBSYSTEMS = NDR
+REQUIRED_SUBSYSTEMS = NDR_RAW
 
 [SUBSYSTEM::NDR_ROT]
 INIT_FUNCTION = dcerpc_rot_init
 INIT_OBJ_FILES = librpc/gen_ndr/ndr_rot.o
 NOPROTO = YES
-REQUIRED_SUBSYSTEMS = NDR
+REQUIRED_SUBSYSTEMS = NDR_RAW
 
 [SUBSYSTEM::NDR_LSA]
 INIT_FUNCTION = dcerpc_lsa_init
 INIT_OBJ_FILES = librpc/gen_ndr/ndr_lsa.o
 NOPROTO = YES
-REQUIRED_SUBSYSTEMS = NDR
+REQUIRED_SUBSYSTEMS = NDR_RAW
 
 [SUBSYSTEM::NDR_DFS]
 INIT_FUNCTION = dcerpc_dfs_init
 INIT_OBJ_FILES = librpc/gen_ndr/ndr_dfs.o
 NOPROTO = YES
-REQUIRED_SUBSYSTEMS = NDR
+REQUIRED_SUBSYSTEMS = NDR_RAW
 
 [SUBSYSTEM::NDR_DRSUAPI]
 INIT_FUNCTION = dcerpc_drsuapi_init
 INIT_OBJ_FILES = librpc/gen_ndr/ndr_drsuapi.o
 NOPROTO = YES
-REQUIRED_SUBSYSTEMS = NDR NDR_DRSUAPI_PRINT RPC_COMPRESSION
+REQUIRED_SUBSYSTEMS = NDR_RAW NDR_DRSUAPI_PRINT NDR_COMPRESSION
 
 [SUBSYSTEM::NDR_DRSUAPI_PRINT]
 INIT_OBJ_FILES = librpc/ndr/ndr_drsuapi.o
@@ -113,31 +116,31 @@ INIT_OBJ_FILES = librpc/ndr/ndr_drsuapi.o
 INIT_FUNCTION = dcerpc_drsblobs_init
 INIT_OBJ_FILES = librpc/gen_ndr/ndr_drsblobs.o
 NOPROTO = YES
-REQUIRED_SUBSYSTEMS = NDR
+REQUIRED_SUBSYSTEMS = NDR_RAW
 
 [SUBSYSTEM::NDR_POLICYAGENT]
 INIT_FUNCTION = dcerpc_policyagent_init
 INIT_OBJ_FILES = librpc/gen_ndr/ndr_policyagent.o
 NOPROTO = YES
-REQUIRED_SUBSYSTEMS = NDR
+REQUIRED_SUBSYSTEMS = NDR_RAW
 
 [SUBSYSTEM::NDR_UNIXINFO]
 INIT_FUNCTION = dcerpc_unixinfo_init
 INIT_OBJ_FILES = librpc/gen_ndr/ndr_unixinfo.o
 NOPROTO = YES
-REQUIRED_SUBSYSTEMS = NDR
+REQUIRED_SUBSYSTEMS = NDR_RAW
 
 [SUBSYSTEM::NDR_SAMR]
 INIT_FUNCTION = dcerpc_samr_init
 INIT_OBJ_FILES = librpc/gen_ndr/ndr_samr.o
 NOPROTO = YES
-REQUIRED_SUBSYSTEMS = NDR
+REQUIRED_SUBSYSTEMS = NDR_RAW
 
 [SUBSYSTEM::NDR_SPOOLSS]
 INIT_FUNCTION = dcerpc_spoolss_init
 INIT_OBJ_FILES = librpc/gen_ndr/ndr_spoolss.o
 NOPROTO = YES
-REQUIRED_SUBSYSTEMS = NDR NDR_SPOOLSS_BUF
+REQUIRED_SUBSYSTEMS = NDR_RAW NDR_SPOOLSS_BUF
 
 [SUBSYSTEM::NDR_SPOOLSS_BUF]
 INIT_OBJ_FILES = librpc/ndr/ndr_spoolss_buf.o
@@ -146,91 +149,91 @@ INIT_OBJ_FILES = librpc/ndr/ndr_spoolss_buf.o
 INIT_FUNCTION = dcerpc_wkssvc_init
 INIT_OBJ_FILES = librpc/gen_ndr/ndr_wkssvc.o
 NOPROTO = YES
-REQUIRED_SUBSYSTEMS = NDR
+REQUIRED_SUBSYSTEMS = NDR_RAW
 
 [SUBSYSTEM::NDR_SRVSVC]
 INIT_FUNCTION = dcerpc_srvsvc_init
 INIT_OBJ_FILES = librpc/gen_ndr/ndr_srvsvc.o
 NOPROTO = YES
-REQUIRED_SUBSYSTEMS = NDR NDR_SVCCTL
+REQUIRED_SUBSYSTEMS = NDR_RAW NDR_SVCCTL
 
 [SUBSYSTEM::NDR_SVCCTL]
 INIT_FUNCTION = dcerpc_svcctl_init
 INIT_OBJ_FILES = librpc/gen_ndr/ndr_svcctl.o
 NOPROTO = YES
-REQUIRED_SUBSYSTEMS = NDR
+REQUIRED_SUBSYSTEMS = NDR_RAW
 
 [SUBSYSTEM::NDR_ATSVC]
 INIT_FUNCTION = dcerpc_atsvc_init
 INIT_OBJ_FILES = librpc/gen_ndr/ndr_atsvc.o
 NOPROTO = YES
-REQUIRED_SUBSYSTEMS = NDR
+REQUIRED_SUBSYSTEMS = NDR_RAW
 
 [SUBSYSTEM::NDR_EVENTLOG]
 INIT_FUNCTION = dcerpc_eventlog_init
 INIT_OBJ_FILES = librpc/gen_ndr/ndr_eventlog.o
 NOPROTO = YES
-REQUIRED_SUBSYSTEMS = NDR
+REQUIRED_SUBSYSTEMS = NDR_RAW
 
 [SUBSYSTEM::NDR_EPMAPPER]
 INIT_FUNCTION = dcerpc_epmapper_init
 INIT_OBJ_FILES = librpc/gen_ndr/ndr_epmapper.o
 NOPROTO = YES
-REQUIRED_SUBSYSTEMS = NDR
+REQUIRED_SUBSYSTEMS = NDR_RAW
 
 [SUBSYSTEM::NDR_DBGIDL]
 INIT_FUNCTION = dcerpc_dbgidl_init
 INIT_OBJ_FILES = librpc/gen_ndr/ndr_dbgidl.o
 NOPROTO = YES
-REQUIRED_SUBSYSTEMS = NDR
+REQUIRED_SUBSYSTEMS = NDR_RAW
 
 [SUBSYSTEM::NDR_DSSETUP]
 INIT_FUNCTION = dcerpc_dssetup_init
 INIT_OBJ_FILES = librpc/gen_ndr/ndr_dssetup.o
 NOPROTO = YES
-REQUIRED_SUBSYSTEMS = NDR
+REQUIRED_SUBSYSTEMS = NDR_RAW
 
 [SUBSYSTEM::NDR_MSGSVC]
 INIT_FUNCTION = dcerpc_msgsvc_init
 INIT_OBJ_FILES = librpc/gen_ndr/ndr_msgsvc.o
 NOPROTO = YES
-REQUIRED_SUBSYSTEMS = NDR
+REQUIRED_SUBSYSTEMS = NDR_RAW
 
 [SUBSYSTEM::NDR_WINS]
 INIT_FUNCTION = dcerpc_wins_init
 INIT_OBJ_FILES = librpc/gen_ndr/ndr_wins.o
 NOPROTO = YES
-REQUIRED_SUBSYSTEMS = NDR
+REQUIRED_SUBSYSTEMS = NDR_RAW
 
 [SUBSYSTEM::NDR_WINREG]
 INIT_FUNCTION = dcerpc_winreg_init
 INIT_OBJ_FILES = librpc/gen_ndr/ndr_winreg.o
 NOPROTO = YES
-REQUIRED_SUBSYSTEMS = NDR NDR_INITSHUTDOWN
+REQUIRED_SUBSYSTEMS = NDR_RAW NDR_INITSHUTDOWN
 
 [SUBSYSTEM::NDR_INITSHUTDOWN]
 INIT_FUNCTION = dcerpc_initshutdown_init
 INIT_OBJ_FILES = librpc/gen_ndr/ndr_initshutdown.o
 NOPROTO = YES
-REQUIRED_SUBSYSTEMS = NDR
+REQUIRED_SUBSYSTEMS = NDR_RAW
 
 [SUBSYSTEM::NDR_MGMT]
 INIT_FUNCTION = dcerpc_mgmt_init
 INIT_OBJ_FILES = librpc/gen_ndr/ndr_mgmt.o
 NOPROTO = YES
-REQUIRED_SUBSYSTEMS = NDR
+REQUIRED_SUBSYSTEMS = NDR_RAW
 
 [SUBSYSTEM::NDR_PROTECTED_STORAGE]
 INIT_FUNCTION = dcerpc_protected_storage_init
 INIT_OBJ_FILES = librpc/gen_ndr/ndr_protected_storage.o
 NOPROTO = YES
-REQUIRED_SUBSYSTEMS = NDR
+REQUIRED_SUBSYSTEMS = NDR_RAW
 
 [SUBSYSTEM::NDR_DCOM]
 INIT_FUNCTION = dcerpc_dcom_init
 INIT_OBJ_FILES = librpc/gen_ndr/ndr_dcom.o
 NOPROTO = YES
-REQUIRED_SUBSYSTEMS = NDR NDR_ORPC
+REQUIRED_SUBSYSTEMS = NDR_RAW NDR_ORPC
 
 [SUBSYSTEM::NDR_ORPC_MANUAL]
 INIT_OBJ_FILES = librpc/ndr/ndr_orpc.o 
@@ -239,97 +242,97 @@ INIT_OBJ_FILES = librpc/ndr/ndr_orpc.o
 INIT_FUNCTION = dcerpc_orpc_init
 INIT_OBJ_FILES = librpc/gen_ndr/ndr_orpc.o
 NOPROTO = YES
-REQUIRED_SUBSYSTEMS = NDR NDR_ORPC_MANUAL
+REQUIRED_SUBSYSTEMS = NDR_RAW NDR_ORPC_MANUAL
 
 [SUBSYSTEM::NDR_OXIDRESOLVER]
 INIT_FUNCTION = dcerpc_oxidresolver_init
 INIT_OBJ_FILES = librpc/gen_ndr/ndr_oxidresolver.o
 NOPROTO = YES
-REQUIRED_SUBSYSTEMS = NDR NDR_ORPC
+REQUIRED_SUBSYSTEMS = NDR_RAW NDR_ORPC
 
 [SUBSYSTEM::NDR_REMACT]
 INIT_FUNCTION = dcerpc_remact_init
 INIT_OBJ_FILES = librpc/gen_ndr/ndr_remact.o
 NOPROTO = YES
-REQUIRED_SUBSYSTEMS = NDR NDR_ORPC
+REQUIRED_SUBSYSTEMS = NDR_RAW NDR_ORPC
 
 [SUBSYSTEM::NDR_WZCSVC]
 INIT_FUNCTION = dcerpc_wzcsvc_init
 INIT_OBJ_FILES = librpc/gen_ndr/ndr_wzcsvc.o
 NOPROTO = YES
-REQUIRED_SUBSYSTEMS = NDR
+REQUIRED_SUBSYSTEMS = NDR_RAW
 
 [SUBSYSTEM::NDR_BROWSER]
 INIT_FUNCTION = dcerpc_browser_init
 INIT_OBJ_FILES = librpc/gen_ndr/ndr_browser.o
 NOPROTO = YES
-REQUIRED_SUBSYSTEMS = NDR
+REQUIRED_SUBSYSTEMS = NDR_RAW
 
 [SUBSYSTEM::NDR_W32TIME]
 INIT_FUNCTION = dcerpc_w32time_init
 INIT_OBJ_FILES = librpc/gen_ndr/ndr_w32time.o
 NOPROTO = YES
-REQUIRED_SUBSYSTEMS = NDR
+REQUIRED_SUBSYSTEMS = NDR_RAW
 
 [SUBSYSTEM::NDR_SCERPC]
 INIT_FUNCTION = dcerpc_scerpc_init
 INIT_OBJ_FILES = librpc/gen_ndr/ndr_scerpc.o
 NOPROTO = YES
-REQUIRED_SUBSYSTEMS = NDR
+REQUIRED_SUBSYSTEMS = NDR_RAW
 
 [SUBSYSTEM::NDR_NTSVCS]
 INIT_FUNCTION = dcerpc_ntsvcs_init
 INIT_OBJ_FILES = librpc/gen_ndr/ndr_ntsvcs.o
 NOPROTO = YES
-REQUIRED_SUBSYSTEMS = NDR
+REQUIRED_SUBSYSTEMS = NDR_RAW
 
 [SUBSYSTEM::NDR_NETLOGON]
 INIT_FUNCTION = dcerpc_netlogon_init
 INIT_OBJ_FILES = librpc/gen_ndr/ndr_netlogon.o
 NOPROTO = YES
-REQUIRED_SUBSYSTEMS = NDR NDR_SAMR
+REQUIRED_SUBSYSTEMS = NDR_RAW NDR_SAMR
 
 [SUBSYSTEM::NDR_TRKWKS]
 INIT_FUNCTION = dcerpc_trkwks_init
 INIT_OBJ_FILES = librpc/gen_ndr/ndr_trkwks.o
 NOPROTO = YES
-REQUIRED_SUBSYSTEMS = NDR
+REQUIRED_SUBSYSTEMS = NDR_RAW
 
 [SUBSYSTEM::NDR_KEYSVC]
 INIT_FUNCTION = dcerpc_keysvc_init
 INIT_OBJ_FILES = librpc/gen_ndr/ndr_keysvc.o
 NOPROTO = YES
-REQUIRED_SUBSYSTEMS = NDR
+REQUIRED_SUBSYSTEMS = NDR_RAW
 
 [SUBSYSTEM::NDR_KRB5PAC]
 INIT_FUNCTION = dcerpc_krb5pac_init
 INIT_OBJ_FILES = librpc/gen_ndr/ndr_krb5pac.o
 NOPROTO = YES
-REQUIRED_SUBSYSTEMS = NDR
+REQUIRED_SUBSYSTEMS = NDR_RAW
 
 [SUBSYSTEM::NDR_XATTR]
 INIT_FUNCTION = dcerpc_xattr_init
 INIT_OBJ_FILES = librpc/gen_ndr/ndr_xattr.o
 NOPROTO = YES
-REQUIRED_SUBSYSTEMS = NDR
+REQUIRED_SUBSYSTEMS = NDR_RAW
 
 [SUBSYSTEM::NDR_SCHANNEL]
 INIT_FUNCTION = dcerpc_schannel_init
 INIT_OBJ_FILES = librpc/gen_ndr/ndr_schannel.o
 NOPROTO = YES
-REQUIRED_SUBSYSTEMS = NDR
+REQUIRED_SUBSYSTEMS = NDR_RAW
 
 [SUBSYSTEM::NDR_NBT]
 INIT_OBJ_FILES = librpc/gen_ndr/ndr_nbt.o
 INIT_FUNCTION = dcerpc_nbt_init
 NOPROTO = YES
-REQUIRED_SUBSYSTEMS = NDR NDR_MISC
+REQUIRED_SUBSYSTEMS = NDR_RAW NDR_MISC
 
 [SUBSYSTEM::NDR_WINSREPL]
 INIT_OBJ_FILES = librpc/gen_ndr/ndr_winsrepl.o
 INIT_FUNCTION = dcerpc_winsrepl_init
 NOPROTO = YES
-REQUIRED_SUBSYSTEMS = NDR NDR_NBT
+REQUIRED_SUBSYSTEMS = NDR_RAW NDR_NBT
 
 
 [SUBSYSTEM::NDR_ALL]
@@ -440,7 +443,7 @@ NOPROTO = YES
 
 [SUBSYSTEM::RPC_NDR_EPMAPPER]
 ADD_OBJ_FILES = librpc/gen_ndr/ndr_epmapper_c.o
-REQUIRED_SUBSYSTEMS = RPC NDR_EPMAPPER
+REQUIRED_SUBSYSTEMS = NDR_EPMAPPER
 NOPROTO = YES
 
 [SUBSYSTEM::RPC_NDR_DBGIDL]
@@ -525,7 +528,7 @@ NOPROTO = YES
 
 [SUBSYSTEM::RPC_NDR_NETLOGON]
 ADD_OBJ_FILES = librpc/gen_ndr/ndr_netlogon_c.o
-REQUIRED_SUBSYSTEMS = RPC NDR_NETLOGON
+REQUIRED_SUBSYSTEMS = NDR_NETLOGON
 NOPROTO = YES
 
 [SUBSYSTEM::RPC_NDR_TRKWKS]