Commit d10dac11 authored by Rich Salz's avatar Rich Salz Committed by Rich Salz
Browse files

Move Makefiles to Makefile.in 



Create Makefile's from Makefile.in
Rename Makefile.org to Makefile.in
Rename Makefiles to Makefile.in
Address review feedback from Viktor and Richard

Reviewed-by: default avatarViktor Dukhovni <viktor@openssl.org>
Reviewed-by: default avatarRichard Levitte <levitte@openssl.org>
parent 4b1fa408

.gitignore

+3 −1
Original line number Diff line number Diff line
@@ -10,7 +10,7 @@ 
/.dir-locals.el



# Top level excludes

/Makefile.bak

/Makefile.orig

/Makefile

/MINFO

/TABLE
@@ -22,6 +22,8 @@ 
/out.*

/tmp.*



**/Makefile



/test/*.ss

/test/*.srl

/test/.rnd

.travis-create-release.sh

+2 −2
Original line number Diff line number Diff line
@@ -3,8 +3,8 @@ 
# $1 is expected to be $TRAVIS_OS_NAME



if [ "$1" == osx ]; then

    make -f Makefile.org \

    make -f Makefile.in \

	 DISTTARVARS="NAME=_srcdist TAR_COMMAND='\$\$(TAR) \$\$(TARFLAGS) -s \"|^|\$\$(NAME)/|\" -T \$\$(TARFILE).list -cvf -' TARFLAGS='-n' TARFILE=_srcdist.tar" SHELL='sh -vx' dist

else

    make -f Makefile.org DISTTARVARS='TARFILE=_srcdist.tar NAME=_srcdist' SHELL='sh -v' dist

    make -f Makefile.in DISTTARVARS='TARFILE=_srcdist.tar NAME=_srcdist' SHELL='sh -v' dist

fi

CHANGES

+5 −0
Original line number Diff line number Diff line
@@ -4,6 +4,11 @@ 


 Changes between 1.0.2e and 1.1.0  [xx XXX xxxx]



  *) The distribution now has Makefile.in files, which are used to

     create Makefile's when Configure is run.  *Configure must be run

     before trying to build now.*

     [Rich Salz]



  *) The return value for SSL_CIPHER_description() for error conditions

     has changed.

     [Rich Salz]

Configurations/10-main.conf

+1 −1
Original line number Diff line number Diff line
@@ -2,7 +2,7 @@ 
## Standard openssl configuration targets.

##

## If you edit this file, run this command before committing

##	make -f Makefile.org TABLE

##	make -f Makefile.in TABLE

## This file is interpolated by the Configure script.



%targets = (

Configurations/90-team.conf

+1 −1
Original line number Diff line number Diff line
@@ -2,7 +2,7 @@ 
## Build configuration targets for openssl-team members

##

## If you edit this file, run this command before committing

##	make -f Makefile.org TABLE

##	make -f Makefile.in TABLE

## This file is interpolated by the Configure script.



%targets = (