X-Git-Url: https://git.openssl.org/gitweb/?p=openssl.git;a=blobdiff_plain;f=Configurations%2Funix-Makefile.tmpl;h=ebdc82b684fdfc2e09a788cbf19d4b8d5dfb88e4;hp=dfae9afd0e6e7555e1ae459aac709fc88076aada;hb=70d9675342efbc9fe518e082c44f3ad80a1e4671;hpb=2fce15b58b2502a614529707eb45b6e5cac4eb15 diff --git a/Configurations/unix-Makefile.tmpl b/Configurations/unix-Makefile.tmpl index dfae9afd0e..ebdc82b684 100644 --- a/Configurations/unix-Makefile.tmpl +++ b/Configurations/unix-Makefile.tmpl @@ -54,44 +54,44 @@ GENERATED={- # common0.tmpl provides @generated INSTALL_LIBS={- join(" ", map { platform->staticlib($_) // () } - grep { !$unified_info{attributes}->{$_}->{noinst} } + grep { !$unified_info{attributes}->{libraries}->{$_}->{noinst} } @{$unified_info{libraries}}) -} INSTALL_SHLIBS={- join(" ", map { platform->sharedlib($_) // () } - grep { !$unified_info{attributes}->{$_}->{noinst} } + grep { !$unified_info{attributes}->{libraries}->{$_}->{noinst} } @{$unified_info{libraries}}) -} INSTALL_SHLIB_INFO={- join(" ", map { my $x = platform->sharedlib($_); my $y = platform->sharedlib_simple($_); $x ? "\"$x;$y\"" : () } - grep { !$unified_info{attributes}->{$_}->{noinst} } + grep { !$unified_info{attributes}->{libraries}->{$_}->{noinst} } @{$unified_info{libraries}}) -} INSTALL_ENGINES={- join(" ", map { platform->dso($_) } - grep { !$unified_info{attributes}->{$_}->{noinst} - && $unified_info{attributes}->{$_}->{engine} } + grep { !$unified_info{attributes}->{modules}->{$_}->{noinst} + && $unified_info{attributes}->{modules}->{$_}->{engine} } @{$unified_info{modules}}) -} INSTALL_PROGRAMS={- join(" ", map { platform->bin($_) } - grep { !$unified_info{attributes}->{$_}->{noinst} } + grep { !$unified_info{attributes}->{programs}->{$_}->{noinst} } @{$unified_info{programs}}) -} BIN_SCRIPTS={- - join(" ", map { my $x = $unified_info{attributes}->{$_}->{linkname}; + join(" ", map { my $x = $unified_info{attributes}->{scripts}->{$_}->{linkname}; $x ? "$_:$x" : $_ } - grep { !$unified_info{attributes}->{$_}->{noinst} - && !$unified_info{attributes}->{$_}->{misc} } + grep { !$unified_info{attributes}->{scripts}->{$_}->{noinst} + && !$unified_info{attributes}->{scripts}->{$_}->{misc} } @{$unified_info{scripts}}) -} MISC_SCRIPTS={- - join(" ", map { my $x = $unified_info{attributes}->{$_}->{linkname}; + join(" ", map { my $x = $unified_info{attributes}->{scripts}->{$_}->{linkname}; $x ? "$_:$x" : $_ } - grep { !$unified_info{attributes}->{$_}->{noinst} - && $unified_info{attributes}->{$_}->{misc} } + grep { !$unified_info{attributes}->{scripts}->{$_}->{noinst} + && $unified_info{attributes}->{scripts}->{$_}->{misc} } @{$unified_info{scripts}}) -} @@ -142,6 +142,7 @@ LIBDIR={- our $libdir = $config{libdir}; libdir={- file_name_is_absolute($libdir) ? $libdir : '$(INSTALLTOP)/$(LIBDIR)' -} ENGINESDIR=$(libdir)/engines-{- $sover_dirname -} +MODULESDIR=$(libdir)/ossl-modules # Convenience variable for those who want to set the rpath in shared # libraries and applications @@ -238,7 +239,8 @@ LIB_CPPFLAGS={- our $lib_cppflags = join(' ', $lib_cppflags, (map { '-D'.$_ } 'OPENSSLDIR="\"$(OPENSSLDIR)\""', - 'ENGINESDIR="\"$(ENGINESDIR)\""'), + 'ENGINESDIR="\"$(ENGINESDIR)\""', + 'MODULESDIR="\"$(MODULESDIR)\""'), '$(CNF_CPPFLAGS)', '$(CPPFLAGS)') -} LIB_CFLAGS={- join(' ', $target{lib_cflags} || (), $target{shared_cflag} || (), @@ -350,6 +352,7 @@ test: tests PERL="$(PERL)" \ EXE_EXT={- platform->binext() -} \ OPENSSL_ENGINES=`cd ../$(BLDDIR)/engines 2>/dev/null && pwd` \ + OPENSSL_MODULES=`cd ../$(BLDDIR)/providers 2>/dev/null && pwd` \ OPENSSL_DEBUG_MEMORY=on \ $(PERL) ../$(SRCDIR)/test/run_tests.pl $(TESTS) ) @ : {- if ($disabled{tests}) { output_on(); } else { output_off(); } "" -} @@ -389,13 +392,13 @@ libclean: clean: libclean $(RM) $(PROGRAMS) $(TESTPROGS) $(MODULES) $(SCRIPTS) $(RM) $(GENERATED_MANDATORY) $(GENERATED) - -$(RM) `find . -name .git -prune -o -name '*{- platform->depext() -}' -print` - -$(RM) `find . -name .git -prune -o -name '*{- platform->objext() -}' -print` + -$(RM) `find . -name '*{- platform->depext() -}' \! -name '.*' -print` + -$(RM) `find . -name '*{- platform->objext() -}' \! -name '.*' -print` $(RM) core $(RM) tags TAGS doc-nits $(RM) -r test/test-runs $(RM) openssl.pc libcrypto.pc libssl.pc - -$(RM) `find . -name .git -prune -o -type l -print` + -$(RM) `find . -type l \! -name '.*' -print` $(RM) $(TARFILE) distclean: clean @@ -420,7 +423,7 @@ uninstall_sw: uninstall_runtime uninstall_engines uninstall_dev install_docs: install_man_docs install_html_docs uninstall_docs: uninstall_man_docs uninstall_html_docs - $(RM) -r -v $(DESTDIR)$(DOCDIR) + $(RM) -r $(DESTDIR)$(DOCDIR) install_ssldirs: @$(PERL) $(SRCDIR)/util/mkdir-p.pl $(DESTDIR)$(OPENSSLDIR)/certs @@ -726,9 +729,7 @@ generate: generate_apps generate_crypto_bn generate_crypto_objects \ .PHONY: doc-nits doc-nits: build_generated - (cd $(SRCDIR); $(PERL) util/find-doc-nits -n -p ) >doc-nits - @if [ -s doc-nits ] ; then cat doc-nits ; exit 1; \ - else echo 'doc-nits: no errors.'; rm doc-nits ; fi + (cd $(SRCDIR); $(PERL) util/find-doc-nits -n -e ) # Test coverage is a good idea for the future #coverage: $(PROGRAMS) $(TESTPROGRAMS) @@ -740,6 +741,12 @@ lint: generate_apps: ( cd $(SRCDIR); $(PERL) VMS/VMSify-conf.pl \ < apps/openssl.cnf > apps/openssl-vms.cnf ) + @ : {- output_off() if $disabled{apps}; "" -} + ( b=`pwd`; cd $(SRCDIR); \ + $(PERL) -I$$b apps/progs.pl -H $(APPS_OPENSSL) > apps/progs.h ) + ( b=`pwd`; cd $(SRCDIR); \ + $(PERL) -I$$b apps/progs.pl -C $(APPS_OPENSSL) > apps/progs.c ) + @ : {- output_on() if $disabled{apps}; "" -} generate_crypto_bn: ( cd $(SRCDIR); $(PERL) crypto/bn/bn_prime.pl > crypto/bn/bn_prime.h ) @@ -802,7 +809,6 @@ errors: our @cryptoheaders = qw( include/internal/dso.h include/internal/o_dir.h - include/internal/o_str.h include/internal/err.h include/internal/sslconf.h ); our @cryptoskipheaders = ( @sslheaders, @@ -960,10 +966,14 @@ EOF my $dofile = abs2rel(rel2abs(catfile($config{sourcedir}, "util", "dofile.pl")), rel2abs($config{builddir})); + my @modules = ( 'configdata.pm', + grep { $_ =~ m|\.pm$| } @{$args{deps}} ); + my %moduleincs = map { '"-I'.dirname($_).'"' => 1 } @modules; + @modules = map { "-M".basename($_, '.pm') } @modules; + my $modules = join(' ', '', sort keys %moduleincs, @modules); return <<"EOF"; -$args{src}: $args{generator}->[0] $deps - \$(PERL) "-I\$(BLDDIR)" -Mconfigdata "$dofile" \\ - "-o$target{build_file}" $generator > \$@ +$args{src}: $args{generator}->[0] $deps \$(BLDDIR)/configdata.pm + \$(PERL)$modules "$dofile" "-o$target{build_file}" $generator > \$@ EOF } else { return <<"EOF"; @@ -972,8 +982,16 @@ $args{src}: $args{generator}->[0] $deps EOF } } else { + my $cppflags = { + shlib => '$(LIB_CFLAGS) $(LIB_CPPFLAGS)', + lib => '$(LIB_CFLAGS) $(LIB_CPPFLAGS)', + dso => '$(DSO_CFLAGS) $(DSO_CPPFLAGS)', + bin => '$(BIN_CFLAGS) $(BIN_CPPFLAGS)' + } -> {$args{intent}}; + if ($args{generator}->[0] =~ /\.pl$/) { - $generator = 'CC="$(CC)" $(PERL)'.$generator_incs.' '.$generator; + $generator = 'CC="$(CC)" $(PERL)'.$generator_incs.' '.$generator + .' "$(PERLASM_SCHEME)"'.$incs.' '.$cppflags.$defs.' $(PROCESSSOR)'; } elsif ($args{generator}->[0] =~ /\.m4$/) { $generator = 'm4 -B 8192'.$generator_incs.' '.$generator.' >' } elsif ($args{generator}->[0] =~ /\.S$/) { @@ -982,12 +1000,6 @@ EOF die "Generator type for $args{src} unknown: $generator\n"; } - my $cppflags = { - shlib => '$(LIB_CFLAGS) $(LIB_CPPFLAGS)', - lib => '$(LIB_CFLAGS) $(LIB_CPPFLAGS)', - dso => '$(DSO_CFLAGS) $(DSO_CPPFLAGS)', - bin => '$(BIN_CFLAGS) $(BIN_CPPFLAGS)' - } -> {$args{intent}}; if (defined($generator)) { return <<"EOF"; $args{src}: $args{generator}->[0] $deps @@ -1007,7 +1019,7 @@ EOF # last in the line. We may therefore need to put back a line ending. sub src2obj { my %args = @_; - my $obj = platform->obj($args{obj}); + my $obj = platform->convertext($args{obj}); my $dep = platform->dep($args{obj}); my @srcs = @{$args{srcs}}; my $srcs = join(" ", @srcs); @@ -1087,15 +1099,22 @@ EOF sub obj2shlib { my %args = @_; my @linkdirs = (); - foreach (@{args{deps}}) { - my $d = dirname($_); - push @linkdirs, $d unless grep { $d eq $_ } @linkdirs; + my @linklibs = (); + foreach (@{$args{deps}}) { + if (platform->isstaticlib($_)) { + push @linklibs, platform->convertext($_); + } else { + my $d = "-L" . dirname($_); + my $l = basename($_); + $l =~ s/^lib//; + $l = "-l" . $l; + push @linklibs, $l; + push @linkdirs, $d unless grep { $d eq $_ } @linkdirs; + } } - my $linkflags = join("", map { "-L$_ " } @linkdirs); - my $linklibs = join("", map { my $f = basename($_); - (my $l = $f) =~ s/^lib//; - " -l$l" } @{$args{deps}}); - my @objs = map { platform->obj($_) } + my $linkflags = join("", map { $_." " } @linkdirs); + my $linklibs = join("", map { $_." " } @linklibs); + my @objs = map { platform->convertext($_) } grep { !platform->isdef($_) } @{$args{objs}}; my @defs = map { platform->def($_) } @@ -1148,17 +1167,25 @@ EOF } sub obj2dso { my %args = @_; - my $dso = platform->dso($args{lib}); + my $dso = platform->dso($args{module}); my @linkdirs = (); - foreach (@{args{deps}}) { - my $d = dirname($_); - push @linkdirs, $d unless grep { $d eq $_ } @linkdirs; + my @linklibs = (); + foreach (@{$args{deps}}) { + next unless defined $_; + if (platform->isstaticlib($_)) { + push @linklibs, platform->convertext($_); + } else { + my $d = "-L" . dirname($_); + my $l = basename($_); + $l =~ s/^lib//; + $l = "-l" . $l; + push @linklibs, $l; + push @linkdirs, $d unless grep { $d eq $_ } @linkdirs; + } } - my $linkflags = join("", map { "-L$_ " } @linkdirs); - my $linklibs = join("", map { my $f = basename($_); - (my $l = $f) =~ s/^lib//; - " -l$l" } @{$args{deps}}); - my @objs = map { platform->obj($_) } + my $linkflags = join("", map { $_." " } @linkdirs); + my $linklibs = join("", map { $_." " } @linklibs); + my @objs = map { platform->convertext($_) } grep { !platform->isdef($_) } @{$args{objs}}; my @defs = map { platform->def($_) } @@ -1172,7 +1199,7 @@ EOF $dso: $deps \$(CC) \$(DSO_CFLAGS) $linkflags\$(DSO_LDFLAGS) \\ -o $dso$shared_def $objs \\ - $linklibs \$(DSO_EX_LIBS) + $linklibs\$(DSO_EX_LIBS) EOF } sub obj2lib { @@ -1192,20 +1219,22 @@ EOF my $objs = join(" ", map { platform->obj($_) } @{$args{objs}}); my $deps = join(" ", compute_lib_depends(@{$args{deps}})); my @linkdirs = (); - foreach (@{args{deps}}) { - next if $_ =~ /\.a$/; - my $d = dirname($_); - push @linkdirs, $d unless grep { $d eq $_ } @linkdirs; + my @linklibs = (); + foreach (@{$args{deps}}) { + next unless defined $_; + if (platform->isstaticlib($_)) { + push @linklibs, platform->convertext($_); + } else { + my $d = "-L" . dirname($_); + my $l = basename($_); + $l =~ s/^lib//; + $l = "-l" . $l; + push @linklibs, $l; + push @linkdirs, $d unless grep { $d eq $_ } @linkdirs; + } } - my $linkflags = join("", map { "-L$_ " } @linkdirs); - my $linklibs = join("", map { if ($_ =~ m/\.a$/) { - " ".platform->staticlib($_); - } else { - my $f = basename($_); - (my $l = $f) =~ s/^lib//; - " -l$l" - } - } @{$args{deps}}); + my $linkflags = join("", map { $_." " } @linkdirs); + my $linklibs = join("", map { $_." " } @linklibs); my $cmd = '$(CC)'; my $cmdflags = '$(BIN_CFLAGS)'; if (grep /_cc\.o$/, @{$args{objs}}) { @@ -1217,7 +1246,7 @@ $bin: $objs $deps rm -f $bin \$\${LDCMD:-$cmd} $cmdflags $linkflags\$(BIN_LDFLAGS) \\ -o $bin $objs \\ - $linklibs \$(BIN_EX_LIBS) + $linklibs\$(BIN_EX_LIBS) EOF } sub in2script {