waf: convert NDR_NBT into shared library.

Guenther

7 files changed, 28 insertions, 15 deletions

diff --git a/libcli/nbt/wscript_build b/libcli/nbt/wscript_build
index b531dba469..a70db083e6 100644
--- a/libcli/nbt/wscript_build
+++ b/libcli/nbt/wscript_build
@@ -13,7 +13,7 @@ bld.SAMBA_SUBSYSTEM('lmhosts',
 
 bld.SAMBA_LIBRARY('cli-nbt',
                   source='nbtsocket.c namequery.c nameregister.c namerefresh.c namerelease.c',
-                  public_deps='ndr NDR_NBT tevent tevent-util NDR_SECURITY samba_socket samba-util lmhosts',
+                  public_deps='ndr ndr_nbt tevent tevent-util NDR_SECURITY samba_socket samba-util lmhosts',
                   private_library=True
                   )
 
diff --git a/libcli/netlogon/wscript_build b/libcli/netlogon/wscript_build
index ad37c0c325..ab49599f75 100644
--- a/libcli/netlogon/wscript_build
+++ b/libcli/netlogon/wscript_build
@@ -2,5 +2,5 @@
 
 bld.SAMBA_SUBSYSTEM('LIBCLI_NETLOGON',
 	source='netlogon.c',
-	public_deps='samba-util NDR_NBT'
+	public_deps='samba-util ndr_nbt'
 	)
diff --git a/librpc/ndr_nbt.pc.in b/librpc/ndr_nbt.pc.in
new file mode 100644
index 0000000000..5b69699d09
--- /dev/null
+++ b/librpc/ndr_nbt.pc.in
@@ -0,0 +1,11 @@
+prefix=@prefix@
+exec_prefix=@exec_prefix@
+libdir=@libdir@
+includedir=@includedir@
+
+Name: ndr-nbt
+Description: NDR marshallers for nbt formats
+Requires: ndr
+Version: 0.0.1
+Libs: @LIB_RPATH@ -L${libdir} -lndr-nbt
+Cflags: -I${includedir}  -DHAVE_IMMEDIATE_STRUCTURES=1 -D_GNU_SOURCE=1
diff --git a/librpc/wscript_build b/librpc/wscript_build
index e6fde1558f..f0b461d8c8 100644
--- a/librpc/wscript_build
+++ b/librpc/wscript_build
@@ -251,7 +251,7 @@ bld.SAMBA_SUBSYSTEM('NDR_SRVSVC',
 
 bld.SAMBA_SUBSYSTEM('NDR_NETLOGON',
 	source='gen_ndr/ndr_netlogon.c ndr/ndr_netlogon.c',
-	public_deps='ndr NDR_SECURITY NDR_LSA NDR_SAMR NDR_NBT'
+	public_deps='ndr NDR_SECURITY NDR_LSA NDR_SAMR ndr_nbt'
 	)
 
 bld.SAMBA_SUBSYSTEM('NDR_EVENTLOG',
@@ -331,14 +331,16 @@ bld.SAMBA_SUBSYSTEM('NDR_XATTR',
 
 bld.SAMBA_SUBSYSTEM('NDR_SCHANNEL',
 	source='ndr/ndr_schannel.c gen_ndr/ndr_schannel.c',
-	public_deps='ndr NDR_NBT'
+	public_deps='ndr ndr_nbt'
 	)
 
-bld.SAMBA_SUBSYSTEM('NDR_NBT',
+bld.SAMBA_LIBRARY('ndr_nbt',
 	source='gen_ndr/ndr_nbt.c ndr/ndr_nbt.c',
-	public_deps='ndr NDR_NBT_BUF NDR_SECURITY ndr-standard',
-	public_headers='gen_ndr/nbt.h',
-        header_path='gen_ndr'
+	public_deps='ndr NDR_NBT_BUF NDR_SECURITY',
+	public_headers='gen_ndr/nbt.h gen_ndr/ndr_nbt.h ndr/ndr_nbt.h',
+        header_path=[ ('gen_ndr*', 'gen_ndr'), ('ndr*', 'ndr')],
+        pc_files='ndr_nbt.pc',
+        vnum='0.0.1'
 	)
 
 bld.SAMBA_SUBSYSTEM('NDR_BACKUPKEY',
@@ -443,7 +445,7 @@ bld.SAMBA_SUBSYSTEM('RPC_NDR_SPOOLSS',
 
 bld.SAMBA_SUBSYSTEM('RPC_NDR_NBT',
 	source='gen_ndr/ndr_nbt_c.c',
-	public_deps='dcerpc-binding NDR_NBT'
+	public_deps='dcerpc-binding ndr_nbt'
 	)
 
 bld.SAMBA_SUBSYSTEM('RPC_NDR_WKSSVC',
diff --git a/source3/wscript_build b/source3/wscript_build
index 54c7075fe5..129313424a 100755
--- a/source3/wscript_build
+++ b/source3/wscript_build
@@ -975,7 +975,7 @@ bld.SAMBA3_SUBSYSTEM('LIBNMB',
 
 bld.SAMBA3_SUBSYSTEM('LIBNBT',
                     source='',
-                    deps='NDR_SVCCTL NDR_NBT LIBCLI_NETLOGON',
+                    deps='NDR_SVCCTL ndr_nbt LIBCLI_NETLOGON',
                     vars=locals())
 
 bld.SAMBA3_SUBSYSTEM('SERVICES',
diff --git a/source4/libcli/wscript_build b/source4/libcli/wscript_build
index 7a26d477dc..1d59e69bd4 100644
--- a/source4/libcli/wscript_build
+++ b/source4/libcli/wscript_build
@@ -54,7 +54,7 @@ bld.SAMBA_SUBSYSTEM('LIBCLI_RESOLVE',
 	source='resolve/resolve.c',
 	autoproto='resolve/proto.h',
 	deps='roken',
-	public_deps='NDR_NBT LIBTSOCKET'
+	public_deps='ndr_nbt LIBTSOCKET'
 	)
 
 
diff --git a/source4/librpc/wscript_build b/source4/librpc/wscript_build
index 8168c4f10b..b4e65e8aa7 100755
--- a/source4/librpc/wscript_build
+++ b/source4/librpc/wscript_build
@@ -13,7 +13,7 @@ bld.SAMBA_SUBSYSTEM('NDR_WINSTATION',
 
 bld.SAMBA_SUBSYSTEM('NDR_IRPC',
 	source='gen_ndr/ndr_irpc.c',
-	public_deps='ndr NDR_SECURITY NDR_NBT'
+	public_deps='ndr NDR_SECURITY ndr_nbt'
 	)
 
 
@@ -51,7 +51,7 @@ bld.SAMBA_SUBSYSTEM('NDR_NTP_SIGND',
 
 bld.SAMBA_SUBSYSTEM('NDR_WINSREPL',
 	source='gen_ndr/ndr_winsrepl.c',
-	public_deps='ndr NDR_NBT'
+	public_deps='ndr ndr_nbt'
 	)
 
 
@@ -86,7 +86,7 @@ bld.SAMBA_SUBSYSTEM('ndr-table',
         NDR_DBGIDL NDR_DSSETUP NDR_MSGSVC NDR_WINSIF NDR_MGMT
         NDR_OXIDRESOLVER NDR_REMACT NDR_WZCSVC
         NDR_BROWSER NDR_W32TIME NDR_SCERPC NDR_TRKWKS NDR_KEYSVC ndr-krb5pac
-        NDR_XATTR NDR_SCHANNEL NDR_ROT NDR_DRSBLOBS NDR_NBT NDR_WINSREPL
+        NDR_XATTR NDR_SCHANNEL NDR_ROT NDR_DRSBLOBS ndr_nbt NDR_WINSREPL
         NDR_SECURITY NDR_DNSSERVER NDR_WINSTATION NDR_IRPC NDR_OPENDB
         NDR_SASL_HELPERS NDR_NOTIFY NDR_WINBIND NDR_FRSRPC NDR_FRSAPI
         NDR_FRSTRANS NDR_NFS4ACL NDR_NTP_SIGND NDR_DCOM NDR_WMI
@@ -237,7 +237,7 @@ bld.SAMBA_PYTHON('python_atsvc',
 
 bld.SAMBA_PYTHON('python_dcerpc_nbt',
 	source='../../librpc/gen_ndr/py_nbt.c',
-	deps='NDR_NBT RPC_NDR_NBT pytalloc-util pyrpc_util',
+	deps='ndr_nbt RPC_NDR_NBT pytalloc-util pyrpc_util',
 	realname='samba/dcerpc/nbt.so'
 	)