diff options
| author | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2013-01-04 12:18:01 +0000 |
|---|---|---|
| committer | Simon McVittie <simon.mcvittie@collabora.co.uk> | 2013-01-04 12:18:01 +0000 |
| commit | 454061d0119057584a30e8f1c997d9524758520e (patch) | |
| tree | b1117912e704804e0749ff3b93e9e098cf44c77b /src | |
| parent | dc6a5ddcc684018fd822271b1ee20e5b49d80a24 (diff) | |
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.
Diffstat (limited to 'src')
| -rw-r--r-- | src/Makefile.am | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/src/Makefile.am b/src/Makefile.am index a376ae13..e1d10e0d 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) \ |