[Spice-commits] 2 commits - configure.ac gtk/Makefile.am vapi/Makefile.am

[Marc-André Lureau]

 configure.ac     |    2 +-
 gtk/Makefile.am  |    1 +
 vapi/Makefile.am |   14 +++++++++-----
 3 files changed, 11 insertions(+), 6 deletions(-)

New commits:
commit 346bf69b1b75d93156158c0ad99741fa2c01d87b
Author: Marc-André Lureau <marcandre.lureau at redhat.com>
Date:   Fri Dec 2 16:49:28 2011 +0100

    build: do not clean spice-client-glib-2.0.deps

diff --git a/vapi/Makefile.am b/vapi/Makefile.am
index 49f8509..b85d8ab 100644
--- a/vapi/Makefile.am
+++ b/vapi/Makefile.am
@@ -1,13 +1,19 @@
 NULL =
+CLEANFILES =
 
 if WITH_VALA
-vapidir = $(datadir)/vala/vapi
-vapi_DATA =						\
+BUILT_VAPI =						\
 	spice-client-glib-2.0.vapi			\
-	spice-client-glib-2.0.deps			\
 	spice-client-gtk-$(SPICE_GTK_API_VERSION).deps	\
 	spice-client-gtk-$(SPICE_GTK_API_VERSION).vapi	\
 	$(NULL)
+CLEANFILES += $(BUILT_VAPI)
+
+vapidir = $(datadir)/vala/vapi
+vapi_DATA =						\
+	spice-client-glib-2.0.deps			\
+	$(BUILT_VAPI)
+	$(NULL)
 
 spice-client-glib-2.0.vapi: $(top_builddir)/gtk/SpiceClientGLib-2.0.gir
 	$(AM_V_GEN)$(VAPIGEN)			\
@@ -29,6 +35,4 @@ spice-client-gtk-$(SPICE_GTK_API_VERSION).deps: spice-client-gtk-$(SPICE_GTK_API
 
 endif
 
-CLEANFILES = $(vapi_DATA)
-
 -include $(top_srcdir)/git.mk
commit ae0b95039949fc94523490dc62940d0626a240f7
Author: Marc-André Lureau <marcandre.lureau at redhat.com>
Date:   Fri Dec 2 13:44:40 2011 +0100

    build: fix linking with -Wl,--as-needed -Wl,--no-undefined etc..
    
    Mageia is using linker flags and miss symbols when linking.
    The error can be reproduced with:
    
    make LDFLAGS="-Wl,--as-needed -Wl,--no-undefined -Wl,-z,relro -Wl,-O1 -Wl,--build-id -Wl,--enable-new-dtags"
    
    Based on patch by Christophe Fergeau.
    
    https://bugs.freedesktop.org/show_bug.cgi?id=43416

diff --git a/configure.ac b/configure.ac
index 4a94d7b..e38aad1 100644
--- a/configure.ac
+++ b/configure.ac
@@ -266,7 +266,7 @@ AC_SUBST(PULSE_CFLAGS)
 AC_SUBST(PULSE_LIBS)
 
 AS_IF([test "x$with_audio" = "xgstreamer"],
-      [PKG_CHECK_MODULES(GST, gstreamer-0.10 gstreamer-base-0.10 gstreamer-app-0.10, [have_gst=yes GST_LIBS="$GST_LIBS -lgstapp-0.10 -lgstaudio-0.10"], [have_gst=no])],
+      [PKG_CHECK_MODULES(GST, gstreamer-0.10 gstreamer-base-0.10 gstreamer-app-0.10 gstreamer-audio-0.10, [have_gst=yes], [have_gst=no])],
       [have_gst=no])
 
 AS_IF([test "x$have_gst" = "xyes"],
diff --git a/gtk/Makefile.am b/gtk/Makefile.am
index 491eff8..b780882 100644
--- a/gtk/Makefile.am
+++ b/gtk/Makefile.am
@@ -98,6 +98,7 @@ SPICE_GTK_LIBADD_COMMON =		\
 	libspice-client-glib-2.0.la	\
 	$(GTK_LIBS)			\
 	$(CAIRO_LIBS)			\
+	$(XRANDR_LIBS)			\
 	$(NULL)
 
 SPICE_GTK_SOURCES_COMMON =		\