summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGrigori Goronzy <greg@blackbox>2010-08-09 19:03:26 +0200
committerGrigori Goronzy <greg@blackbox>2010-08-09 19:03:26 +0200
commit705d2f10efe51e5d8afab4be7c92f72ebe4c98b9 (patch)
tree732c6b0123d664f91eff6a8f3223029253750f2e
parent48d7100528ec1e5cd27428dc3d57c1b015c4f055 (diff)
downloadlibass-705d2f10efe51e5d8afab4be7c92f72ebe4c98b9.tar.bz2
libass-705d2f10efe51e5d8afab4be7c92f72ebe4c98b9.tar.xz
Set AM_CFLAGS instead of CFLAGS directly
-rw-r--r--configure.ac3
-rw-r--r--libass/Makefile.am2
-rw-r--r--test/Makefile.am2
3 files changed, 4 insertions, 3 deletions
diff --git a/configure.ac b/configure.ac
index 381e528..8cff886 100644
--- 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 04db84d..375f8e6 100644
--- 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 9267b1a..9adad4d 100644
--- 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