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. --- ext/mpeg2enc/Makefile.am | 6 ++++-- ext/soundtouch/Makefile.am | 4 ++-- 2 files changed, 6 insertions(+), 4 deletions(-) (limited to 'ext') 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 -- cgit v1.2.1