Remove public library dcerpc-atsvc.

Signed-Off-By: Jelmer Vernooij <jelmer@samba.org>
Reviewed-By: Andrew Bartlett <abartlet@samba.org>
Reviewed-By: Stefan Metzmacher <metze@samba.org>

diff --git a/source4/librpc/dcerpc_atsvc.pc.in b/source4/librpc/dcerpc_atsvc.pc.in
deleted file mode 100644 (file)
index f781f23..0000000
--- a/source4/librpc/dcerpc_atsvc.pc.in
+++ /dev/null
@@ -1,11 +0,0 @@
-prefix=@prefix@
-exec_prefix=@exec_prefix@
-libdir=@libdir@
-includedir=@includedir@
-
-Name: dcerpc_atsvc
-Description: DCE/RPC client library - ATSVC
-Requires.private: dcerpc ndr
-Version: @PACKAGE_VERSION@
-Libs: @LIB_RPATH@ -L${libdir} -ldcerpc-atsvc
-Cflags: -I${includedir}  -DHAVE_IMMEDIATE_STRUCTURES=1

diff --git a/source4/librpc/wscript_build b/source4/librpc/wscript_build
index 781611e7b4c79c02ac7fa397a3bcb06421e2f3df..5100ae80464d4c6f422a3c39db05c905b6c66e56 100755 (executable)
--- a/source4/librpc/wscript_build
+++ b/source4/librpc/wscript_build
@@ -99,17 +99,6 @@ bld.SAMBA_LIBRARY('dcerpc-samr',
        header_path='gen_ndr'
        )
 
-
-bld.SAMBA_LIBRARY('dcerpc-atsvc',
-       source='',
-       pc_files='dcerpc_atsvc.pc',
-       vnum='0.0.1',
-       public_deps='dcerpc ndr-standard RPC_NDR_ATSVC',
-       public_headers='../../librpc/gen_ndr/ndr_atsvc_c.h',
-       header_path='gen_ndr'
-       )
-
-
 bld.SAMBA_SUBSYSTEM('RPC_NDR_WINSIF',
        source='gen_ndr/ndr_winsif_c.c',
        public_deps='dcerpc NDR_WINSIF'
@@ -125,10 +114,7 @@ bld.SAMBA_LIBRARY('dcerpc',
        deps='samba_socket LIBCLI_RESOLVE LIBCLI_SMB LIBCLI_SMB2 ndr NDR_DCERPC RPC_NDR_EPMAPPER NDR_SCHANNEL RPC_NDR_NETLOGON RPC_NDR_MGMT gensec LIBCLI_AUTH smbclient-raw LP_RESOLVE tevent-util dcerpc-binding param_options http',
        autoproto='rpc/dcerpc_proto.h',
        public_deps='samba-credentials tevent talloc',
-       public_headers='''rpc/dcerpc.h ../../librpc/gen_ndr/mgmt.h
-       ../../librpc/gen_ndr/ndr_mgmt.h ../../librpc/gen_ndr/ndr_mgmt_c.h
-       ../../librpc/gen_ndr/epmapper.h ../../librpc/gen_ndr/ndr_epmapper.h
-       ../../librpc/gen_ndr/ndr_epmapper_c.h''',
+       public_headers='''rpc/dcerpc.h''',
        # It's very important to keep this form of construction
        # it force the sambawaf extension to put everything that match the first element
        # (*gen_ndr*) into the dir named by the second element (gen_ndr).
@@ -220,7 +206,7 @@ bld.SAMBA_PYTHON('python_mgmt',
 
 bld.SAMBA_PYTHON('python_atsvc',
        source='../../librpc/gen_ndr/py_atsvc.c',
-       deps='dcerpc-atsvc pytalloc-util pyrpc_util',
+       deps='RPC_NDR_ATSVC pytalloc-util pyrpc_util',
        realname='samba/dcerpc/atsvc.so'
        )
 

diff --git a/source4/torture/wscript_build b/source4/torture/wscript_build
index d189b62fc46657f82665319029d14f10ed508865..6cf255ba1bf0f26ee93f6d0613fac7ac3deadcd2 100755 (executable)
--- a/source4/torture/wscript_build
+++ b/source4/torture/wscript_build
@@ -140,7 +140,7 @@ bld.SAMBA_MODULE('torture_rpc',
                       RPC_NDR_ECHO
                       RPC_NDR_SVCCTL
                       RPC_NDR_NETLOGON
-                      dcerpc-atsvc
+                      RPC_NDR_ATSVC
                       RPC_NDR_DRSUAPI
                       RPC_NDR_LSA
                       RPC_NDR_EPMAPPER
@@ -286,7 +286,7 @@ bld.SAMBA_SUBSYSTEM('torturemain',
 bld.SAMBA_BINARY('smbtorture',
                  source=[],
                  manpages='man/smbtorture.1',
-                 public_headers='smbtorture.h',
+                 private_headers='smbtorture.h',
                  deps='torturemain torture popt POPT_SAMBA POPT_CREDENTIALS dcerpc LIBCLI_SMB SMBREADLINE ' + TORTURE_MODULES,
                  pyembed=True
                  )