sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-01-21 18:04:06 +03:00
Code

Use make to create lists of pc files and prototype headers.

Browse Source 
(This used to be commit 6cc7bc1586e892e8470cb3f18a7afa2029a0399d)
This commit is contained in:
Jelmer Vernooij 2008-02-16 17:12:01 +01:00
parent c35f6437e3
commit cddb061f3c
2 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
source4/build/smb_build/main.pl
View File

@ -61,7 +61,7 @@ foreach my $key (values %$OUTPUT) {
$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}});

11
source4/build/smb_build/makefile.pm
View File

@ -26,7 +26,6 @@ sub new($$$)
$self->{headers} = [];
$self->{shared_modules} = [];
$self->{plugins} = [];
$self->{pc_files} = [];
$self->{output} = "";
$self->{mkfile} = $mkfile;
@ -297,9 +296,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($$)
@ -415,8 +420,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("SHARED_MODULES = " . array2oneperline($self->{shared_modules}) . "\n");
$self->output("PLUGINS = " . array2oneperline($self->{plugins}) . "\n");