diff options
| author | Alvaro Soliverez <alvaro.soliverez@collabora.co.uk> | 2012-02-23 00:19:12 -0300 |
|---|---|---|
| committer | Alvaro Soliverez <alvaro.soliverez@collabora.co.uk> | 2012-02-23 08:48:12 -0300 |
| commit | a842971ca3c1aa11c3495fd88ddcad89eee321c0 (patch) | |
| tree | 6ab9e17b58aecd45ed430dc668719b2d147e93d8 | |
| parent | fe007161af92fc84875610752b7cf7ca2ca4d1d1 (diff) | |
| download | telepathy-salut-a842971ca3c1aa11c3495fd88ddcad89eee321c0.tar.gz | |
Fix Android build after plugin library refactor
| -rw-r--r-- | Android.mk | 2 | ||||
| -rw-r--r-- | src/Makefile.am | 18 |
2 files changed, 16 insertions, 4 deletions
@@ -18,7 +18,7 @@ telepathy-salut-configure-real: PKG_CONFIG_LIBDIR=$(CONFIGURE_PKG_CONFIG_LIBDIR) \ PKG_CONFIG_TOP_BUILD_DIR=$(PKG_CONFIG_TOP_BUILD_DIR) \ $(TELEPATHY_SALUT_TOP)/$(CONFIGURE) --host=arm-linux-androideabi \ - --disable-submodules \ + --disable-submodules --disable-python --disable-avahi-tests \ --disable-Werror && \ for file in $(TELEPATHY_SALUT_BUILT_SOURCES); do \ rm -f $$file && \ diff --git a/src/Makefile.am b/src/Makefile.am index be4bf617..78c69691 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -130,6 +130,10 @@ libsalut_plugins_la_LDFLAGS = \ -no-undefined \ -avoid-version +libsalut_plugins_android_la_LDFLAGS = \ + -shared \ + -avoid-version + libsalut_plugins_la_LIBADD = \ @TELEPATHY_GLIB_LIBS@ \ @WOCKY_LIBS@ @@ -273,13 +277,20 @@ enumtypes.c: $(enumtype_sources) Makefile.in $(enumtype_sources) > $@ Android.mk: Makefile.am $(BUILT_SOURCES) - androgenizer -:PROJECT telepathy-salut -:STATIC salut-convenience \ - -:TAGS eng debug \ + androgenizer -:PROJECT telepathy-salut \ -:REL_TOP $(top_srcdir) -:ABS_TOP $(abs_top_srcdir) \ - -:SOURCES $(libsalut_convenience_la_SOURCES) \ + -:SHARED salut-plugins -:TAGS eng debug \ + -:SOURCES $(libsalut_plugins_la_SOURCES) \ -:CFLAGS $(DEFS) $(CFLAGS) $(DEFAULT_INCLUDES) $(INCLUDES) \ $(AM_CFLAGS) \ -:CPPFLAGS $(CPPFLAGS) $(AM_CPPFLAGS) \ + -:LDFLAGS $(libsalut_plugins_android_la_LDFLAGS) $(AM_LDFLAGS) \ + $(ALL_LIBS) \ + -:STATIC salut-convenience -:TAGS eng debug \ + -:SOURCES $(libsalut_convenience_la_SOURCES) \ + -:CFLAGS $(DEFS) $(CFLAGS) $(DEFAULT_INCLUDES) $(INCLUDES) \ + $(AM_CFLAGS) \ + -:CPPFLAGS $(CPPFLAGS) $(AM_CPPFLAGS) \ -:SHARED telepathy-salut \ -:TAGS eng debug \ -:REL_TOP $(top_srcdir) -:ABS_TOP $(abs_top_srcdir) \ @@ -288,5 +299,6 @@ Android.mk: Makefile.am $(BUILT_SOURCES) $(AM_CFLAGS) \ -:CPPFLAGS $(CPPFLAGS) $(AM_CPPFLAGS) -DBUILD_AS_ANDROID_SERVICE \ -:LDFLAGS $(telepathy_salut_android_libs) $(AM_LDFLAGS) \ + $(lib_LTLIBRARIES) \ -:LIBFILTER_STATIC salut-convenience \ > $@ |