diff options
| author | Richard Levitte <levitte@openssl.org> | 2016-02-18 13:17:15 +0100 |
|---|---|---|
| committer | Richard Levitte <levitte@openssl.org> | 2016-02-18 23:43:09 +0100 |
| commit | ce192ebed0f5445076996b46c279a1499fdc8948 (patch) | |
| tree | 83bc0d2247e2577d6d9ddb6cef81891c202e0ac7 /Makefile.in | |
| parent | Don't treat .d (depend) files separately from object files (diff) | |
| download | openssl-ce192ebed0f5445076996b46c279a1499fdc8948.tar.xz openssl-ce192ebed0f5445076996b46c279a1499fdc8948.zip | |
Remove all special make depend flags, as well as OPENSSL_DOING_MAKEDEPEND
All those flags existed because we had all the dependencies versioned
in the repository, and wanted to have it be consistent, no matter what
the local configuration was. Now that the dependencies are gone from
the versioned Makefile.ins, it makes much more sense to use the exact
same flags as when compiling the object files.
Reviewed-by: Rich Salz <rsalz@openssl.org>
Diffstat (limited to 'Makefile.in')
| -rw-r--r-- | Makefile.in | 2 |
1 files changed, 0 insertions, 2 deletions
diff --git a/Makefile.in b/Makefile.in index cc2c0b520d..2fa7a652bc 100644 --- a/Makefile.in +++ b/Makefile.in @@ -92,7 +92,6 @@ CROSS_COMPILE= {- $config{cross_compile_prefix} -} CC= $(CROSS_COMPILE){- $target{cc} -} CFLAG={- our $cflags2 = join(" ",(map { "-D".$_} @{$config{defines}}),"-DOPENSSLDIR=\"\\\"\$(OPENSSLDIR)\\\"\"","-DENGINESDIR=\"\\\"\$(ENGINESDIR)\\\"\"") -} {- $config{cflags} -} CFLAG_Q={- $cflags2 =~ s|([\\"])|\\$1|g; $cflags2 -} {- $config{cflags} -} -DEPFLAG= {- join(" ",map { "-D".$_} @{$config{depdefines}}) -} LDFLAG= {- $config{lflags} -} PLIB_LDFLAG= {- $config{plib_lflags} -} EX_LIBS= {- $config{ex_libs} -} @@ -254,7 +253,6 @@ BUILDENV= LC_ALL=C PLATFORM='$(PLATFORM)' PROCESSOR='$(PROCESSOR)'\ DESTDIR='$(DESTDIR)' \ INSTALLTOP='$(INSTALLTOP)' OPENSSLDIR='$(OPENSSLDIR)' \ LIBDIR='$(LIBDIR)' \ - DEPFLAG='$(DEPFLAG)' \ SHARED_LDFLAG='$(SHARED_LDFLAG)' \ SHARED_RCFLAG='$(SHARED_RCFLAG)' \ ZLIB_INCLUDE='$(ZLIB_INCLUDE)' LIBZLIB='$(LIBZLIB)' \ |