summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Tridgell <tridge@samba.org>2010-03-17 22:19:46 +1100
committerAndrew Tridgell <tridge@samba.org>2010-04-06 20:26:52 +1000
commitfe7d1a18b956503851dcdc5fa455fbb47e8eb028 (patch)
treea06ec0efc4cb852beb99e3bff371e1786d80f3f4
parentb7cc6d48d5664aa83951c31fbdaabfb839f1b420 (diff)
downloadsamba-fe7d1a18b956503851dcdc5fa455fbb47e8eb028.tar.gz
samba-fe7d1a18b956503851dcdc5fa455fbb47e8eb028.tar.bz2
samba-fe7d1a18b956503851dcdc5fa455fbb47e8eb028.zip
build: don't need the S4 in the PIDL prefix
-rw-r--r--buildtools/wafsamba/samba_asn1.py1
-rw-r--r--source4/librpc/idl/wscript_build3
2 files changed, 1 insertions, 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')
-