Fix automake warnings. r=ron, rillian

Patch by valtri.
https://trac.xiph.org/ticket/2032

git-svn-id: http://svn.xiph.org/trunk/theora@19181 0101bb08-14d6-0310-b084-bc0e0c8e3800

diff --git a/examples/Makefile.am b/examples/Makefile.am
index 2c8ad1c..40c72f0 100644 (file)
--- a/examples/Makefile.am
+++ b/examples/Makefile.am
@@ -1,13 +1,12 @@
 ## Process this file with automake to produce Makefile.in
 
-INCLUDES = -I$(top_srcdir)/include 
-
 noinst_PROGRAMS = dump_video dump_psnr libtheora_info \
        $(BUILDABLE_EXAMPLES)
 
 # possible contents of BUILDABLE_EXAMPLES:
 EXTRA_PROGRAMS = player_example encoder_example png2theora tiff2theora
 
+AM_CPPFLAGS = -I$(top_srcdir)/include
 AM_CFLAGS = $(OGG_CFLAGS)
 LDADD = ../lib/libtheora.la $(OGG_LIBS)
 LDADDDEC = ../lib/libtheoradec.la $(OGG_LIBS)

diff --git a/lib/Makefile.am b/lib/Makefile.am
index 8aa3cb7..3bfb060 100644 (file)
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -1,4 +1,4 @@
-INCLUDES = -I$(top_srcdir)/include
+AM_CPPFLAGS = -I$(top_srcdir)/include
 AM_CFLAGS = $(OGG_CFLAGS) $(CAIRO_CFLAGS)
 
 EXTRA_DIST = \

diff --git a/tests/Makefile.am b/tests/Makefile.am
index 7c11232..5501bd5 100644 (file)
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -1,7 +1,6 @@
-INCLUDES = -I$(top_srcdir)/include
-
 noinst_HEADERS = tests.h
 
+AM_CPPFLAGS = -I$(top_srcdir)/include
 AM_CFLAGS = $(OGG_CFLAGS)
 
 THEORADIR = ../lib