diff options
| author | Richard Levitte <levitte@openssl.org> | 2016-02-15 17:20:15 +0100 |
|---|---|---|
| committer | Richard Levitte <levitte@openssl.org> | 2016-02-19 11:51:23 +0100 |
| commit | e987f9f271a13558213e56659fba943df1578f98 (patch) | |
| tree | bc13ba6c0a58711354ba98e91b70f7643fc58013 /Makefile.in | |
| parent | a8a421b1136a7aefa6d8658ab1095bb87e90b82e (diff) | |
Let Configure figure out the diverse shared library and DSO extensions
Then it can pass around the information where it belongs. The
Makefile templates pick it up along with other target data, the
DSO module gets to pick up the information through
crypto/include/internal/dso_conf.h
Reviewed-by: Andy Polyakov <appro@openssl.org>
Diffstat (limited to 'Makefile.in')
| -rw-r--r-- | Makefile.in | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/Makefile.in b/Makefile.in index 9912d8868a..38601bb624 100644 --- a/Makefile.in +++ b/Makefile.in @@ -10,7 +10,10 @@ 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} -} +SHLIB_EXT={- $target{shared_extension} || ".so" -} +SHLIB_EXT_SIMPLE={- $target{shared_extension_simple} || ".so" -} +SHLIB_EXT_IMPORT={- $target{shared_import_extension} || "" -} +DSO_EXT={- $target{dso_extension} || ".so" -} PLATFORM={- $config{target} -} OPTIONS={- $config{options} -} CONFIGURE_ARGS=({- join(", ",quotify_l(@{$config{perlargv}})) -}) @@ -258,7 +261,8 @@ BUILDENV= LC_ALL=C PLATFORM='$(PLATFORM)' PROCESSOR='$(PROCESSOR)'\ SHARED_RCFLAG='$(SHARED_RCFLAG)' \ ZLIB_INCLUDE='$(ZLIB_INCLUDE)' LIBZLIB='$(LIBZLIB)' \ EXE_EXT='$(EXE_EXT)' SHARED_LIBS='$(SHARED_LIBS)' \ - SHLIB_EXT='$(SHLIB_EXT)' SHLIB_TARGET='$(SHLIB_TARGET)' \ + SHLIB_EXT='$(SHLIB_EXT)' DSO_EXT='$(DSO_EXT)' \ + SHLIB_TARGET='$(SHLIB_TARGET)' \ LDFLAG='$(LDFLAG)' \ PLIB_LDFLAG='$(PLIB_LDFLAG)' EX_LIBS='$(EX_LIBS)' \ APPS_OBJ='$(APPS_OBJ)' \ |