Share object files for gen_ndr.

3 files changed, 335 insertions, 10 deletions

diff --git a/source3/Makefile.in b/source3/Makefile.in
index d33a719f36..1c77fd4a29 100644
--- a/source3/Makefile.in
+++ b/source3/Makefile.in
@@ -1228,16 +1228,7 @@ modules:: SHOWFLAGS $(MODULES)
 ## Perl IDL Compiler
 samba3-idl::
 	@PIDL_OUTPUTDIR="../librpc/gen_ndr" PIDL_ARGS="$(PIDL_ARGS)" CPP="$(CPP)" PIDL="../pidl/pidl" \
-	 srcdir="$(srcdir)" ../librpc/build_idl.sh ../librpc/idl/lsa.idl \
-	 	../librpc/idl/dfs.idl ../librpc/idl/echo.idl ../librpc/idl/winreg.idl \
-		../librpc/idl/initshutdown.idl ../librpc/idl/srvsvc.idl ../librpc/idl/svcctl.idl \
-		../librpc/idl/eventlog.idl ../librpc/idl/wkssvc.idl ../librpc/idl/netlogon.idl \
-		 ../librpc/idl/epmapper.idl \
-		../librpc/idl/xattr.idl ../librpc/idl/misc.idl ../librpc/idl/samr.idl \
-		../librpc/idl/security.idl ../librpc/idl/dssetup.idl ../librpc/idl/krb5pac.idl \
-		../librpc/idl/ntsvcs.idl ../librpc/idl/drsuapi.idl \
-		../librpc/idl/drsblobs.idl ../librpc/idl/nbt.idl \
-		../librpc/idl/named_pipe_auth.idl 
+	 srcdir="$(srcdir)" ../librpc/build_idl.sh ../librpc/idl/*.idl
 	@PIDL_OUTPUTDIR="librpc/gen_ndr" PIDL_ARGS="$(PIDL_ARGS)" CPP="$(CPP)" PIDL="../pidl/pidl" \
 	 srcdir="$(srcdir)" $(srcdir)/script/build_idl.sh \
 	 	librpc/idl/messaging.idl librpc/idl/libnetapi.idl librpc/idl/notify.idl
diff --git a/source3/librpc/gen_ndr/tables.c b/source3/librpc/gen_ndr/tables.c
index 09071f96d6..06127b135a 100644
--- a/source3/librpc/gen_ndr/tables.c
+++ b/source3/librpc/gen_ndr/tables.c
@@ -4,51 +4,213 @@
 #include "includes.h"
 #include "librpc/ndr/libndr.h"
 #include "librpc/ndr/ndr_table.h"
+#include "../librpc/gen_ndr/ndr_atsvc_c.h"
+#include "../librpc/gen_ndr/ndr_atsvc.h"
+#include "../librpc/gen_ndr/ndr_audiosrv_c.h"
+#include "../librpc/gen_ndr/ndr_audiosrv.h"
+#include "../librpc/gen_ndr/ndr_browser_c.h"
+#include "../librpc/gen_ndr/ndr_browser.h"
+#include "../librpc/gen_ndr/ndr_dbgidl_c.h"
+#include "../librpc/gen_ndr/ndr_dbgidl.h"
+#include "../librpc/gen_ndr/ndr_dcom_c.h"
+#include "../librpc/gen_ndr/ndr_dcom.h"
 #include "../librpc/gen_ndr/ndr_dfs_c.h"
 #include "../librpc/gen_ndr/ndr_dfs.h"
+#include "../librpc/gen_ndr/ndr_dnsserver_c.h"
+#include "../librpc/gen_ndr/ndr_dnsserver.h"
 #include "../librpc/gen_ndr/ndr_drsblobs_c.h"
 #include "../librpc/gen_ndr/ndr_drsblobs.h"
 #include "../librpc/gen_ndr/ndr_drsuapi_c.h"
 #include "../librpc/gen_ndr/ndr_drsuapi.h"
+#include "../librpc/gen_ndr/ndr_dsbackup_c.h"
+#include "../librpc/gen_ndr/ndr_dsbackup.h"
 #include "../librpc/gen_ndr/ndr_dssetup_c.h"
 #include "../librpc/gen_ndr/ndr_dssetup.h"
 #include "../librpc/gen_ndr/ndr_echo_c.h"
 #include "../librpc/gen_ndr/ndr_echo.h"
+#include "../librpc/gen_ndr/ndr_efs_c.h"
+#include "../librpc/gen_ndr/ndr_efs.h"
 #include "../librpc/gen_ndr/ndr_epmapper_c.h"
 #include "../librpc/gen_ndr/ndr_epmapper.h"
 #include "../librpc/gen_ndr/ndr_eventlog_c.h"
 #include "../librpc/gen_ndr/ndr_eventlog.h"
+#include "../librpc/gen_ndr/ndr_frsapi_c.h"
+#include "../librpc/gen_ndr/ndr_frsapi.h"
+#include "../librpc/gen_ndr/ndr_frsrpc_c.h"
+#include "../librpc/gen_ndr/ndr_frsrpc.h"
 #include "../librpc/gen_ndr/ndr_initshutdown_c.h"
 #include "../librpc/gen_ndr/ndr_initshutdown.h"
+#include "../librpc/gen_ndr/ndr_keysvc_c.h"
+#include "../librpc/gen_ndr/ndr_keysvc.h"
 #include "../librpc/gen_ndr/ndr_krb5pac_c.h"
 #include "../librpc/gen_ndr/ndr_krb5pac.h"
 #include "../librpc/gen_ndr/ndr_lsa_c.h"
 #include "../librpc/gen_ndr/ndr_lsa.h"
+#include "../librpc/gen_ndr/ndr_mgmt_c.h"
+#include "../librpc/gen_ndr/ndr_mgmt.h"
+#include "../librpc/gen_ndr/ndr_msgsvc_c.h"
+#include "../librpc/gen_ndr/ndr_msgsvc.h"
 #include "../librpc/gen_ndr/ndr_netlogon_c.h"
 #include "../librpc/gen_ndr/ndr_netlogon.h"
 #include "../librpc/gen_ndr/ndr_ntsvcs_c.h"
 #include "../librpc/gen_ndr/ndr_ntsvcs.h"
+#include "../librpc/gen_ndr/ndr_oxidresolver_c.h"
+#include "../librpc/gen_ndr/ndr_oxidresolver.h"
+#include "../librpc/gen_ndr/ndr_policyagent_c.h"
+#include "../librpc/gen_ndr/ndr_policyagent.h"
+#include "../librpc/gen_ndr/ndr_protected_storage_c.h"
+#include "../librpc/gen_ndr/ndr_protected_storage.h"
+#include "../librpc/gen_ndr/ndr_remact_c.h"
+#include "../librpc/gen_ndr/ndr_remact.h"
+#include "../librpc/gen_ndr/ndr_rot_c.h"
+#include "../librpc/gen_ndr/ndr_rot.h"
 #include "../librpc/gen_ndr/ndr_samr_c.h"
 #include "../librpc/gen_ndr/ndr_samr.h"
+#include "../librpc/gen_ndr/ndr_spoolss_c.h"
+#include "../librpc/gen_ndr/ndr_spoolss.h"
 #include "../librpc/gen_ndr/ndr_srvsvc_c.h"
 #include "../librpc/gen_ndr/ndr_srvsvc.h"
 #include "../librpc/gen_ndr/ndr_svcctl_c.h"
 #include "../librpc/gen_ndr/ndr_svcctl.h"
+#include "../librpc/gen_ndr/ndr_trkwks_c.h"
+#include "../librpc/gen_ndr/ndr_trkwks.h"
+#include "../librpc/gen_ndr/ndr_unixinfo_c.h"
+#include "../librpc/gen_ndr/ndr_unixinfo.h"
+#include "../librpc/gen_ndr/ndr_w32time_c.h"
+#include "../librpc/gen_ndr/ndr_w32time.h"
 #include "../librpc/gen_ndr/ndr_winreg_c.h"
 #include "../librpc/gen_ndr/ndr_winreg.h"
 #include "../librpc/gen_ndr/ndr_wkssvc_c.h"
 #include "../librpc/gen_ndr/ndr_wkssvc.h"
+#include "../librpc/gen_ndr/ndr_wmi_c.h"
+#include "../librpc/gen_ndr/ndr_wmi.h"
+#include "../librpc/gen_ndr/ndr_wzcsvc_c.h"
+#include "../librpc/gen_ndr/ndr_wzcsvc.h"
 
 NTSTATUS ndr_table_register_builtin_tables(void)
 {
 	NTSTATUS status;
 
+	status = ndr_table_register(&ndr_table_atsvc);
+	if (NT_STATUS_IS_ERR(status)) return status;
+
+	status = ndr_table_register(&ndr_table_atsvc);
+	if (NT_STATUS_IS_ERR(status)) return status;
+
+	status = ndr_table_register(&ndr_table_audiosrv);
+	if (NT_STATUS_IS_ERR(status)) return status;
+
+	status = ndr_table_register(&ndr_table_audiosrv);
+	if (NT_STATUS_IS_ERR(status)) return status;
+
+	status = ndr_table_register(&ndr_table_browser);
+	if (NT_STATUS_IS_ERR(status)) return status;
+
+	status = ndr_table_register(&ndr_table_browser);
+	if (NT_STATUS_IS_ERR(status)) return status;
+
+	status = ndr_table_register(&ndr_table_dbgidl);
+	if (NT_STATUS_IS_ERR(status)) return status;
+
+	status = ndr_table_register(&ndr_table_dbgidl);
+	if (NT_STATUS_IS_ERR(status)) return status;
+
+	status = ndr_table_register(&ndr_table_dcom_Unknown);
+	if (NT_STATUS_IS_ERR(status)) return status;
+
+	status = ndr_table_register(&ndr_table_IUnknown);
+	if (NT_STATUS_IS_ERR(status)) return status;
+
+	status = ndr_table_register(&ndr_table_IClassFactory);
+	if (NT_STATUS_IS_ERR(status)) return status;
+
+	status = ndr_table_register(&ndr_table_IRemUnknown);
+	if (NT_STATUS_IS_ERR(status)) return status;
+
+	status = ndr_table_register(&ndr_table_IClassActivator);
+	if (NT_STATUS_IS_ERR(status)) return status;
+
+	status = ndr_table_register(&ndr_table_ISCMLocalActivator);
+	if (NT_STATUS_IS_ERR(status)) return status;
+
+	status = ndr_table_register(&ndr_table_IMachineLocalActivator);
+	if (NT_STATUS_IS_ERR(status)) return status;
+
+	status = ndr_table_register(&ndr_table_ILocalObjectExporter);
+	if (NT_STATUS_IS_ERR(status)) return status;
+
+	status = ndr_table_register(&ndr_table_ISystemActivator);
+	if (NT_STATUS_IS_ERR(status)) return status;
+
+	status = ndr_table_register(&ndr_table_IRemUnknown2);
+	if (NT_STATUS_IS_ERR(status)) return status;
+
+	status = ndr_table_register(&ndr_table_IDispatch);
+	if (NT_STATUS_IS_ERR(status)) return status;
+
+	status = ndr_table_register(&ndr_table_IMarshal);
+	if (NT_STATUS_IS_ERR(status)) return status;
+
+	status = ndr_table_register(&ndr_table_ICoffeeMachine);
+	if (NT_STATUS_IS_ERR(status)) return status;
+
+	status = ndr_table_register(&ndr_table_IStream);
+	if (NT_STATUS_IS_ERR(status)) return status;
+
+	status = ndr_table_register(&ndr_table_dcom_Unknown);
+	if (NT_STATUS_IS_ERR(status)) return status;
+
+	status = ndr_table_register(&ndr_table_IUnknown);
+	if (NT_STATUS_IS_ERR(status)) return status;
+
+	status = ndr_table_register(&ndr_table_IClassFactory);
+	if (NT_STATUS_IS_ERR(status)) return status;
+
+	status = ndr_table_register(&ndr_table_IRemUnknown);
+	if (NT_STATUS_IS_ERR(status)) return status;
+
+	status = ndr_table_register(&ndr_table_IClassActivator);
+	if (NT_STATUS_IS_ERR(status)) return status;
+
+	status = ndr_table_register(&ndr_table_ISCMLocalActivator);
+	if (NT_STATUS_IS_ERR(status)) return status;
+
+	status = ndr_table_register(&ndr_table_IMachineLocalActivator);
+	if (NT_STATUS_IS_ERR(status)) return status;
+
+	status = ndr_table_register(&ndr_table_ILocalObjectExporter);
+	if (NT_STATUS_IS_ERR(status)) return status;
+
+	status = ndr_table_register(&ndr_table_ISystemActivator);
+	if (NT_STATUS_IS_ERR(status)) return status;
+
+	status = ndr_table_register(&ndr_table_IRemUnknown2);
+	if (NT_STATUS_IS_ERR(status)) return status;
+
+	status = ndr_table_register(&ndr_table_IDispatch);
+	if (NT_STATUS_IS_ERR(status)) return status;
+
+	status = ndr_table_register(&ndr_table_IMarshal);
+	if (NT_STATUS_IS_ERR(status)) return status;
+
+	status = ndr_table_register(&ndr_table_ICoffeeMachine);
+	if (NT_STATUS_IS_ERR(status)) return status;
+
+	status = ndr_table_register(&ndr_table_IStream);
+	if (NT_STATUS_IS_ERR(status)) return status;
+
 	status = ndr_table_register(&ndr_table_netdfs);
 	if (NT_STATUS_IS_ERR(status)) return status;
 
 	status = ndr_table_register(&ndr_table_netdfs);
 	if (NT_STATUS_IS_ERR(status)) return status;
 
+	status = ndr_table_register(&ndr_table_dnsserver);
+	if (NT_STATUS_IS_ERR(status)) return status;
+
+	status = ndr_table_register(&ndr_table_dnsserver);
+	if (NT_STATUS_IS_ERR(status)) return status;
+
 	status = ndr_table_register(&ndr_table_drsblobs);
 	if (NT_STATUS_IS_ERR(status)) return status;
 
@@ -61,6 +223,18 @@ NTSTATUS ndr_table_register_builtin_tables(void)
 	status = ndr_table_register(&ndr_table_drsuapi);
 	if (NT_STATUS_IS_ERR(status)) return status;
 
+	status = ndr_table_register(&ndr_table_ad_backup);
+	if (NT_STATUS_IS_ERR(status)) return status;
+
+	status = ndr_table_register(&ndr_table_ad_restore);
+	if (NT_STATUS_IS_ERR(status)) return status;
+
+	status = ndr_table_register(&ndr_table_ad_backup);
+	if (NT_STATUS_IS_ERR(status)) return status;
+
+	status = ndr_table_register(&ndr_table_ad_restore);
+	if (NT_STATUS_IS_ERR(status)) return status;
+
 	status = ndr_table_register(&ndr_table_dssetup);
 	if (NT_STATUS_IS_ERR(status)) return status;
 
@@ -73,6 +247,12 @@ NTSTATUS ndr_table_register_builtin_tables(void)
 	status = ndr_table_register(&ndr_table_rpcecho);
 	if (NT_STATUS_IS_ERR(status)) return status;
 
+	status = ndr_table_register(&ndr_table_efs);
+	if (NT_STATUS_IS_ERR(status)) return status;
+
+	status = ndr_table_register(&ndr_table_efs);
+	if (NT_STATUS_IS_ERR(status)) return status;
+
 	status = ndr_table_register(&ndr_table_epmapper);
 	if (NT_STATUS_IS_ERR(status)) return status;
 
@@ -85,12 +265,30 @@ NTSTATUS ndr_table_register_builtin_tables(void)
 	status = ndr_table_register(&ndr_table_eventlog);
 	if (NT_STATUS_IS_ERR(status)) return status;
 
+	status = ndr_table_register(&ndr_table_frsapi);
+	if (NT_STATUS_IS_ERR(status)) return status;
+
+	status = ndr_table_register(&ndr_table_frsapi);
+	if (NT_STATUS_IS_ERR(status)) return status;
+
+	status = ndr_table_register(&ndr_table_frsrpc);
+	if (NT_STATUS_IS_ERR(status)) return status;
+
+	status = ndr_table_register(&ndr_table_frsrpc);
+	if (NT_STATUS_IS_ERR(status)) return status;
+
 	status = ndr_table_register(&ndr_table_initshutdown);
 	if (NT_STATUS_IS_ERR(status)) return status;
 
 	status = ndr_table_register(&ndr_table_initshutdown);
 	if (NT_STATUS_IS_ERR(status)) return status;
 
+	status = ndr_table_register(&ndr_table_keysvc);
+	if (NT_STATUS_IS_ERR(status)) return status;
+
+	status = ndr_table_register(&ndr_table_keysvc);
+	if (NT_STATUS_IS_ERR(status)) return status;
+
 	status = ndr_table_register(&ndr_table_krb5pac);
 	if (NT_STATUS_IS_ERR(status)) return status;
 
@@ -103,6 +301,24 @@ NTSTATUS ndr_table_register_builtin_tables(void)
 	status = ndr_table_register(&ndr_table_lsarpc);
 	if (NT_STATUS_IS_ERR(status)) return status;
 
+	status = ndr_table_register(&ndr_table_mgmt);
+	if (NT_STATUS_IS_ERR(status)) return status;
+
+	status = ndr_table_register(&ndr_table_mgmt);
+	if (NT_STATUS_IS_ERR(status)) return status;
+
+	status = ndr_table_register(&ndr_table_msgsvc);
+	if (NT_STATUS_IS_ERR(status)) return status;
+
+	status = ndr_table_register(&ndr_table_msgsvcsend);
+	if (NT_STATUS_IS_ERR(status)) return status;
+
+	status = ndr_table_register(&ndr_table_msgsvc);
+	if (NT_STATUS_IS_ERR(status)) return status;
+
+	status = ndr_table_register(&ndr_table_msgsvcsend);
+	if (NT_STATUS_IS_ERR(status)) return status;
+
 	status = ndr_table_register(&ndr_table_netlogon);
 	if (NT_STATUS_IS_ERR(status)) return status;
 
@@ -115,12 +331,48 @@ NTSTATUS ndr_table_register_builtin_tables(void)
 	status = ndr_table_register(&ndr_table_ntsvcs);
 	if (NT_STATUS_IS_ERR(status)) return status;
 
+	status = ndr_table_register(&ndr_table_IOXIDResolver);
+	if (NT_STATUS_IS_ERR(status)) return status;
+
+	status = ndr_table_register(&ndr_table_IOXIDResolver);
+	if (NT_STATUS_IS_ERR(status)) return status;
+
+	status = ndr_table_register(&ndr_table_policyagent);
+	if (NT_STATUS_IS_ERR(status)) return status;
+
+	status = ndr_table_register(&ndr_table_policyagent);
+	if (NT_STATUS_IS_ERR(status)) return status;
+
+	status = ndr_table_register(&ndr_table_protected_storage);
+	if (NT_STATUS_IS_ERR(status)) return status;
+
+	status = ndr_table_register(&ndr_table_protected_storage);
+	if (NT_STATUS_IS_ERR(status)) return status;
+
+	status = ndr_table_register(&ndr_table_IRemoteActivation);
+	if (NT_STATUS_IS_ERR(status)) return status;
+
+	status = ndr_table_register(&ndr_table_IRemoteActivation);
+	if (NT_STATUS_IS_ERR(status)) return status;
+
+	status = ndr_table_register(&ndr_table_rot);
+	if (NT_STATUS_IS_ERR(status)) return status;
+
+	status = ndr_table_register(&ndr_table_rot);
+	if (NT_STATUS_IS_ERR(status)) return status;
+
 	status = ndr_table_register(&ndr_table_samr);
 	if (NT_STATUS_IS_ERR(status)) return status;
 
 	status = ndr_table_register(&ndr_table_samr);
 	if (NT_STATUS_IS_ERR(status)) return status;
 
+	status = ndr_table_register(&ndr_table_spoolss);
+	if (NT_STATUS_IS_ERR(status)) return status;
+
+	status = ndr_table_register(&ndr_table_spoolss);
+	if (NT_STATUS_IS_ERR(status)) return status;
+
 	status = ndr_table_register(&ndr_table_srvsvc);
 	if (NT_STATUS_IS_ERR(status)) return status;
 
@@ -133,6 +385,24 @@ NTSTATUS ndr_table_register_builtin_tables(void)
 	status = ndr_table_register(&ndr_table_svcctl);
 	if (NT_STATUS_IS_ERR(status)) return status;
 
+	status = ndr_table_register(&ndr_table_trkwks);
+	if (NT_STATUS_IS_ERR(status)) return status;
+
+	status = ndr_table_register(&ndr_table_trkwks);
+	if (NT_STATUS_IS_ERR(status)) return status;
+
+	status = ndr_table_register(&ndr_table_unixinfo);
+	if (NT_STATUS_IS_ERR(status)) return status;
+
+	status = ndr_table_register(&ndr_table_unixinfo);
+	if (NT_STATUS_IS_ERR(status)) return status;
+
+	status = ndr_table_register(&ndr_table_w32time);
+	if (NT_STATUS_IS_ERR(status)) return status;
+
+	status = ndr_table_register(&ndr_table_w32time);
+	if (NT_STATUS_IS_ERR(status)) return status;
+
 	status = ndr_table_register(&ndr_table_winreg);
 	if (NT_STATUS_IS_ERR(status)) return status;
 
@@ -145,6 +415,66 @@ NTSTATUS ndr_table_register_builtin_tables(void)
 	status = ndr_table_register(&ndr_table_wkssvc);
 	if (NT_STATUS_IS_ERR(status)) return status;
 
+	status = ndr_table_register(&ndr_table_IWbemClassObject);
+	if (NT_STATUS_IS_ERR(status)) return status;
+
+	status = ndr_table_register(&ndr_table_IWbemServices);
+	if (NT_STATUS_IS_ERR(status)) return status;
+
+	status = ndr_table_register(&ndr_table_IEnumWbemClassObject);
+	if (NT_STATUS_IS_ERR(status)) return status;
+
+	status = ndr_table_register(&ndr_table_IWbemContext);
+	if (NT_STATUS_IS_ERR(status)) return status;
+
+	status = ndr_table_register(&ndr_table_IWbemLevel1Login);
+	if (NT_STATUS_IS_ERR(status)) return status;
+
+	status = ndr_table_register(&ndr_table_IWbemWCOSmartEnum);
+	if (NT_STATUS_IS_ERR(status)) return status;
+
+	status = ndr_table_register(&ndr_table_IWbemFetchSmartEnum);
+	if (NT_STATUS_IS_ERR(status)) return status;
+
+	status = ndr_table_register(&ndr_table_IWbemCallResult);
+	if (NT_STATUS_IS_ERR(status)) return status;
+
+	status = ndr_table_register(&ndr_table_IWbemObjectSink);
+	if (NT_STATUS_IS_ERR(status)) return status;
+
+	status = ndr_table_register(&ndr_table_IWbemClassObject);
+	if (NT_STATUS_IS_ERR(status)) return status;
+
+	status = ndr_table_register(&ndr_table_IWbemServices);
+	if (NT_STATUS_IS_ERR(status)) return status;
+
+	status = ndr_table_register(&ndr_table_IEnumWbemClassObject);
+	if (NT_STATUS_IS_ERR(status)) return status;
+
+	status = ndr_table_register(&ndr_table_IWbemContext);
+	if (NT_STATUS_IS_ERR(status)) return status;
+
+	status = ndr_table_register(&ndr_table_IWbemLevel1Login);
+	if (NT_STATUS_IS_ERR(status)) return status;
+
+	status = ndr_table_register(&ndr_table_IWbemWCOSmartEnum);
+	if (NT_STATUS_IS_ERR(status)) return status;
+
+	status = ndr_table_register(&ndr_table_IWbemFetchSmartEnum);
+	if (NT_STATUS_IS_ERR(status)) return status;
+
+	status = ndr_table_register(&ndr_table_IWbemCallResult);
+	if (NT_STATUS_IS_ERR(status)) return status;
+
+	status = ndr_table_register(&ndr_table_IWbemObjectSink);
+	if (NT_STATUS_IS_ERR(status)) return status;
+
+	status = ndr_table_register(&ndr_table_wzcsvc);
+	if (NT_STATUS_IS_ERR(status)) return status;
+
+	status = ndr_table_register(&ndr_table_wzcsvc);
+	if (NT_STATUS_IS_ERR(status)) return status;
+
 
 	
 	return NT_STATUS_OK;
diff --git a/source3/samba4.mk b/source3/samba4.mk
index 18f7541333..8962d6b5de 100644
--- a/source3/samba4.mk
+++ b/source3/samba4.mk
@@ -36,6 +36,8 @@ SAMBA4_CFLAGS = -I.. -I$(samba4srcdir) -I$(samba4srcdir)/include \
 # overrides are not specified first.
 ifeq ($(MAKE_VERSION),3.81)
 %.o: CFLAGS+=$(FLAGS)
+../librpc/gen_ndr/%_c.o: CFLAGS=$(SAMBA4_CFLAGS)
+../librpc/gen_ndr/py_%.o: CFLAGS=$(SAMBA4_CFLAGS)
 $(samba4srcdir)/%.o: CFLAGS=$(SAMBA4_CFLAGS)
 $(samba4srcdir)/%.ho: CFLAGS=$(SAMBA4_CFLAGS)
 $(heimdalsrcdir)/%.o: CFLAGS=-I$(heimdalbuildsrcdir) $(SAMBA4_CFLAGS) -I$(srcdir)
@@ -45,6 +47,8 @@ $(heimdalsrcdir)/%.o: CFLAGS=-I$(heimdalbuildsrcdir) $(SAMBA4_CFLAGS) -I$(srcdir
 $(heimdalsrcdir)/%.ho: CFLAGS=-I$(heimdalbuildsrcdir) $(SAMBA4_CFLAGS) -I$(srcdir)
 $(samba4srcdir)/%.o: CFLAGS=$(SAMBA4_CFLAGS)
 $(samba4srcdir)/%.ho: CFLAGS=$(SAMBA4_CFLAGS)
+../librpc/gen_ndr/%_c.o: CFLAGS=$(SAMBA4_CFLAGS)
+../librpc/gen_ndr/py_%.o: CFLAGS=$(SAMBA4_CFLAGS)
 %.o: CFLAGS+=$(FLAGS)
 endif