diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2008-02-16 17:01:27 +0100 |
|---|---|---|
| committer | Jelmer Vernooij <jelmer@samba.org> | 2008-02-16 17:01:27 +0100 |
| commit | c35f6437e3c0389dd34ee5f4b460c83e3245bb64 (patch) | |
| tree | 0fa6a424f5da8de5eec40f9de2a3182a48aeed87 /source4 | |
| parent | 9a5f6f8e71b96c789c21df622d3e6d0e009a0a30 (diff) | |
| download | samba-c35f6437e3c0389dd34ee5f4b460c83e3245bb64.tar.gz samba-c35f6437e3c0389dd34ee5f4b460c83e3245bb64.tar.bz2 samba-c35f6437e3c0389dd34ee5f4b460c83e3245bb64.zip | |
Use make to generate list of prototype headers.
(This used to be commit 20800de0581de1f8be57755df5cc05ffad34ada9)
Diffstat (limited to 'source4')
| -rw-r--r-- | source4/build/smb_build/makefile.pm | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/source4/build/smb_build/makefile.pm b/source4/build/smb_build/makefile.pm index ecad082da3..43839dd465 100644 --- a/source4/build/smb_build/makefile.pm +++ b/source4/build/smb_build/makefile.pm @@ -27,7 +27,6 @@ sub new($$$) $self->{shared_modules} = []; $self->{plugins} = []; $self->{pc_files} = []; - $self->{proto_headers} = []; $self->{output} = ""; $self->{mkfile} = $mkfile; @@ -389,7 +388,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}); @@ -399,7 +398,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}); @@ -419,7 +418,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("SHARED_MODULES = " . array2oneperline($self->{shared_modules}) . "\n"); $self->output("PLUGINS = " . array2oneperline($self->{plugins}) . "\n"); |