diff options
Diffstat (limited to 'source4/build')
| -rw-r--r-- | source4/build/smb_build/config_mk.pm | 4 | ||||
| -rw-r--r-- | source4/build/smb_build/output.pm | 21 |
2 files changed, 21 insertions, 4 deletions
diff --git a/source4/build/smb_build/config_mk.pm b/source4/build/smb_build/config_mk.pm index e5c8c293aa..b26e70f88b 100644 --- a/source4/build/smb_build/config_mk.pm +++ b/source4/build/smb_build/config_mk.pm @@ -8,6 +8,7 @@ package smb_build::config_mk; use smb_build::input; +use File::Basename; use strict; @@ -131,7 +132,7 @@ sub run_config_mk($$) # include if ($line =~ /^include (.*)$/) { - $makefile .= run_config_mk($input, $1); + $makefile .= run_config_mk($input, dirname($filename)."/$1"); next; } @@ -171,6 +172,7 @@ sub run_config_mk($$) $input->{$name}{NAME} = $name; $input->{$name}{TYPE} = $type; + $input->{$name}{BASEDIR} = dirname($filename); foreach my $key (values %{$result->{$section}}) { $key->{VAL} = smb_build::input::strtrim($key->{VAL}); diff --git a/source4/build/smb_build/output.pm b/source4/build/smb_build/output.pm index f6c4a78274..46e8ffb0c5 100644 --- a/source4/build/smb_build/output.pm +++ b/source4/build/smb_build/output.pm @@ -10,6 +10,21 @@ package output; use strict; +sub add_dir($$) +{ + my ($dir,$files) = @_; + my @ret = (); + + foreach (@$files) { + $_ = "$dir/$_"; + s/\/\//\//g; + s/\/([^\/\.]+)\/\.\.\//\//g; + push (@ret, $_); + } + + return @ret; +} + sub generate_mergedobj($) { my $subsys = shift; @@ -93,9 +108,9 @@ sub create_output($) next if not defined($part->{OUTPUT_TYPE}); # Combine object lists - push(@{$part->{OBJ_LIST}}, @{$part->{INIT_OBJ_FILES}}) if defined($part->{INIT_OBJ_FILES}); - push(@{$part->{OBJ_LIST}}, @{$part->{ADD_OBJ_FILES}}) if defined($part->{ADD_OBJ_FILES}); - push(@{$part->{OBJ_LIST}}, @{$part->{OBJ_FILES}}) if defined($part->{OBJ_FILES}); + push(@{$part->{OBJ_LIST}}, add_dir($part->{BASEDIR}, $part->{INIT_OBJ_FILES})) if defined($part->{INIT_OBJ_FILES}); + push(@{$part->{OBJ_LIST}}, add_dir($part->{BASEDIR}, $part->{ADD_OBJ_FILES})) if defined($part->{ADD_OBJ_FILES}); + push(@{$part->{OBJ_LIST}}, add_dir($part->{BASEDIR}, $part->{OBJ_FILES})) if defined($part->{OBJ_FILES}); if ((not defined($part->{OBJ_LIST}) or scalar(@{$part->{OBJ_LIST}}) == 0) and |