diff options
| author | Andrew Tridgell <tridge@samba.org> | 2010-03-07 10:26:46 +1100 |
|---|---|---|
| committer | Andrew Tridgell <tridge@samba.org> | 2010-04-06 20:26:40 +1000 |
| commit | d004964142b0eac88528bb556228a49742725f4e (patch) | |
| tree | 7fe4c720ed31650283e61fba747a6dfe85c6392b | |
| parent | 6dcf5563eab238f833b5a0afc215995704d3c9f6 (diff) | |
| download | samba-d004964142b0eac88528bb556228a49742725f4e.tar.gz samba-d004964142b0eac88528bb556228a49742725f4e.tar.bz2 samba-d004964142b0eac88528bb556228a49742725f4e.zip | |
build: moved main autoproto rule into samba_autoproto.py
| -rw-r--r-- | buildtools/wafsamba/samba_autoproto.py | 11 | ||||
| -rw-r--r-- | buildtools/wafsamba/wafsamba.py | 16 | ||||
| -rw-r--r-- | source4/heimdal_build/wscript_build | 1 |
3 files changed, 9 insertions, 19 deletions
diff --git a/buildtools/wafsamba/samba_autoproto.py b/buildtools/wafsamba/samba_autoproto.py index 4d213feaad..ab21a1e1a7 100644 --- a/buildtools/wafsamba/samba_autoproto.py +++ b/buildtools/wafsamba/samba_autoproto.py @@ -21,9 +21,14 @@ Build.BuildContext.HEIMDAL_AUTOPROTO_PRIVATE = HEIMDAL_AUTOPROTO_PRIVATE # rule for samba prototype generation def SAMBA_AUTOPROTO(bld, header, source): - print "TODO: add samba autoproto rule" - return + bld.SET_BUILD_GROUP('prototypes') + bld( + source = source, + target = header, + ext_out='.c', + rule = '../script/mkproto.pl --srcdir=.. --builddir=. --public=/dev/null --private=${TGT} ${SRC}' + ) + print "Added AUTOPROTO target %s" % header Build.BuildContext.SAMBA_AUTOPROTO = SAMBA_AUTOPROTO - diff --git a/buildtools/wafsamba/wafsamba.py b/buildtools/wafsamba/wafsamba.py index 015db06fd4..7686a891b2 100644 --- a/buildtools/wafsamba/wafsamba.py +++ b/buildtools/wafsamba/wafsamba.py @@ -336,22 +336,6 @@ def SAMBA_ERRTABLE(bld, name, source, ) Build.BuildContext.SAMBA_ERRTABLE = SAMBA_ERRTABLE - - - -################################################################ -# build a C prototype file automatically -def AUTOPROTO(bld, header, source): - if header is not None: - bld.SET_BUILD_GROUP('prototypes') - bld( - source = source, - target = header, - rule = '../script/mkproto.pl --srcdir=.. --builddir=. --public=/dev/null --private=${TGT} ${SRC}' - ) -Build.BuildContext.AUTOPROTO = AUTOPROTO - - ################################################################# # define a Samba module. def SAMBA_MODULE(bld, modname, source, diff --git a/source4/heimdal_build/wscript_build b/source4/heimdal_build/wscript_build index c684e9ac04..e539bb7620 100644 --- a/source4/heimdal_build/wscript_build +++ b/source4/heimdal_build/wscript_build @@ -546,5 +546,6 @@ HEIMDAL_HEIM_ASN1_DER_SOURCE = ''' bld.HEIMDAL_AUTOPROTO('../heimdal/lib/asn1/der-protos.h', HEIMDAL_HEIM_ASN1_DER_SOURCE, + group = 'build_compilers', options="-q -P comment -o") |