diff options
| author | Tim-Philipp Müller <tim@centricular.net> | 2008-02-23 12:35:53 +0000 |
|---|---|---|
| committer | Tim-Philipp Müller <tim@centricular.net> | 2008-02-23 12:35:53 +0000 |
| commit | 6d86239ade96de8788dbfdf05e942ed79ede77d6 (patch) | |
| tree | 0447d3d6e3d7104c4da1abb0392a68356be31743 | |
| parent | ec18a61d728fcebc74aa2cc1f004d43e7f56e0ea (diff) | |
| download | gstreamer-plugins-ugly-6d86239ade96de8788dbfdf05e942ed79ede77d6.tar.gz | |
Check for and define ERROR_CXXFLAGS and GST_CXXFLAGS and use them when building C++ code (#516509).
Original commit message from CVS:
* configure.ac:
* ext/sidplay/Makefile.am:
Check for and define ERROR_CXXFLAGS and GST_CXXFLAGS and use them
when building C++ code (#516509).
| -rw-r--r-- | ChangeLog | 7 | ||||
| m--------- | common | 0 | ||||
| -rw-r--r-- | configure.ac | 10 | ||||
| -rw-r--r-- | ext/sidplay/Makefile.am | 4 |
4 files changed, 18 insertions, 3 deletions
@@ -1,3 +1,10 @@ +2008-02-23 Tim-Philipp Müller <tim at centricular dot net> + + * configure.ac: + * ext/sidplay/Makefile.am: + Check for and define ERROR_CXXFLAGS and GST_CXXFLAGS and use them + when building C++ code (#516509). + 2008-02-22 Tim-Philipp Müller <tim at centricular dot net> * ext/lame/gstlame.c: (gst_lame_sink_setcaps): diff --git a/common b/common -Subproject bd6ec57040fe3fa93e21ca440dfe494e3ee1855 +Subproject ce296a6e04ac824523dbf7bf836f91e14012ab9 diff --git a/configure.ac b/configure.ac index 58ad0146..1b5f22d1 100644 --- a/configure.ac +++ b/configure.ac @@ -201,6 +201,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) @@ -385,16 +388,21 @@ 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 FIXME: do we want to rename to GST_ALL_* ? dnl prefer internal headers to already installed ones dnl also add builddir include for enumtypes and marshal dnl add GST_OPTION_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 diff --git a/ext/sidplay/Makefile.am b/ext/sidplay/Makefile.am index 1644bf03..28acf275 100644 --- a/ext/sidplay/Makefile.am +++ b/ext/sidplay/Makefile.am @@ -1,8 +1,8 @@ plugin_LTLIBRARIES = libgstsid.la libgstsid_la_SOURCES = gstsiddec.cc -libgstsid_la_CXXFLAGS = $(GST_CFLAGS) $(SIDPLAY_CFLAGS) -libgstsid_la_LIBADD = $(GST_PLUGINS_BASE_LIBS) $(SIDPLAY_LIBS) +libgstsid_la_CXXFLAGS = $(GST_CXXFLAGS) $(SIDPLAY_CFLAGS) +libgstsid_la_LIBADD = $(GST_LIBS) $(SIDPLAY_LIBS) libgstsid_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) noinst_HEADERS = gstsiddec.h |