From 77d09884c65896052f794fed4c2c70480bb429b0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Tim-Philipp=20M=C3=BCller?= Date: Sat, 23 Feb 2008 15:01:32 +0000 Subject: Check for and define ERROR_CXXFLAGS and GST_CXXFLAGS and use them when building C++ code. Original commit message from CVS: * configure.ac: * ext/mpeg2enc/Makefile.am: * ext/soundtouch/Makefile.am: * gst/modplug/Makefile.am: Check for and define ERROR_CXXFLAGS and GST_CXXFLAGS and use them when building C++ code. --- ChangeLog | 9 +++++++++ common | 2 +- configure.ac | 10 +++++++++- ext/mpeg2enc/Makefile.am | 6 ++++-- ext/soundtouch/Makefile.am | 4 ++-- gst/modplug/Makefile.am | 2 +- 6 files changed, 26 insertions(+), 7 deletions(-) diff --git a/ChangeLog b/ChangeLog index b74393e0..244811d8 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,12 @@ +2008-02-23 Tim-Philipp Müller + + * configure.ac: + * ext/mpeg2enc/Makefile.am: + * ext/soundtouch/Makefile.am: + * gst/modplug/Makefile.am: + Check for and define ERROR_CXXFLAGS and GST_CXXFLAGS and use them + when building C++ code. + 2008-02-23 Zaheer Abbas Merali * sys/dvb/gstdvbsrc.c: diff --git a/common b/common index bd6ec570..ce296a6e 160000 --- a/common +++ b/common @@ -1 +1 @@ -Subproject commit bd6ec57040fe3fa93e21ca440dfe494e3ee18555 +Subproject commit ce296a6e04ac824523dbf7bf836f91e14012ab9d diff --git a/configure.ac b/configure.ac index 655ecc28..7b7e1ea5 100644 --- a/configure.ac +++ b/configure.ac @@ -258,6 +258,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) @@ -998,16 +1001,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/mpeg2enc/Makefile.am b/ext/mpeg2enc/Makefile.am index 7d5d3468..d70be9b2 100644 --- a/ext/mpeg2enc/Makefile.am +++ b/ext/mpeg2enc/Makefile.am @@ -7,8 +7,10 @@ libgstmpeg2enc_la_SOURCES = \ gstmpeg2encstreamwriter.cc \ gstmpeg2encpicturereader.cc -libgstmpeg2enc_la_CXXFLAGS = $(MPEG2ENC_CFLAGS) $(GST_CFLAGS) $(GST_PLUGINS_BASE_CFLAGS) -Wno-non-virtual-dtor -libgstmpeg2enc_la_LIBADD = $(MPEG2ENC_LIBS) $(GST_PLUGINS_BASE_LIBS) $(GST_LIBS) +libgstmpeg2enc_la_CXXFLAGS = \ + $(GST_PLUGINS_BASE_CFLAGS) $(GST_CXXFLAGS) $(MPEG2ENC_CFLAGS) +libgstmpeg2enc_la_LIBADD = \ + $(GST_PLUGINS_BASE_LIBS) $(GST_LIBS) $(MPEG2ENC_LIBS) libgstmpeg2enc_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) noinst_HEADERS = \ diff --git a/ext/soundtouch/Makefile.am b/ext/soundtouch/Makefile.am index 555c88c8..036d54ad 100644 --- a/ext/soundtouch/Makefile.am +++ b/ext/soundtouch/Makefile.am @@ -6,8 +6,8 @@ libgstsoundtouch_la_SOURCES = \ gstbpmdetect.cc libgstsoundtouch_la_CFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(GST_BASE_CFLAGS) $(GST_CFLAGS) $(SOUNDTOUCH_CFLAGS) -libgstsoundtouch_la_CXXFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(GST_BASE_CFLAGS) $(GST_CFLAGS) $(SOUNDTOUCH_CFLAGS) -libgstsoundtouch_la_LIBADD = $(GST_PLUGINS_BASE_LIBS) $(GST_BASE_LIBS) $(GST_CONTROLLER_LIBS) $(GST_LIBS) $(SOUNDTOUCH_LIBS) -lgstaudio-$(GST_MAJORMINOR) -lBPM $(LIBM) +libgstsoundtouch_la_CXXFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(GST_BASE_CFLAGS) $(GST_CXXFLAGS) $(SOUNDTOUCH_CFLAGS) +libgstsoundtouch_la_LIBADD = $(GST_PLUGINS_BASE_LIBS) -lgstaudio-$(GST_MAJORMINOR) $(GST_BASE_LIBS) $(GST_CONTROLLER_LIBS) $(GST_LIBS) $(SOUNDTOUCH_LIBS) -lBPM $(LIBM) libgstsoundtouch_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) noinst_HEADERS = gstpitch.hh gstbpmdetect.hh diff --git a/gst/modplug/Makefile.am b/gst/modplug/Makefile.am index 59d22863..420a2ba5 100644 --- a/gst/modplug/Makefile.am +++ b/gst/modplug/Makefile.am @@ -3,7 +3,7 @@ SUBDIRS=libmodplug . plugin_LTLIBRARIES = libgstmodplug.la libgstmodplug_la_SOURCES = gstmodplug.cc -libgstmodplug_la_CXXFLAGS = $(GST_CFLAGS) $(GST_PLUGINS_BASE_CFLAGS) +libgstmodplug_la_CXXFLAGS = $(GST_PLUGINS_BASE_CFLAGS) $(GST_CXXFLAGS) libgstmodplug_la_LIBADD = $(top_builddir)/gst/modplug/libmodplug/libmodplug.la $(GST_PLUGINS_BASE_LIBS) -lstdc++ libgstmodplug_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) -- cgit v1.2.1