diff options
-rw-r--r-- | configure.ac | 25 | ||||
-rw-r--r-- | ext/jpeg/Makefile.am | 2 | ||||
-rw-r--r-- | gst/avi/Makefile.am | 6 | ||||
-rw-r--r-- | gst/goom/Makefile.am | 3 | ||||
-rw-r--r-- | gst/median/Makefile.am | 2 | ||||
-rw-r--r-- | gst/monoscope/Makefile.am | 2 | ||||
-rw-r--r-- | gst/smpte/Makefile.am | 2 |
7 files changed, 6 insertions, 36 deletions
diff --git a/configure.ac b/configure.ac index 0432ddf4..c3274bee 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/jpeg/Makefile.am b/ext/jpeg/Makefile.am index 7018a3cf..351a2e77 100644 --- a/ext/jpeg/Makefile.am +++ b/ext/jpeg/Makefile.am @@ -3,8 +3,6 @@ plugin_LTLIBRARIES = libgstjpeg.la libgstjpeg_la_SOURCES = gstjpeg.c gstjpegdec.c gstjpegenc.c libgstjpeg_la_CFLAGS = $(GST_CFLAGS) -## FIXME: check these CFLAGS -## -O3 $(FOMIT_FRAME_POINTER) $(GST_OPT_CFLAGS) $(GST_FUNROLL_CFLAGS) -DNDEBUG libgstjpeg_la_LIBADD = $(JPEG_LIBS) libgstjpeg_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) diff --git a/gst/avi/Makefile.am b/gst/avi/Makefile.am index 68abc449..e2dd95f1 100644 --- a/gst/avi/Makefile.am +++ b/gst/avi/Makefile.am @@ -10,13 +10,11 @@ noinst_HEADERS = \ gstavimux.h \ gstavidemux.h -#CFLAGS += $(GST_CFLAGS) -O3 $(GST_OPT_CFLAGS) $(GST_FUNROLL_CFLAGS) -fomit-frame-pointer -DNDEBUG - -libgstavidemux_la_CFLAGS = -O2 $(GST_FFASTMATH_CFLAGS) $(GST_CFLAGS) +libgstavidemux_la_CFLAGS = $(GST_CFLAGS) libgstavidemux_la_LIBADD = libgstavidemux_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) -libgstavimux_la_CFLAGS = -O2 $(GST_FFASTMATH_CFLAGS) $(GST_CFLAGS) +libgstavimux_la_CFLAGS = $(GST_CFLAGS) libgstavimux_la_LIBADD = libgstavimux_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) diff --git a/gst/goom/Makefile.am b/gst/goom/Makefile.am index 5fafbde2..85b5c234 100644 --- a/gst/goom/Makefile.am +++ b/gst/goom/Makefile.am @@ -13,8 +13,7 @@ libgstgoom_la_SOURCES = gstgoom.c goom_core.c $(GOOM_FILTER_FILES) graphic.c lin noinst_HEADERS = filters.h goom_core.h goom_tools.h graphic.h lines.h -#CFLAGS += $(GST_CFLAGS) -O3 $(GST_OPT_CFLAGS) $(GST_FUNROLL_CFLAGS) -fomit-frame-pointer -DNDEBUG -libgstgoom_la_CFLAGS = -O2 $(GST_FFASTMATH_CFLAGS) $(GST_CFLAGS) $(GOOM_FILTER_CFLAGS) +libgstgoom_la_CFLAGS = $(GST_CFLAGS) $(GOOM_FILTER_CFLAGS) libgstgoom_la_LIBADD = libgstgoom_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) diff --git a/gst/median/Makefile.am b/gst/median/Makefile.am index b73d4b0e..3d447b02 100644 --- a/gst/median/Makefile.am +++ b/gst/median/Makefile.am @@ -3,7 +3,7 @@ plugin_LTLIBRARIES = libgstmedian.la libgstmedian_la_SOURCES = gstmedian.c -libgstmedian_la_CFLAGS = -O3 $(FOMIT_FRAME_POINTER) $(GST_OPT_CFLAGS) $(GST_FUNROLL_CFLAGS) $(GST_CFLAGS) +libgstmedian_la_CFLAGS = $(GST_CFLAGS) libgstmedian_la_LIBADD = libgstmedian_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) diff --git a/gst/monoscope/Makefile.am b/gst/monoscope/Makefile.am index 7f50915e..97b1f19e 100644 --- a/gst/monoscope/Makefile.am +++ b/gst/monoscope/Makefile.am @@ -5,7 +5,7 @@ libgstmonoscope_la_SOURCES = gstmonoscope.c monoscope.c convolve.c noinst_HEADERS = monoscope.h convolve.h -libgstmonoscope_la_CFLAGS = -O2 $(GST_FFASTMATH_CFLAGS) $(GST_CFLAGS) +libgstmonoscope_la_CFLAGS = $(GST_CFLAGS) libgstmonoscope_la_LIBADD = libgstmonoscope_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) diff --git a/gst/smpte/Makefile.am b/gst/smpte/Makefile.am index 00d06bbc..26723c8d 100644 --- a/gst/smpte/Makefile.am +++ b/gst/smpte/Makefile.am @@ -5,7 +5,7 @@ libgstsmpte_la_SOURCES = gstsmpte.c gstmask.c barboxwipes.c paint.c noinst_HEADERS = gstsmpte.h gstmask.h paint.h -libgstsmpte_la_CFLAGS = -O2 $(GST_FFASTMATH_CFLAGS) $(GST_CFLAGS) +libgstsmpte_la_CFLAGS = $(GST_CFLAGS) libgstsmpte_la_LIBADD = libgstsmpte_la_LDFLAGS = $(GST_PLUGIN_LDFLAGS) |