summaryrefslogtreecommitdiff
path: root/source4/build/smb_build
diff options
context:
space:
mode:
authorJelmer Vernooij <jelmer@samba.org>2008-02-16 16:58:26 +0100
committerJelmer Vernooij <jelmer@samba.org>2008-02-16 16:58:26 +0100
commit9a5f6f8e71b96c789c21df622d3e6d0e009a0a30 (patch)
tree775fca2e41dbd692d927f8dd93a928285063675c /source4/build/smb_build
parentdd2a52b7c7a15bbc6b3d607654792cf22aa5d072 (diff)
downloadsamba-9a5f6f8e71b96c789c21df622d3e6d0e009a0a30.tar.gz
samba-9a5f6f8e71b96c789c21df622d3e6d0e009a0a30.tar.bz2
samba-9a5f6f8e71b96c789c21df622d3e6d0e009a0a30.zip
Use make to generate lists of libraries.
(This used to be commit 8e1396d5666b1c9306e04cf98d1c89fa13199c7d)
Diffstat (limited to 'source4/build/smb_build')
-rw-r--r--source4/build/smb_build/makefile.pm8
1 files changed, 2 insertions, 6 deletions
diff --git a/source4/build/smb_build/makefile.pm b/source4/build/smb_build/makefile.pm
index fe15e4907e..ecad082da3 100644
--- a/source4/build/smb_build/makefile.pm
+++ b/source4/build/smb_build/makefile.pm
@@ -21,10 +21,8 @@ sub new($$$)
bless($self, $myname);
- $self->{static_libs} = [];
$self->{python_dsos} = [];
$self->{python_pys} = [];
- $self->{shared_libs} = [];
$self->{headers} = [];
$self->{shared_modules} = [];
$self->{plugins} = [];
@@ -238,7 +236,7 @@ sub SharedLibrary($$)
{
my ($self,$ctx) = @_;
- push (@{$self->{shared_libs}}, "$ctx->{SHAREDDIR}/$ctx->{LIBRARY_REALNAME}") if (defined($ctx->{SO_VERSION}));
+ $self->output("SHARED_LIBS += $ctx->{SHAREDDIR}/$ctx->{LIBRARY_REALNAME}\n") if (defined($ctx->{SO_VERSION}));
$self->_prepare_list($ctx, "DEPEND_LIST");
$self->_prepare_list($ctx, "LINK_FLAGS");
@@ -280,7 +278,7 @@ sub StaticLibrary($$)
return unless (defined($ctx->{OBJ_FILES}));
- push (@{$self->{static_libs}}, $ctx->{TARGET_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, "OBJ_LIST");
@@ -416,8 +414,6 @@ sub write($$)
{
my ($self, $file) = @_;
- $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");