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

[Benjamin Wolsey]

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  ae3c837e1dac3099acee8f8184725151fc4c1490 (commit)
       via  0045dda9b6d855ffc24e376817cda9824265107d (commit)
      from  adf728eb64ecfd82031ed6a00574f63788f706f0 (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=ae3c837e1dac3099acee8f8184725151fc4c1490


commit ae3c837e1dac3099acee8f8184725151fc4c1490
Author: Benjamin Wolsey <address@hidden>
Date:   Fri Sep 10 10:02:37 2010 +0200

    Put forward declarations where they're needed.

diff --git a/libcore/gnash.h b/libcore/gnash.h
index 34ddde3..381083c 100644
--- a/libcore/gnash.h
+++ b/libcore/gnash.h
@@ -26,15 +26,6 @@
 
 #include "dsodefs.h"
 
-
-namespace gnash {
-       class IOChannel;
-       class movie_definition; // for create_movie
-       class URL; // for set_base_url
-    class RunResources;
-}
-
-
 /// Freedom bites
 namespace gnash {
 
diff --git a/librender/Renderer.h b/librender/Renderer.h
index 02912a7..b8e55e4 100644
--- a/librender/Renderer.h
+++ b/librender/Renderer.h
@@ -160,6 +160,7 @@
 
 // Forward declarations.
 namespace gnash {
+    class IOChannel;
     class CachedBitmap;
     class rgba;
     class Transform;

http://git.savannah.gnu.org/cgit//commit/?id=0045dda9b6d855ffc24e376817cda9824265107d


commit 0045dda9b6d855ffc24e376817cda9824265107d
Author: Benjamin Wolsey <address@hidden>
Date:   Fri Sep 10 09:55:17 2010 +0200

    Fix snapshot compile error.

diff --git a/Makefile.am b/Makefile.am
index a2022a0..7c83558 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -130,7 +130,6 @@ CLEANFILES =
 CLEANFILES += revno.h
 BUILT_SOURCES = revno.h
 revno.h: Makefile.in
-       @echo "Generating revno.h"
        address@hidden test -d $(srcdir)/.bzr; then \
          status=`which bzr 2>&1 | grep -c " no bzr"`; \
          if test x"$${status}" = x"0"; then \
@@ -142,12 +141,12 @@ revno.h: Makefile.in
            revno="${NOW}"; \
          fi; \
        else \
-         if test -d $(srcdir)/.git; then \
+         if test -d $(top_srcdir)/.git; then \
             status=`which git 2>&1 | grep -c " no git"`; \
             if test x"$${status}" = x"0"; then \
               echo "Generating revno.h"; \
               $(RM) -f revno.h; \
-              revno="`(cd $(srcdir) && git describe --tags | cut -d '-' -f 2-3 
| tr a- a.)`"; \
+              revno="`(cd $(top_srcdir) && git describe --tags | cut -d '-' -f 
2-3 | tr a- a.)`"; \
               nick="`basename $(top_srcdir) | tr a_ a.`"; \
            fi; \
           else \
@@ -155,8 +154,8 @@ revno.h: Makefile.in
             nick="none"; \
          fi; \
        fi; \
-       echo "static const char *BRANCH_REVNO  = \"$${revno}\";" > revno.h; \
-       echo "static const char *BRANCH_NICK = \"$${nick}\";" >> revno.h;
+       echo "static const char* BRANCH_REVNO  = \"$${revno}\";" > revno.h; \
+       echo "static const char* BRANCH_NICK = \"$${nick}\";" >> revno.h;
 
 # The branch nickname and revision number must be set before including
 # the other Makefile fragments used for package building, as they use
diff --git a/gui/Makefile.am b/gui/Makefile.am
index 24d7451..fb6cfcb 100644
--- a/gui/Makefile.am
+++ b/gui/Makefile.am
@@ -46,24 +46,28 @@ endif
 DIST_SUBDIRS = pythonmod
 
 noinst_HEADERS =
-noinst_LTLIBRARIES = #libgnashgui.la
+noinst_LTLIBRARIES = 
+
+# top_builddir and top_srcdir are for revno.h; its location depends on
+# whether we're building from a snapshot or a checkout.
 AM_CPPFLAGS = \
-        -I../.. \
-        -I$(top_srcdir)/libnet \
-        -I$(top_srcdir)/libcore \
-        -I$(top_srcdir)/libcore/swf \
-        -I$(top_srcdir)/libcore/parser \
-        -I$(top_srcdir)/libcore/vm \
-        -I$(top_srcdir)/libcore/asobj \
+       -I$(top_builddir) \
+       -I$(top_srcdir) \
+       -I$(top_srcdir)/libnet \
+       -I$(top_srcdir)/libcore \
+       -I$(top_srcdir)/libcore/swf \
+       -I$(top_srcdir)/libcore/parser \
+       -I$(top_srcdir)/libcore/vm \
+       -I$(top_srcdir)/libcore/asobj \
        -I$(top_srcdir)/libltdl \
-        -I$(top_srcdir)/libbase \
-        -I$(top_srcdir)/librender \
+       -I$(top_srcdir)/libbase \
+       -I$(top_srcdir)/librender \
        -I$(top_srcdir)/libmedia \
        -I$(top_srcdir)/libsound \
        -I$(top_srcdir)/libmedia/ffmpeg \
        -I$(top_srcdir)/libmedia/gst \
        -I$(top_srcdir)/libmedia/haiku \
-       -DLOCALEDIR=\"$(localedir)\" \
+    -DLOCALEDIR=\"$(localedir)\" \
        -DPLUGINSDIR=\"$(pluginsdir)\" \
        -DLIBAVCODEC_IDENT=\"$(LIBAVCODEC_IDENT)\" \
        $(GLIB_CFLAGS) \

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

Summary of changes:
 Makefile.am          |    9 ++++-----
 gui/Makefile.am      |   26 +++++++++++++++-----------
 libcore/gnash.h      |    9 ---------
 librender/Renderer.h |    1 +
 4 files changed, 20 insertions(+), 25 deletions(-)


hooks/post-receive
-- 
Gnash