diff options
| -rwxr-xr-x | autogen.sh | 2 | ||||
| -rw-r--r-- | configure.ac | 24 | ||||
| -rw-r--r-- | ext/sdl/Makefile.am | 2 | ||||
| -rw-r--r-- | gst-libs/gst/audio/Makefile.am | 2 | ||||
| -rw-r--r-- | gst-libs/gst/idct/Makefile.am | 2 | ||||
| -rw-r--r-- | gst-libs/gst/resample/Makefile.am | 2 | ||||
| -rw-r--r-- | gst-libs/gst/riff/Makefile.am | 2 | ||||
| -rw-r--r-- | gst-libs/gst/video/Makefile.am | 2 | ||||
| -rw-r--r-- | gst/cdxaparse/Makefile.am | 2 | ||||
| -rw-r--r-- | gst/modplug/libmodplug/Makefile.am | 2 | ||||
| -rw-r--r-- | gst/mpeg1sys/Makefile.am | 2 | ||||
| -rw-r--r-- | gst/mpeg1videoparse/Makefile.am | 2 | ||||
| -rw-r--r-- | gst/mpeg2sub/Makefile.am | 2 | ||||
| -rw-r--r-- | gst/mpegaudioparse/Makefile.am | 4 | ||||
| -rw-r--r-- | gst/smooth/Makefile.am | 2 | ||||
| -rw-r--r-- | gst/smpte/Makefile.am | 2 |
16 files changed, 39 insertions, 17 deletions
@@ -30,7 +30,7 @@ CONFIGURE_DEF_OPT='--enable-maintainer-mode --enable-plugin-builddir --enable-de autogen_options $@ echo -n "+ check for build tools" -if test ! -z $NOCHECK; then echo " skipped"; else echo; fi +if test ! -z "$NOCHECK"; then echo " skipped"; else echo; fi version_check "autoconf" "$AUTOCONF autoconf autoconf-2.54 autoconf-2.53 autoconf-2.52" \ "ftp://ftp.gnu.org/pub/gnu/autoconf/" 2 52 || DIE=1 version_check "automake" "$AUTOMAKE automake automake-1.7 automake-1.6 automake-1.5" \ diff --git a/configure.ac b/configure.ac index 1fa3dcc9..b9c0bb0b 100644 --- a/configure.ac +++ b/configure.ac @@ -12,7 +12,7 @@ AM_MAINTAINER_MODE dnl when going to/from release please set the nano (fourth number) right ! dnl releases only do Wall, cvs and prerelease does Werror too -AS_VERSION(gst-plugins, GST_PLUGINS_VERSION, 0, 7, 0, 1, GST_ERROR="-Wall", GST_ERROR="-Wall -Werror") +AS_VERSION(gst-plugins, GST_PLUGINS_VERSION, 0, 7, 0, 1, GST_CVS="no", CVS="yes") AM_INIT_AUTOMAKE($PACKAGE,$VERSION) dnl our libraries and install dirs use major.minor as a version @@ -39,6 +39,21 @@ AC_PROG_CC AM_PROG_CC_STDC AM_PROG_AS AS="${CC}" + +dnl decide on error flags +AS_COMPILER_FLAG(-Wall,GST_ERROR="$GST_ERROR -Wall",GST_ERROR="$GST_ERROR") +if test "x$GST_CVS"="xyes"; then + AS_COMPILER_FLAG(-Werror,GST_ERROR="$GST_ERROR -Werror",GST_ERROR="$GST_ERROR") + + # Only set these optimization flags if gcc is being used. + # + GST_FUNROLL_CFLAGS="$GST_FUNROLL_CFLAGS -funroll-all-loops" + GST_FINLINE_CFLAGS="$GST_FINLINE_CFLAGS -finline-functions" + GST_FFASTMATH_CFLAGS="$GST_FFASTMATH_CFLAGS -ffast-math" + GST_FSCHEDULE_CFLAGS="$GST_FSCHEDULE_CFLAGS -fschedule-insns2" + GST_FNOEXCEPTIONS_CFLAGS="$GST_FNOEXCEPTIONS_CFLAGS -fno-exceptions" +fi + dnl determine c++ compiler AC_PROG_CXX dnl determine if c++ is available on this system @@ -1056,9 +1071,16 @@ AM_CONDITIONAL(HAVE_RAW1394, test "x$HAVE_RAW1394" = "xyes") dnl prefer internal headers to already installed ones GST_CFLAGS="-I\$(top_srcdir)/gst-libs $GST_CFLAGS $GST_ERROR" +GST_OPT_CFLAGS="$GST_FINLINE_CFLAGS $GST_FFASTMATH_CFLAGS" AC_SUBST(GST_LIBS) AC_SUBST(GST_CFLAGS) +AC_SUBST(GST_FUNROLL_CFLAGS) +AC_SUBST(GST_FINLINE_CFLAGS) +AC_SUBST(GST_FFASTMATH_CFLAGS) +AC_SUBST(GST_FSCHEDULE_CFLAGS) +AC_SUBST(GST_FNOEXCEPTIONS_CFLAGS) +AC_SUBST(GST_OPT_CFLAGS) dnl ########################### dnl # Configure external libs # diff --git a/ext/sdl/Makefile.am b/ext/sdl/Makefile.am index 26c4390d..447fbe4f 100644 --- a/ext/sdl/Makefile.am +++ b/ext/sdl/Makefile.am @@ -4,7 +4,7 @@ plugin_LTLIBRARIES = libgstsdlvideosink.la libgstsdlvideosink_la_SOURCES = sdlvideosink.c ## FIXME I have my doubts about these opti flags -libgstsdlvideosink_la_CFLAGS = $(GST_CFLAGS) $(SDL_CFLAGS) -ffast-math -finline-functions +libgstsdlvideosink_la_CFLAGS = $(GST_CFLAGS) $(SDL_CFLAGS) $(GST_OPT_CFLAGS) libgstsdlvideosink_la_LIBADD = $(SDL_LIBS) libgstsdlvideosink_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) diff --git a/gst-libs/gst/audio/Makefile.am b/gst-libs/gst/audio/Makefile.am index e6efc8e2..059f79e5 100644 --- a/gst-libs/gst/audio/Makefile.am +++ b/gst-libs/gst/audio/Makefile.am @@ -8,5 +8,5 @@ libgstaudioincludedir = $(includedir)/gstreamer-@GST_MAJORMINOR@/gst/audio libgstaudioinclude_HEADERS = audio.h libgstaudio_la_LIBADD = -libgstaudio_la_CFLAGS = $(GST_CFLAGS) -finline-functions -ffast-math +libgstaudio_la_CFLAGS = $(GST_CFLAGS) $(GST_OPT_CFLAGS) libgstaudio_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) diff --git a/gst-libs/gst/idct/Makefile.am b/gst-libs/gst/idct/Makefile.am index bdf92d37..ea06100d 100644 --- a/gst-libs/gst/idct/Makefile.am +++ b/gst-libs/gst/idct/Makefile.am @@ -28,5 +28,5 @@ noinst_HEADERS = dct.h libgstidct_la_LIBADD = -libgstidct_la_CFLAGS = $(GST_CFLAGS) -finline-functions -ffast-math +libgstidct_la_CFLAGS = $(GST_CFLAGS) $(GST_OPT_CFLAGS) libgstidct_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) diff --git a/gst-libs/gst/resample/Makefile.am b/gst-libs/gst/resample/Makefile.am index 3c23638a..7edbd6c7 100644 --- a/gst-libs/gst/resample/Makefile.am +++ b/gst-libs/gst/resample/Makefile.am @@ -14,7 +14,7 @@ endif libgstresample_la_SOURCES = dtos.c dtof.c functable.c resample.c resample.h libgstresample_la_LIBADD = -libgstresample_la_CFLAGS = $(GST_CFLAGS) -ffast-math $(ARCHCFLAGS) +libgstresample_la_CFLAGS = $(GST_CFLAGS) $(GST_FFASTMATH_CFLAGS) $(ARCHCFLAGS) libgstresample_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) libgstresampleincludedir = $(includedir)/gstreamer-@GST_MAJORMINOR@/gst/resample diff --git a/gst-libs/gst/riff/Makefile.am b/gst-libs/gst/riff/Makefile.am index b8becdb9..6e235202 100644 --- a/gst-libs/gst/riff/Makefile.am +++ b/gst-libs/gst/riff/Makefile.am @@ -8,5 +8,5 @@ libgstriffincludedir = $(includedir)/gstreamer-@GST_MAJORMINOR@/gst/riff libgstriffinclude_HEADERS = riff.h libgstriff_la_LIBADD = -libgstriff_la_CFLAGS = $(GST_CFLAGS) -funroll-all-loops -finline-functions -ffast-math +libgstriff_la_CFLAGS = $(GST_CFLAGS) $(GST_OPT_CFLAGS) $(GST_FUNROLL_CFLAGS) libgstriff_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) diff --git a/gst-libs/gst/video/Makefile.am b/gst-libs/gst/video/Makefile.am index 3e6f9bd3..86a4d4e9 100644 --- a/gst-libs/gst/video/Makefile.am +++ b/gst-libs/gst/video/Makefile.am @@ -8,5 +8,5 @@ libgstvideoincludedir = $(includedir)/gstreamer-@GST_MAJORMINOR@/gst/video libgstvideoinclude_HEADERS = video.h libgstvideo_la_LIBADD = -libgstvideo_la_CFLAGS = $(GST_CFLAGS) -finline-functions -ffast-math +libgstvideo_la_CFLAGS = $(GST_CFLAGS) $(GST_OPT_CFLAGS) libgstvideo_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) diff --git a/gst/cdxaparse/Makefile.am b/gst/cdxaparse/Makefile.am index 02fca6b5..d07dc484 100644 --- a/gst/cdxaparse/Makefile.am +++ b/gst/cdxaparse/Makefile.am @@ -8,6 +8,6 @@ libgstcdxaparse_la_SOURCES = gstcdxaparse.c noinst_HEADERS = \ gstcdxaparse.h -libgstcdxaparse_la_CFLAGS = -O2 -ffast-math $(GST_CFLAGS) +libgstcdxaparse_la_CFLAGS = -O2 $(GST_FFASTMATH_CFLAGS) $(GST_CFLAGS) libgstcdxaparse_la_LIBADD = libgstcdxaparse_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) diff --git a/gst/modplug/libmodplug/Makefile.am b/gst/modplug/libmodplug/Makefile.am index be6698b9..939014da 100644 --- a/gst/modplug/libmodplug/Makefile.am +++ b/gst/modplug/libmodplug/Makefile.am @@ -1,6 +1,6 @@ noinst_LTLIBRARIES = libmodplug.la -libmodplug_la_CXXFLAGS = -fno-exceptions -Wall -ffast-math -D_REENTRANT +libmodplug_la_CXXFLAGS = $(GST_FNOEXCEPTIONS_CFLAGS) $(GST_CFLAGS) $(GST_FFASTMATH_CFLAGS) -D_REENTRANT libmodplug_la_LDFLAGS = -module -avoid-version libmodplug_la_SOURCES = tables.cpp \ sndmix.cpp \ diff --git a/gst/mpeg1sys/Makefile.am b/gst/mpeg1sys/Makefile.am index 87bc8550..2083e719 100644 --- a/gst/mpeg1sys/Makefile.am +++ b/gst/mpeg1sys/Makefile.am @@ -5,7 +5,7 @@ plugin_LTLIBRARIES = libgstmpeg1systemencode.la libgstmpeg1systemencode_la_SOURCES = gstmpeg1systemencode.c \ buffer.c \ systems.c -libgstmpeg1systemencode_la_CFLAGS = -O2 $(FOMIT_FRAME_POINTER) -funroll-all-loops -finline-functions -ffast-math $(GST_CFLAGS) +libgstmpeg1systemencode_la_CFLAGS = -O2 $(FOMIT_FRAME_POINTER) $(GST_OPT_CFLAGS) $(GST_FUNROLL_CFLAGS) $(GST_CFLAGS) libgstmpeg1systemencode_la_LIBADD = libgstmpeg1systemencode_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) diff --git a/gst/mpeg1videoparse/Makefile.am b/gst/mpeg1videoparse/Makefile.am index dbe0b4bc..ed72691e 100644 --- a/gst/mpeg1videoparse/Makefile.am +++ b/gst/mpeg1videoparse/Makefile.am @@ -3,7 +3,7 @@ plugindir = $(libdir)/gstreamer-@GST_MAJORMINOR@ plugin_LTLIBRARIES = libgstmp1videoparse.la libgstmp1videoparse_la_SOURCES = gstmp1videoparse.c -libgstmp1videoparse_la_CFLAGS = $(GST_CFLAGS) -O3 $(FOMIT_FRAME_POINTER) -ffast-math +libgstmp1videoparse_la_CFLAGS = $(GST_CFLAGS) -O3 $(FOMIT_FRAME_POINTER) $(GST_FFASTMATH_CFLAGS) libgstmp1videoparse_la_LIBADD = libgstmp1videoparse_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) diff --git a/gst/mpeg2sub/Makefile.am b/gst/mpeg2sub/Makefile.am index 5bf0e4ae..14f1c7db 100644 --- a/gst/mpeg2sub/Makefile.am +++ b/gst/mpeg2sub/Makefile.am @@ -10,7 +10,7 @@ else ARCHCFLAGS = endif -libgstmpeg2subt_la_CFLAGS = -O3 $(ARCHCFLAGS) -fschedule-insns2 $(FOMIT_FRAME_POINTER) -finline-functions -ffast-math $(GST_CFLAGS) +libgstmpeg2subt_la_CFLAGS = -O3 $(ARCHCFLAGS) $(GST_FSCHEDULE_CFLAGS) $(FOMIT_FRAME_POINTER) $(GST_OPT_CFLAGS) $(GST_CFLAGS) libgstmpeg2subt_la_LIBADD = libgstmpeg2subt_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) diff --git a/gst/mpegaudioparse/Makefile.am b/gst/mpegaudioparse/Makefile.am index 06b3f91d..8b81fcc4 100644 --- a/gst/mpegaudioparse/Makefile.am +++ b/gst/mpegaudioparse/Makefile.am @@ -5,12 +5,12 @@ plugin_LTLIBRARIES = libgstmpegaudioparse.la libgstmp3types.la libgstmpegaudioparse_la_SOURCES = gstmpegaudioparse.c # FIXME is this useful? -libgstmpegaudioparse_la_CFLAGS = -O3 $(FOMIT_FRAME_POINTER) -ffast-math -finline-functions $(GST_CFLAGS) +libgstmpegaudioparse_la_CFLAGS = -O3 $(FOMIT_FRAME_POINTER) $(GST_OPT_CFLAGS) $(GST_CFLAGS) libgstmpegaudioparse_la_LIBADD = libgstmpegaudioparse_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) libgstmp3types_la_SOURCES = gstmp3types.c -libgstmp3types_la_CFLAGS = -O3 $(FOMIT_FRAME_POINTER) -ffast-math -finline-functions $(GST_CFLAGS) +libgstmp3types_la_CFLAGS = -O3 $(FOMIT_FRAME_POINTER) $(GST_OPT_CFLAGS) $(GST_CFLAGS) libgstmp3types_la_LIBADD = libgstmp3types_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) diff --git a/gst/smooth/Makefile.am b/gst/smooth/Makefile.am index 933debda..31675bf5 100644 --- a/gst/smooth/Makefile.am +++ b/gst/smooth/Makefile.am @@ -3,7 +3,7 @@ plugindir = $(libdir)/gstreamer-@GST_MAJORMINOR@ plugin_LTLIBRARIES = libgstsmooth.la libgstsmooth_la_SOURCES = gstsmooth.c -libgstsmooth_la_CFLAGS = -O3 $(FOMIT_FRAME_POINTER) -funroll-all-loops -finline-functions -ffast-math $(GST_CFLAGS) +libgstsmooth_la_CFLAGS = -O3 $(FOMIT_FRAME_POINTER) $(GST_OPT_CFLAGS) $(GST_FUNROLL_CFLAGS) $(GST_CFLAGS) libgstsmooth_la_LIBADD = libgstsmooth_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) diff --git a/gst/smpte/Makefile.am b/gst/smpte/Makefile.am index 3aef3a85..b46ff76a 100644 --- a/gst/smpte/Makefile.am +++ b/gst/smpte/Makefile.am @@ -6,7 +6,7 @@ libgstsmpte_la_SOURCES = gstsmpte.c gstmask.c barboxwipes.c paint.c noinst_HEADERS = gstsmpte.h gstmask.h paint.h -libgstsmpte_la_CFLAGS = -O2 -ffast-math $(GST_CFLAGS) +libgstsmpte_la_CFLAGS = -O2 $(GST_FFASTMATH_CFLAGS) $(GST_CFLAGS) libgstsmpte_la_LIBADD = libgstsmpte_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) |