[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Gnash-commit] [SCM] Gnash branch, master, updated. release_0_8_9_final-
|
From: |
Petter Reinholdtsen |
|
Subject: |
[Gnash-commit] [SCM] Gnash branch, master, updated. release_0_8_9_final-2037-g4661b5f |
|
Date: |
Wed, 21 May 2014 08:52:14 +0000 |
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 4661b5f191466001a76d87174181af7ba7ac7bf4 (commit)
from 1d65e427f21890c0ccedfafa66fea12ea2b380dd (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=4661b5f191466001a76d87174181af7ba7ac7bf4
commit 4661b5f191466001a76d87174181af7ba7ac7bf4
Author: Petter Reinholdtsen <address@hidden>
Date: Wed May 21 10:51:00 2014 +0200
Rename automake variable INCLUDES to AM_CPPFLAGS.
Merge duplicate definitions and get rid of warnings.
The INCLUDES variable is obsolete and was renamed to AM_CPPFLAGS.
diff --git a/cygnal/Makefile.am b/cygnal/Makefile.am
index 30fbba6..c4b0146 100644
--- a/cygnal/Makefile.am
+++ b/cygnal/Makefile.am
@@ -44,8 +44,6 @@ sysconf_DATA = cygnalrc
# this is where Cygnal plugins get installed
pluginsdir = $(libdir)/cygnal/plugins
-AM_CPPFLAGS = -DPLUGINSDIR=\"$(pluginsdir)\"
-
AM_LDFLAGS = \
libnet/libgnashnet.la \
libamf/libgnashamf.la \
@@ -68,7 +66,7 @@ endif
localedir = $(datadir)/locale
-INCLUDES = -I.. \
+AM_CPPFLAGS = -I.. \
-I$(srcdir)/libamf \
-I$(srcdir)/libnet \
-I$(top_srcdir) \
@@ -83,6 +81,7 @@ INCLUDES = -I.. \
-I$(top_srcdir)/libcore/parser \
-I$(top_srcdir)/libcore/vm \
-DLOCALEDIR=\"$(localedir)\" \
+ -DPLUGINSDIR=\"$(pluginsdir)\" \
$(CURL_CFLAGS) \
$(BOOST_CFLAGS) \
$(PTHREAD_CFLAGS)
diff --git a/cygnal/cgi-bin/echo/Makefile.am b/cygnal/cgi-bin/echo/Makefile.am
index 841a203..28c9830 100644
--- a/cygnal/cgi-bin/echo/Makefile.am
+++ b/cygnal/cgi-bin/echo/Makefile.am
@@ -31,7 +31,7 @@ GNASH_LIBS = \
$(BOOST_LIBS) \
$(NULL)
-INCLUDES = \
+AM_CPPFLAGS = \
-I$(top_srcdir)/libbase \
-I$(top_srcdir)/libcore \
-I$(top_srcdir)/libltdl \
diff --git a/cygnal/cgi-bin/fitcDemo/Makefile.am
b/cygnal/cgi-bin/fitcDemo/Makefile.am
index e661c49..49027f6 100644
--- a/cygnal/cgi-bin/fitcDemo/Makefile.am
+++ b/cygnal/cgi-bin/fitcDemo/Makefile.am
@@ -31,7 +31,7 @@ GNASH_LIBS = \
$(BOOST_CFLAGS) \
$(NULL)
-INCLUDES = \
+AM_CPPFLAGS = \
-I$(top_srcdir)/libbase \
-I$(top_srcdir)/libamf \
-I$(top_srcdir)/libnet \
diff --git a/cygnal/cgi-bin/oflaDemo/Makefile.am
b/cygnal/cgi-bin/oflaDemo/Makefile.am
index e24a9fe..fcee9d7 100644
--- a/cygnal/cgi-bin/oflaDemo/Makefile.am
+++ b/cygnal/cgi-bin/oflaDemo/Makefile.am
@@ -31,7 +31,7 @@ GNASH_LIBS = \
$(BOOST_LIBS) \
$(NULL)
-INCLUDES = \
+AM_CPPFLAGS = \
-I$(top_srcdir)/libbase \
-I$(top_srcdir)/libcore \
-I$(top_srcdir)/libltdl \
diff --git a/cygnal/libnet/Makefile.am b/cygnal/libnet/Makefile.am
index e5a27a6..a99d195 100644
--- a/cygnal/libnet/Makefile.am
+++ b/cygnal/libnet/Makefile.am
@@ -39,7 +39,7 @@ libgnashnet_la_LDFLAGS = -release $(VERSION) $(AM_LDFLAGS)
localedir = $(datadir)/locale
-INCLUDES = \
+AM_CPPFLAGS = \
-I$(top_srcdir)/cygnal/libamf \
-I$(top_srcdir)/cygnal/libnet \
-I$(top_srcdir)/libbase \
diff --git a/cygnal/testsuite/cygnal.all/Makefile.am
b/cygnal/testsuite/cygnal.all/Makefile.am
index 3950d6c..a6d1dd5 100644
--- a/cygnal/testsuite/cygnal.all/Makefile.am
+++ b/cygnal/testsuite/cygnal.all/Makefile.am
@@ -28,8 +28,6 @@ libcygnal_la_SOURCES = \
libcygnal_la_LDFLAGS = \
$(top_builddir)/cygnal/libamf/libgnashamf.la
-AM_CPPFLAGS = # -Wall
-
AM_LDFLAGS = \
$(top_builddir)/libbase/libgnashbase.la \
$(top_builddir)/cygnal/libamf/libgnashamf.la \
@@ -40,7 +38,7 @@ AM_LDFLAGS = \
localedir = $(datadir)/locale
-INCLUDES = \
+AM_CPPFLAGS = \
-I$(top_srcdir)/cygnal/libamf \
-I$(top_srcdir)/cygnal/libnet \
-I$(top_srcdir)/libbase \
diff --git a/cygnal/testsuite/libamf.all/Makefile.am
b/cygnal/testsuite/libamf.all/Makefile.am
index 2318ad2..2a0dd9e 100644
--- a/cygnal/testsuite/libamf.all/Makefile.am
+++ b/cygnal/testsuite/libamf.all/Makefile.am
@@ -30,14 +30,13 @@ AM_LDFLAGS = \
$(DEJAGNU_CFLAGS) \
$(NULL)
-AM_CPPFLAGS = -DSRCDIR=\"$(srcdir)\"
-
-INCLUDES = \
+AM_CPPFLAGS = \
-I$(top_srcdir)/cygnal/libamf \
-I$(top_srcdir)/cygnal/libnet \
-I$(top_srcdir)/libbase \
-I$(top_srcdir)/libcore \
-I$(top_srcdir)/testsuite \
+ -DSRCDIR=\"$(srcdir)\" \
$(CURL_CFLAGS) \
$(BOOST_CFLAGS) \
$(DEJAGNU_CFLAGS) \
diff --git a/cygnal/testsuite/libnet.all/Makefile.am
b/cygnal/testsuite/libnet.all/Makefile.am
index b767294..c60e1fa 100644
--- a/cygnal/testsuite/libnet.all/Makefile.am
+++ b/cygnal/testsuite/libnet.all/Makefile.am
@@ -21,8 +21,6 @@
AUTOMAKE_OPTIONS = dejagnu
-AM_CPPFLAGS = # -Wall
-
AM_LDFLAGS = \
$(top_builddir)/libbase/libgnashbase.la \
$(top_builddir)/cygnal/libamf/libgnashamf.la \
@@ -35,7 +33,7 @@ AM_LDFLAGS = \
localedir = $(datadir)/locale
-INCLUDES = \
+AM_CPPFLAGS = \
-I$(top_srcdir)/testsuite \
-I$(top_srcdir)/cygnal/libnet \
-I$(top_srcdir)/cygnal/libamf \
diff --git a/extensions/dejagnu/Makefile.am b/extensions/dejagnu/Makefile.am
index a9dab7f..124c9c7 100644
--- a/extensions/dejagnu/Makefile.am
+++ b/extensions/dejagnu/Makefile.am
@@ -23,7 +23,7 @@ pluginsdir = $(libdir)/gnash/plugins
plugins_LTLIBRARIES = dejagnu.la
-INCLUDES = \
+AM_CPPFLAGS = \
-I$(top_srcdir)/libbase \
-I$(top_srcdir)/libcore \
-I$(top_srcdir)/libcore/abc \
diff --git a/extensions/fileio/Makefile.am b/extensions/fileio/Makefile.am
index f6fbf40..02a8866 100644
--- a/extensions/fileio/Makefile.am
+++ b/extensions/fileio/Makefile.am
@@ -27,7 +27,7 @@ plugins_LTLIBRARIES = fileio.la
DEF_MAKESWF_FLAGS = -I $(top_builddir) -I
$(top_srcdir)/testsuite/actionscript.all
-INCLUDES = \
+AM_CPPFLAGS = \
-I$(top_srcdir)/libbase \
-I$(top_srcdir)/libcore \
-I$(top_srcdir)/libcore/abc \
diff --git a/gui/pythonmod/Makefile.am b/gui/pythonmod/Makefile.am
index aee24b4..d22af18 100644
--- a/gui/pythonmod/Makefile.am
+++ b/gui/pythonmod/Makefile.am
@@ -38,7 +38,7 @@ GNASH_INCLUDES = \
-I$(top_srcdir)/libdevice/vaapi \
-I$(top_srcdir)/libsound
-INCLUDES = \
+AM_CPPFLAGS = \
$(PYTHON_CFLAGS) \
$(PYGTK_CFLAGS) \
$(GTK2_CFLAGS) \
@@ -73,7 +73,7 @@ inst_HEADERS = gnash-view.h
RENDERER_GLUE =
if BUILD_OGL_RENDERER
RENDERER_GLUE += $(top_srcdir)/gui/gtk/gtk_glue_gtkglext.cpp
-INCLUDES += $(GLEXT_CFLAGS)
+AM_CPPFLAGS += $(GLEXT_CFLAGS)
gnash_la_LIBADD += $(GLEXT_LIBS)
endif
if BUILD_AGG_RENDERER
diff --git a/testsuite/libmedia.all/Makefile.am
b/testsuite/libmedia.all/Makefile.am
index b651342..ea2bf0d 100644
--- a/testsuite/libmedia.all/Makefile.am
+++ b/testsuite/libmedia.all/Makefile.am
@@ -21,8 +21,6 @@
AUTOMAKE_OPTIONS = dejagnu
-AM_CPPFLAGS = # -Wall
-
AM_LDFLAGS = \
$(top_builddir)/libbase/libgnashbase.la \
$(top_builddir)/libmedia/libgnashmedia.la \
@@ -39,7 +37,7 @@ endif # ANDROID
localedir = $(datadir)/locale
-INCLUDES = \
+AM_CPPFLAGS = \
-I$(top_srcdir)/testsuite \
-I$(top_srcdir)/libbase \
-I$(top_srcdir)/libmedia \
-----------------------------------------------------------------------
Summary of changes:
cygnal/Makefile.am | 5 ++---
cygnal/cgi-bin/echo/Makefile.am | 2 +-
cygnal/cgi-bin/fitcDemo/Makefile.am | 2 +-
cygnal/cgi-bin/oflaDemo/Makefile.am | 2 +-
cygnal/libnet/Makefile.am | 2 +-
cygnal/testsuite/cygnal.all/Makefile.am | 4 +---
cygnal/testsuite/libamf.all/Makefile.am | 5 ++---
cygnal/testsuite/libnet.all/Makefile.am | 4 +---
extensions/dejagnu/Makefile.am | 2 +-
extensions/fileio/Makefile.am | 2 +-
gui/pythonmod/Makefile.am | 4 ++--
testsuite/libmedia.all/Makefile.am | 4 +---
12 files changed, 15 insertions(+), 23 deletions(-)
hooks/post-receive
--
Gnash
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Gnash-commit] [SCM] Gnash branch, master, updated. release_0_8_9_final-2037-g4661b5f,
Petter Reinholdtsen <=