Commit 05a7aee0 authored by Richard Levitte's avatar Richard Levitte
Browse files

Communicate Configure generated header files to build files 



Add Configure generated header files to $unified_info{generate}.  This
makes sure the build files will pick them up with the rest for the
GENERATED macro, and thereby make sure they get cleaned away by 'make
clean'

Reviewed-by: default avatarRich Salz <rsalz@openssl.org>
parent 73b61c7e

Configurations/common.tmpl

+2 −0
Original line number Diff line number Diff line
@@ -42,6 +42,8 @@ 
     my $bin = shift;

     my %opts = @_;

     if ($unified_info{generate}->{$src}) {

         die "$src is generated by Configure, should not appear in build file\n"

             if ref $unified_info{generate}->{$src} eq "";

         my $script = $unified_info{generate}->{$src}->[0];

         $OUT .= generatesrc(src => $src,

                             generator => $unified_info{generate}->{$src},

Configurations/unix-Makefile.tmpl

+6 −1
Original line number Diff line number Diff line
@@ -84,7 +84,12 @@ DEPS={- join(" ", map { (my $x = $_) =~ s|\.o$|$depext|; $x; } 
                  grep { $unified_info{sources}->{$_}->[0] =~ /\.c$/ }

                  keys %{$unified_info{sources}}); -}

{- output_on() if $disabled{makedepend}; "" -}

GENERATED={- join(" ", map { (my $x = $_) =~ s|\.S$|\.s|; $x } keys %{$unified_info{generate}}) -}

GENERATED={- join(" ",

                  ( map { (my $x = $_) =~ s|\.S$|\.s|; $x }

                    grep { defined $unified_info{generate}->{$_} }

                    map { @{$unified_info{sources}->{$_}} }

                    grep { /\.o$/ } keys %{$unified_info{sources}} ),

                  ( grep { /\.h$/ } keys %{$unified_info{generate}} )) -}



{- output_off() if $disabled{apps}; "" -}

BIN_SCRIPTS=$(BLDDIR)/tools/c_rehash

Configurations/windows-makefile.tmpl

+7 −1
Original line number Diff line number Diff line
@@ -77,6 +77,12 @@ DEPS={- join(" ", map { (my $x = $_) =~ s|\.o$|$depext|; $x; } 
                  grep { $unified_info{sources}->{$_}->[0] =~ /\.c$/ }

                  keys %{$unified_info{sources}}); -}

{- output_on() if $disabled{makedepend}; "" -}

GENERATED={- join(" ",

                  ( map { (my $x = $_) =~ s|\.[sS]$|\.asm|; $x }

                    grep { defined $unified_info{generate}->{$_} }

                    map { @{$unified_info{sources}->{$_}} }

                    grep { /\.o$/ } keys %{$unified_info{sources}} ),

                  ( grep { /\.h$/ } keys %{$unified_info{generate}} )) -}



# Do not edit these manually. Use Configure with --prefix or --openssldir

# to change this!  Short explanation in the top comment in Configure
@@ -176,7 +182,7 @@ libclean: 


clean: libclean

	-del /Q /F $(PROGRAMS) $(TESTPROGS) $(ENGINES) $(SCRIPTS)

	-del /Q /S /F *.asm

	-del /Q /S /F $(GENERATED)

	-del /Q /S /F *.d

	-del /Q /S /F *.obj

	-del /Q /S /F *.pdb

Configure

+7 −0
Original line number Diff line number Diff line
@@ -1731,6 +1731,13 @@ EOF 
        }

    }



    ### Add information about files generated by Configure

    foreach (map { abs2rel($_) } @generated_headers) {

        die "Configure gerenerated header file $_ has a GENERATE in a build.info\n"

            if $unified_info{generate}->{$_};

        $unified_info{generate}->{$_} = "Generated by Configure";

    }



    ### Make unified_info a bit more efficient

    # One level structures

    foreach (("programs", "libraries", "engines", "scripts", "extra", "overrides")) {