[java-atk-wrapper/wip] Build: Use PLATFORM_LDFLAGS



commit 35caeed39567eb030d6222e6616a5c6119dd0bed
Author: Magdalen Berns <m berns thismagpie com>
Date:   Tue Jun 23 17:37:49 2015 +0100

    Build: Use PLATFORM_LDFLAGS
    
    Bug: https://bugzilla.gnome.org/show_bug.cgi?id=751396

 acinclude.m4        |    2 +-
 jni/src/Makefile.am |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
---
diff --git a/acinclude.m4 b/acinclude.m4
index 05c0133..f684a6d 100644
--- a/acinclude.m4
+++ b/acinclude.m4
@@ -36,7 +36,7 @@ case "$host" in
       JNI_INCLUDES="-I$JDK_SRC/include -I$JDK_SRC/include/linux"
     fi
     PLATFORM_CFLAGS=
-    PLATFORM_LDFLAGS=
+    PLATFORM_LDFLAGS="-rpath $libdir"
     PLATFORM_CLASSPATH_SEPARATOR=":"
     SOPREFIX=
     ;;
diff --git a/jni/src/Makefile.am b/jni/src/Makefile.am
index 2740685..0158e0e 100644
--- a/jni/src/Makefile.am
+++ b/jni/src/Makefile.am
@@ -31,7 +31,7 @@ libatk_wrapper_la_CPPFLAGS = $(JNI_INCLUDES)\
 
 libatk_wrapper_la_LDFLAGS = $(LIB_ATK_WRAPPER_LD_FLAGS) \
                             $(LT_VERSION_INFO) \
-                            -rpath $(libdir) \
+                            $(PLATFORM_LDFLAGS) \
                             $(AM_LDFLAGS)
 
 libatk_wrapper_la_LIBADD = $(JAW_LIBS)


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