summaryrefslogtreecommitdiff
path: root/source4/build/smb_build
diff options
context:
space:
mode:
authorJelmer Vernooij <jelmer@samba.org>2008-02-26 15:11:47 +0100
committerJelmer Vernooij <jelmer@samba.org>2008-02-29 14:12:23 +0100
commitd8d9a6ef040b6c3e7946e6ae2cba2b28234c8baf (patch)
tree7ca1f74a5698989585882b49e26354412407940e /source4/build/smb_build
parentd3f260cbef82c040f8b287163f92c5b54f23d433 (diff)
downloadsamba-d8d9a6ef040b6c3e7946e6ae2cba2b28234c8baf.tar.gz
samba-d8d9a6ef040b6c3e7946e6ae2cba2b28234c8baf.tar.bz2
samba-d8d9a6ef040b6c3e7946e6ae2cba2b28234c8baf.zip
Move manpage management out of the perl build system.
(This used to be commit 1dd6bea507f1f5e26cccf89148280721260a4673)
Diffstat (limited to 'source4/build/smb_build')
-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
4 files changed, 1 insertions, 16 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 4d8db8a04e..2f29516ba5 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",
-
"PUBLIC_PROTO_HEADER" => "string",
"PRIVATE_PROTO_HEADER" => "string",
@@ -62,7 +60,6 @@ my $section_types = {
"OUTPUT_TYPE" => "list",
- "MANPAGE" => "string",
"PRIVATE_PROTO_HEADER" => "string",
"CFLAGS" => "list"
@@ -74,7 +71,6 @@ my $section_types = {
"ENABLE" => "bool",
- "MANPAGE" => "string",
"INSTALLDIR" => "string",
"PRIVATE_PROTO_HEADER" => "string",
@@ -102,8 +98,6 @@ my $section_types = {
"ENABLE" => "bool",
- "MANPAGE" => "string",
-
"PUBLIC_HEADERS" => "list",
"PUBLIC_PROTO_HEADER" => "string",
diff --git a/source4/build/smb_build/main.pl b/source4/build/smb_build/main.pl
index d2d3dc9c5c..b9e1037423 100644
--- a/source4/build/smb_build/main.pl
+++ b/source4/build/smb_build/main.pl
@@ -67,7 +67,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});
$mkenv->ProtoHeader($key) if defined($key->{PRIVATE_PROTO_HEADER}) or
defined($key->{PUBLIC_PROTO_HEADER});
diff --git a/source4/build/smb_build/makefile.pm b/source4/build/smb_build/makefile.pm
index a152bfc90f..005c6f7fe8 100644
--- a/source4/build/smb_build/makefile.pm
+++ b/source4/build/smb_build/makefile.pm
@@ -361,13 +361,6 @@ sub PythonFiles($$)
}
}
-sub Manpage($$)
-{
- my ($self,$ctx) = @_;
-
- $self->output("MANPAGES += " . output::add_dir_str($ctx->{BASEDIR}, $ctx->{MANPAGE}) . "\n");
-}
-
sub ProtoHeader($$)
{
my ($self,$ctx) = @_;