summaryrefslogtreecommitdiff
path: root/server
diff options
context:
space:
mode:
authorSimon McVittie <simon.mcvittie@collabora.co.uk>2013-09-27 17:09:18 +0100
committerSimon McVittie <simon.mcvittie@collabora.co.uk>2013-10-02 12:34:34 +0100
commitf67323d8326b3f5abe9438a21ea253cc45f74b32 (patch)
tree0b88b0529c1baa918920f35c7320bf07522c354b /server
parent04dd9b4c9c877a9d2be838101c19ae096277c692 (diff)
Use AM_CPPFLAGS instead of deprecated INCLUDES
Bug: https://bugs.freedesktop.org/show_bug.cgi?id=69885 Reviewed-by: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
Diffstat (limited to 'server')
-rw-r--r--server/Makefile.am2
1 files changed, 1 insertions, 1 deletions
diff --git a/server/Makefile.am b/server/Makefile.am
index 5be1cdc1..b18a442b 100644
--- a/server/Makefile.am
+++ b/server/Makefile.am
@@ -47,7 +47,7 @@ Android.mk: Makefile.am
-:REL_TOP $(top_srcdir) -:ABS_TOP $(abs_top_srcdir) \
-:SOURCES $(mission_control_5_SOURCES) \
-:CFLAGS $(DEFAULT_INCLUDES) $(DEFS) $(CFLAGS) $(AM_CFLAGS) \
- -:CPPFLAGS $(CPPFLAGS) $(AM_CPPFLAGS) $(INCLUDES) \
+ -:CPPFLAGS $(CPPFLAGS) $(AM_CPPFLAGS) \
-DBUILD_AS_ANDROID_SERVICE \
-:LDFLAGS $(mission_control_5_LDADD) \
-:LIBFILTER_STATIC mcd-convenience mission-control-plugins \