diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2008-02-18 17:08:54 +0100 |
|---|---|---|
| committer | Jelmer Vernooij <jelmer@samba.org> | 2008-02-18 17:08:54 +0100 |
| commit | 7dd064fcd9c41f19d43abaa9d994224b0e215edb (patch) | |
| tree | ea75433c8bf4383b891e52b91e28d5580b87f570 /source4/build/smb_build/makefile.pm | |
| parent | 86be022079a1efe43604a263fa12aa73ef93efba (diff) | |
| download | samba-7dd064fcd9c41f19d43abaa9d994224b0e215edb.tar.gz samba-7dd064fcd9c41f19d43abaa9d994224b0e215edb.tar.bz2 samba-7dd064fcd9c41f19d43abaa9d994224b0e215edb.zip | |
Factor out common code that generates object lists.
(This used to be commit ef14e1ab3267263d65c4c41cd3c0dab3680f4104)
Diffstat (limited to 'source4/build/smb_build/makefile.pm')
| -rw-r--r-- | source4/build/smb_build/makefile.pm | 12 |
1 files changed, 0 insertions, 12 deletions
diff --git a/source4/build/smb_build/makefile.pm b/source4/build/smb_build/makefile.pm index dc9e1e9911..b06279ed10 100644 --- a/source4/build/smb_build/makefile.pm +++ b/source4/build/smb_build/makefile.pm @@ -112,13 +112,6 @@ sub _prepare_list($$$) $self->output("$ctx->{NAME}_$var =$tmplist\n"); } -sub Integrated($$) -{ - my ($self,$ctx) = @_; - - $self->_prepare_list($ctx, "OBJ_LIST"); -} - sub SharedModulePrimitives($$) { my ($self,$ctx) = @_; @@ -163,7 +156,6 @@ sub SharedModule($$) } $self->output("$ctx->{NAME}_OUTPUT = $ctx->{OUTPUT}\n"); - $self->_prepare_list($ctx, "OBJ_LIST"); $self->_prepare_list($ctx, "FULL_OBJ_LIST"); $self->_prepare_list($ctx, "DEPEND_LIST"); $self->_prepare_list($ctx, "LINK_FLAGS"); @@ -221,7 +213,6 @@ sub SharedLibraryPrimitives($$) if (not grep(/STATIC_LIBRARY/, @{$ctx->{OUTPUT_TYPE}})) { $self->output("$ctx->{NAME}_OUTPUT = $ctx->{OUTPUT}\n"); - $self->_prepare_list($ctx, "OBJ_LIST"); $self->_prepare_list($ctx, "FULL_OBJ_LIST"); } } @@ -269,7 +260,6 @@ sub MergedObj($$) my ($self, $ctx) = @_; $self->output("$ctx->{NAME}_OUTPUT = $ctx->{OUTPUT}\n"); - $self->_prepare_list($ctx, "OBJ_LIST"); $self->_prepare_list($ctx, "FULL_OBJ_LIST"); push(@{$self->{all_objs}}, "\$($ctx->{NAME}_FULL_OBJ_LIST)"); $self->output(<< "__EOD__" @@ -292,7 +282,6 @@ sub StaticLibrary($$) push (@{$self->{static_libs}}, $ctx->{RESULT_STATIC_LIBRARY}) if ($ctx->{TYPE} eq "LIBRARY"); $self->output("$ctx->{NAME}_OUTPUT = $ctx->{OUTPUT}\n"); - $self->_prepare_list($ctx, "OBJ_LIST"); $self->_prepare_list($ctx, "FULL_OBJ_LIST"); push(@{$self->{all_objs}}, "\$($ctx->{NAME}_FULL_OBJ_LIST)"); @@ -335,7 +324,6 @@ sub Binary($$) $self->output("binaries:: $ctx->{TARGET_BINARY}\n"); - $self->_prepare_list($ctx, "OBJ_LIST"); $self->_prepare_list($ctx, "FULL_OBJ_LIST"); $self->_prepare_list($ctx, "DEPEND_LIST"); $self->_prepare_list($ctx, "LINK_FLAGS"); |