Simplify handling of ALL_OBJS.

(This used to be commit 5512c61d75d1a5404d58ba777720e62089bf45a1)

diff --git a/source4/build/smb_build/main.pl b/source4/build/smb_build/main.pl
index d4d18a5cb94587d41d3f2aa3e727e8ede09edf9a..375962bde974bacb8402531ee08936760cd2da2b 100644 (file)
--- a/source4/build/smb_build/main.pl
+++ b/source4/build/smb_build/main.pl
@@ -51,6 +51,7 @@ my $mkenv = new smb_build::makefile(\%config::config, $mkfile);
 my $shared_libs_used = 0;
 foreach my $key (values %$OUTPUT) {
        $mkenv->_prepare_list($key, "OBJ_LIST");
+       push(@{$mkenv->{all_objs}}, "\$($key->{NAME}_OBJ_LIST)");
 }
 
 foreach my $key (values %$OUTPUT) {

diff --git a/source4/build/smb_build/makefile.pm b/source4/build/smb_build/makefile.pm
index b06279ed10220c0d11363ceb2fb203b529319dbd..52149083b115f9835b67d61aae240734151b0778 100644 (file)
--- a/source4/build/smb_build/makefile.pm
+++ b/source4/build/smb_build/makefile.pm
@@ -160,8 +160,6 @@ sub SharedModule($$)
        $self->_prepare_list($ctx, "DEPEND_LIST");
        $self->_prepare_list($ctx, "LINK_FLAGS");
 
-       push(@{$self->{all_objs}}, "\$($ctx->{NAME}_FULL_OBJ_LIST)");
-
        if (defined($ctx->{INIT_FUNCTION}) and $ctx->{TYPE} ne "PYTHON") {
                my $init_fn = $ctx->{INIT_FUNCTION_TYPE};
                $init_fn =~ s/\(\*\)/init_module/;
@@ -226,8 +224,6 @@ sub SharedLibrary($$)
        $self->_prepare_list($ctx, "DEPEND_LIST");
        $self->_prepare_list($ctx, "LINK_FLAGS");
 
-       push(@{$self->{all_objs}}, "\$($ctx->{NAME}_FULL_OBJ_LIST)");
-
        my $soarg = "";
        my $lns = "";
        if ($self->{config}->{SONAMEFLAG} ne "#" and defined($ctx->{LIBRARY_SONAME})) {
@@ -261,7 +257,6 @@ sub MergedObj($$)
 
        $self->output("$ctx->{NAME}_OUTPUT = $ctx->{OUTPUT}\n");
        $self->_prepare_list($ctx, "FULL_OBJ_LIST");
-       push(@{$self->{all_objs}}, "\$($ctx->{NAME}_FULL_OBJ_LIST)");
        $self->output(<< "__EOD__"
 #
 $ctx->{RESULT_MERGED_OBJ}: \$($ctx->{NAME}_FULL_OBJ_LIST)
@@ -284,8 +279,6 @@ sub StaticLibrary($$)
        $self->output("$ctx->{NAME}_OUTPUT = $ctx->{OUTPUT}\n");
        $self->_prepare_list($ctx, "FULL_OBJ_LIST");
 
-       push(@{$self->{all_objs}}, "\$($ctx->{NAME}_FULL_OBJ_LIST)");
-
        $self->output(<< "__EOD__"
 #
 $ctx->{RESULT_STATIC_LIBRARY}: \$($ctx->{NAME}_FULL_OBJ_LIST)
@@ -313,8 +306,6 @@ sub Binary($$)
 
        my $extradir = "";
 
-       push(@{$self->{all_objs}}, "\$($ctx->{NAME}_FULL_OBJ_LIST)");
-               
        unless (defined($ctx->{INSTALLDIR})) {
        } elsif ($ctx->{INSTALLDIR} eq "SBINDIR") {
                push (@{$self->{sbin_progs}}, $ctx->{RESULT_BINARY});