summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--source4/build/smb_build/README.txt3
-rw-r--r--source4/build/smb_build/config_mk.pm6
-rw-r--r--source4/build/smb_build/main.pl1
-rw-r--r--source4/build/smb_build/makefile.pm7
-rw-r--r--source4/configure.ac2
-rw-r--r--source4/lib/ldb/config.mk8
-rw-r--r--source4/lib/ldb/tools/config.mk18
-rw-r--r--source4/lib/registry/config.mk12
-rw-r--r--source4/lib/talloc/config.mk4
-rw-r--r--source4/librpc/config.mk3
-rw-r--r--source4/smbd/config.mk3
-rw-r--r--source4/torture/config.mk12
-rw-r--r--source4/utils/config.mk6
13 files changed, 47 insertions, 38 deletions
diff --git a/source4/build/smb_build/README.txt b/source4/build/smb_build/README.txt
index 5974db998f..eac3905cce 100644
--- a/source4/build/smb_build/README.txt
+++ b/source4/build/smb_build/README.txt
@@ -1,6 +1,5 @@
The Samba Build System
-----------------------
-----------------------
+======================
The build system basically has two main parts: the autoconf-generated
shell scripts which check for availability of functions and libraries
diff --git a/source4/build/smb_build/config_mk.pm b/source4/build/smb_build/config_mk.pm
index bb8a5f9650..74a56a375a 100644
--- a/source4/build/smb_build/config_mk.pm
+++ b/source4/build/smb_build/config_mk.pm
@@ -36,8 +36,6 @@ my $section_types = {
"ENABLE" => "bool",
- "MANPAGE" => "string",
-
"PRIVATE_PROTO_HEADER" => "string",
"PUBLIC_HEADERS" => "list",
@@ -61,7 +59,6 @@ my $section_types = {
"OUTPUT_TYPE" => "list",
- "MANPAGE" => "string",
"PRIVATE_PROTO_HEADER" => "string",
"CFLAGS" => "list"
@@ -73,7 +70,6 @@ my $section_types = {
"ENABLE" => "bool",
- "MANPAGE" => "string",
"INSTALLDIR" => "string",
"PRIVATE_PROTO_HEADER" => "string",
@@ -101,8 +97,6 @@ my $section_types = {
"ENABLE" => "bool",
- "MANPAGE" => "string",
-
"PUBLIC_HEADERS" => "list",
"PRIVATE_PROTO_HEADER" => "string",
diff --git a/source4/build/smb_build/main.pl b/source4/build/smb_build/main.pl
index 73055eb87f..3d715a513e 100644
--- a/source4/build/smb_build/main.pl
+++ b/source4/build/smb_build/main.pl
@@ -65,7 +65,6 @@ foreach my $key (values %$OUTPUT) {
$key->{TYPE} eq "PYTHON") and
grep(/SHARED_LIBRARY/, @{$key->{OUTPUT_TYPE}});
$mkenv->PythonFiles($key) if defined($key->{PYTHON_FILES});
- $mkenv->Manpage($key) if defined($key->{MANPAGE});
$mkenv->Header($key) if defined($key->{PUBLIC_HEADERS});
if ($key->{TYPE} eq "MODULE" and @{$key->{OUTPUT_TYPE}}[0] eq "MERGED_OBJ" and defined($key->{INIT_FUNCTION})) {
$mkenv->output("$key->{SUBSYSTEM}_INIT_FUNCTIONS += $key->{INIT_FUNCTION},\n");
diff --git a/source4/build/smb_build/makefile.pm b/source4/build/smb_build/makefile.pm
index 13c28de697..04bef1e160 100644
--- a/source4/build/smb_build/makefile.pm
+++ b/source4/build/smb_build/makefile.pm
@@ -301,13 +301,6 @@ sub PythonFiles($$)
}
}
-sub Manpage($$)
-{
- my ($self,$ctx) = @_;
-
- $self->output("MANPAGES += \$(addprefix $ctx->{BASEDIR}/, $ctx->{MANPAGE})\n");
-}
-
sub ProtoHeader($$)
{
my ($self,$ctx) = @_;
diff --git a/source4/configure.ac b/source4/configure.ac
index 66556ad641..5ba441375c 100644
--- a/source4/configure.ac
+++ b/source4/configure.ac
@@ -78,6 +78,8 @@ SMB_EXT_LIB_FROM_PKGCONFIG(LIBLDB, ldb >= 0.9.1,
AC_DEFINE_UNQUOTED(LDB_MODULESDIR, "${LDB_MODULESDIR}" , [ldb Modules directory])
fi
])
+ ldbdir=lib/ldb
+ AC_SUBST(ldbdir)
m4_include(lib/ldb/sqlite3.m4)
m4_include(lib/ldb/libldb.m4)
SMB_INCLUDE_MK(lib/ldb/config.mk)
diff --git a/source4/lib/ldb/config.mk b/source4/lib/ldb/config.mk
index 7d6328fc52..ad202fb34e 100644
--- a/source4/lib/ldb/config.mk
+++ b/source4/lib/ldb/config.mk
@@ -147,12 +147,13 @@ PUBLIC_DEPENDENCIES = \
LIBTALLOC
PRIVATE_DEPENDENCIES = \
SOCKET_WRAPPER
-MANPAGE = man/ldb.3
PUBLIC_HEADERS = include/ldb.h include/ldb_errors.h
#
# End SUBSYSTEM ldb
################################################
+MANPAGES += $(ldbdir)/man/ldb.3
+
################################################
# Start BINARY ldbtest
[BINARY::ldbtest]
@@ -167,7 +168,6 @@ PRIVATE_DEPENDENCIES = \
# Start BINARY oLschema2ldif
[BINARY::oLschema2ldif]
INSTALLDIR = BINDIR
-MANPAGE = man/oLschema2ldif.1
OBJ_FILES= \
tools/convert.o \
tools/oLschema2ldif.o
@@ -176,11 +176,12 @@ PRIVATE_DEPENDENCIES = \
# End BINARY oLschema2ldif
################################################
+MANPAGES += $(ldbdir)/man/oLschema2ldif.1
+
################################################
# Start BINARY ad2oLschema
[BINARY::ad2oLschema]
INSTALLDIR = BINDIR
-MANPAGE = man/ad2oLschema.1
OBJ_FILES= \
tools/convert.o \
tools/ad2oLschema.o
@@ -189,6 +190,7 @@ PRIVATE_DEPENDENCIES = \
# End BINARY ad2oLschema
################################################
+MANPAGES += $(ldbdir)/man/ad2oLschema.1
mkinclude tools/config.mk
mkinclude ldb_ildap/config.mk
diff --git a/source4/lib/ldb/tools/config.mk b/source4/lib/ldb/tools/config.mk
index bf6c5f963c..c1c368f336 100644
--- a/source4/lib/ldb/tools/config.mk
+++ b/source4/lib/ldb/tools/config.mk
@@ -17,10 +17,11 @@ OBJ_FILES = \
ldbadd.o
PRIVATE_DEPENDENCIES = \
LIBLDB_CMDLINE LIBCLI_RESOLVE
-MANPAGE = ../man/ldbadd.1
# End BINARY ldbadd
################################################
+MANPAGES += $(ldbdir)/../man/ldbadd.1
+
################################################
# Start BINARY ldbdel
[BINARY::ldbdel]
@@ -29,10 +30,11 @@ OBJ_FILES= \
ldbdel.o
PRIVATE_DEPENDENCIES = \
LIBLDB_CMDLINE
-MANPAGE = ../man/ldbdel.1
# End BINARY ldbdel
################################################
+MANPAGES += $(ldbdir)/../man/ldbdel.1
+
################################################
# Start BINARY ldbmodify
[BINARY::ldbmodify]
@@ -41,10 +43,11 @@ OBJ_FILES= \
ldbmodify.o
PRIVATE_DEPENDENCIES = \
LIBLDB_CMDLINE
-MANPAGE = ../man/ldbmodify.1
# End BINARY ldbmodify
################################################
+MANPAGES += $(ldbdir)/../man/ldbmodify.1
+
################################################
# Start BINARY ldbsearch
[BINARY::ldbsearch]
@@ -53,10 +56,11 @@ OBJ_FILES= \
ldbsearch.o
PRIVATE_DEPENDENCIES = \
LIBLDB_CMDLINE
-MANPAGE = ../man/ldbsearch.1
# End BINARY ldbsearch
################################################
+MANPAGES += $(ldbdir)/../man/ldbsearch.1
+
################################################
# Start BINARY ldbedit
[BINARY::ldbedit]
@@ -65,10 +69,11 @@ OBJ_FILES= \
ldbedit.o
PRIVATE_DEPENDENCIES = \
LIBLDB_CMDLINE
-MANPAGE = ../man/ldbedit.1
# End BINARY ldbedit
################################################
+MANPAGES += $(ldbdir)/../man/ldbedit.1
+
################################################
# Start BINARY ldbrename
[BINARY::ldbrename]
@@ -77,8 +82,9 @@ OBJ_FILES= \
ldbrename.o
PRIVATE_DEPENDENCIES = \
LIBLDB_CMDLINE
-MANPAGE = ../man/ldbrename.1
# End BINARY ldbrename
################################################
+MANPAGES += $(ldbdir)/../man/ldbrename.1
+
diff --git a/source4/lib/registry/config.mk b/source4/lib/registry/config.mk
index 7a9c8fcff1..af5b1bc301 100644
--- a/source4/lib/registry/config.mk
+++ b/source4/lib/registry/config.mk
@@ -52,10 +52,11 @@ INSTALLDIR = BINDIR
OBJ_FILES = tools/regdiff.o
PRIVATE_DEPENDENCIES = \
LIBSAMBA-CONFIG registry LIBPOPT POPT_SAMBA POPT_CREDENTIALS
-MANPAGE = man/regdiff.1
# End BINARY regdiff
################################################
+MANPAGES += lib/registry/man/regdiff.1
+
################################################
# Start BINARY regpatch
[BINARY::regpatch]
@@ -64,10 +65,11 @@ OBJ_FILES = tools/regpatch.o
PRIVATE_DEPENDENCIES = \
LIBSAMBA-CONFIG registry LIBPOPT POPT_SAMBA POPT_CREDENTIALS \
registry_common
-MANPAGE = man/regpatch.1
# End BINARY regpatch
################################################
+MANPAGES += lib/registry/man/regpatch.1
+
################################################
# Start BINARY regshell
[BINARY::regshell]
@@ -76,10 +78,11 @@ OBJ_FILES = tools/regshell.o
PRIVATE_DEPENDENCIES = \
LIBSAMBA-CONFIG LIBPOPT registry POPT_SAMBA POPT_CREDENTIALS \
SMBREADLINE registry_common
-MANPAGE = man/regshell.1
# End BINARY regshell
################################################
+MANPAGES += lib/registry/man/regshell.1
+
################################################
# Start BINARY regtree
[BINARY::regtree]
@@ -88,10 +91,11 @@ OBJ_FILES = tools/regtree.o
PRIVATE_DEPENDENCIES = \
LIBSAMBA-CONFIG LIBPOPT registry POPT_SAMBA POPT_CREDENTIALS \
registry_common
-MANPAGE = man/regtree.1
# End BINARY regtree
################################################
+MANPAGES += lib/registry/man/regtree.1
+
[SUBSYSTEM::torture_registry]
PRIVATE_DEPENDENCIES = registry
PRIVATE_PROTO_HEADER = tests/proto.h
diff --git a/source4/lib/talloc/config.mk b/source4/lib/talloc/config.mk
index af1b590c98..abbad2e613 100644
--- a/source4/lib/talloc/config.mk
+++ b/source4/lib/talloc/config.mk
@@ -1,6 +1,8 @@
[LIBRARY::LIBTALLOC]
OUTPUT_TYPE = STATIC_LIBRARY
OBJ_FILES = talloc.o
-MANPAGE = talloc.3
CFLAGS = -Ilib/talloc
PUBLIC_HEADERS = talloc.h
+
+
+MANPAGES += $(tallocdir)/talloc.3
diff --git a/source4/librpc/config.mk b/source4/librpc/config.mk
index c83f895642..9616fcd922 100644
--- a/source4/librpc/config.mk
+++ b/source4/librpc/config.mk
@@ -29,11 +29,12 @@ PRIVATE_DEPENDENCIES = \
POPT_SAMBA \
NDR_TABLE \
LIBSAMBA-ERRORS
-MANPAGE = tools/ndrdump.1
# FIXME: ndrdump shouldn't have to depend on RPC...
# End BINARY ndrdump
#################################
+MANPAGES += librpc/tools/ndrdump.1
+
################################################
# Start SUBSYSTEM NDR_COMPRESSION
[SUBSYSTEM::NDR_COMPRESSION]
diff --git a/source4/smbd/config.mk b/source4/smbd/config.mk
index c4d1070992..2482780756 100644
--- a/source4/smbd/config.mk
+++ b/source4/smbd/config.mk
@@ -27,7 +27,6 @@ PRIVATE_PROTO_HEADER = pidfile.h
# Start BINARY smbd
[BINARY::smbd]
INSTALLDIR = SBINDIR
-MANPAGE = smbd.8
OBJ_FILES = \
server.o
PRIVATE_DEPENDENCIES = \
@@ -44,5 +43,7 @@ PRIVATE_DEPENDENCIES = \
ntvfs \
share \
CLUSTER
+
+MANPAGES += smbd/smbd.8
# End BINARY smbd
#################################
diff --git a/source4/torture/config.mk b/source4/torture/config.mk
index 8dc13e3f8b..06892dd7ef 100644
--- a/source4/torture/config.mk
+++ b/source4/torture/config.mk
@@ -314,10 +314,11 @@ PRIVATE_DEPENDENCIES = \
dcerpc \
LIBCLI_SMB \
SMBREADLINE
-MANPAGE = man/smbtorture.1
# End BINARY smbtorture
#################################
+MANPAGES += torture/man/smbtorture.1
+
#################################
# Start BINARY gentest
[BINARY::gentest]
@@ -332,10 +333,11 @@ PRIVATE_DEPENDENCIES = \
POPT_CREDENTIALS \
LIBCLI_SMB \
LIBCLI_RAW
-MANPAGE = man/gentest.1
# End BINARY gentest
#################################
+MANPAGES += torture/man/gentest.1
+
#################################
# Start BINARY masktest
[BINARY::masktest]
@@ -349,10 +351,11 @@ PRIVATE_DEPENDENCIES = \
POPT_SAMBA \
POPT_CREDENTIALS \
LIBCLI_SMB
-MANPAGE = man/masktest.1
# End BINARY masktest
#################################
+MANPAGES += torture/man/masktest.1
+
#################################
# Start BINARY locktest
[BINARY::locktest]
@@ -366,10 +369,11 @@ PRIVATE_DEPENDENCIES = \
LIBSAMBA-UTIL \
LIBCLI_SMB \
LIBSAMBA-CONFIG
-MANPAGE = man/locktest.1
# End BINARY locktest
#################################
+MANPAGES += utils/man/locktest.1
+
COV_TARGET = test
COV_VARS = \
diff --git a/source4/utils/config.mk b/source4/utils/config.mk
index 6ef7e40471..9ebfbbb7e3 100644
--- a/source4/utils/config.mk
+++ b/source4/utils/config.mk
@@ -17,14 +17,14 @@ PRIVATE_DEPENDENCIES = \
auth \
MESSAGING \
LIBEVENTS
-MANPAGE = man/ntlm_auth.1
# End BINARY ntlm_auth
#################################
+MANPAGES += utils/man/ntlm_auth.1
+
#################################
# Start BINARY getntacl
[BINARY::getntacl]
-MANPAGE = man/getntacl.1
INSTALLDIR = BINDIR
OBJ_FILES = \
getntacl.o
@@ -38,6 +38,8 @@ PRIVATE_DEPENDENCIES = \
# End BINARY getntacl
#################################
+MANPAGES += utils/man/getntacl.1
+
#################################
# Start BINARY setntacl
[BINARY::setntacl]
generated by cgit (git 2.34.1) at 2024-12-03 10:02:39 +0000