summaryrefslogtreecommitdiff
path: root/source4
diff options
context:
space:
mode:
authorJelmer Vernooij <jelmer@samba.org>2008-02-16 16:58:26 +0100
committerJelmer Vernooij <jelmer@samba.org>2008-02-29 13:47:21 +0100
commitb48375f432e014f3250d012b1c1b7da6d47ac383 (patch)
tree66bf69ecfa10ccbbe6b6120bfabc348ea8b08b7a /source4
parentf0ad690768b2b9fc260e62e3ab2cca4ad6c93ba9 (diff)
downloadsamba-b48375f432e014f3250d012b1c1b7da6d47ac383.tar.gz
samba-b48375f432e014f3250d012b1c1b7da6d47ac383.tar.bz2
samba-b48375f432e014f3250d012b1c1b7da6d47ac383.zip
Use make to generate lists of libraries.
(This used to be commit 3519aae1845f2a15330184625d541ce0f0cac56b)
Diffstat (limited to 'source4')
-rw-r--r--source4/build/smb_build/makefile.pm10
1 files changed, 2 insertions, 8 deletions
diff --git a/source4/build/smb_build/makefile.pm b/source4/build/smb_build/makefile.pm
index b29107679e..2acd022503 100644
--- a/source4/build/smb_build/makefile.pm
+++ b/source4/build/smb_build/makefile.pm
@@ -21,11 +21,8 @@ sub new($$$)
bless($self, $myname);
- $self->{manpages} = [];
- $self->{static_libs} = [];
$self->{python_dsos} = [];
$self->{python_pys} = [];
- $self->{shared_libs} = [];
$self->{headers} = [];
$self->{plugins} = [];
$self->{pc_files} = [];
@@ -217,7 +214,7 @@ sub SharedLibrary($$)
{
my ($self,$ctx) = @_;
- push (@{$self->{shared_libs}}, $ctx->{RESULT_SHARED_LIBRARY}) if (defined($ctx->{SO_VERSION}));
+ $self->output("SHARED_LIBS += $ctx->{RESULT_SHARED_LIBRARY}\n") if (defined($ctx->{SO_VERSION}));
$self->_prepare_list($ctx, "DEPEND_LIST");
$self->_prepare_list($ctx, "LINK_FLAGS");
@@ -273,7 +270,7 @@ sub StaticLibrary($$)
return unless (defined($ctx->{OBJ_FILES}));
- push (@{$self->{static_libs}}, $ctx->{RESULT_STATIC_LIBRARY}) if ($ctx->{TYPE} eq "LIBRARY");
+ $self->output("STATIC_LIBS += $ctx->{TARGET_STATIC_LIBRARY}\n") if ($ctx->{TYPE} eq "LIBRARY");
$self->output("$ctx->{NAME}_OUTPUT = $ctx->{OUTPUT}\n");
$self->_prepare_list($ctx, "FULL_OBJ_LIST");
@@ -394,9 +391,6 @@ sub write($$)
{
my ($self, $file) = @_;
- $self->output("MANPAGES = " . array2oneperline($self->{manpages})."\n");
- $self->output("STATIC_LIBS = " . array2oneperline($self->{static_libs}) . "\n");
- $self->output("SHARED_LIBS = " . array2oneperline($self->{shared_libs}) . "\n");
$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");