X-Git-Url: https://git.openssl.org/gitweb/?p=openssl.git;a=blobdiff_plain;f=Configurations%2Funix-Makefile.tmpl;h=4dced5d9cc5be86e44daa19faaf50640674cd5f1;hp=77ba75b44aecd3090e0092ebc3fe62a9e37905c8;hb=f3e5948af6a9b27aad9cd3224f67b6231da2f89f;hpb=769777b0a24c77377c612d84537c40a2b55abfa6 diff --git a/Configurations/unix-Makefile.tmpl b/Configurations/unix-Makefile.tmpl index 77ba75b44a..4dced5d9cc 100644 --- a/Configurations/unix-Makefile.tmpl +++ b/Configurations/unix-Makefile.tmpl @@ -260,7 +260,7 @@ clean: libclean # concatenate only if that is true. depend: @: {- output_off() if $disabled{makedepend}; "" -} - @if [ -z "`find $(DEPS) -newer Makefile`" ]; then \ + @if [ -z "`find $(DEPS) -newer Makefile 2>/dev/null; exit 0`" ]; then \ ( sed -e '/^# DO NOT DELETE THIS LINE.*/,$$d' < Makefile; \ echo '# DO NOT DELETE THIS LINE -- make depend depends on it.'; \ echo; \ @@ -492,11 +492,11 @@ uninstall_runtime: # A method to extract all names from a .pod file # The first sed extracts everything between "=head1 NAME" and the next =head1 -# The second sed joins all the lines into one -# The third sed removes the description and turns all commas into spaces +# The perl command joins all the lines into one +# The second sed removes the description and turns all commas into spaces # Voilà, you have a space separated list of names! EXTRACT_NAMES=sed -e '1,/^=head1 *NAME *$$/d;/^=head1/,$$d' | \ - sed -e ':a;{N;s/\n/ /;ba}' | \ + $(PERL) -p -0 -e 's/\n/ /g; END {print "\n"}' | \ sed -e 's/ - .*$$//;s/,/ /g' PROCESS_PODS=\ set -e; \ @@ -617,13 +617,35 @@ generate: generate_apps generate_crypto_bn generate_crypto_objects lint: lint -DLINT $(INCLUDES) $(SRCS) -generate_apps: $(SRCDIR)/apps/openssl-vms.cnf - -generate_crypto_bn: $(SRCDIR)/crypto/bn/bn_prime.h - -generate_crypto_objects: $(SRCDIR)/crypto/objects/obj_dat.h \ - $(SRCDIR)/include/openssl/obj_mac.h \ - $(SRCDIR)/crypto/objects/obj_xref.h +{- # because the program apps/openssl has object files as sources, and + # they then have the corresponding C files as source, we need to chain + # the lookups in %unified_info + my $apps_openssl = catfile("apps","openssl"); + our @openssl_source = map { @{$unified_info{sources}->{$_}} } + @{$unified_info{sources}->{$apps_openssl}}; + ""; -} +generate_apps: + ( cd $(SRCDIR); $(PERL) VMS/VMSify-conf.pl \ + < apps/openssl.cnf > apps/openssl-vms.cnf ) + ( b=`pwd`; cd $(SRCDIR); $(PERL) -I$$b apps/progs.pl \ + {- join(" ", @openssl_source) -} \ + > apps/progs.h ) + +generate_crypto_bn: + ( cd $(SRCDIR); $(PERL) crypto/bn/bn_prime.pl > crypto/bn/bn_prime.h ) + +generate_crypto_objects: + ( cd $(SRCDIR); $(PERL) crypto/objects/obj_dat.pl \ + include/openssl/obj_mac.h \ + crypto/objects/obj_dat.h ) + ( cd $(SRCDIR); $(PERL) crypto/objects/objects.pl \ + crypto/objects/objects.txt \ + crypto/objects/obj_mac.num \ + include/openssl/obj_mac.h ) + ( cd $(SRCDIR); $(PERL) crypto/objects/objxref.pl \ + crypto/objects/obj_mac.num \ + crypto/objects/obj_xref.txt \ + > crypto/objects/obj_xref.h ) errors: ( cd $(SRCDIR); $(PERL) util/ck_errf.pl -strict */*.c */*/*.c ) @@ -691,38 +713,6 @@ $(BLDDIR)/util/shlib_wrap.sh: configdata.pm ln -sf "../$(SRCDIR)/util/shlib_wrap.sh" "$(BLDDIR)/util"; \ fi -$(SRCDIR)/apps/openssl-vms.cnf: $(SRCDIR)/apps/openssl.cnf - $(PERL) $(SRCDIR)/VMS/VMSify-conf.pl \ - < $(SRCDIR)/apps/openssl.cnf > $(SRCDIR)/apps/openssl-vms.cnf - -$(SRCDIR)/crypto/bn/bn_prime.h: $(SRCDIR)/crypto/bn/bn_prime.pl - $(PERL) $(SRCDIR)/crypto/bn/bn_prime.pl > $(SRCDIR)/crypto/bn/bn_prime.h - -$(SRCDIR)/crypto/objects/obj_dat.h: $(SRCDIR)/crypto/objects/obj_dat.pl \ - $(SRCDIR)/include/openssl/obj_mac.h - $(PERL) $(SRCDIR)/crypto/objects/obj_dat.pl \ - $(SRCDIR)/include/openssl/obj_mac.h \ - $(SRCDIR)/crypto/objects/obj_dat.h - -# objects.pl both reads and writes obj_mac.num -$(SRCDIR)/include/openssl/obj_mac.h: $(SRCDIR)/crypto/objects/objects.pl \ - $(SRCDIR)/crypto/objects/objects.txt \ - $(SRCDIR)/crypto/objects/obj_mac.num - $(PERL) $(SRCDIR)/crypto/objects/objects.pl \ - $(SRCDIR)/crypto/objects/objects.txt \ - $(SRCDIR)/crypto/objects/obj_mac.num \ - $(SRCDIR)/include/openssl/obj_mac.h - @sleep 1; touch $(SRCDIR)/include/openssl/obj_mac.h; sleep 1 - -$(SRCDIR)/crypto/objects/obj_xref.h: $(SRCDIR)/crypto/objects/objxref.pl \ - $(SRCDIR)/crypto/objects/obj_xref.txt \ - $(SRCDIR)/crypto/objects/obj_mac.num - $(PERL) $(SRCDIR)/crypto/objects/objxref.pl \ - $(SRCDIR)/crypto/objects/obj_mac.num \ - $(SRCDIR)/crypto/objects/obj_xref.txt \ - > $(SRCDIR)/crypto/objects/obj_xref.h - @sleep 1; touch $(SRCDIR)/crypto/objects/obj_xref.h; sleep 1 - FORCE: # Building targets ################################################### @@ -851,7 +841,12 @@ EOF sub src2obj { my %args = @_; my $obj = $args{obj}; - my @srcs = map { (my $x = $_) =~ s/\.S$/.s/; $x } ( @{$args{srcs}} ); + my @srcs = map { if ($unified_info{generate}->{$_}) { + (my $x = $_) =~ s/\.S$/.s/; $x + } else { + $_ + } + } ( @{$args{srcs}} ); my $srcs = join(" ", @srcs); my $deps = join(" ", @srcs, @{$args{deps}}); my $incs = join("", map { " -I".$_ } @{$args{incs}}); @@ -863,9 +858,8 @@ EOF if (!$disabled{makedepend} && $makedepprog =~ /\/makedepend/) { $recipe .= <<"EOF"; $obj$depext: $deps - rm -f \$\@.tmp; touch \$\@.tmp - -\$(MAKEDEPEND) -f\$\@.tmp -o"|$obj$objext" -- \$(CFLAGS) $ecflags$incs -- $srcs \\ - 2>/dev/null + -\$(MAKEDEPEND) -f- -o"|$obj$objext" -- \$(CFLAGS) $ecflags$incs -- $srcs \\ + >\$\@.tmp 2>/dev/null -\$(PERL) -i -pe 's/^.*\\|//; s/ \\/(\\\\.|[^ ])*//; \$\$_ = undef if (/: *\$\$/ || /^(#.*| *)\$\$/); \$\$_.="\\n" unless !defined(\$\$_) or /\\R\$\$/g;' \$\@.tmp \@if cmp \$\@.tmp \$\@ > /dev/null 2> /dev/null; then \\ rm -f \$\@.tmp; \\