mirror of
https://gitlab.freedesktop.org/gstreamer/gstreamer.git
synced 2025-03-30 12:49:40 +00:00
Check for and define ERROR_CXXFLAGS and use them when building
Original commit message from CVS: * configure.ac: * ext/taglib/Makefile.am: Check for and define ERROR_CXXFLAGS and use them when building C++ code (#516509).
This commit is contained in:
parent
67101abdd6
commit
954187812f
4 changed files with 18 additions and 3 deletions
|
@ -1,3 +1,10 @@
|
|||
2008-02-23 Tim-Philipp Müller <tim at centricular dot net>
|
||||
|
||||
* configure.ac:
|
||||
* ext/taglib/Makefile.am:
|
||||
Check for and define ERROR_CXXFLAGS and use them when building
|
||||
C++ code (#516509).
|
||||
|
||||
2008-02-23 Tim-Philipp Müller <tim at centricular dot net>
|
||||
|
||||
* gst/goom/gstgoom.c: (goom_debug), (plugin_init):
|
||||
|
|
2
common
2
common
|
@ -1 +1 @@
|
|||
Subproject commit bd6ec57040fe3fa93e21ca440dfe494e3ee18555
|
||||
Subproject commit ce296a6e04ac824523dbf7bf836f91e14012ab9d
|
10
configure.ac
10
configure.ac
|
@ -324,6 +324,9 @@ AG_GST_SET_PLUGINDIR
|
|||
dnl define an ERROR_CFLAGS Makefile variable
|
||||
AG_GST_SET_ERROR_CFLAGS($GST_CVS)
|
||||
|
||||
dnl define an ERROR_CXXFLAGS Makefile variable
|
||||
AG_GST_SET_ERROR_CXXFLAGS($GST_CVS)
|
||||
|
||||
dnl define correct level for debugging messages
|
||||
AG_GST_SET_LEVEL_DEFAULT($GST_CVS)
|
||||
|
||||
|
@ -981,9 +984,12 @@ else
|
|||
fi
|
||||
AC_SUBST(DEPRECATED_CFLAGS)
|
||||
|
||||
dnl every flag in GST_OPTION_CFLAGS can be overridden at make time
|
||||
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_CXXFLAGS="\$(ERROR_CXXFLAGS) \$(DEBUG_CFLAGS) \$(PROFILE_CFLAGS) \$(GCOV_CFLAGS) \$(OPT_CFLAGS) \$(DEPRECATED_CFLAGS)"
|
||||
AC_SUBST(GST_OPTION_CFLAGS)
|
||||
AC_SUBST(GST_OPTION_CXXFLAGS)
|
||||
|
||||
dnl our libraries need to be versioned correctly
|
||||
AC_SUBST(GST_LT_LDFLAGS)
|
||||
|
@ -993,7 +999,9 @@ dnl prefer internal headers to already installed ones
|
|||
dnl also add builddir include for enumtypes and marshal
|
||||
dnl add ERROR_CFLAGS, but overridable
|
||||
GST_CFLAGS="-I\$(top_srcdir)/gst-libs -I\$(top_builddir)/gst-libs $GST_CFLAGS \$(GST_OPTION_CFLAGS)"
|
||||
GST_CXXFLAGS="-I\$(top_srcdir)/gst-libs -I\$(top_builddir)/gst-libs $GST_CFLAGS \$(GST_OPTION_CXXFLAGS)"
|
||||
AC_SUBST(GST_CFLAGS)
|
||||
AC_SUBST(GST_CXXFLAGS)
|
||||
AC_SUBST(GST_LIBS)
|
||||
|
||||
dnl LDFLAGS really should only contain flags, not libs - they get added before
|
||||
|
|
|
@ -7,7 +7,7 @@ libgsttaglib_la_CFLAGS = \
|
|||
$(TAGLIB_CFLAGS)
|
||||
libgsttaglib_la_CXXFLAGS = \
|
||||
$(GST_PLUGINS_BASE_CFLAGS) \
|
||||
$(GST_CFLAGS) \
|
||||
$(GST_CXXFLAGS) \
|
||||
$(TAGLIB_CFLAGS)
|
||||
libgsttaglib_la_LIBADD = \
|
||||
$(GST_PLUGINS_BASE_LIBS) -lgsttag-$(GST_MAJORMINOR) \
|
||||
|
|
Loading…
Reference in a new issue