summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJelmer Vernooij <jelmer@samba.org>2008-02-16 17:01:27 +0100
committerJelmer Vernooij <jelmer@samba.org>2008-02-29 13:45:22 +0100
commitf0ad690768b2b9fc260e62e3ab2cca4ad6c93ba9 (patch)
tree45c17d7bb49f5148041386275a5420ed5def9ceb
parent581167ddd7153e59c94d0eb2709cd7719a13ca25 (diff)
downloadsamba-f0ad690768b2b9fc260e62e3ab2cca4ad6c93ba9.tar.gz
samba-f0ad690768b2b9fc260e62e3ab2cca4ad6c93ba9.tar.bz2
samba-f0ad690768b2b9fc260e62e3ab2cca4ad6c93ba9.zip
Use make to generate list of prototype headers.
(This used to be commit 17d2f682e94154ee654de59b88816437f4e7f093)
-rw-r--r--source4/build/smb_build/makefile.pm6
1 files changed, 2 insertions, 4 deletions
diff --git a/source4/build/smb_build/makefile.pm b/source4/build/smb_build/makefile.pm
index 8d7b41a404..b29107679e 100644
--- a/source4/build/smb_build/makefile.pm
+++ b/source4/build/smb_build/makefile.pm
@@ -29,7 +29,6 @@ sub new($$$)
$self->{headers} = [];
$self->{plugins} = [];
$self->{pc_files} = [];
- $self->{proto_headers} = [];
$self->{output} = "";
$self->{mkfile} = $mkfile;
@@ -370,7 +369,7 @@ sub ProtoHeader($$)
$comment .= " and ";
$target.= " ";
}
- push (@{$self->{proto_headers}}, $priv);
+ $self->output("PROTO_HEADERS += $priv\n");
} else {
$ctx->{PRIVATE_PROTO_HEADER} = $ctx->{PUBLIC_PROTO_HEADER};
$priv = output::add_dir_str($ctx->{BASEDIR}, $ctx->{PRIVATE_PROTO_HEADER});
@@ -380,7 +379,7 @@ sub ProtoHeader($$)
$pub = output::add_dir_str($ctx->{BASEDIR}, $ctx->{PUBLIC_PROTO_HEADER});
$comment .= $pub;
$target .= $pub;
- push (@{$self->{proto_headers}}, $pub);
+ $self->output("PROTO_HEADERS += $pub\n");
} else {
$ctx->{PUBLIC_PROTO_HEADER} = $ctx->{PRIVATE_PROTO_HEADER};
$pub = output::add_dir_str($ctx->{BASEDIR}, $ctx->{PUBLIC_PROTO_HEADER});
@@ -403,7 +402,6 @@ sub write($$)
$self->output("PUBLIC_HEADERS = " . array2oneperline($self->{headers}) . "\n");
$self->output("PC_FILES = " . array2oneperline($self->{pc_files}) . "\n");
$self->output("ALL_OBJS = " . array2oneperline($self->{all_objs}) . "\n");
- $self->output("PROTO_HEADERS = " . array2oneperline($self->{proto_headers}) . "\n");
$self->output("PLUGINS = " . array2oneperline($self->{plugins}) . "\n");
$self->_prepare_mk_files();