From 0e42de9149ccb7a5b13e9687b30efacb18d3e75f Mon Sep 17 00:00:00 2001 From: Dan Winship Date: Sat, 30 Apr 2011 10:00:36 -0400 Subject: [PATCH] run-js-test: link to libgnome-shell.la The tests were broken again, because since Shell-0.1.gir now has 'shared-library="libgnome-shell.so"', the references to Shell.PerfLog ended up pulling in libgnome-shell in addition to the copy of shell-perf-log.c that libjs-test was built with. Fix all this hopefully forever by just making run-js-test link to libgnome-shell. https://bugzilla.gnome.org/show_bug.cgi?id=649203 --- configure.ac | 1 - src/Makefile.am | 21 ++------------------- 2 files changed, 2 insertions(+), 20 deletions(-) diff --git a/configure.ac b/configure.ac index abd4c2506..31d565c77 100644 --- a/configure.ac +++ b/configure.ac @@ -120,7 +120,6 @@ PKG_CHECK_MODULES(ST, clutter-1.0 gtk+-3.0 libcroco-0.6 >= 0.6.2 gnome-desktop-3 PKG_CHECK_MODULES(GDMUSER, dbus-glib-1 gtk+-3.0) PKG_CHECK_MODULES(TRAY, gtk+-3.0) PKG_CHECK_MODULES(GVC, libpulse libpulse-mainloop-glib gobject-2.0) -PKG_CHECK_MODULES(JS_TEST, clutter-x11-1.0 gjs-1.0 gobject-introspection-1.0 gtk+-3.0) PKG_CHECK_MODULES(DESKTOP_SCHEMAS, gsettings-desktop-schemas >= 0.1.7) AC_MSG_CHECKING([for bluetooth support]) diff --git a/src/Makefile.am b/src/Makefile.am index cdb3173ab..d5e825aba 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -186,27 +186,10 @@ gnome_shell_perf_helper_LDADD = $(SHELL_PERF_HELPER_LIBS) ######################################## -# In order to run the interactive tests for GUI components, we need to have -# an executable that exports the St components. Libtool doesn't have a way -# to include all the symbols from a convenience library into a executable -# so what we do is build a small uninstalled library that pulls in the -# St convenience library and link the test running program to that. - -noinst_LTLIBRARIES += libjs-test.la - -libjs_test_la_LDFLAGS = -rpath $(libdir) -libjs_test_la_CPPFLAGS = $(JS_TEST_CFLAGS) -libjs_test_la_LIBADD = $(JS_TEST_LIBS) libst-1.0.la - -# The tests use or reference a couple of Shell classes -libjs_test_la_SOURCES = \ - shell-generic-container.c \ - shell-perf-log.c - noinst_PROGRAMS += run-js-test -run_js_test_CPPFLAGS = $(JS_TEST_CFLAGS) -run_js_test_LDADD = $(JS_TEST_LIBS) libjs-test.la +run_js_test_CPPFLAGS = $(gnome_shell_cflags) +run_js_test_LDADD = libgnome-shell.la $(libgnome_shell_la_LIBADD) run_js_test_LDFLAGS = -export-dynamic run_js_test_SOURCES = \