diff options
| author | Benjamin Otte <otte@redhat.com> | 2010-03-10 21:01:20 +0100 |
|---|---|---|
| committer | Benjamin Otte <otte@redhat.com> | 2010-03-10 21:53:51 +0100 |
| commit | 21f66635e85ed649abb124ebc04d8719012a01f1 (patch) | |
| tree | 074ba88b51089ca2c6627a865f9b57a0ae70006f | |
| parent | 205c6d01a1b0c9208499ffa6e1dda949d33180c8 (diff) | |
Update for recent changes to common submodule
This just replaces every "$ERROR_CFLAGS" usage with a usage of
"$WARNING_CFLAGS $ERROR_CFLAGS" to get the same functionality as
previously.
Actually using that separation will happen later.
| -rw-r--r-- | configure.ac | 2 | ||||
| -rw-r--r-- | gst/rtpmanager/Makefile.am | 2 | ||||
| -rw-r--r-- | tests/check/Makefile.am | 2 |
3 files changed, 3 insertions, 3 deletions
diff --git a/configure.ac b/configure.ac index f31841101..f2b488613 100644 --- a/configure.ac +++ b/configure.ac @@ -1021,7 +1021,7 @@ AC_SUBST(DEPRECATED_CFLAGS) dnl every flag in GST_OPTION_CFLAGS and GST_OPTION_CXXFLAGS can be overridden dnl at make time with e.g. make ERROR_CFLAGS="" -GST_OPTION_CFLAGS="\$(ERROR_CFLAGS) \$(DEBUG_CFLAGS) \$(PROFILE_CFLAGS) \$(GCOV_CFLAGS) \$(OPT_CFLAGS) \$(DEPRECATED_CFLAGS)" +GST_OPTION_CFLAGS="\$(WARNING_CFLAGS) \$(ERROR_CFLAGS) \$(DEBUG_CFLAGS) \$(PROFILE_CFLAGS) \$(GCOV_CFLAGS) \$(OPT_CFLAGS) \$(DEPRECATED_CFLAGS)" GST_OPTION_CXXFLAGS="\$(ERROR_CXXFLAGS) \$(DEBUG_CFLAGS) \$(PROFILE_CFLAGS) \$(GCOV_CFLAGS) \$(OPT_CFLAGS) \$(DEPRECATED_CFLAGS)" AC_SUBST(GST_OPTION_CFLAGS) AC_SUBST(GST_OPTION_CXXFLAGS) diff --git a/gst/rtpmanager/Makefile.am b/gst/rtpmanager/Makefile.am index e9f7ed762..10e2d62f6 100644 --- a/gst/rtpmanager/Makefile.am +++ b/gst/rtpmanager/Makefile.am @@ -36,7 +36,7 @@ noinst_HEADERS = gstrtpbin.h \ gstrtpsession.h libgstrtpmanager_la_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(GST_CFLAGS) \ - $(ERROR_CFLAGS) + $(WARNING_CFLAGS) $(ERROR_CFLAGS) libgstrtpmanager_la_LIBADD = $(GST_PLUGINS_BASE_LIBS) \ -lgstnetbuffer-@GST_MAJORMINOR@ -lgstrtp-@GST_MAJORMINOR@ \ $(GST_BASE_LIBS) $(GST_LIBS_LIBS) diff --git a/tests/check/Makefile.am b/tests/check/Makefile.am index b28b78685..3feec7531 100644 --- a/tests/check/Makefile.am +++ b/tests/check/Makefile.am @@ -180,7 +180,7 @@ elements_interleave_LDADD = $(GST_PLUGINS_BASE_LIBS) -lgstaudio-$(GST_MAJORMINOR elements_level_LDADD = $(LDADD) $(LIBM) elements_rtpbin_buffer_list_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(GST_CFLAGS) \ - $(ERROR_CFLAGS) $(GST_CHECK_CFLAGS) + $(WARNING_CFLAGS) $(ERROR_CFLAGS) $(GST_CHECK_CFLAGS) elements_rtpbin_buffer_list_LDADD = $(GST_PLUGINS_BASE_LIBS) \ -lgstnetbuffer-@GST_MAJORMINOR@ -lgstrtp-@GST_MAJORMINOR@ \ $(GST_BASE_LIBS) $(GST_LIBS_LIBS) $(GST_CHECK_LIBS) |