aboutsummaryrefslogtreecommitdiff
path: root/tests/examples/controller/Makefile.in
diff options
context:
space:
mode:
authorSebastian Dröge <sebastian.droege@collabora.co.uk>2012-09-14 09:01:50 +0200
committerSebastian Dröge <sebastian.droege@collabora.co.uk>2012-09-14 09:01:50 +0200
commit9d38656f62214739b6c0e2690c883d9d65600b41 (patch)
treefe9b79a38c4aa0e38d472b7c54d5d18d896bc50a /tests/examples/controller/Makefile.in
parent427ff61c5eb4e91087d7c1df17f4cfd20dbc36a1 (diff)
parente0655f96cc7e2ef783f3db82c6b087d34f1e2b87 (diff)
Merge tag 'upstream/0.11.94'
Upstream version 0.11.94
Diffstat (limited to 'tests/examples/controller/Makefile.in')
-rw-r--r--tests/examples/controller/Makefile.in2
1 files changed, 1 insertions, 1 deletions
diff --git a/tests/examples/controller/Makefile.in b/tests/examples/controller/Makefile.in
index 2e9cc06..26737fa 100644
--- a/tests/examples/controller/Makefile.in
+++ b/tests/examples/controller/Makefile.in
@@ -733,7 +733,7 @@ Android.mk: Makefile.am audio-example.c
-:TAGS eng debug \
-:REL_TOP $(top_srcdir) -:ABS_TOP $(abs_top_srcdir) \
-:SOURCES audio-example.c \
- -:CFLAGS $(DEFS) $(DEFAULT_INCLUDES) $(audio_example_CFLAGS) \
+ -:CFLAGS $(DEFS) $(DEFAULT_INCLUDES) $(AM_CFLAGS) \
-:LDFLAGS -lgstcontroller-@GST_API_VERSION@ \
$(GST_OBJ_LIBS) -ldl \
-:PASSTHROUGH LOCAL_ARM_MODE:=arm \