[Gnash-commit] [SCM] Gnash branch, master, updated. b21cfd0b496935d2e95aeefd7157838d4d045669

[Rob Savoye]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "Gnash".

The branch, master has been updated
       via  b21cfd0b496935d2e95aeefd7157838d4d045669 (commit)
      from  9073746fa7bdde6f3b1d469d55a665478856736a (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
http://git.savannah.gnu.org/cgit//commit/?id=b21cfd0b496935d2e95aeefd7157838d4d045669


commit b21cfd0b496935d2e95aeefd7157838d4d045669
Author: Rob Savoye <address@hidden>
Date:   Wed Jan 12 13:12:00 2011 -0700

    rename INCLUDES to AM_CPPFLAGS to be consistent., Add to *_CPPFLAGS so 
headers can be found on OpenBSD

diff --git a/testsuite/libbase.all/Makefile.am 
b/testsuite/libbase.all/Makefile.am
index b1412da..182be6d 100644
--- a/testsuite/libbase.all/Makefile.am
+++ b/testsuite/libbase.all/Makefile.am
@@ -21,7 +21,6 @@ AUTOMAKE_OPTIONS = dejagnu
 LDADD = $(top_builddir)/libbase/libgnashbase.la \
        $(LIBINTL)
 
-
 if LIBLTDL2
 LDADD  += $(top_builddir)/libltdl/libltdlc.la
 endif
@@ -31,7 +30,7 @@ endif
 
 # AM_CPPFLAGS isn't right here since per-program *_CPPFLAGS override global
 # AM_CPPFLAGS
-INCLUDES = \
+AM_CPPFLAGS = \
         -I$(top_srcdir)/libbase \
         -I$(top_srcdir)/libcore  \
         -I$(top_srcdir)/testsuite \
@@ -70,16 +69,20 @@ check_PROGRAMS = \
 #endif
 
 NoSeekFileTest_SOURCES = NoSeekFileTest.cpp
-NoSeekFileTest_CPPFLAGS = '-DINPUT="$(srcdir)/NoSeekFileTest.cpp"'
+NoSeekFileTest_CPPFLAGS = $(AM_CPPFLAGS) \
+       '-DINPUT="$(srcdir)/NoSeekFileTest.cpp"'
 
 URLTest_SOURCES = URLTest.cpp
-URLTest_CPPFLAGS = '-DBUILDDIR="$(abs_builddir)"'
+URLTest_CPPFLAGS =  $(AM_CPPFLAGS) \
+       '-DBUILDDIR="$(abs_builddir)"'
 
 RcTest_SOURCES = RcTest.cpp
-RcTest_CPPFLAGS = -DSRCDIR="$(srcdir)"
+RcTest_CPPFLAGS =  $(AM_CPPFLAGS) \
+       -DSRCDIR="$(srcdir)"
 
 IntTypesTest_SOURCES = IntTypesTest.cpp
-IntTypesTest_CPPFLAGS = -DSRCDIR="$(srcdir)"
+IntTypesTest_CPPFLAGS =  $(AM_CPPFLAGS) \
+       -DSRCDIR="$(srcdir)"
 
 # Test the Memory class
 #memtest_SOURCES = memtest.cpp
@@ -89,7 +92,8 @@ Range2dTest_SOURCES = Range2dTest.cpp
 snappingrangetest_SOURCES = snappingrangetest.cpp
 
 string_tableTest_SOURCES = string_tableTest.cpp
-string_tableTest_CPPFLAGS = -DSRCDIR="$(srcdir)"
+string_tableTest_CPPFLAGS =  $(AM_CPPFLAGS) \
+       -DSRCDIR="$(srcdir)"
 string_tableTest_LDFLAGS = $(BOOST_LIBS)
 
 TEST_DRIVERS = ../simple.exp

-----------------------------------------------------------------------

Summary of changes:
 testsuite/libbase.all/Makefile.am |   18 +++++++++++-------
 1 files changed, 11 insertions(+), 7 deletions(-)


hooks/post-receive
-- 
Gnash