Attachment 53079 Details for Bug 42530 – make sure the proper GABBLE,SALUT define is given

[patch] make sure the proper GABBLE,SALUT define is given

0004-gabble-salut-make-sure-the-proper-GABBLE-SALUT-defin.patch (text/plain), 1.42 KB, created by Alvaro Soliverez on 2011-11-02 12:27:14 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Alvaro Soliverez

Created: 2011-11-02 12:27:14 UTC

Size: 1.42 KB

patch

obsolete

>From ae881acc550f3a36b6efd1bc0731bfc1a06c3371 Mon Sep 17 00:00:00 2001
>From: Jonny Lamb <jonny.lamb@collabora.co.uk>
>Date: Fri, 23 Sep 2011 15:47:40 +0100
>Subject: [PATCH 4/5] gabble,salut: make sure the proper GABBLE,SALUT define
> is given
>
>Signed-off-by: Jonny Lamb <jonny.lamb@collabora.co.uk>
>---
> gabble/Makefile.am |    2 +-
> salut/Makefile.am  |    2 +-
> 2 files changed, 2 insertions(+), 2 deletions(-)
>
>diff --git a/gabble/Makefile.am b/gabble/Makefile.am
>index 8c24668..f2de8f6 100644
>--- a/gabble/Makefile.am
>+++ b/gabble/Makefile.am
>@@ -36,7 +36,7 @@ Android.mk: Makefile.am
> 	 -:SOURCES $(ytstenut_gabble_la_SOURCES) \
> 	 -:CFLAGS $(DEFS) $(CFLAGS) $(DEFAULT_INCLUDES) $(INCLUDES) \
> 	  $(AM_CFLAGS) -I../../wocky \
>-	 -:CPPFLAGS $(CPPFLAGS) $(AM_CPPFLAGS) \
>+	 -:CPPFLAGS $(CPPFLAGS) $(AM_CPPFLAGS) -DGABBLE \
> 	 -:LDFLAGS $(AM_LDFLAGS) $(ytstenut_gabble_la_LIBADD) -lwocky \
> 	  -ltelepathy-gabble -lxml2 \
> 	> $@
>diff --git a/salut/Makefile.am b/salut/Makefile.am
>index 3149518..b517392 100644
>--- a/salut/Makefile.am
>+++ b/salut/Makefile.am
>@@ -36,7 +36,7 @@ Android.mk: Makefile.am
> 	 -:SOURCES $(ytstenut_salut_la_SOURCES) \
> 	 -:CFLAGS $(DEFS) $(CFLAGS) $(DEFAULT_INCLUDES) $(INCLUDES) \
> 	  $(AM_CFLAGS) -I../../wocky \
>-	 -:CPPFLAGS $(CPPFLAGS) $(AM_CPPFLAGS) \
>+	 -:CPPFLAGS $(CPPFLAGS) $(AM_CPPFLAGS) -DSALUT \
> 	 -:LDFLAGS $(AM_LDFLAGS) $(ytstenut_salut_la_LIBADD) -lwocky \
> 	  -ltelepathy-salut -lxml2 \
> 	> $@
>-- 
>1.7.7
>

Actions: View | Splinter Review

Attachments on bug 42530: 53076 | 53077 | 53078 | 53079 | 53080 | 53833 | 53839 | 56323 | 56806 | 56807 | 56843

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.