summaryrefslogtreecommitdiff
path: root/source4/build
diff options
context:
space:
mode:
authorJelmer Vernooij <jelmer@samba.org>2008-02-26 02:45:12 +0100
committerJelmer Vernooij <jelmer@samba.org>2008-02-26 02:45:12 +0100
commit895a0a3238e1f17f39ab0e4543dbd6318d6f8f11 (patch)
treedca92494efd2e7e571c8413e7c0b5f98da23f0ce /source4/build
parent22ef67dd136f0a67885a17be68909643dc97304d (diff)
downloadsamba-895a0a3238e1f17f39ab0e4543dbd6318d6f8f11.tar.gz
samba-895a0a3238e1f17f39ab0e4543dbd6318d6f8f11.tar.bz2
samba-895a0a3238e1f17f39ab0e4543dbd6318d6f8f11.zip
Move more code out of perl.
(This used to be commit ad258e86353250fd447d461c94649c1541b37844)
Diffstat (limited to 'source4/build')
-rw-r--r--source4/build/smb_build/makefile.pm2
-rw-r--r--source4/build/smb_build/output.pm8
2 files changed, 5 insertions, 5 deletions
diff --git a/source4/build/smb_build/makefile.pm b/source4/build/smb_build/makefile.pm
index c2a0c2287e..13c28de697 100644
--- a/source4/build/smb_build/makefile.pm
+++ b/source4/build/smb_build/makefile.pm
@@ -228,7 +228,7 @@ sub MergedObj($$)
return unless defined($ctx->{OUTPUT});
$self->output("$ctx->{NAME}_OUTPUT = $ctx->{OUTPUT}\n");
- $self->output("\$(call partial_link_template, $ctx->{RESULT_MERGED_OBJ}, \$($ctx->{NAME}_OBJ_LIST))\n");
+ $self->output("\$(call partial_link_template, \$($ctx->{NAME}_OUTPUT), \$($ctx->{NAME}_OBJ_LIST))\n");
}
sub StaticLibraryPrimitives($$)
diff --git a/source4/build/smb_build/output.pm b/source4/build/smb_build/output.pm
index eec438b108..67794f9d54 100644
--- a/source4/build/smb_build/output.pm
+++ b/source4/build/smb_build/output.pm
@@ -164,8 +164,8 @@ sub create_output($$)
my $elem = $depend->{$_};
next if $elem == $part;
- merge_array(\$part->{FINAL_CFLAGS}, $elem->{CPPFLAGS});
- merge_array(\$part->{FINAL_CFLAGS}, $elem->{CFLAGS});
+ push(@{$part->{FINAL_CFLAGS}}, "\$($elem->{NAME}_CPPFLAGS)");
+ push(@{$part->{FINAL_CFLAGS}}, "\$($elem->{NAME}_CFLAGS)");
}
# Always import the link options of the unique dependencies
@@ -173,8 +173,8 @@ sub create_output($$)
my $elem = $depend->{$_};
next if $elem == $part;
- push(@{$part->{LINK_FLAGS}}, @{$elem->{LIBS}}) if defined($elem->{LIBS});
- push(@{$part->{LINK_FLAGS}}, @{$elem->{LDFLAGS}}) if defined($elem->{LDFLAGS});
+ push(@{$part->{LINK_FLAGS}}, "\$($elem->{NAME}_LIBS)");
+ push(@{$part->{LINK_FLAGS}}, "\$($elem->{NAME}_LDFLAGS");
if (defined($elem->{OUTPUT_TYPE}) and @{$elem->{OUTPUT_TYPE}}[0] eq "MERGED_OBJ") {
push (@{$part->{FULL_OBJ_LIST}}, $elem->{TARGET});
} else {