From fe7d1a18b956503851dcdc5fa455fbb47e8eb028 Mon Sep 17 00:00:00 2001 From: Andrew Tridgell Date: Wed, 17 Mar 2010 22:19:46 +1100 Subject: build: don't need the S4 in the PIDL prefix --- buildtools/wafsamba/samba_asn1.py | 1 - source4/librpc/idl/wscript_build | 3 +-- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/buildtools/wafsamba/samba_asn1.py b/buildtools/wafsamba/samba_asn1.py index 6b099062c7..7e62af4ce3 100644 --- a/buildtools/wafsamba/samba_asn1.py +++ b/buildtools/wafsamba/samba_asn1.py @@ -23,7 +23,6 @@ def SAMBA_ASN1(bld, name, source, This will produce 2 output files''' bname = os.path.basename(source)[0:-5]; dname = os.path.dirname(source) - name = "ASN1_%s" % bname.upper() asn1name = "%s_asn1" % bname if not SET_TARGET_TYPE(bld, name, 'ASN1'): diff --git a/source4/librpc/idl/wscript_build b/source4/librpc/idl/wscript_build index 3ebe6b8e9e..8ce4b4cefd 100644 --- a/source4/librpc/idl/wscript_build +++ b/source4/librpc/idl/wscript_build @@ -1,7 +1,6 @@ -bld.SAMBA_PIDL_LIST('PIDL_S4', +bld.SAMBA_PIDL_LIST('PIDL', source='''irpc.idl nfs4acl.idl notify.idl ntp_signd.idl opendb.idl sasl_helpers.idl server_id.idl winbind.idl winsif.idl winsrepl.idl winstation.idl''', options="--includedir=../librpc/idl --header --ndr-parser --client --python --server", output_dir='../gen_ndr') - -- cgit