diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2010-05-31 12:08:01 +0200 |
|---|---|---|
| committer | Jelmer Vernooij <jelmer@samba.org> | 2010-05-31 13:56:25 +0200 |
| commit | f98bb7ffc33bf161caf301c50c55c8e3cc858b85 (patch) | |
| tree | 1137d0c8f3c9bf2d67e07d67bb634fb6c062458b | |
| parent | cc77e7966ea95ccc0812dd772a9002b41792e6b8 (diff) | |
| download | samba-f98bb7ffc33bf161caf301c50c55c8e3cc858b85.tar.gz samba-f98bb7ffc33bf161caf301c50c55c8e3cc858b85.tar.bz2 samba-f98bb7ffc33bf161caf301c50c55c8e3cc858b85.zip | |
Add manpages argument to SAMBA_LIBRARY().
| -rw-r--r-- | buildtools/wafsamba/wafsamba.py | 15 | ||||
| -rw-r--r-- | lib/talloc/wscript | 19 | ||||
| -rw-r--r-- | source4/lib/ldb/wscript | 19 |
3 files changed, 19 insertions, 34 deletions
diff --git a/buildtools/wafsamba/wafsamba.py b/buildtools/wafsamba/wafsamba.py index 41b866d05c..00ebe53514 100644 --- a/buildtools/wafsamba/wafsamba.py +++ b/buildtools/wafsamba/wafsamba.py @@ -116,6 +116,7 @@ def SAMBA_LIBRARY(bld, libname, source, abi_match=None, hide_symbols=False, is_bundled=False, + manpages=None, enabled=True): '''define a Samba library''' @@ -196,7 +197,7 @@ def SAMBA_LIBRARY(bld, libname, source, vnum = vnum, install_path = None, samba_inst_path = install_path, - name = libname, + name = libname, samba_realname = realname, samba_install = install, abi_file = abi_file, @@ -212,6 +213,18 @@ def SAMBA_LIBRARY(bld, libname, source, if pc_files is not None: bld.PKG_CONFIG_FILES(pc_files, vnum=vnum) + if manpages is not None and 'XSLTPROC' in bld.env: + bld.env.MAN_XSL = 'http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl' + for m in manpages.split(): + source = m + '.xml' + bld.SAMBA_GENERATOR(m, + source=source, + target=m, + rule='${XSLTPROC} -o ${TGT} ${MAN_XSL} ${SRC}' + ) + bld.INSTALL_FILES('${MANDIR}/man%s' % m[-1], m, flat=True) + + Build.BuildContext.SAMBA_LIBRARY = SAMBA_LIBRARY diff --git a/lib/talloc/wscript b/lib/talloc/wscript index 61930f67e3..45886a553e 100644 --- a/lib/talloc/wscript +++ b/lib/talloc/wscript @@ -60,7 +60,8 @@ def build(bld): abi_file='ABI/talloc-%s.sigs' % VERSION, abi_match='talloc* _talloc*', hide_symbols=True, - vnum=VERSION, is_bundled=True) + vnum=VERSION, is_bundled=True, + manpages='talloc.3') # should we also install the symlink to libtalloc1.so here? bld.SAMBA_LIBRARY('talloc-compat1', @@ -82,22 +83,6 @@ def build(bld): bld.PKG_CONFIG_FILES('talloc.pc', vnum=VERSION) bld.INSTALL_FILES('${INCLUDEDIR}', 'talloc.h') - if bld.env.XSLTPROC: - bld.env.TALLOC_MAN_XSL = 'http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl' - bld.env.TALLOC_WEB_XSL = 'http://docbook.sourceforge.net/release/xsl/current/html/docbook.xsl' - bld.SAMBA_GENERATOR('talloc.3', - source='talloc.3.xml', - target='talloc.3', - rule='${XSLTPROC} -o ${TGT} ${TALLOC_MAN_XSL} ${SRC}' - ) - bld.SAMBA_GENERATOR('talloc.3.html', - source='talloc.3.xml', - target='talloc.3.html', - rule='${XSLTPROC} -o ${TGT} ${TALLOC_WEB_XSL} ${SRC}' - ) - bld.INSTALL_FILES('${MANDIR}/man3', 'talloc.3') - - def test(ctx): '''run talloc testsuite''' import Utils diff --git a/source4/lib/ldb/wscript b/source4/lib/ldb/wscript index 15740d6b74..61fe9cbe40 100644 --- a/source4/lib/ldb/wscript +++ b/source4/lib/ldb/wscript @@ -163,12 +163,13 @@ def build(bld): COMMON_SRC + ' ' + LDB_MAP_SRC, deps=ldb_deps, includes='include', - public_headers='include/ldb.h include/ldb_errors.h', + public_headers='include/ldb.h include/ldb_errors.h '\ + 'include/ldb_module.h', pc_files='ldb.pc', cflags='-DLDB_MODULESDIR=\"%s\"' % modules_dir, abi_file=abi_file, abi_match='!ldb_*module_ops !ldb_*backend_ops ldb_*', - vnum=VERSION) + vnum=VERSION, manpages='man/ldb3.') bld.SAMBA_SUBSYSTEM('LIBLDB_CMDLINE', 'tools/ldbutil.c tools/cmdline.c', @@ -185,20 +186,6 @@ def build(bld): deps='ldb', realname='ldb.so') - if bld.env.XSLTPROC: - manpages = 'man/ldb.3' - - bld.env.LDB_MAN_XSL = 'http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl' - - for m in manpages.split(): - source = m + '.xml' - bld.SAMBA_GENERATOR(m, - source=source, - target=m, - rule='${XSLTPROC} -o ${TGT} ${LDB_MAN_XSL} ${SRC}' - ) - bld.INSTALL_FILES('${MANDIR}/man%s' % m[-1], m, flat=True) - def test(ctx): '''run ldb testsuite''' |