diff options
| author | Richard Levitte <levitte@openssl.org> | 2016-03-09 01:16:10 +0100 |
|---|---|---|
| committer | Richard Levitte <levitte@openssl.org> | 2016-03-09 01:57:52 +0100 |
| commit | 952a9d1aa334003f71310f2111a2fb01ce837042 (patch) | |
| tree | 86caf9171a0d46f62a03e3bf1f4598d9c65febfb /Configurations | |
| parent | 09aa263a143b006650a0f879dc2348609587b806 (diff) | |
| download | openssl-952a9d1aa334003f71310f2111a2fb01ce837042.zip openssl-952a9d1aa334003f71310f2111a2fb01ce837042.tar.gz openssl-952a9d1aa334003f71310f2111a2fb01ce837042.tar.bz2 | |
Adapt descrip.mms.tmpl to 'no-makedepend'
VMS doesn't have "makedepend" anyway, so this is just a matter of using
the right qualifiers when 'makedepend' is enabled.
Reviewed-by: Rich Salz <rsalz@openssl.org>
Diffstat (limited to 'Configurations')
| -rw-r--r-- | Configurations/descrip.mms.tmpl | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/Configurations/descrip.mms.tmpl b/Configurations/descrip.mms.tmpl index 157ebb5..7334f69 100644 --- a/Configurations/descrip.mms.tmpl +++ b/Configurations/descrip.mms.tmpl @@ -103,10 +103,12 @@ ENGINES={- join(", ", map { "-\n\t".$_.".EXE" } @{$unified_info{engines}}) -} PROGRAMS={- join(", ", map { "-\n\t".$_.".EXE" } grep { !m|^\[\.test\]| } @{$unified_info{programs}}) -} TESTPROGS={- join(", ", map { "-\n\t".$_.".EXE" } grep { m|^\[\.test\]| } @{$unified_info{programs}}) -} SCRIPTS={- join(", ", map { "-\n\t".$_ } @{$unified_info{scripts}}) -} +{- output_off() if $disabled{makedepend}; "" -} DEPS={- our @deps = map { (my $x = $_) =~ s|\.o$|\$(DEP_EXT)|; $x; } grep { $unified_info{sources}->{$_}->[0] =~ /\.c$/ } keys %{$unified_info{sources}}; join(", ", map { "-\n\t".$_ } @deps); -} +{- output_on() if $disabled{makedepend}; "" -} # DESTDIR is for package builders so that they can configure for, say, # SYS$COMMON:[OPENSSL] and yet have everything installed in STAGING:[USER]. @@ -263,6 +265,7 @@ clean : libclean depend : descrip.mms descrip.mms : FORCE + @ ! {- output_off() if $disabled{makedepend}; "" -} @ $(PERL) -pe "if (/^# DO NOT DELETE.*/) { exit(0); }" - < descrip.mms > descrip.mms-new @ OPEN/APPEND DESCRIP descrip.mms-new @@ -273,6 +276,7 @@ descrip.mms : FORCE RENAME descrip.mms-new descrip.mms ) @ IF F$SEARCH("descrip.mms-new") .NES. "" THEN DELETE descrip.mms-new;* -@ SPAWN/OUTPUT=NLA0: PURGE/NOLOG descrip.mms + @ ! {- output_on() if $disabled{makedepend}; "" -} # Install helper targets ############################################# @@ -448,12 +452,14 @@ EOF } @{$args{incs}}).")"; my $before = $unified_info{before}->{$obj.".OBJ"} || "\@ !"; my $after = $unified_info{after}->{$obj.".OBJ"} || "\@ !"; + my $depbuild = $disabled{makedepend} ? "" + : " /MMS=(FILE=${objd}${objn}.tmp-MMS,TARGET=$obj.OBJ)" return <<"EOF"; $obj.OBJ : $deps ${before} SET DEFAULT $forward - \$(CC) \$(CFLAGS)${incs} /MMS=(FILE=${objd}${objn}.tmp-MMS,TARGET=$obj.OBJ) /OBJECT=${objd}${objn}.OBJ /REPOSITORY=$backward $srcs + \$(CC) \$(CFLAGS)${incs}${depbuild} /OBJECT=${objd}${objn}.OBJ /REPOSITORY=$backward $srcs SET DEFAULT $backward ${after} \@ PIPE ( \$(PERL) -e "use File::Compare qw/compare_text/; my \$x = compare_text(""$obj.MMS"",""$obj.tmp-MMS""); exit(0x10000000 + (\$x == 0));" || - |