telepathy-salut: Avoid a variable name that looks as though it ought to be for Automake
Simon McVittie
smcv at kemper.freedesktop.org
Fri May 3 03:56:20 PDT 2013
Module: telepathy-salut
Branch: master
Commit: 454061d0119057584a30e8f1c997d9524758520e
URL: http://cgit.freedesktop.org/telepathy/telepathy-salut/commit/?id=454061d0119057584a30e8f1c997d9524758520e
Author: Simon McVittie <simon.mcvittie at collabora.co.uk>
Date: Fri Jan 4 12:18:01 2013 +0000
Avoid a variable name that looks as though it ought to be for Automake
Automake warns if a variable ends with LDFLAGS but has no corresponding
Automake object. There is no libsalut-plugins-android.la, so it will
warn about this one; just use a different variable for the Android build.
---
src/Makefile.am | 4 ++--
1 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/src/Makefile.am b/src/Makefile.am
index a376ae1..e1d10e0 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -135,7 +135,7 @@ libsalut_plugins_la_LDFLAGS = \
-no-undefined \
-release $(VERSION)
-libsalut_plugins_android_la_LDFLAGS = \
+libsalut_plugins_la_android_ldflags = \
-shared \
-avoid-version
@@ -292,7 +292,7 @@ Android.mk: Makefile.am $(BUILT_SOURCES)
-:CFLAGS $(DEFS) $(CFLAGS) $(DEFAULT_INCLUDES) $(INCLUDES) \
$(AM_CFLAGS) \
-:CPPFLAGS $(CPPFLAGS) $(AM_CPPFLAGS) \
- -:LDFLAGS $(libsalut_plugins_android_la_LDFLAGS) $(AM_LDFLAGS) \
+ -:LDFLAGS $(libsalut_plugins_la_android_ldflags) $(AM_LDFLAGS) \
$(ALL_LIBS) \
-:STATIC salut-convenience -:TAGS eng debug \
-:SOURCES $(libsalut_convenience_la_SOURCES) \
More information about the telepathy-commits
mailing list