From 093fd54e2b7cf2e57982f78f729394f4f1c0cf4b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Florian=20M=C3=BCllner?= Date: Thu, 28 Apr 2016 00:07:45 +0200 Subject: [PATCH] build: Point executables to our private lib path We now link to cogl/clutter forks in a private location, so make sure we set the rpath of executables to point the runtime linker to the correct location. --- docs/reference/shell/Makefile.am | 2 +- docs/reference/st/Makefile.am | 2 +- src/Makefile.am | 3 ++- 3 files changed, 4 insertions(+), 3 deletions(-) diff --git a/docs/reference/shell/Makefile.am b/docs/reference/shell/Makefile.am index b82c916be..0733d782d 100644 --- a/docs/reference/shell/Makefile.am +++ b/docs/reference/shell/Makefile.am @@ -113,7 +113,7 @@ expand_content_files= # e.g. GTKDOC_CFLAGS=-I$(top_srcdir) -I$(top_builddir) $(GTK_DEBUG_FLAGS) # e.g. GTKDOC_LIBS=$(top_builddir)/gtk/$(gtktargetlib) GTKDOC_CFLAGS=$(GNOME_SHELL_CFLAGS) -GTKDOC_LIBS=$(GNOME_SHELL_LIBS) $(top_builddir)/src/libgnome-shell-menu.la $(top_builddir)/src/libgnome-shell-base.la $(top_builddir)/src/libgnome-shell.la +GTKDOC_LIBS=$(GNOME_SHELL_LIBS) $(top_builddir)/src/libgnome-shell-menu.la $(top_builddir)/src/libgnome-shell-base.la $(top_builddir)/src/libgnome-shell.la -rpath $(MUTTER_TYPELIB_DIR) # This includes the standard gtk-doc make rules, copied by gtkdocize. include $(top_srcdir)/gtk-doc.make diff --git a/docs/reference/st/Makefile.am b/docs/reference/st/Makefile.am index 9a5efd045..18e837d24 100644 --- a/docs/reference/st/Makefile.am +++ b/docs/reference/st/Makefile.am @@ -78,7 +78,7 @@ expand_content_files= # e.g. GTKDOC_CFLAGS=-I$(top_srcdir) -I$(top_builddir) $(GTK_DEBUG_FLAGS) # e.g. GTKDOC_LIBS=$(top_builddir)/gtk/$(gtktargetlib) GTKDOC_CFLAGS= -GTKDOC_LIBS=$(top_builddir)/src/libst-1.0.la +GTKDOC_LIBS=$(top_builddir)/src/libst-1.0.la -rpath $(MUTTER_TYPELIB_DIR) # This includes the standard gtk-doc make rules, copied by gtkdocize. include $(top_srcdir)/gtk-doc.make diff --git a/src/Makefile.am b/src/Makefile.am index 4b507ee70..76ad9f7f8 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -12,7 +12,7 @@ SUBDIRS = gvc -include $(INTROSPECTION_MAKEFILE) INTROSPECTION_GIRS = -INTROSPECTION_SCANNER_ARGS = --warn-all --warn-error --add-include-path=$(srcdir) --add-include-path=$(MUTTER_GIR_DIR) +INTROSPECTION_SCANNER_ARGS = --warn-all --warn-error --add-include-path=$(srcdir) --add-include-path=$(MUTTER_GIR_DIR) -L$(MUTTER_TYPELIB_DIR) INTROSPECTION_COMPILER_ARGS = --includedir=$(srcdir) --includedir=$(MUTTER_TYPELIB_DIR) typelibdir = $(pkglibdir) @@ -201,6 +201,7 @@ gnome_shell_CPPFLAGS = \ # Here, and after, we repeat mutter and bluetooth libraries just for the rpath # The dependency is already pulled in by libtool gnome_shell_LDADD = libgnome-shell.la libgnome-shell-js.la $(GNOME_SHELL_LIBS) $(MUTTER_LIBS) +gnome_shell_LDFLAGS = -rpath $(MUTTER_TYPELIB_DIR) gnome_shell_DEPENDENCIES = libgnome-shell.la gnome_shell_extension_prefs_SOURCES = \