[gtk+] reftests: Fix Makefile



commit 21d3701291821f750d1c2304f6d87c8f9de32142
Author: Benjamin Otte <otte redhat com>
Date:   Wed Aug 27 17:51:09 2014 +0200

    reftests: Fix Makefile
    
    with non-installed tests the build would get an empty $(reftestdir)
    which would screw up the LDFLAGS.
    
    An rpath seems to be required to make libtool build a shared object.
    Without an rpath line, it only builds a static object.
    
    https://bugzilla.gnome.org/show_bug.cgi?id=735401

 testsuite/reftests/Makefile.am |    7 ++++++-
 1 files changed, 6 insertions(+), 1 deletions(-)
---
diff --git a/testsuite/reftests/Makefile.am b/testsuite/reftests/Makefile.am
index 52a8d99..19c1a5e 100644
--- a/testsuite/reftests/Makefile.am
+++ b/testsuite/reftests/Makefile.am
@@ -409,6 +409,8 @@ reftest_LTLIBRARIES =                       \
        libreftest.la                   \
        $(NULL)
 
+libreftest_la_LDFLAGS = -rpath $(reftestdir)
+
 substitutions = \
        -e s,@libexecdir\@,$(libexecdir),g \
        $(NULL)
@@ -429,9 +431,12 @@ else
 noinst_LTLIBRARIES =                   \
        libreftest.la                   \
        $(NULL)
+
+libreftest_la_LDFLAGS = -rpath /iHaveNoIdeaWhatImDoing
+
 endif
 
-libreftest_la_LDFLAGS = -rpath $(reftestdir) -avoid-version -module $(no_undefined)
+libreftest_la_LDFLAGS += -avoid-version -module $(no_undefined)
 libreftest_la_CFLAGS = $(gtk_reftest_CFLAGS)
 libreftest_la_LIBADD = $(gtk_reftest_LDADD)
 libreftest_la_SOURCES =                        \


[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]