diff options
author | Richard Levitte <levitte@openssl.org> | 2015-05-20 20:03:20 +0200 |
---|---|---|
committer | Richard Levitte <richard@levitte.org> | 2016-01-25 19:07:11 +0100 |
commit | 107b5792b24ae701df442cd36bda785cbaf1bfdc (patch) | |
tree | fe22340cb5cc4a7b500309bb4fc3c78bbce781fc /Makefile.in | |
parent | e8cdcd52b33605b44390888e6aaa0548ca877b46 (diff) |
Refactor file writing - Remake Makefile.org into a template
It is time for Makefile.org to fold into the new regime and have a run
through util/dofile.pl. This forces some information out of there and
into Configure, which isn't a bad thing, it makes Configure
increasingly the center of build information, which is as it should
be.
A few extra defaults were needed in the BASE template to get rid of
warnings about missing values.
Reviewed-by: Viktor Dukhovni <viktor@openssl.org>
Diffstat (limited to 'Makefile.in')
-rw-r--r-- | Makefile.in | 126 |
1 files changed, 59 insertions, 67 deletions
diff --git a/Makefile.in b/Makefile.in index 9278783c8d..e875f43bdc 100644 --- a/Makefile.in +++ b/Makefile.in @@ -2,18 +2,18 @@ ## Makefile for OpenSSL ## -VERSION= -MAJOR= -MINOR= -SHLIB_VERSION_NUMBER= -SHLIB_VERSION_HISTORY= -SHLIB_MAJOR= -SHLIB_MINOR= -SHLIB_EXT= -PLATFORM=dist -OPTIONS= -CONFIGURE_ARGS= -SHLIB_TARGET= +VERSION={- $config{version} -} +MAJOR={- $config{major} -} +MINOR={- $config{minor} -} +SHLIB_VERSION_NUMBER={- $config{shlib_version_number} -} +SHLIB_VERSION_HISTORY={- $config{shlib_version_history} -} +SHLIB_MAJOR={- $config{shlib_major} -} +SHLIB_MINOR={- $config{shlib_minor} -} +SHLIB_EXT={- $target{shared_extension} -} +PLATFORM={- $config{target} -} +OPTIONS={- $config{options} -} +CONFIGURE_ARGS=({- join(", ",quotify_l(@{$config{perlargv}})) -}) +SHLIB_TARGET={- $target{shared_target} -} # HERE indicates where this Makefile lives. This can be used to indicate # where sub-Makefiles are expected to be. Currently has very limited usage, @@ -23,12 +23,12 @@ HERE=. # INSTALL_PREFIX is for package builders so that they can configure # for, say, /usr/ and yet have everything installed to /tmp/somedir/usr/. # Normally it is left empty. -INSTALL_PREFIX= +INSTALL_PREFIX={- $config{install_prefix} -} # Do not edit these manually. Use Configure with --prefix or --openssldir # to change this! Short explanation in the top comment in Configure -INSTALLTOP=/usr/local -OPENSSLDIR=$(INSTALLTOP)/ssl +INSTALLTOP={- $config{prefix} -} +OPENSSLDIR={- $config{openssldir} -} # NO_IDEA - Define to build without the IDEA algorithm # NO_RC4 - Define to build without the RC4 algorithm @@ -57,23 +57,24 @@ OPENSSLDIR=$(INSTALLTOP)/ssl # equal 4. # PKCS1_CHECK - pkcs1 tests. -CC= cc -CFLAG= -O -DEPFLAG= -PEX_LIBS= -EX_LIBS= -EXE_EXT= -ARFLAGS= -AR=ar $(ARFLAGS) r -RANLIB= ranlib -NM= nm -PERL= perl +CROSS_COMPILE= {- $config{cross_compile_prefix} -} +CC= $(CROSS_COMPILE){- $target{cc} -} +CFLAG= {- $config{cflags} -} +DEPFLAG= {- $config{depflags} -} +PEX_LIBS= {- $config{prelflags} -} +EX_LIBS= {- $config{lflags} -} +EXE_EXT= {- $target{exe_extension} -} +ARFLAGS= {- $target{arflags} -} +AR=$(CROSS_COMPILE){- $target{ar} -} $(ARFLAGS) r +RANLIB= {- $target{ranlib} -} +NM= $(CROSS_COMPILE){- $target{nm} -} +PERL= {- $config{perl} -} #RM= echo -- RM= rm -f TAR= tar TARFLAGS= --no-recursion -MAKEDEPPROG=makedepend -LIBDIR=lib +MAKEDEPPROG=$(CROSS_COMPILE){- $config{makedepprog} -} +LIBDIR={- $config{libdir} -} # We let the C compiler driver to take care of .s files. This is done in # order to be excused from maintaining a separate set of architecture @@ -85,32 +86,32 @@ ASFLAG=$(CFLAG) # For x86 assembler: Set PROCESSOR to 386 if you want to support # the 80386. -PROCESSOR= +PROCESSOR= {- $config{processor} -} # CPUID module collects small commonly used assembler snippets -CPUID_OBJ= -BN_ASM= bn_asm.o -EC_ASM= -DES_ENC= des_enc.o fcrypt_b.o -AES_ENC= aes_core.o aes_cbc.o -BF_ENC= bf_enc.o -CAST_ENC= c_enc.o -RC4_ENC= rc4_enc.o -RC5_ENC= rc5_enc.o -MD5_ASM_OBJ= -SHA1_ASM_OBJ= -RMD160_ASM_OBJ= -WP_ASM_OBJ= -CMLL_ENC= -MODES_ASM_OBJ= -ENGINES_ASM_OBJ= -CHACHA_ENC= chacha_enc.o -POLY1305_ASM_OBJ= -PERLASM_SCHEME= +CPUID_OBJ= {- $target{cpuid_obj} -} +BN_ASM= {- $target{bn_obj} -} +EC_ASM= {- $target{ec_obj} -} +DES_ENC= {- $target{des_obj} -} +AES_ENC= {- $target{aes_obj} -} +BF_ENC= {- $target{bf_obj} -} +CAST_ENC= {- $target{cast_obj} -} +RC4_ENC= {- $target{rc4_obj} -} +RC5_ENC= {- $target{rc5_obj} -} +MD5_ASM_OBJ= {- $target{md5_obj} -} +SHA1_ASM_OBJ= {- $target{sha1_obj} -} +RMD160_ASM_OBJ= {- $target{rmd160_obj} -} +WP_ASM_OBJ= {- $target{wp_obj} -} +CMLL_ENC= {- $target{cmll_obj} -} +MODES_ASM_OBJ= {- $target{modes_obj} -} +ENGINES_ASM_OBJ= {- $target{engines_obj} -} +CHACHA_ENC= {- $target{chacha_obj} -} +POLY1305_ASM_OBJ= {- $target{poly1305_obj} -} +PERLASM_SCHEME= {- $target{perlasm_scheme} -} # Zlib stuff -ZLIB_INCLUDE= -LIBZLIB= +ZLIB_INCLUDE={- $withargs{zlib-include} -} +LIBZLIB={- $withargs{zlib-lib} -} # This is the location of fipscanister.o and friends. # The FIPS module build will place it $(INSTALLTOP)/lib @@ -119,34 +120,25 @@ LIBZLIB= # $(INSTALLTOP) for this build may be different so hard # code the path. -FIPSLIBDIR=/usr/local/ssl/$(LIBDIR)/ +FIPSLIBDIR={- $config{fipslibdir} -} # The location of the library which contains fipscanister.o # normally it will be libcrypto. If not compiling in FIPS mode # at all this is empty making it a useful test for a FIPS compile. -FIPSCANLIB= +FIPSCANLIB={- $config{fips} ? "libcrypto" : "" -} # Shared library base address. Currently only used on Windows. # -BASEADDR= +BASEADDR={- $config{baseaddr} -} -DIRS= crypto ssl engines apps test tools +DIRS= {- join(" ", @{$config{dirs}}) -} SHLIBDIRS= crypto ssl INSTALL_SUBS= engines apps tools # dirs in crypto to build -SDIRS= \ - objects \ - md2 md4 md5 sha mdc2 hmac ripemd whrlpool poly1305 \ - des aes rc2 rc4 rc5 idea bf cast camellia seed chacha modes \ - bn ec rsa dsa dh dso engine \ - buffer bio stack lhash rand err \ - evp asn1 pem x509 x509v3 conf txt_db pkcs7 pkcs12 comp ocsp ui \ - cms ts jpake srp store cmac ct async kdf -# keep in mind that the above list is adjusted by ./Configure -# according to no-xxx arguments... +SDIRS= {- join(" ", @{$config{sdirs}}) -} # tests to perform. "alltests" is a special word indicating that all tests # should be performed. @@ -166,9 +158,9 @@ TOP= . LIBS= libcrypto.a libssl.a SHARED_CRYPTO=libcrypto$(SHLIB_EXT) SHARED_SSL=libssl$(SHLIB_EXT) -SHARED_LIBS= -SHARED_LIBS_LINK_EXTS= -SHARED_LDFLAGS= +SHARED_LIBS={- '$(SHARED_CRYPTO) $(SHARED_SSL)' if (!$config{no_shared}) -} +SHARED_LIBS_LINK_EXTS={- $config{shared_link_extensions} -} +SHARED_LDFLAGS={- $target{shared_ldflag} -} GENERAL= Makefile BASENAME= openssl |