summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJelmer Vernooij <jelmer@samba.org>2008-02-16 17:12:01 +0100
committerJelmer Vernooij <jelmer@samba.org>2008-02-29 13:48:34 +0100
commitc865582e9c6159082a59f0bf2bea0538dc277217 (patch)
tree9c04baccef2ae157d092f693dc7d654540408f04
parentacf5b5a1ab48fab40635f98d54601ec9e65742a9 (diff)
downloadsamba-c865582e9c6159082a59f0bf2bea0538dc277217.tar.gz
samba-c865582e9c6159082a59f0bf2bea0538dc277217.tar.bz2
samba-c865582e9c6159082a59f0bf2bea0538dc277217.zip
Use make to create lists of pc files and prototype headers.
(This used to be commit a932a2e37d1aa86cca769398721318b3942fad83)
-rw-r--r--source4/build/smb_build/main.pl2
-rw-r--r--source4/build/smb_build/makefile.pm11
2 files changed, 8 insertions, 5 deletions
diff --git a/source4/build/smb_build/main.pl b/source4/build/smb_build/main.pl
index 3ed0327d6d..9690c465a7 100644
--- a/source4/build/smb_build/main.pl
+++ b/source4/build/smb_build/main.pl
@@ -56,7 +56,7 @@ foreach my $key (values %$OUTPUT) {
$mkenv->MergedObj($key) if grep(/MERGED_OBJ/, @{$key->{OUTPUT_TYPE}});
$mkenv->StaticLibrary($key) if grep(/STATIC_LIBRARY/, @{$key->{OUTPUT_TYPE}});
if (defined($key->{PC_FILE})) {
- push(@{$mkenv->{pc_files}}, "$key->{BASEDIR}/$key->{PC_FILE}");
+ $mkenv->output("PC_FILES += $key->{BASEDIR}/$key->{PC_FILE}\n");
}
$mkenv->SharedLibraryPrimitives($key) if ($key->{TYPE} eq "LIBRARY") and
grep(/SHARED_LIBRARY/, @{$key->{OUTPUT_TYPE}});
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");