Fix automake warning.

Newer versions prefer AM_CPPFLAGS to INCLUDES.
Tell libtool about our m4 directory.

diff --git a/configure.ac b/configure.ac
index eddd02d..70a36c9 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -16,6 +16,7 @@ AM_MAINTAINER_MODE
 
 dnl Add parameters for aclocal
 AC_SUBST(ACLOCAL_AMFLAGS, "-I m4")
+AC_CONFIG_MACRO_DIRS([m4])
 
 dnl Library versioning
 dnl - library source changed -> increment REVISION

diff --git a/examples/Makefile.am b/examples/Makefile.am
index 381d4c9..5881635 100644 (file)
--- a/examples/Makefile.am
+++ b/examples/Makefile.am
@@ -2,13 +2,13 @@
 
 AUTOMAKE_OPTIONS = foreign
 
-INCLUDES = -I$(top_srcdir)/include @OGG_CFLAGS@
-
 noinst_PROGRAMS = decoder_example encoder_example chaining_example\
                vorbisfile_example seeking_example
 
 EXTRA_DIST = frameview.pl
 
+AM_CPPFLAGS = -I$(top_srcdir)/include @OGG_CFLAGS@
+
 # uncomment to build static executables from the example code
 #LDFLAGS = -all-static 
 

diff --git a/lib/Makefile.am b/lib/Makefile.am
index 50f7ea4..cd5afdf 100644 (file)
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -2,7 +2,7 @@
 
 SUBDIRS = modes books
 
-INCLUDES = -I$(top_srcdir)/include @OGG_CFLAGS@
+AM_CPPFLAGS = -I$(top_srcdir)/include @OGG_CFLAGS@
 
 lib_LTLIBRARIES = libvorbis.la libvorbisfile.la libvorbisenc.la
 

diff --git a/test/Makefile.am b/test/Makefile.am
index d922374..b68ebdb 100644 (file)
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -2,13 +2,13 @@
 
 AUTOMAKE_OPTIONS = foreign
 
-INCLUDES = -I$(top_srcdir)/include @OGG_CFLAGS@
-
 check_PROGRAMS = test
 
 check: $(check_PROGRAMS)
        ./test$(EXEEXT)
 
+AM_CPPFLAGS = -I$(top_srcdir)/include @OGG_CFLAGS@
+
 test_SOURCES = util.c util.h write_read.c write_read.h test.c
 test_LDADD = ../lib/libvorbisenc.la ../lib/libvorbis.la @OGG_LIBS@ @VORBIS_LIBS@
 

diff --git a/vq/Makefile.am b/vq/Makefile.am
index 6fd105c..e9c272e 100644 (file)
--- a/vq/Makefile.am
+++ b/vq/Makefile.am
@@ -1,10 +1,9 @@
 ## Process this file with automake to produce Makefile.in
 
-INCLUDES = -I../lib -I$(top_srcdir)/include @OGG_CFLAGS@
-
 EXTRA_PROGRAMS = latticebuild latticetune huffbuild distribution
 CLEANFILES = $(EXTRA_PROGRAMS)
 
+AM_CPPFLAGS = -I../lib -I$(top_srcdir)/include @OGG_CFLAGS@
 AM_LDFLAGS = -static
 LDADD = ../lib/libvorbis.la