From df359fe6950dffb15045113a0efd605931e838d5 Mon Sep 17 00:00:00 2001 From: Rhys Weatherley Date: Tue, 11 May 2004 22:25:22 +0000 Subject: [PATCH] Use both .libs and non.libs versions of the so paths, because some versions of libtool add .libs implicitly and others don't. --- ChangeLog | 6 ++++++ jitdynamic/Makefile.am | 5 +++-- jitplus/Makefile.am | 5 +++-- 3 files changed, 12 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index 347ac03..66b0df2 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,4 +1,10 @@ +2004-05-12 Rhys Weatherley + + * jitdynamic/Makefile.am, jitplus/Makefile.am: use both .libs and + non.libs versions of the so paths, because some versions of libtool + add .libs implicitly and others don't. + 2004-05-11 Rhys Weatherley * include/jit/jit-insn.h, jit/jit-insn.c, jit/jit-interp.cpp, diff --git a/jitdynamic/Makefile.am b/jitdynamic/Makefile.am index e0a033d..0e797ec 100644 --- a/jitdynamic/Makefile.am +++ b/jitdynamic/Makefile.am @@ -8,6 +8,7 @@ libjitdynamic_la_SOURCES = \ AM_CFLAGS = -I$(top_srcdir)/include -I$(top_builddir)/include \ -I. -I$(srcdir) -I$(top_srcdir)/jit -I$(top_builddir)/jit -libjitdynamic_la_LDFLAGS = -version-info $(LIBJIT_VERSION) \ - -L$(top_builddir)/jit/.libs -ljit $(LIB_STDCPP) +libjitdynamic_la_LDFLAGS = \ + -version-info $(LIBJIT_VERSION) \ + -L$(top_builddir)/jit -L$(top_builddir)/jit/.libs -ljit $(LIB_STDCPP) libjitdynamic_la_DEPENDENCIES = $(top_builddir)/jit/libjit.la diff --git a/jitplus/Makefile.am b/jitplus/Makefile.am index 86e2c8e..8069dd9 100644 --- a/jitplus/Makefile.am +++ b/jitplus/Makefile.am @@ -8,6 +8,7 @@ libjitplus_la_SOURCES = \ AM_CXXFLAGS = -I$(top_srcdir)/include -I$(top_builddir)/include -I. -I$(srcdir) -libjitplus_la_LDFLAGS = -version-info $(LIBJIT_VERSION) \ - -L$(top_builddir)/jit/.libs -ljit $(LIB_STDCPP) +libjitplus_la_LDFLAGS = \ + -version-info $(LIBJIT_VERSION) \ + -L$(top_builddir)/jit -L$(top_builddir)/jit/.libs -ljit $(LIB_STDCPP) libjitplus_la_DEPENDENCIES = $(top_builddir)/jit/libjit.la