Remove some make variables that aren't necessary.

diff --git a/source/build/smb_build/input.pm b/source/build/smb_build/input.pm
index 6d5c4f4a1ed5fbdb610802467d19d112a75416f9..594daf62900b547f2dc7b3ed5cdb7b4cfdd627f2 100644 (file)
--- a/source/build/smb_build/input.pm
+++ b/source/build/smb_build/input.pm
@@ -208,7 +208,7 @@ sub import_integrated($$)
                next if($mod->{SUBSYSTEM} ne $lib->{NAME});
                next if($mod->{ENABLE} ne "YES");
 
-               push (@{$lib->{FULL_OBJ_LIST}}, "\$($mod->{TYPE}_$mod->{NAME}_FULL_OBJ_LIST)");
+               push (@{$lib->{FULL_OBJ_LIST}}, "\$($mod->{TYPE}_$mod->{NAME}_OBJ_LIST)");
                push (@{$lib->{LINK_FLAGS}}, "\$($mod->{TYPE}_$mod->{NAME}_LINK_FLAGS)");
                push (@{$lib->{CFLAGS}}, @{$mod->{CFLAGS}}) if defined($mod->{CFLAGS});
                push (@{$lib->{PUBLIC_DEPENDENCIES}}, @{$mod->{PUBLIC_DEPENDENCIES}}) if defined($mod->{PUBLIC_DEPENDENCIES});

diff --git a/source/build/smb_build/makefile.pm b/source/build/smb_build/makefile.pm
index 9c5ae9ea1dc14d2b69ef9b8be3da307603edfaaf..96de863cd2cbd33fcd99af8e1419b349f306d53d 100644 (file)
--- a/source/build/smb_build/makefile.pm
+++ b/source/build/smb_build/makefile.pm
@@ -130,8 +130,6 @@ sub Integrated($$)
        my ($self,$ctx) = @_;
 
        $self->_prepare_list($ctx, "OBJ_LIST");
-       $self->_prepare_list($ctx, "FULL_OBJ_LIST");
-       $self->_prepare_list($ctx, "LINK_FLAGS");
 }
 
 sub SharedModulePrimitives($$)

diff --git a/source/build/smb_build/output.pm b/source/build/smb_build/output.pm
index 855d03ade26f3eb9d21f261001b549186f199b3e..6f2d9dd20927e2a4e191fa6d014c1d2d31985ea7 100644 (file)
--- a/source/build/smb_build/output.pm
+++ b/source/build/smb_build/output.pm
@@ -176,7 +176,7 @@ sub create_output($$)
                        my $elem = $depend->{$_};
                        next if $elem == $part;
 
-                       push(@{$part->{LINK_FLAGS}}, $elem->{OUTPUT}) if defined($elem->{OUTPUT});
+                       push(@{$part->{LINK_FLAGS}}, "\$($elem->{TYPE}_$elem->{NAME}_OUTPUT)") if defined($elem->{OUTPUT});
                        push(@{$part->{LINK_FLAGS}}, @{$elem->{LIBS}}) if defined($elem->{LIBS});
                        push(@{$part->{LINK_FLAGS}},@{$elem->{LDFLAGS}}) if defined($elem->{LDFLAGS});
                        push(@{$part->{DEPEND_LIST}}, $elem->{TARGET}) if defined($elem->{TARGET});