mirror of
https://github.com/openssl/openssl.git
synced 2025-01-18 13:44:20 +08:00
Add the INHIBIT_SYMLINKS flag variable to help Cygwin.
Add missing semicolons. Add a comment explaining a bunch of targets without any action lines.
This commit is contained in:
parent
6f17f16fd5
commit
bfa96bc20e
@ -80,17 +80,19 @@ LINK_SO= \
|
|||||||
$$ALLSYMSFLAGS $$SHOBJECTS $$NOALLSYMSFLAGS $$LIBDEPS ) && \
|
$$ALLSYMSFLAGS $$SHOBJECTS $$NOALLSYMSFLAGS $$LIBDEPS ) && \
|
||||||
$(SYMLINK_SO); ( $(DEBUG); rm -f lib$(LIBNAME).exp )
|
$(SYMLINK_SO); ( $(DEBUG); rm -f lib$(LIBNAME).exp )
|
||||||
SYMLINK_SO= \
|
SYMLINK_SO= \
|
||||||
prev=$$SHLIB$$SHLIB_SOVER$$SHLIB_SUFFIX; \
|
if [ -n "$$INHIBIT_SYMLINKS" ]; then :; else \
|
||||||
if [ -n "$$SHLIB_COMPAT" ]; then \
|
prev=$$SHLIB$$SHLIB_SOVER$$SHLIB_SUFFIX; \
|
||||||
for x in $$SHLIB_COMPAT; do \
|
if [ -n "$$SHLIB_COMPAT" ]; then \
|
||||||
( $(DEBUG); rm -f $$SHLIB$$x$$SHLIB_SUFFIX; \
|
for x in $$SHLIB_COMPAT; do \
|
||||||
ln -s $$prev $$SHLIB$$x$$SHLIB_SUFFIX ); \
|
( $(DEBUG); rm -f $$SHLIB$$x$$SHLIB_SUFFIX; \
|
||||||
prev=$$SHLIB$$x$$SHLIB_SUFFIX; \
|
ln -s $$prev $$SHLIB$$x$$SHLIB_SUFFIX ); \
|
||||||
done; \
|
prev=$$SHLIB$$x$$SHLIB_SUFFIX; \
|
||||||
fi; \
|
done; \
|
||||||
if [ -n "$$SHLIB_SOVER" ]; then \
|
fi; \
|
||||||
( $(DEBUG); rm -f $$SHLIB$$SHLIB_SUFFIX; \
|
if [ -n "$$SHLIB_SOVER" ]; then \
|
||||||
ln -s $$prev $$SHLIB$$SHLIB_SUFFIX ); \
|
( $(DEBUG); rm -f $$SHLIB$$SHLIB_SUFFIX; \
|
||||||
|
ln -s $$prev $$SHLIB$$SHLIB_SUFFIX ); \
|
||||||
|
fi; \
|
||||||
fi
|
fi
|
||||||
|
|
||||||
LINK_SO_A= SHOBJECTS="lib$(LIBNAME).a $(LIBEXTRAS)"; $(LINK_SO)
|
LINK_SO_A= SHOBJECTS="lib$(LIBNAME).a $(LIBEXTRAS)"; $(LINK_SO)
|
||||||
@ -159,18 +161,22 @@ link_a.darwin:
|
|||||||
$(LINK_SO_A)
|
$(LINK_SO_A)
|
||||||
|
|
||||||
link_o.cygwin:
|
link_o.cygwin:
|
||||||
@ SHLIB=cyg$(LIBNAME).dll \
|
@ $(CALC_VERSIONS); \
|
||||||
SHLIB_SUFFIX= \
|
INHIBIT_SYMLINKS=yes; \
|
||||||
|
SHLIB=cyg$(LIBNAME) \
|
||||||
|
SHLIB_SUFFIX=.dll \
|
||||||
LIBDEPS="$(LIBDEPS) -lc" \
|
LIBDEPS="$(LIBDEPS) -lc" \
|
||||||
SHLIB_SOVER= \
|
SHLIB_SOVER=-$(LIBVERSION) \
|
||||||
ALLSYMSFLAGS='-Wl,--whole-archive' \
|
ALLSYMSFLAGS='-Wl,--whole-archive' \
|
||||||
NOALLSYMSFLAGS='-Wl,--no-whole-archive' \
|
NOALLSYMSFLAGS='-Wl,--no-whole-archive' \
|
||||||
SHAREDFLAGS="-shared -Wl,-Bsymbolic -Wl,--out-implib,lib$(LIBNAME).dll.a" \
|
SHAREDFLAGS="-shared -Wl,-Bsymbolic -Wl,--out-implib,lib$(LIBNAME).dll.a" \
|
||||||
SHAREDCMD='${CC}'; \
|
SHAREDCMD='${CC}'; \
|
||||||
$(LINK_SO_O)
|
$(LINK_SO_O)
|
||||||
link_a.cygwin:
|
link_a.cygwin:
|
||||||
@ SHLIB=cyg$(LIBNAME).dll \
|
@ $(CALC_VERSIONS); \
|
||||||
SHLIB_SUFFIX= \
|
INHIBIT_SYMLINKS=yes; \
|
||||||
|
SHLIB=cyg$(LIBNAME) \
|
||||||
|
SHLIB_SUFFIX=.dll \
|
||||||
LIBDEPS="$(LIBDEPS) -lc" \
|
LIBDEPS="$(LIBDEPS) -lc" \
|
||||||
SHLIB_SOVER= \
|
SHLIB_SOVER= \
|
||||||
ALLSYMSFLAGS='-Wl,--whole-archive' \
|
ALLSYMSFLAGS='-Wl,--whole-archive' \
|
||||||
@ -519,18 +525,19 @@ link_a.reliantunix:
|
|||||||
symlink.gnu symlink.solaris symlink.svr3 symlink.irix \
|
symlink.gnu symlink.solaris symlink.svr3 symlink.irix \
|
||||||
symlink.aix symlink.reliantunix:
|
symlink.aix symlink.reliantunix:
|
||||||
@ $(CALC_VERSIONS); \
|
@ $(CALC_VERSIONS); \
|
||||||
SHLIB=lib$(LIBNAME).so \
|
SHLIB=lib$(LIBNAME).so; \
|
||||||
$(SYMLINK_SO)
|
$(SYMLINK_SO)
|
||||||
symlink.darwin:
|
symlink.darwin:
|
||||||
@ $(CALC_VERSIONS); \
|
@ $(CALC_VERSIONS); \
|
||||||
SHLIB=lib$(LIBNAME) \
|
SHLIB=lib$(LIBNAME) \
|
||||||
SHLIB_SUFFIX=.dylib \
|
SHLIB_SUFFIX=.dylib; \
|
||||||
$(SYMLINK_SO)
|
$(SYMLINK_SO)
|
||||||
symlink.cygwin symlib.alpha-osf1 symlink.tru64 symlink.tru64-rpath:
|
|
||||||
symlink.hpux32 symlink.hpux64:
|
symlink.hpux32 symlink.hpux64:
|
||||||
@ $(CALC_VERSIONS); \
|
@ $(CALC_VERSIONS); \
|
||||||
SHLIB=lib$(LIBNAME).sl \
|
SHLIB=lib$(LIBNAME).sl; \
|
||||||
$(SYMLINK_SO)
|
$(SYMLINK_SO)
|
||||||
|
# The following lines means those specific architectures do no symlinks
|
||||||
|
symlink.cygwin symlib.alpha-osf1 symlink.tru64 symlink.tru64-rpath:
|
||||||
|
|
||||||
# Compatibility targets
|
# Compatibility targets
|
||||||
link_o.bsd-gcc-shared link_o.linux-shared link_o.gnu-shared: link_o.gnu
|
link_o.bsd-gcc-shared link_o.linux-shared link_o.gnu-shared: link_o.gnu
|
||||||
|
Loading…
Reference in New Issue
Block a user