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-26 15:11:47 +0100
commitc8af9559dc44b578d3b49620f690652a1676e9bd (patch)
tree517ef6eb4db147b69ae253ac974e6dbff3b4458c /source4/build/smb_build
parentceb2bb16b5e01c8341a269420cafab0d189889f2 (diff)
downloadsamba-c8af9559dc44b578d3b49620f690652a1676e9bd.tar.gz
samba-c8af9559dc44b578d3b49620f690652a1676e9bd.tar.bz2
samba-c8af9559dc44b578d3b49620f690652a1676e9bd.zip
Move manpage management out of the perl build system.
(This used to be commit a660ab262e7202baccf16cb8b2bc47cb8efacc34)
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 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) = @_;