[farsight2/master] Get CFLAGS for -Wall -Werror on non-release versions

[Olivier Crête]

---
 gst-libs/gst/farsight/Makefile.am |    2 +-
 gst/fsrtpconference/Makefile.am   |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/gst-libs/gst/farsight/Makefile.am b/gst-libs/gst/farsight/Makefile.am
index 51adb0e..96a8c9c 100644
--- a/gst-libs/gst/farsight/Makefile.am
+++ b/gst-libs/gst/farsight/Makefile.am
@@ -42,7 +42,7 @@ fs-marshal.c: Makefile fs-marshal.list
 		glib-genmarshal --body --prefix=fs_marshal $(srcdir)/fs-marshal.list >> fs-marshal.c.tmp
 		mv fs-marshal.c.tmp fs-marshal.c
 
-libgstfarsight_ at GST_MAJORMINOR@_la_CFLAGS = $(FS2_INTERNAL_CFLAGS) $(GST_PLUGINS_BASE_CFLAGS) $(GST_BASE_CFLAGS) $(GST_CFLAGS)
+libgstfarsight_ at GST_MAJORMINOR@_la_CFLAGS = $(FS2_INTERNAL_CFLAGS) $(FS2_CFLAGS) $(GST_PLUGINS_BASE_CFLAGS) $(GST_BASE_CFLAGS) $(GST_CFLAGS)
 libgstfarsight_ at GST_MAJORMINOR@_la_LIBADD = $(GST_BASE_LIBS) $(GST_LIBS)
 libgstfarsight_ at GST_MAJORMINOR@_la_LDFLAGS = $(GST_LIB_LDFLAGS) $(GST_ALL_LDFLAGS) $(GST_LT_LDFLAGS)
 
diff --git a/gst/fsrtpconference/Makefile.am b/gst/fsrtpconference/Makefile.am
index a91afbf..d8a2de5 100644
--- a/gst/fsrtpconference/Makefile.am
+++ b/gst/fsrtpconference/Makefile.am
@@ -5,7 +5,7 @@ libfsrtpconference_la_SOURCES = gstfsrtpconference.c \
 	fs-rtp-participant.c \
 	fs-rtp-session.c \
 	fs-rtp-stream.c
-libfsrtpconference_la_CFLAGS = $(FS2_INTERNAL_CFLAGS) $(GST_PLUGINS_BASE_CFLAGS) $(GST_CFLAGS)
+libfsrtpconference_la_CFLAGS = $(FS2_INTERNAL_CFLAGS) $(FS2_CFLAGS) $(GST_PLUGINS_BASE_CFLAGS) $(GST_CFLAGS)
 libfsrtpconference_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)
 libfsrtpconference_la_LIBADD = $(FS2_LIBS) $(GST_BASE_LIBS) $(GST_LIBS) \
 	$(top_builddir)/gst-libs/gst/farsight/libgstfarsight-0.10.la
-- 
1.5.6.5