From f5bc030dd5054b5bb75ddf512f017ef3071957a0 Mon Sep 17 00:00:00 2001 From: Max Horn Date: Thu, 10 Apr 2014 15:22:17 +0200 Subject: [PATCH 1/2] refactor shobj-conf to improve readability --- support/shobj-conf | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/support/shobj-conf b/support/shobj-conf index 1f64433..e666fae 100644 --- a/support/shobj-conf +++ b/support/shobj-conf @@ -189,7 +189,7 @@ darwin*) darwin[1-7].*) SHOBJ_STATUS=unsupported SHOBJ_LDFLAGS='-dynamic' - SHLIB_XLDFLAGS='-arch_only `/usr/bin/arch` -install_name $(libdir)/`echo $@ | sed "s:\\..*::"`.$(SHLIB_MAJOR).$(SHLIB_LIBSUFF) -current_version $(SHLIB_MAJOR)$(SHLIB_MINOR) -compatibility_version $(SHLIB_MAJOR) -v' + SHLIB_XLDFLAGS='-arch_only `/usr/bin/arch`' ;; # Darwin 8 == Mac OS X 10.4; Mac OS X 10.N == Darwin N+4 *) @@ -205,9 +205,13 @@ darwin*) ;; esac SHOBJ_LDFLAGS="-dynamiclib -dynamic -undefined dynamic_lookup ${SHOBJ_ARCHFLAGS}" - SHLIB_XLDFLAGS="-dynamiclib ${SHOBJ_ARCHFLAGS}"' -install_name $(libdir)/`echo $@ | sed "s:\\..*::"`.$(SHLIB_MAJOR).$(SHLIB_LIBSUFF) -current_version $(SHLIB_MAJOR)$(SHLIB_MINOR) -compatibility_version $(SHLIB_MAJOR) -v' + SHLIB_XLDFLAGS="-dynamiclib ${SHOBJ_ARCHFLAGS}" ;; esac + SHLIB_XLDFLAGS="${SHLIB_XLDFLAGS}"' -install_name $(libdir)/`echo $@ | sed "s:\\..*::"`.$(SHLIB_MAJOR).$(SHLIB_LIBSUFF)' + SHLIB_XLDFLAGS="${SHLIB_XLDFLAGS}"' -current_version $(SHLIB_MAJOR)$(SHLIB_MINOR)' + SHLIB_XLDFLAGS="${SHLIB_XLDFLAGS}"' -compatibility_version $(SHLIB_MAJOR)' + SHLIB_XLDFLAGS="${SHLIB_XLDFLAGS}"' -v' SHLIB_LIBS='-lncurses' # see if -lcurses works on MacOS X 10.1 ;; -- 1.9.0.7.ga299b13