s3-waf: use more of the NDR_ subsystems.

Guenther

diff --git a/source3/wscript_build b/source3/wscript_build
index b5f277a539934289a74109447fc4d91782fc17f7..2676abe0dc560a5d95e6887ab27646a7b1404a1d 100644 (file)
--- a/source3/wscript_build
+++ b/source3/wscript_build
@@ -170,7 +170,7 @@ LIBREPLACE_SRCS = ''
 ZLIB_SRCS = ''
 
 LIB_SRC = '''${LIBSAMBAUTIL_SRC} ${UTIL_SRC}
-          lib/messages.c librpc/gen_ndr/ndr_messaging.c lib/messages_local.c
+          lib/messages.c lib/messages_local.c
           lib/messages_ctdbd.c lib/packet.c lib/ctdbd_conn.c
           lib/interfaces.c lib/memcache.c
           lib/talloc_dict.c
@@ -238,14 +238,12 @@ LIBADS_SRC = '''libads/ldap.c
              libads/disp_sec.c libads/ldap_utils.c
              libads/ldap_schema.c libads/util.c libads/ndr.c'''
 
-LIBADS_SERVER_SRC = '''libads/kerberos_verify.c libads/authdata.c
-                    ../librpc/ndr/ndr_krb5pac.c
-                    ../librpc/gen_ndr/ndr_krb5pac.c'''
+LIBADS_SERVER_SRC = '''libads/kerberos_verify.c libads/authdata.c'''
 
 LIBADS_PRINTER_SRC = '''libads/ldap_printer.c'''
 
 SECRETS_SRC = '''passdb/secrets.c passdb/machine_account_secrets.c
-                 passdb/machine_sid.c librpc/gen_ndr/ndr_secrets.c'''
+                 passdb/machine_sid.c'''
 
 LIBNBT_SRC = '''../libcli/nbt/nbtname.c
              ../libcli/netlogon.c
@@ -769,7 +767,6 @@ LIBSMBSHAREMODES_SRC = '${LIBSMBSHAREMODES_SRC0}'
 
 LIBNETAPI_SRC0 = '''lib/netapi/netapi.c
                     lib/netapi/cm.c
-                    librpc/gen_ndr/ndr_libnetapi.c
                     lib/netapi/libnetapi.c
                     lib/netapi/joindomain.c
                     lib/netapi/serverinfo.c
@@ -1026,7 +1023,7 @@ bld.SAMBA_LIBRARY('libnetapi',
                     source=LIBNETAPI_SRC,
                     public_deps='''talloc tdb cap libwbclient LIB_NONSMBD LIBSMB KRBCLIENT
                     PASSDB SMBLDAP GROUPDB PARAM_WITHOUT_REG DYNCONFIG
-                    LIBMSRPC_GEN LIBMSRPC LIBADS LIBNET DCUTIL''',
+                    LIBMSRPC_GEN LIBMSRPC LIBADS LIBNET DCUTIL NDR_LIBNETAPI''',
                     public_headers='lib/netapi/netapi.h',
                     vars=locals())
 
@@ -1119,7 +1116,7 @@ bld.SAMBA_SUBSYSTEM('KRBCLIENT',
 
 bld.SAMBA_SUBSYSTEM('LIBS',
                     source=LIB_SRC,
-                    deps='NSS_WRAPPER iconv LIBCRYPTO LIBNDR NDR_SECURITY CHARSET',
+                    deps='NSS_WRAPPER iconv LIBCRYPTO LIBNDR NDR_SECURITY CHARSET NDR_MESSAGING',
                     vars=locals())
 
 bld.SAMBA_SUBSYSTEM('LIB_NONSMBD',
@@ -1149,6 +1146,7 @@ bld.SAMBA_SUBSYSTEM('CLDAP',
 
 bld.SAMBA_SUBSYSTEM('SECRETS',
                     source=SECRETS_SRC,
+                    deps='NDR_SECRETS',
                     vars=locals())
 
 bld.SAMBA_SUBSYSTEM('SMBLDAP',
@@ -1163,6 +1161,7 @@ bld.SAMBA_SUBSYSTEM('LIBADS',
 
 bld.SAMBA_SUBSYSTEM('LIBADS_SERVER',
                     source=LIBADS_SERVER_SRC,
+                    deps='NDR_KRB5PAC',
                    vars=locals())
 
 bld.SAMBA_SUBSYSTEM('LIBADS_PRINTER',