diff options
| author | Vadim Zborovskii <vzborovsky@gmail.com> | 2013-08-18 14:58:27 +0400 |
|---|---|---|
| committer | Steve Bennett <steveb@workware.net.au> | 2013-08-23 08:40:26 +1000 |
| commit | 9f6a391ea48da29f46aa92a500df91a944e39307 (patch) | |
| tree | 65260db4bcd4a88004a6ed7bd7c647d5ba5c7eaf /Makefile.in | |
| parent | ab939f33357c7ee7825aff0ecf51f3f77b0dde30 (diff) | |
| download | jimtcl-9f6a391ea48da29f46aa92a500df91a944e39307.zip jimtcl-9f6a391ea48da29f46aa92a500df91a944e39307.tar.gz jimtcl-9f6a391ea48da29f46aa92a500df91a944e39307.tar.bz2 | |
Unbreak shared build on Windows. Collect all version ids to auto.def.
Diffstat (limited to 'Makefile.in')
| -rw-r--r-- | Makefile.in | 9 |
1 files changed, 6 insertions, 3 deletions
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 |