summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar Alexey Yakovenko <wakeroid@gmail.com>2010-01-03 16:21:31 +0100
committerGravatar Alexey Yakovenko <wakeroid@gmail.com>2010-01-03 16:21:31 +0100
commit8fa2b7f9d7df2a7ec93cdb890a64a2eedefd9630 (patch)
treea1e9d65edde0709f92993dcdecc8d3d6894ad2bd
parentddd92e9b681d85a3b45facd70dad3adb648b2a65 (diff)
updated warning CFLAGS
-rw-r--r--Makefile.am2
-rw-r--r--configure.ac7
-rw-r--r--plugins/flac/Makefile.am2
3 files changed, 4 insertions, 7 deletions
diff --git a/Makefile.am b/Makefile.am
index 2d76b89f..18aecca8 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -51,7 +51,7 @@ sdk_HEADERS = deadbeef.h
deadbeef_LDADD = $(LDADD) $(DEPS_LIBS) gme/Game_Music_Emu-0.5.2/gme/libgme.a sid/sidplay-libs-2.1.0/libsidplay2.a dumb/libdumb.a -lstdc++
-AM_CFLAGS = $(DEPS_CFLAGS) $(INSANE_CFLAGS) -I$(gmepath) -std=c99
+AM_CFLAGS = $(DEPS_CFLAGS) -I$(gmepath) -std=c99
AM_CPPFLAGS = $(DEPS_CFLAGS) -I$(sidpath)/libsidplay/include -I$(sidpath)/builders/resid-builder/include
docsdir = $(datadir)/doc/$(PACKAGE)
diff --git a/configure.ac b/configure.ac
index e7984003..ef425eb7 100644
--- a/configure.ac
+++ b/configure.ac
@@ -35,11 +35,8 @@ esac
test "x$prefix" = xNONE && prefix=$ac_default_prefix
-CFLAGS="$CFLAGS -D_GNU_SOURCE -DLIBDIR=\\\"$libdir\\\" -DPREFIX=\\\"$prefix\\\""
-CPPFLAGS="$CFLAGS"
-
-INSANE_CFLAGS="-Wformat -Wcomment -Wchar-subscripts -Wformat-security -Wunused-function -Wunused-variable -Wunused-value -Wuninitialized -Wfloat-equal -Wundef -Wshadow -Wtype-limits -Wbad-function-cast -Wcast-qual -Wwrite-strings"
-AC_SUBST(INSANE_CFLAGS)
+INSANE_CFLAGS="-Wcomment -Wchar-subscripts -Wunused-function -Wunused-variable -Wunused-value -Wuninitialized -Wfloat-equal -Wundef -Wtype-limits -Wbad-function-cast -Wcast-qual -Wwrite-strings"
+CFLAGS="$CFLAGS $INSANE_CFLAGS -D_GNU_SOURCE -DLIBDIR=\\\"$libdir\\\" -DPREFIX=\\\"$prefix\\\""
PKG_CHECK_MODULES(DEPS, samplerate)
PKG_CHECK_MODULES(GTKUI_DEPS, gtk+-2.0 >= 2.12 gthread-2.0 glib-2.0, HAVE_GTK=1, NO_GTK=1)
diff --git a/plugins/flac/Makefile.am b/plugins/flac/Makefile.am
index 767231a1..1e8b09bc 100644
--- a/plugins/flac/Makefile.am
+++ b/plugins/flac/Makefile.am
@@ -5,5 +5,5 @@ flac_la_SOURCES = flac.c
flac_la_LDFLAGS = -module
flac_la_LIBADD = $(LDADD) $(FLAC_LIBS)
-AM_CFLAGS = $(CFLAGS) $(INSANE_CFLAGS) -std=c99
+AM_CFLAGS = $(CFLAGS) -std=c99
endif