[Bug 42446] [PATCH] Allow building tp-gabble in Android

[bugzilla-daemon at freedesktop.org]

https://bugs.freedesktop.org/show_bug.cgi?id=42446

--- Comment #4 from Simon McVittie <simon.mcvittie at collabora.co.uk> 2011-10-31 11:48:17 PDT ---
Comment on attachment 52964
  --> https://bugs.freedesktop.org/attachment.cgi?id=52964
Android-specific files

Review of attachment 52964:
 --> (https://bugs.freedesktop.org/page.cgi?id=splinter.html&bug=42446&attachment=52964)
-----------------------------------------------------------------

::: src/Makefile.am
@@ +283,5 @@
> +	 -:REL_TOP $(top_srcdir) -:ABS_TOP $(abs_top_srcdir) \
> +	 -:SOURCES $(libgabble_convenience_la_SOURCES) \
> +	  $(nodist_libgabble_convenience_la_SOURCES) main.c \
> +	 -:CFLAGS $(DEFS) $(CFLAGS) $(DEFAULT_INCLUDES) $(INCLUDES) \
> +	  $(AM_CFLAGS) -DBUILD_AS_ANDROID_SERVICE \

Strictly speaking -D should go in CPPFLAGS.

@@ +286,5 @@
> +	 -:CFLAGS $(DEFS) $(CFLAGS) $(DEFAULT_INCLUDES) $(INCLUDES) \
> +	  $(AM_CFLAGS) -DBUILD_AS_ANDROID_SERVICE \
> +	 -:CPPFLAGS $(CPPFLAGS) $(AM_CPPFLAGS) -I../lib \
> +	 -:LDFLAGS $(libgabble_convenience_la_LIBADD) -lgio-2.0 -ldbus-1 \
> +	  -lsoup -lgabble_ext -lnice -lgcrypt -lgnutls -lxml2 -lsqlite3 \

It would be much better if we could avoid hard-coding these.

::: src/main.c
@@ +27,2 @@
>  main (int argc,
> +#endif

To not screw up syntax highlighting I'd vaguely prefer:

int
#ifdef ...
telepathy_gabble_main
#else
main
#endif
    (int argc,
    char **argv)
{
}

or, even better (if this works):

#ifdef BUILD_AS_ANDROID_SERVICE
#define main telepathy_gabble_main
#endif

int
main (int argc,
    char **argv)
{
}

-- 
Configure bugmail: https://bugs.freedesktop.org/userprefs.cgi?tab=email
------- You are receiving this mail because: -------
You are the QA Contact for the bug.
You are the assignee for the bug.