diff --git a/configure.ac b/configure.ac index 0432ddf4ff..c3274bee1c 100644 --- a/configure.ac +++ b/configure.ac @@ -49,13 +49,6 @@ if test "x$GST_WALL" = "xyes"; then if test "x$GST_CVS" = "xyes"; then AS_COMPILER_FLAG(-Werror,GST_ERROR="$GST_ERROR -Werror",GST_ERROR="$GST_ERROR") fi - - dnl set gcc-style optimization flags if using the gnu compiler. - 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 @@ -1107,17 +1100,6 @@ if test "x$USE_DEBUG" = xyes; then GST_CFLAGS="$GST_CFLAGS -g" fi -if test "x$USE_PROFILING" = xyes; then -dnl CFLAGS="$CFLAGS -pg -fprofile-arcs" - FOMIT_FRAME_POINTER="" -else - FOMIT_FRAME_POINTER="-fomit-frame-pointer" -fi - -dnl -dnl AC_SUBST(FOMIT_FRAME_POINTER) -dnl - dnl ############################# dnl # Set automake conditionals # dnl ############################# @@ -1149,16 +1131,9 @@ 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/a52dec/Makefile.am b/ext/a52dec/Makefile.am index 91ef80dc63..2b92b27817 100644 --- a/ext/a52dec/Makefile.am +++ b/ext/a52dec/Makefile.am @@ -2,7 +2,7 @@ plugin_LTLIBRARIES = libgsta52dec.la libgsta52dec_la_SOURCES = gsta52dec.c -libgsta52dec_la_CFLAGS = $(GST_CFLAGS) $(FOMIT_FRAME_POINTER) +libgsta52dec_la_CFLAGS = $(GST_CFLAGS) libgsta52dec_la_LIBADD = $(A52DEC_LIBS) libgsta52dec_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) diff --git a/gst-libs/gst/audio/Makefile.am b/gst-libs/gst/audio/Makefile.am index fa9abaf472..4f95f4efdf 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 audioclock.h libgstaudio_la_LIBADD = -libgstaudio_la_CFLAGS = $(GST_CFLAGS) $(GST_OPT_CFLAGS) +libgstaudio_la_CFLAGS = $(GST_CFLAGS) libgstaudio_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) diff --git a/gst-libs/gst/idct/Makefile.am b/gst-libs/gst/idct/Makefile.am index ea06100d91..aea5a1f37e 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) $(GST_OPT_CFLAGS) +libgstidct_la_CFLAGS = $(GST_CFLAGS) libgstidct_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) diff --git a/gst-libs/gst/resample/Makefile.am b/gst-libs/gst/resample/Makefile.am index 7edbd6c7fe..94ebea5bbc 100644 --- a/gst-libs/gst/resample/Makefile.am +++ b/gst-libs/gst/resample/Makefile.am @@ -2,19 +2,9 @@ librarydir = $(libdir)/gstreamer-@GST_MAJORMINOR@ library_LTLIBRARIES = libgstresample.la -if HAVE_CPU_I386 -ARCHCFLAGS = -march=i486 -else -if HAVE_CPU_PPC -ARCHCFLAGS = -Wa,-m7400 -else -ARCHCFLAGS = -endif -endif - libgstresample_la_SOURCES = dtos.c dtof.c functable.c resample.c resample.h libgstresample_la_LIBADD = -libgstresample_la_CFLAGS = $(GST_CFLAGS) $(GST_FFASTMATH_CFLAGS) $(ARCHCFLAGS) +libgstresample_la_CFLAGS = $(GST_CFLAGS) libgstresample_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) libgstresampleincludedir = $(includedir)/gstreamer-@GST_MAJORMINOR@/gst/resample @@ -22,9 +12,3 @@ libgstresampleinclude_HEADERS = resample.h noinst_HEADERS = private.h -#check_PROGRAMS = test -#test_SOURCES = test.c -#test_LDADD = libresample.la - - - diff --git a/gst-libs/gst/riff/Makefile.am b/gst-libs/gst/riff/Makefile.am index 6e235202d0..05ab689461 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) $(GST_OPT_CFLAGS) $(GST_FUNROLL_CFLAGS) +libgstriff_la_CFLAGS = $(GST_CFLAGS) libgstriff_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) diff --git a/gst-libs/gst/video/Makefile.am b/gst-libs/gst/video/Makefile.am index 86a4d4e997..e45c00511e 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) $(GST_OPT_CFLAGS) +libgstvideo_la_CFLAGS = $(GST_CFLAGS) libgstvideo_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) diff --git a/gst/ac3parse/Makefile.am b/gst/ac3parse/Makefile.am index 84148ca727..58f0b9e9e0 100644 --- a/gst/ac3parse/Makefile.am +++ b/gst/ac3parse/Makefile.am @@ -5,7 +5,7 @@ libgstac3parse_la_SOURCES = gstac3parse.c noinst_HEADERS = gstac3parse.h -libgstac3parse_la_CFLAGS = -O3 $(FOMIT_FRAME_POINTER) $(GST_OPT_FLAGS) $(GST_FUNROLL_CFLAGS) $(GST_CFLAGS) +libgstac3parse_la_CFLAGS = $(GST_CFLAGS) libgstac3parse_la_LIBADD = libgstac3parse_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) diff --git a/gst/mpegaudioparse/Makefile.am b/gst/mpegaudioparse/Makefile.am index ece03b8531..ee22c43e37 100644 --- a/gst/mpegaudioparse/Makefile.am +++ b/gst/mpegaudioparse/Makefile.am @@ -3,17 +3,15 @@ plugin_LTLIBRARIES = libgstmpegaudioparse.la libgstmp3types.la libgstmpegaudioparse_la_SOURCES = gstmpegaudioparse.c -# FIXME is this useful? -libgstmpegaudioparse_la_CFLAGS = -O3 $(FOMIT_FRAME_POINTER) $(GST_OPT_CFLAGS) $(GST_CFLAGS) +libgstmpegaudioparse_la_CFLAGS = $(GST_CFLAGS) libgstmpegaudioparse_la_LIBADD = libgstmpegaudioparse_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) libgstmp3types_la_SOURCES = gstmp3types.c -libgstmp3types_la_CFLAGS = -O3 $(FOMIT_FRAME_POINTER) $(GST_OPT_CFLAGS) $(GST_CFLAGS) +libgstmp3types_la_CFLAGS = $(GST_CFLAGS) libgstmp3types_la_LIBADD = libgstmp3types_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) noinst_HEADERS = gstmpegaudioparse.h EXTRA_DIST = README -# FIXME is this needed? diff --git a/gst/mpegstream/Makefile.am b/gst/mpegstream/Makefile.am index 98ebb2fad3..08709c70d5 100644 --- a/gst/mpegstream/Makefile.am +++ b/gst/mpegstream/Makefile.am @@ -2,7 +2,7 @@ plugin_LTLIBRARIES = libgstmpegstream.la libgstmpegstream_la_SOURCES = gstmpegstream.c gstmpegparse.c gstmpegdemux.c gstmpegpacketize.c gstrfc2250enc.c gstmpegclock.c -libgstmpegstream_la_CFLAGS = $(GST_CFLAGS) -O3 $(FOMIT_FRAME_POINTER) $(GST_FFASTMATH_CFLAGS) +libgstmpegstream_la_CFLAGS = $(GST_CFLAGS) libgstmpegstream_la_LIBADD = libgstmpegstream_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) diff --git a/gst/synaesthesia/Makefile.am b/gst/synaesthesia/Makefile.am index ae2bb4e90c..1168ed1e1d 100644 --- a/gst/synaesthesia/Makefile.am +++ b/gst/synaesthesia/Makefile.am @@ -5,7 +5,7 @@ libgstsynaesthesia_la_SOURCES = gstsynaesthesia.c synaescope.c noinst_HEADERS = synaescope.h -libgstsynaesthesia_la_CFLAGS = -O2 $(GST_FFASTMATH_CFLAGS) $(GST_CFLAGS) +libgstsynaesthesia_la_CFLAGS = $(GST_CFLAGS) libgstsynaesthesia_la_LIBADD = libgstsynaesthesia_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS)