teuf

From 2d7cb1a22438f44f8b368146e920eec85be2482b Mon Sep 17 00:00:00 2001From: Christophe Fergeau <cfergeau@mandriva.com>Date: Mon, 22 Mar 2010 17:15:35 +0000Subject: [PATCH] remove hardcoded optimization flags--- bristol/Makefile.am    |    4 ++-- libbristol/Makefile.am |    2 +- 2 files changed, 3 insertions(+), 3 deletions(-)diff --git a/bristol/Makefile.am b/bristol/Makefile.amindex f5b62a7..1a5fce9 100755--- a/bristol/Makefile.am+++ b/bristol/Makefile.am@@ -1,8 +1,8 @@ AUTOMAKE_OPTIONS = foreign  #LDFLAGS = -Bdynamic `pkg-config --silence-errors --libs alsa` @ALSA_LIBS@ -L../libbristolmidi/.libs -L../libbristolaudio/.libs -L../libbristol/.libs -lbristolmidi -lbristolaudio -lbristol -lm -lpthread `pkg-config --silence-errors --libs jack`-#AM_CFLAGS = -pthread -Wall -g -I$(srcdir)/../include/slab -I$(srcdir)/../include/bristol -I. @BRISTOL_SEMAPHORE@ @BRISTOL_SEM_OPEN@ @BRISTOL_HAS_DRAIN@ @BRISTOL_HAS_JACK@ @BRISTOL_HAS_JACK_MIDI@ -DBRISTOL_HAS_ALSA=@BRISTOL_HAS_ALSA@ @JACK_CFLAGS@ @ALSA_CFLAGS@ -march=core2 -msse -msse2 -mfpmath=sse -ffast-math -fomit-frame-pointer -O2-AM_CFLAGS = -pthread -Wall -g -I$(srcdir)/../include/slab -I$(srcdir)/../include/bristol -I. @BRISTOL_SEMAPHORE@ @BRISTOL_SEM_OPEN@ @BRISTOL_HAS_DRAIN@ @BRISTOL_HAS_JACK@ @BRISTOL_HAS_JACK_MIDI@ -DBRISTOL_HAS_ALSA=@BRISTOL_HAS_ALSA@ @JACK_CFLAGS@ @ALSA_CFLAGS@ -ffast-math -fomit-frame-pointer -O2+#AM_CFLAGS = -pthread -Wall -g -I$(srcdir)/../include/slab -I$(srcdir)/../include/bristol -I. @BRISTOL_SEMAPHORE@ @BRISTOL_SEM_OPEN@ @BRISTOL_HAS_DRAIN@ @BRISTOL_HAS_JACK@ @BRISTOL_HAS_JACK_MIDI@ -DBRISTOL_HAS_ALSA=@BRISTOL_HAS_ALSA@ @JACK_CFLAGS@ @ALSA_CFLAGS@ +AM_CFLAGS = -pthread -Wall -g -I$(srcdir)/../include/slab -I$(srcdir)/../include/bristol -I. @BRISTOL_SEMAPHORE@ @BRISTOL_SEM_OPEN@ @BRISTOL_HAS_DRAIN@ @BRISTOL_HAS_JACK@ @BRISTOL_HAS_JACK_MIDI@ -DBRISTOL_HAS_ALSA=@BRISTOL_HAS_ALSA@ @JACK_CFLAGS@ @ALSA_CFLAGS@  bin_PROGRAMS = bristol #bristol_LDFLAGS = -Bdynamic -L../libbristolmidi/.libs -L../libbristolaudio/.libs -L../libbristol/.libs -L../libbristolic/.libs bristol_LDFLAGS = -Bdynamic `pkg-config --silence-errors --libs alsa` @ALSA_LIBS@ -L../libbristolmidi/.libs -L../libbristolaudio/.libs -L../libbristol/.libs -L../libbristolic -lbristolmidi -lbristolaudio -lbristol -lm -lpthread `pkg-config --silence-errors --libs jack`diff --git a/libbristol/Makefile.am b/libbristol/Makefile.amindex 465efea..7cc65e8 100755--- a/libbristol/Makefile.am+++ b/libbristol/Makefile.am@@ -1,7 +1,7 @@ AUTOMAKE_OPTIONS = foreign  AM_CFLAGS = -pthread -Wall -g -I$(srcdir)/../include/bristol -I$(srcdir)/../include/slab -DBRISOL_HAS_ALSA=@BRISTOL_HAS_ALSA@-libbristol_la_LDFLAGS=-export-dynamic -version-info @BRISTOL_SO_VERSION@ -march=core2 -msse -msse2 -mfpmath=sse -ffast-math -fomit-frame-pointer -O3+libbristol_la_LDFLAGS=-export-dynamic -version-info @BRISTOL_SO_VERSION@ #libbristol_la_LIBADD=$(top_builddir)/libbristol/libbristol.la  lib_LTLIBRARIES = libbristol.la-- 1.7.0.2