From bbe0cb04407262707643a6fcd0c3eaf65d6c3fa5 Mon Sep 17 00:00:00 2001 From: Scott Fan Date: Wed, 24 Oct 2012 20:10:03 +0800 Subject: [PATCH] Makefile.am: Fix typos for generating the Android.mk files Change libgstasfdemux to libgstasf, and change libgstrealmedia to libgstrmdemux. The typos led to generate the incorrect Android.mk files for the asfdemux and realmedia plugin. https://bugzilla.gnome.org/show_bug.cgi?id=686748 --- gst/asfdemux/Makefile.am | 10 +++++----- gst/realmedia/Makefile.am | 10 +++++----- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/gst/asfdemux/Makefile.am b/gst/asfdemux/Makefile.am index 2b3bc27f92..e76500a039 100644 --- a/gst/asfdemux/Makefile.am +++ b/gst/asfdemux/Makefile.am @@ -14,13 +14,13 @@ noinst_HEADERS = gstasfdemux.h asfheaders.h asfpacket.h gstrtpasfdepay.h gstrtsp Android.mk: Makefile.am $(BUILT_SOURCES) androgenizer \ - -:PROJECT libgstasfdemux -:SHARED libgstasfdemux \ + -:PROJECT libgstasf -:SHARED libgstasf \ -:TAGS eng debug \ -:REL_TOP $(top_srcdir) -:ABS_TOP $(abs_top_srcdir) \ - -:SOURCES $(libgstasfdemux_la_SOURCES) \ - -:CFLAGS $(DEFS) $(DEFAULT_INCLUDES) $(libgstasfdemux_la_CFLAGS) \ - -:LDFLAGS $(libgstasfdemux_la_LDFLAGS) \ - $(libgstasfdemux_la_LIBADD) \ + -:SOURCES $(libgstasf_la_SOURCES) \ + -:CFLAGS $(DEFS) $(DEFAULT_INCLUDES) $(libgstasf_la_CFLAGS) \ + -:LDFLAGS $(libgstasf_la_LDFLAGS) \ + $(libgstasf_la_LIBADD) \ -ldl \ -:PASSTHROUGH LOCAL_ARM_MODE:=arm \ LOCAL_MODULE_PATH:='$$(TARGET_OUT)/lib/gstreamer-0.10' \ diff --git a/gst/realmedia/Makefile.am b/gst/realmedia/Makefile.am index 4db7e7d26e..9df89e9d85 100644 --- a/gst/realmedia/Makefile.am +++ b/gst/realmedia/Makefile.am @@ -26,13 +26,13 @@ asmrules_LDADD = $(GST_LIBS) $(LIBM) Android.mk: Makefile.am $(BUILT_SOURCES) androgenizer \ - -:PROJECT libgstrealmedia -:SHARED libgstrealmedia \ + -:PROJECT libgstrmdemux -:SHARED libgstrmdemux \ -:TAGS eng debug \ -:REL_TOP $(top_srcdir) -:ABS_TOP $(abs_top_srcdir) \ - -:SOURCES $(libgstrealmedia_la_SOURCES) \ - -:CFLAGS $(DEFS) $(DEFAULT_INCLUDES) $(libgstrealmedia_la_CFLAGS) \ - -:LDFLAGS $(libgstrealmedia_la_LDFLAGS) \ - $(libgstrealmedia_la_LIBADD) \ + -:SOURCES $(libgstrmdemux_la_SOURCES) \ + -:CFLAGS $(DEFS) $(DEFAULT_INCLUDES) $(libgstrmdemux_la_CFLAGS) \ + -:LDFLAGS $(libgstrmdemux_la_LDFLAGS) \ + $(libgstrmdemux_la_LIBADD) \ -ldl \ -:PASSTHROUGH LOCAL_ARM_MODE:=arm \ LOCAL_MODULE_PATH:='$$(TARGET_OUT)/lib/gstreamer-0.10' \