X-Git-Url: https://git.openssl.org/gitweb/?p=openssl.git;a=blobdiff_plain;f=Makefile.in;h=924dfa0aa0cd1aa64a6038a0746cf758beeebad0;hp=a7cd7570a9d6cde36c36b0e4cd3efd73cfa4e19a;hb=6a99fde46b520637865a116e75f52514b39af16a;hpb=520f434b42c83d63d8777075eb66967618551d5b diff --git a/Makefile.in b/Makefile.in index a7cd7570a9..924dfa0aa0 100644 --- a/Makefile.in +++ b/Makefile.in @@ -193,7 +193,8 @@ TOP= . LIBS= libcrypto.a libssl.a SHARED_CRYPTO=libcrypto$(SHLIB_EXT) SHARED_SSL=libssl$(SHLIB_EXT) -SHARED_LIBS={- '$(SHARED_CRYPTO) $(SHARED_SSL)' if (!$config{no_shared}) -} +SHARED_LIBS={- $disabled{shared} ? '' : '$(SHARED_CRYPTO) $(SHARED_SSL)' -} +SHARED_CFLAG={- $target{shared_cflag} -} SHARED_LDFLAG={- $target{shared_ldflag} # Unlike other OSes (like Solaris, Linux, Tru64, # IRIX) BSD run-time linkers (tested OpenBSD, NetBSD @@ -209,6 +210,7 @@ SHARED_LDFLAG={- $target{shared_ldflag} . ($config{target} =~ m|^BSD-| && $prefix !~ m|^/usr/.*$| ? " -Wl,-rpath,\$\$(LIBRPATH)" : "") -} SHARED_RCFLAG={- $target{shared_rcflag} -} +DYNAMIC_ENGINES={- $config{dynamic_engines} -} GENERAL= Makefile BASENAME= openssl @@ -249,10 +251,11 @@ CLEARENV= TOP= && unset TOP $${LIB+LIB} $${LIBS+LIBS} \ # same language for uniform treatment. BUILDENV= LC_ALL=C PLATFORM='$(PLATFORM)' PROCESSOR='$(PROCESSOR)'\ CC='$(CC)' CFLAG='$(CFLAG)' CFLAG_Q='$(CFLAG_Q)' \ + SHARED_CFLAG='$(SHARED_CFLAG)' \ AS='$(CC)' ASFLAG='$(CFLAG) -c' \ AR='$(AR)' NM='$(NM)' RANLIB='$(RANLIB)' \ - CROSS_COMPILE='$(CROSS_COMPILE)' \ - PERL='$(PERL)' \ + CROSS_COMPILE='$(CROSS_COMPILE)' \ + PERL='$(PERL)' DYNAMIC_ENGINES='$(DYNAMIC_ENGINES)' \ SDIRS='$(SDIRS)' LIBRPATH='$(INSTALLTOP)/$(LIBDIR)' \ DESTDIR='$(DESTDIR)' \ INSTALLTOP='$(INSTALLTOP)' OPENSSLDIR='$(OPENSSLDIR)' \