[glib] giomodule test: force shared library build
- From: Ryan Lortie <desrt src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [glib] giomodule test: force shared library build
- Date: Mon, 13 Jan 2014 21:14:25 +0000 (UTC)
commit 186965fc9b9105fbaaffec2300a36175f160b1db
Author: Ryan Lortie <desrt desrt ca>
Date: Mon Jan 13 15:31:38 2014 -0500
giomodule test: force shared library build
http://lists.gnu.org/archive/html/bug-libtool/2013-05/msg00009.html hit
us again. libtool only builds .so files if we install the library, so
force it to build for our testcase, even if we don't install it.
gio/tests/modules/Makefile.am | 7 +++++--
1 files changed, 5 insertions(+), 2 deletions(-)
---
diff --git a/gio/tests/modules/Makefile.am b/gio/tests/modules/Makefile.am
index 1e4e1fa..d24357a 100644
--- a/gio/tests/modules/Makefile.am
+++ b/gio/tests/modules/Makefile.am
@@ -27,12 +27,15 @@ endif
if ENABLE_INSTALLED_TESTS
testmoduledir = $(installed_testdir)/modules
testmodule_LTLIBRARIES = $(modules)
+else
+# See comment in Makefile.am one level up
+rpath_hack = -rpath /
endif
libtestmodulea_la_SOURCES = test-module-a.c
libtestmodulea_la_LIBADD = $(LDADD)
-libtestmodulea_la_LDFLAGS = $(LDFLAGS) -no-undefined -avoid-version
+libtestmodulea_la_LDFLAGS = $(LDFLAGS) -no-undefined -avoid-version $(rpath_hack)
libtestmoduleb_la_SOURCES = test-module-b.c
libtestmoduleb_la_LIBADD = $(LDADD)
-libtestmoduleb_la_LDFLAGS =$(LDFLAGS) -no-undefined -avoid-version
+libtestmoduleb_la_LDFLAGS =$(LDFLAGS) -no-undefined -avoid-version $(rpath_hack)
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]