Attachment 57496 Details for Bug 46492 – Fixed salut linking

[patch] Fixed salut linking

0002-Fix-linking-after-salut-plugin.patch (text/plain), 1.77 KB, created by Alvaro Soliverez on 2012-02-22 19:08:51 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Alvaro Soliverez

Created: 2012-02-22 19:08:51 UTC

Size: 1.77 KB

patch

obsolete

>From f9174b093732ef569a5f1a5b48a34b81888d6f45 Mon Sep 17 00:00:00 2001
>From: Alvaro Soliverez <alvaro.soliverez@collabora.co.uk>
>Date: Wed, 22 Feb 2012 23:58:27 -0300
>Subject: [PATCH 2/2] Fix linking after salut plugin
>
>---
> salut/Makefile.am |   24 +++++++++++++-----------
> 1 files changed, 13 insertions(+), 11 deletions(-)
>
>diff --git a/salut/Makefile.am b/salut/Makefile.am
>index 8ec5fa0..ffe3bc2 100644
>--- a/salut/Makefile.am
>+++ b/salut/Makefile.am
>@@ -16,27 +16,29 @@ ytstenut_salut_la_LIBADD = \
> 	$(TELEPATHY_YTSTENUT_LIBS) \
> 	$(WOCKY_LIBS)
> 
>+copied_files = \
>+	ytstenut.c \
>+	caps-manager.c \
>+	channel-manager.c \
>+	utils.c
>+
> ytstenut_salut_la_SOURCES = \
>-	$(top_srcdir)/plugin-base/ytstenut.c \
>-	$(top_srcdir)/plugin-base/ytstenut.h \
>-	$(top_srcdir)/plugin-base/caps-manager.c \
>-	$(top_srcdir)/plugin-base/caps-manager.h \
>+	$(copied_files) \
> 	status.c \
> 	status.h \
> 	message-channel.c \
>-	message-channel.h \
>-	$(top_srcdir)/plugin-base/channel-manager.c \
>-	$(top_srcdir)/plugin-base/channel-manager.h \
>-	$(top_srcdir)/plugin-base/utils.c \
>-	$(top_srcdir)/plugin-base/utils.h
>+	message-channel.h
> 
> Android.mk: Makefile.am $(BUILT_SOURCES)
>+	for i in $(copied_files); do \
>+		cp $(top_srcdir)/plugin-base/$$i .; \
>+	done
> 	androgenizer -:PROJECT ytstenut-plugins \
> 	 -:SHARED ytstenut-salut -:TAGS eng debug \
> 	 -:REL_TOP $(top_srcdir) -:ABS_TOP $(abs_top_srcdir) \
> 	 -:SOURCES $(ytstenut_salut_la_SOURCES) \
> 	 -:CFLAGS $(DEFS) $(CFLAGS) $(DEFAULT_INCLUDES) $(INCLUDES) \
> 	  $(AM_CFLAGS) -I../../wocky \
>-	 -:CPPFLAGS $(CPPFLAGS) $(AM_CPPFLAGS) -DSALUT \
>-	 -:LDFLAGS $(AM_LDFLAGS) $(ytstenut_salut_la_LIBADD) -ltelepathy-salut \
>+	 -:CPPFLAGS $(CPPFLAGS) $(AM_CPPFLAGS) \
>+	 -:LDFLAGS $(AM_LDFLAGS) $(ytstenut_salut_la_LIBADD) $(SALUT_LIBS) -ltelepathy-salut \
> 	> $@
>-- 
>1.7.7.3
>

Actions: View | Splinter Review

Attachments on bug 46492: 57495 | 57496 | 57527

Use of freedesktop.org services, including Bugzilla, is subject to our Code of Conduct. How we collect and use information is described in our Privacy Policy.