From 9f6a391ea48da29f46aa92a500df91a944e39307 Mon Sep 17 00:00:00 2001 From: Vadim Zborovskii Date: Sun, 18 Aug 2013 14:58:27 +0400 Subject: Unbreak shared build on Windows. Collect all version ids to auto.def. --- Makefile.in | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) (limited to 'Makefile.in') diff --git a/Makefile.in b/Makefile.in index 3efc9f7..3080190 100644 --- a/Makefile.in +++ b/Makefile.in @@ -8,7 +8,10 @@ STRIP = @STRIP@ # Configuration SH_CFLAGS ?= @SH_CFLAGS@ -SH_LDFLAGS ?= @SH_LDFLAGS@ @SH_SOPREFIX@libjim.@LIBSOEXT@.0.75 +SH_LDFLAGS ?= @SH_LDFLAGS@ +@if SH_SOPREFIX +SH_LDFLAGS += @SH_SOPREFIX@libjim@LIBSOEXT@ +@endif SHOBJ_CFLAGS ?= @SHOBJ_CFLAGS@ @if JIM_STATICLIB SHOBJ_LDFLAGS ?= @SHOBJ_LDFLAGS@ @@ -33,11 +36,11 @@ VPATH := @srcdir@ @if JIM_STATICLIB LIBJIM := libjim.a @else -LIBJIM := libjim.@LIBSOEXT@.0.75 +LIBJIM := libjim@LIBSOEXT@ SH_LIBJIM := $(LIBJIM) CC += $(SH_CFLAGS) CXX += $(SH_CFLAGS) -DEF_LD_PATH := @LD_LIBRARY_PATH@=@builddir@ +DEF_LD_PATH := @LD_LIBRARY_PATH@="@builddir@:$(@LD_LIBRARY_PATH@)" @endif @if HAVE_CXX_EXTENSIONS -- cgit v1.1