diff options
author | Richard Levitte <levitte@openssl.org> | 2016-04-21 14:30:08 +0200 |
---|---|---|
committer | Richard Levitte <levitte@openssl.org> | 2016-04-25 18:06:06 +0200 |
commit | 8d34daf0ce3bd2fc08dda0f1b0d1213dec452a1d (patch) | |
tree | bddf80d3549bba3a35ffabe413e4ec150f78528d /Configurations/windows-makefile.tmpl | |
parent | 79356a83b78a2d936dcd022847465d9ebf6c67b1 (diff) | |
download | openssl-8d34daf0ce3bd2fc08dda0f1b0d1213dec452a1d.tar.gz |
Build system: add include directories and dependencies for generators
In the case of generating a file like this:
GENERATE[foo.S]=mkfoo.pl arg1 arg2
the 'mkfoo.pl' generator itself might need to include other files,
such as perl modules within our source tree. We can reuse already
existing syntax for it, like this:
INCLUDE[mkfoo.pl]=module/path
or:
DEPEND[mkfoo.pl]=modules/mymodule.pm
This change implements the support for such constructs, and for the
DEPEND statement, for any value that indicates a perl module (.pm
file), it will automatically infer an INCLUDE statement for its
directory, just like it does for C header files, so you won't have do
write this:
DEPEND[mkfoo.pl]=modules/mymodule.pm
INCLUDE[mkfoo.pl]=modules
Reviewed-by: Emilia Käsper <emilia@openssl.org>
Diffstat (limited to 'Configurations/windows-makefile.tmpl')
-rw-r--r-- | Configurations/windows-makefile.tmpl | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/Configurations/windows-makefile.tmpl b/Configurations/windows-makefile.tmpl index c3233eeb08..159d57c931 100644 --- a/Configurations/windows-makefile.tmpl +++ b/Configurations/windows-makefile.tmpl @@ -252,17 +252,18 @@ configdata.pm: {- $config{build_file_template} -} $(SRCDIR)\Configure my %args = @_; (my $target = $args{src}) =~ s/\.[sS]$/.asm/; my $generator = join(" ", @{$args{generator}}); + my $generator_incs = join("", map { " -I".$_ } @{$args{generator_incs}}); my $incs = join("", map { " /I ".$_ } @{$args{incs}}); - my $deps = join(" ", @{$args{deps}}); + my $deps = join(" ", @{$args{generator_deps}}, @{$args{deps}}); if ($target !~ /\.asm$/) { return <<"EOF"; $target: $args{generator}->[0] $deps - \$(PERL) $generator > \$@ + \$(PERL)$generator_incs $generator > \$@ EOF } else { if ($args{generator}->[0] =~ /\.pl$/) { - $generator = '$(PERL) '.$generator; + $generator = '$(PERL)'.$generator_incs.' '.$generator; } elsif ($args{generator}->[0] =~ /\.S$/) { $generator = undef; } else { |