diff options
| author | Richard Levitte <levitte@openssl.org> | 2016-06-13 22:02:11 +0200 |
|---|---|---|
| committer | Richard Levitte <levitte@openssl.org> | 2016-06-14 22:11:38 +0200 |
| commit | 7cae38642e116b0a769fb3c31448be29469dc1da (patch) | |
| tree | b9bce183fff1fb42a9af155ef8ffee692fa7ecca /Configurations/descrip.mms.tmpl | |
| parent | 27ffb86c209c456c40ec82b80ebb922b5f377992 (diff) | |
| download | openssl-7cae38642e116b0a769fb3c31448be29469dc1da.tar.gz | |
Build file templates: make sure to depend on generated header files
As well as properly generating those that are made from .in files.
Reviewed-by: Rich Salz <rsalz@openssl.org>
Diffstat (limited to 'Configurations/descrip.mms.tmpl')
| -rw-r--r-- | Configurations/descrip.mms.tmpl | 32 |
1 files changed, 25 insertions, 7 deletions
diff --git a/Configurations/descrip.mms.tmpl b/Configurations/descrip.mms.tmpl index 3314a17017..66eaeadd6a 100644 --- a/Configurations/descrip.mms.tmpl +++ b/Configurations/descrip.mms.tmpl @@ -113,6 +113,8 @@ DEPS={- our @deps = map { (my $x = $_) =~ s|\.o$|\$(DEP_EXT)|; $x; } keys %{$unified_info{sources}}; join(", ", map { "-\n\t".$_ } @deps); -} {- output_on() if $disabled{makedepend}; "" -} +GENERATED_MANDATORY={- join(",", @{$unified_info{depends}->{""}} ) -} + {- output_off() if $disabled{apps}; "" -} BIN_SCRIPTS=[.tools]c_rehash.pl MISC_SCRIPTS=[.apps]CA.pl, [.apps]tsget.pl @@ -221,20 +223,20 @@ NODEBUG=@ # The main targets ################################################### -all : configdata.pm, - +all : $(GENERATED_MANDATORY), - build_libs_nodep, build_engines_nodep, build_apps_nodep, - depend -build_libs : configdata.pm, build_libs_nodep, depend +build_libs : $(GENERATED_MANDATORY), build_libs_nodep, depend build_libs_nodep : $(LIBS) -build_engines : configdata.pm, build_engines_nodep, depend +build_engines : $(GENERATED_MANDATORY), build_engines_nodep, depend build_engines_nodep : $(ENGINES) -build_apps : configdata.pm, build_apps_nodep, depend +build_apps : $(GENERATED_MANDATORY), build_apps_nodep, depend build_apps_nodep : $(PROGRAMS), $(SCRIPTS) -build_tests : configdata.pm, build_tests_nodep, depend +build_tests : $(GENERATED_MANDATORY), build_tests_nodep, depend build_tests_nodep : $(TESTPROGS) -test tests : configdata.pm, - +test tests : $(GENERATED_MANDATORY), - build_apps_nodep, build_engines_nodep, build_tests_nodep, - depend @ ! {- output_off() if $disabled{tests}; "" -} @@ -292,6 +294,7 @@ install : install_sw install_docs uninstall : uninstall_docs uninstall_sw clean : libclean + - DELETE {- join(",", map { "$_;*" } @{$unified_info{depends}->{""}} ) -} - DELETE []OSSL$LIB*.EXE;*,OSSL$LIB*.MAP;*,OSSL$LIB*.OPT;* - DELETE [.engines...]LIB*.EXE;*,LIB*.MAP;*,LIB*.OPT;* - DELETE [.apps]*.EXE;*,*.MAP;*,*.OPT;* @@ -301,6 +304,10 @@ clean : libclean - DELETE [.test]*.LOG;* - DELETE []*.MAP;* +distclean : clean + - DELETE configdata.pm;* + - DELETE descrip.mms;* + depend : descrip.mms descrip.mms : FORCE @ ! {- output_off() if $disabled{makedepend}; "" -} @@ -464,10 +471,21 @@ configdata.pm : {- join(" ", sourcefile("Configurations", "descrip.mms.tmpl"), s my $deps = join(", -\n\t\t", @{$args{generator_deps}}, @{$args{deps}}); if ($args{src} !~ /\.[sS]$/) { - return <<"EOF"; + if ($args{generator}->[0] =~ m|^.*\.in$|) { + my $dofile = abs2rel(rel2abs(catfile($config{sourcedir}, + "util", "dofile.pl")), + rel2abs($config{builddir})); + return <<"EOF"; +$args{src} : $args{generator}->[0] $deps + \$(PERL) "-I\$(BLDDIR)" "-Mconfigdata" $dofile \\ + "-o$target{build_file}" $generator > \$@ +EOF + } else { + return <<"EOF"; $args{src} : $args{generator}->[0] $deps \$(PERL)$generator_incs $generator > \$@ EOF + } } else { die "No method to generate assembler source present.\n"; } |