Use make to generate list of prototype headers.
authorJelmer Vernooij <jelmer@samba.org>
Sat, 16 Feb 2008 16:01:27 +0000 (17:01 +0100)
committerJelmer Vernooij <jelmer@samba.org>
Fri, 29 Feb 2008 12:45:22 +0000 (13:45 +0100)
source/build/smb_build/makefile.pm

index 8d7b41a40498ab8dfff1159689f8e0b69f6a0f2b..b29107679ecf06b4d84fed59c754b83a2c3584d1 100644 (file)
@@ -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();