From c865582e9c6159082a59f0bf2bea0538dc277217 Mon Sep 17 00:00:00 2001 From: Jelmer Vernooij Date: Sat, 16 Feb 2008 17:12:01 +0100 Subject: Use make to create lists of pc files and prototype headers. (This used to be commit a932a2e37d1aa86cca769398721318b3942fad83) --- source4/build/smb_build/makefile.pm | 11 +++++++---- 1 file changed, 7 insertions(+), 4 deletions(-) (limited to 'source4/build/smb_build/makefile.pm') diff --git a/source4/build/smb_build/makefile.pm b/source4/build/smb_build/makefile.pm index fea0977ee6..fe16f0124a 100644 --- a/source4/build/smb_build/makefile.pm +++ b/source4/build/smb_build/makefile.pm @@ -25,7 +25,6 @@ sub new($$$) $self->{python_pys} = []; $self->{headers} = []; $self->{plugins} = []; - $self->{pc_files} = []; $self->{output} = ""; $self->{mkfile} = $mkfile; @@ -282,9 +281,15 @@ sub Header($$) { my ($self,$ctx) = @_; + return if ($#{$ctx->{PUBLIC_HEADERS}} == -1); + + $self->output("PUBLIC_HEADERS +="); + foreach (@{$ctx->{PUBLIC_HEADERS}}) { - push (@{$self->{headers}}, output::add_dir_str($ctx->{BASEDIR}, $_)); + $self->output(" " . output::add_dir_str($ctx->{BASEDIR}, $_)); } + + $self->output("\n"); } sub Binary($$) @@ -393,8 +398,6 @@ sub write($$) $self->output("PYTHON_DSOS = " . array2oneperline($self->{python_dsos}) . "\n"); $self->output("PYTHON_PYS = " . array2oneperline($self->{python_pys}) . "\n"); - $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("PLUGINS = " . array2oneperline($self->{plugins}) . "\n"); -- cgit