summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Makefile.am24
-rw-r--r--configure.ac4
-rw-r--r--plugins/flac/Makefile.am2
3 files changed, 5 insertions, 25 deletions
diff --git a/Makefile.am b/Makefile.am
index 9079ff2d..2d76b89f 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) $(SIMD_FLAGS) -I$(gmepath) -std=c99
+AM_CFLAGS = $(DEPS_CFLAGS) $(INSANE_CFLAGS) -I$(gmepath) -std=c99
AM_CPPFLAGS = $(DEPS_CFLAGS) -I$(sidpath)/libsidplay/include -I$(sidpath)/builders/resid-builder/include
docsdir = $(datadir)/doc/$(PACKAGE)
@@ -62,25 +62,3 @@ desktopdir = $(datadir)/applications
desktop_DATA = deadbeef.desktop
EXTRA_DIST = $(docs_DATA) $(desktop_DATA)
-
-#install-data-local:
-# @$(NORMAL_INSTALL)
-# if test -d $(srcdir)/pixmaps; then \
-# $(mkinstalldirs) $(DESTDIR)$(pkgdatadir)/pixmaps; \
-# for pixmap in $(srcdir)/pixmaps/*; do \
-# if test -f $$pixmap; then \
-# $(INSTALL_DATA) $$pixmap $(DESTDIR)$(pkgdatadir)/pixmaps; \
-# fi \
-# done \
-# fi
-#
-#dist-hook:
-# if test -d pixmaps; then \
-# mkdir $(distdir)/pixmaps; \
-# for pixmap in pixmaps/*; do \
-# if test -f $$pixmap; then \
-# cp -p $$pixmap $(distdir)/pixmaps; \
-# fi \
-# done \
-# fi
-#
diff --git a/configure.ac b/configure.ac
index d1c47c57..e7984003 100644
--- a/configure.ac
+++ b/configure.ac
@@ -38,6 +38,9 @@ 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)
+
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)
PKG_CHECK_MODULES(ALSA_DEPS, alsa, HAVE_ALSA=1, NO_ALSA=1)
@@ -49,7 +52,6 @@ AX_CHECK_COMPILER_FLAGS(-msse2, HAVE_SSE2=1, [])
if test ${HAVE_SSE2}; then
AC_DEFINE(HAVE_SSE2,1,[Support SSE2 instructions])
fi
-AC_SUBST(SIMD_FLAGS)
dnl curl lib
AC_CHECK_LIB([curl], [main], [HAVE_CURL=1])
diff --git a/plugins/flac/Makefile.am b/plugins/flac/Makefile.am
index 1e8b09bc..767231a1 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) -std=c99
+AM_CFLAGS = $(CFLAGS) $(INSANE_CFLAGS) -std=c99
endif