Set AM_CFLAGS instead of CFLAGS directly

diff --git a/configure.ac b/configure.ac
index 381e5284c93ef3cc9c78cce5f0be86bfcee228ef..8cff886eb2952cf48d30b1c4a10d5116417da99b 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -90,8 +90,5 @@ AC_SUBST([PKG_REQUIRES])
 # Setup output beautifier.
 m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
 
-# More sensible compile flags
-CFLAGS="$CFLAGS -Wall"
-
 AC_CONFIG_FILES([Makefile libass/Makefile test/Makefile libass.pc])
 AC_OUTPUT

diff --git a/libass/Makefile.am b/libass/Makefile.am
index 04db84ddff7a2d70111de63a8b41b90839065835..375f8e644d1f7bdb0e05231a0a5a8e04ce397fcd 100644 (file)
--- a/libass/Makefile.am
+++ b/libass/Makefile.am
@@ -1,3 +1,5 @@
+AM_CFLAGS = -Wall
+
 LIBASS_LT_CURRENT = 5
 LIBASS_LT_REVISION = 0
 LIBASS_LT_AGE = 1

diff --git a/test/Makefile.am b/test/Makefile.am
index 9267b1a5f081488fb9f36d2b923cd7f9e0bdbed9..9adad4dacb17b2eaf2b72e3f4d897133fa21dc47 100644 (file)
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -1,3 +1,5 @@
+AM_CFLAGS = -Wall
+
 noinst_PROGRAMS = test
 test_SOURCES = test.c
 test_CPPFLAGS = -I../libass