# Where installed engines reside, for C
ENGINESDIR_C={- $osslprefix -}ENGINES{- $sover_dirname.$target{pointer_size} -}:
-CC= {- $target{cc} -}
-CFLAGS= /DEFINE=({- join(",", @{$target{defines}}, @{$config{defines}},"OPENSSLDIR=\"\"\"\$(OPENSSLDIR_C)\"\"\"","ENGINESDIR=\"\"\"\$(ENGINESDIR_C)\"\"\"") -}) {- $target{cflags} -} {- $config{cflags} -}
-CFLAGS_Q=$(CFLAGS)
-DEPFLAG= /DEFINE=({- join(",", @{$config{depdefines}}) -})
-LDFLAGS= {- $target{lflags} -}
-EX_LIBS= {- $target{ex_libs} ? ",".$target{ex_libs} : "" -}{- $config{ex_libs} ? ",".$config{ex_libs} : "" -}
+CC= {- $config{cc} -}
+CPP= {- $config{cpp} -}
+DEFINES={- our $defines = join(",",
+ '__dummy', # To make comma processing easier
+ @{$config{defines}}) -}
+INCLUDES={- our $includes = join(',', @{$config{includes}}) -}
+CPPFLAGS={- our $cppflags = join('', @{$config{cppflags}}) -}
+CPPFLAGS_Q={- (my $x = $cppflags) =~ s|"|""|g; $defines =~ s|"|""|g;
+ $x .= "/DEFINE=($defines)";
+ $x .= "/INCLUDE=($includes)" if $includes;
+ $x; -}
+CFLAGS={- join('', @{$config{cflags}}) -}
+LDFLAGS= {- join('', @{$config{lflags}}) -}
+EX_LIBS= {- join('', map { ','.$_ } @{$config{ex_libs}}) -}
+LIB_DEFINES={- join("",
+ (map { ",$_" }
+ @{$target{shared_defines}},
+ 'OPENSSLDIR="""$(OPENSSLDIR_C)"""',
+ 'ENGINESDIR="""$(ENGINESDIR_C)"""')) -}
LIB_CFLAGS={- $target{lib_cflags} // "" -}
DSO_CFLAGS={- $target{dso_cflags} // "" -}
BIN_CFLAGS={- $target{bin_cflags} // "" -}
# dependent assembler flags. E.g. if you throw -mcpu=ultrasparc at SPARC
# gcc, then the driver will automatically translate it to -xarch=v8plus
# and pass it down to assembler.
-AS={- $target{as} -}
-ASFLAG={- $target{asflags} -}
+AS={- $config{as} -}
+ASFLAGS={- join('', @{$config{asflags}}) -}
# .FIRST and .LAST are special targets with MMS and MMK.
# The defines in there are for C. includes that look like
# Building targets ###################################################
configdata.pm : $(SRCDIR)Configure $(SRCDIR)config.com {- join(" ", @{$config{build_file_templates}}, @{$config{build_infos}}, @{$config{conf_files}}) -}
- @ WRITE SYS$OUTPUT "Reconfiguring..."
- perl $(SRCDIR)Configure reconf
+ perl configdata.pm -r -v
@ WRITE SYS$OUTPUT "*************************************************"
@ WRITE SYS$OUTPUT "*** ***"
@ WRITE SYS$OUTPUT "*** Please run the same mms command again ***"
@ WRITE SYS$OUTPUT "*************************************************"
@ PIPE ( EXIT %X10000000 )
+reconfigure reconf :
+ perl configdata.pm -r -v
+
{-
use File::Basename;
use File::Spec::Functions qw/abs2rel rel2abs catfile catdir/;
my $srcs =
join(", ",
map { abs2rel(rel2abs($_), rel2abs($forward)) } @{$args{srcs}});
- my $ecflags;
+ my $cflags = '$(CFLAGS)';
if ($args{installed}) {
- $ecflags = { lib => '$(LIB_CFLAGS)',
+ $cflags .= { lib => '$(LIB_CFLAGS)',
dso => '$(DSO_CFLAGS)',
bin => '$(BIN_CFLAGS)' } -> {$args{intent}};
} else {
- $ecflags = { lib => '$(NO_INST_LIB_CFLAGS)',
+ $cflags .= { lib => '$(NO_INST_LIB_CFLAGS)',
dso => '$(NO_INST_DSO_CFLAGS)',
bin => '$(NO_INST_BIN_CFLAGS)' } -> {$args{intent}};
}
- my $incs_on = "\@ !";
- my $incs_off = "\@ !";
- my $incs = "";
- my @incs = ();
- push @incs, @{$args{incs}} if @{$args{incs}};
- unless ($disabled{zlib}) {
- # GNV$ZLIB_INCLUDE is the standard logical name for later zlib
- # incarnations.
- push @incs, ($withargs{zlib_include} || 'GNV$ZLIB_INCLUDE:');
- }
- if (@incs) {
+ $cflags .= '$(CPPFLAGS)';
+ $cflags .= { lib => '$(LIB_CPPFLAGS)',
+ dso => '$(DSO_CPPFLAGS)',
+ bin => '$(BIN_CPPFLAGS)' } -> {$args{intent}};
+ my $defines = '$(DEFINES)';
+ $defines .= { lib => '$(LIB_DEFINES)',
+ dso => '$(DSO_DEFINES)',
+ bin => '$(BIN_DEFINES)' } -> {$args{intent}};
+ $cflags .= '/DEFINE=('.$defines.')';
+ $cflags .= "/INCLUDE=('tmp_includes')";
+
+ # We create a logical name TMP_INCLUDES: to hold the list of internal
+ # includes. However, we cannot use it directly, as logical names can't
+ # hold zero entries, so we also create a symbol with the same name and
+ # use that instead, see the '/INCLUDE=' assignment above. If there are
+ # no internal include directories, it will simply be the empty string,
+ # but if there are, it will be assigned "TMP_DEFINES:,"
+ my $xtraincludes = { lib => '$(LIB_INCLUDES)',
+ dso => '$(DSO_INCLUDES)',
+ bin => '$(BIN_INCLUDES)' } -> {$args{intent}};
+ my $incs_add =
+ 'IF tmp_add .NES. "" .AND. tmp_includes .NES. "" THEN tmp_includes = "," + tmp_includes'
+ ."\n\t".'tmp_includes = tmp_add + tmp_includes';
+ my $incs_on = 'tmp_includes := '
+ ."\n\t"."tmp_add := $xtraincludes"
+ ."\n\t".$incs_add
+ ."\n\t".'tmp_add := $(INCLUDES)'
+ ."\n\t".$incs_add;
+ my $incs_off = 'DELETE/SYMBOL/LOCAL tmp_includes'
+ ."\n\t".'DELETE/SYMBOL/LOCAL tmp_add';
+ if (@{$args{incs}}) {
$incs_on =
- "DEFINE tmp_includes "
+ 'DEFINE tmp_includes '
.join(",-\n\t\t\t", map {
file_name_is_absolute($_)
? $_ : catdir($backward,$_)
- } @incs);
- $incs_off = "DEASSIGN tmp_includes";
- $incs = " /INCLUDE=(tmp_includes:)";
+ } @{$args{incs}})
+ ."\n\t".$incs_on
+ ."\n\t".'IF tmp_includes .NES. "" THEN tmp_includes = "," + tmp_includes'
+ ."\n\t".'tmp_includes = "tmp_includes:" + tmp_includes';
+ $incs_off .=
+ "\n\t".'DEASSIGN tmp_includes';
}
my $before = $unified_info{before}->{$obj.".OBJ"} || "\@ !";
my $after = $unified_info{after}->{$obj.".OBJ"} || "\@ !";
${before}
SET DEFAULT $forward
$incs_on
- \$(CC) \$(CFLAGS)${ecflags}${incs}${depbuild} /OBJECT=${objd}${objn}.OBJ /REPOSITORY=$backward $srcs
+ \$(CC) ${cflags}${depbuild} /OBJECT=${objd}${objn}.OBJ /REPOSITORY=$backward $srcs
$incs_off
SET DEFAULT $backward
${after}
projects / openssl.git / blobdiff