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

[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  dca3e820747d26bc0790224b04100c063e2b3163 (commit)
      from  b21cfd0b496935d2e95aeefd7157838d4d045669 (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=dca3e820747d26bc0790224b04100c063e2b3163


commit dca3e820747d26bc0790224b04100c063e2b3163
Author: Rob Savoye <address@hidden>
Date:   Wed Jan 12 16:50:42 2011 -0700

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

diff --git a/extensions/dbus/Makefile.am b/extensions/dbus/Makefile.am
index a2a2a51..209e5fa 100644
--- a/extensions/dbus/Makefile.am
+++ b/extensions/dbus/Makefile.am
@@ -22,20 +22,23 @@ pluginsdir = $(libdir)/gnash/plugins
 
 plugins_LTLIBRARIES = dbus.la
 
-INCLUDES =  \
+AM_CPPFLAGS =  \
             -I$(top_srcdir)/libbase \
             -I$(top_srcdir)/libcore \
             -I$(top_srcdir)/libcore/abc \
             -I$(top_srcdir)/libcore/swf \
             -I$(top_srcdir)/libcore/vm \
            -I$(top_srcdir)/libcore/asobj \
+           $(BOOST_CFLAGS) \
            $(INCLTDL)
 
 dbus_la_SOURCES = dbus_ext.cpp dbus_ext.h
+dbus_la_CPPFLAGS = $(AM_CPPFLAGS)
 dbus_la_LDFLAGS = -module -avoid-version -no-undefined
 dbus_la_LIBDADD = $(LIBADD_DL) \
        $(top_builddir)/libbase/libgnashbase.la \
        $(top_builddir)/libcore/libgnashcore.la \
+       $(BOOST_LIBS) \
        $(PTHREAD_LIBS) \
        $(NULL)
 
diff --git a/extensions/gtk2/Makefile.am b/extensions/gtk2/Makefile.am
index 8574412..a3f3a5d 100644
--- a/extensions/gtk2/Makefile.am
+++ b/extensions/gtk2/Makefile.am
@@ -23,12 +23,12 @@ pluginsdir = $(libdir)/gnash/plugins
 plugins_LTLIBRARIES = gtkext.la
 DEF_MAKESWF_FLAGS = -I $(top_srcdir)/testsuite/actionscript.all
 
-INCLUDES = \
+AM_CPPFLAGS = \
        -I$(top_srcdir)/libbase \
        -I$(top_srcdir)/gui \
        -I$(top_srcdir)/libcore \
        -I$(top_srcdir)/libcore/abc \
-    -I$(top_srcdir)/libcore/swf \
+        -I$(top_srcdir)/libcore/swf \
        -I$(top_srcdir)/libcore/vm \
        -I$(top_srcdir)/libcore/parser \
        -I$(top_srcdir)/libcore/asobj \
@@ -58,6 +58,7 @@ AM_LDFLAGS =  \
        $(NULL)
 
 gtkext_la_SOURCES = gtkext.cpp gtkext.h
+gtkext_la_CPPFLAGS = $(AM_CPPFLAGS)
 gtkext_la_LDFLAGS = -module -avoid-version # -no-undefined
 gtkext_la_LIBDADD = $(LIBADD_DL) $(AM_LDFLAGS)
 
diff --git a/extensions/launcher/Makefile.am b/extensions/launcher/Makefile.am
index 6e5396d..f424b3a 100644
--- a/extensions/launcher/Makefile.am
+++ b/extensions/launcher/Makefile.am
@@ -24,7 +24,7 @@ plugins_LTLIBRARIES = launcher_ext.la
 bin_PROGRAMS = launcher-gnash
 
 AM_CPPFLAGS = -DGNASHBINDIR=\"${bindir}\" 
-INCLUDES =  \
+AM_CPPFLAGS =  \
             -I$(top_srcdir)/libbase \
             -I$(top_srcdir)/libcore \
             -I$(top_srcdir)/libcore/abc \
@@ -39,12 +39,14 @@ launcher_ext_la_LDFLAGS = -module -avoid-version 
-no-undefined
 launcher_ext_la_LIBDADD = $(LIBADD_DL) \
        $(top_builddir)/libbase/libgnashbase.la \
        $(top_builddir)/libcore/libgnashcore.la \
+       $(BOOST_LIBS) \
        $(PTHREAD_LIBS) \
        $(NULL)
 
 launcher_gnash_SOURCES = \
        launcher.cpp \
        md5.cpp md5.h
+launcher_gnash_CPPFLAGS = $(AM_CPPFLAGS)
 launcher_gnash_LDADD = $(top_builddir)/libbase/libgnashbase.la
 launcher_gnash_DEPENDENCIES = sums
 
diff --git a/extensions/lirc/Makefile.am b/extensions/lirc/Makefile.am
index 98a78af..b290886 100644
--- a/extensions/lirc/Makefile.am
+++ b/extensions/lirc/Makefile.am
@@ -22,7 +22,7 @@ pluginsdir = $(libdir)/gnash/plugins
 
 plugins_LTLIBRARIES = lirc.la
 
-INCLUDES = \
+AM_CPPFLAGS = \
             -I$(top_srcdir)/libbase \
             -I$(top_srcdir)/libcore \
             -I$(top_srcdir)/libcore/abc \
@@ -34,6 +34,7 @@ INCLUDES = \
            $(INCLTDL)
 
 lirc_la_SOURCES = lirc_ext.cpp lirc_ext.h
+lirc_la_CPPFLAGS = $(AM_CPPFLAGS)
 lirc_la_LDFLAGS = -module -avoid-version -no-undefined
 lirc_la_LIBDADD = $(LIBADD_DL) \
        $(top_builddir)/libbase/libgnashbase.la \

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

Summary of changes:
 extensions/dbus/Makefile.am     |    5 ++++-
 extensions/gtk2/Makefile.am     |    5 +++--
 extensions/launcher/Makefile.am |    4 +++-
 extensions/lirc/Makefile.am     |    3 ++-
 4 files changed, 12 insertions(+), 5 deletions(-)


hooks/post-receive
-- 
Gnash