[Gnash-commit] [SCM] Gnash branch, hwaccel, updated. release_0_8_9_start-934-g265a691

[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, hwaccel has been updated
       via  265a6915d62e98675a7e3382aabf9700b473148d (commit)
       via  978b967200c5e99a7966e12f9831c7b27222664c (commit)
      from  4c7fde5a36f699080924b704d9aacafeaaa7b32f (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=265a6915d62e98675a7e3382aabf9700b473148d


commit 265a6915d62e98675a7e3382aabf9700b473148d
Author: Rob Savoye <address@hidden>
Date:   Mon Apr 4 09:55:21 2011 -0600

    convert dump/Makefile.am to dump/dump.am

diff --git a/configure.ac b/configure.ac
index 4b363d0..07d16c3 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2927,7 +2927,6 @@ testsuite/movies.all/Makefile
 testsuite/libcore.all/Makefile
 testsuite/libmedia.all/Makefile
 gui/Makefile
-gui/dump/Makefile
 gui/Info.plist
 gui/pythonmod/Makefile
 extensions/Makefile
diff --git a/gui/Makefile.am b/gui/Makefile.am
index 106e55e..f434ebd 100644
--- a/gui/Makefile.am
+++ b/gui/Makefile.am
@@ -149,6 +149,10 @@ GUI_SRCS = gnash.cpp \
        ScreenShotter.cpp ScreenShotter.h \
        $(NULL)
 
+if BUILD_DUMP_GUI
+include $(srcdir)/dump/dump.am
+endif
+
 if BUILD_AQUA_GUI
 BUILT_SOURCES += bundle
 EXTRA_DIST += Gnash.app
diff --git a/gui/dump/Makefile.am b/gui/dump/Makefile.am
deleted file mode 100644
index ed737e3..0000000
--- a/gui/dump/Makefile.am
+++ /dev/null
@@ -1,103 +0,0 @@
-## Process this file with automake to generate Makefile.in
-# 
-#   Copyright (C) 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc.
-# 
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 3 of the License, or
-# (at your option) any later version.
-# 
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
-# 
-
-#
-# Build the DUMP gui
-#
-
-AUTOMAKE_OPTIONS = -Wno-portability
-
-if BUILD_FB_GUI
-
-# 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$(top_builddir) \
-       -I$(top_srcdir) \
-       -I$(top_srcdir)/gui \
-       -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)/librender/agg \
-       -I$(top_srcdir)/librender/cairo \
-       -I$(top_srcdir)/librender/opengl \
-       -I$(top_srcdir)/libmedia \
-       -I$(top_srcdir)/libsound \
-       -DLOCALEDIR=\"$(localedir)\" \
-       -DPLUGINSDIR=\"$(pluginsdir)\" \
-       -DLIBAVCODEC_IDENT=\"$(LIBAVCODEC_IDENT)\" \
-       $(GLIB_CFLAGS) \
-       $(LIRC_CFLAGS) \
-       $(BOOST_CFLAGS) \
-       $(PYTHON_LIBS) \
-       $(PTHREAD_CFLAGS) \
-       $(NULL)
-
-AM_CPPFLAGS += -DPKGDATADIR="\"$(pkgdatadir)\""
-AM_CPPFLAGS += -DRENDERER_CONFIG="\"$(RENDERER_CONFIG)\""
-AM_CPPFLAGS += -DHWACCEL_CONFIG="\"$(HWACCEL_CONFIG)\""
-AM_CPPFLAGS += -DMEDIA_CONFIG="\"$(MEDIA_CONFIG)\""
-AM_CPPFLAGS += -DCONFIG_CONFIG="\"$(shell cat ../../.configline)\""
-AM_CPPFLAGS += -DCXXFLAGS="\"$(CXXFLAGS)\"" 
-
-## WARNING: make sure GLIB_LIBS appears first
-## See: http://lists.gnu.org/archive/html/gnash-dev/2006-07/msg00076.html
-AM_LDFLAGS =  \
-       -export-dynamic \
-       $(GLIB_LIBS) \
-       $(CURL_LIBS) \
-       $(JPEG_LIBS) \
-       $(PNG_LIBS) \
-       $(INTLLIBS) \
-       $(TS_LIBS) \
-       $(BOOST_LIBS) \
-       $(NULL)
-
-GNASH_LIBS = \
-       $(top_builddir)/libcore/libgnashcore.la \
-       $(top_builddir)/librender/libgnashrender.la \
-       $(top_builddir)/libsound/libgnashsound.la \
-       $(top_builddir)/libmedia/libgnashmedia.la \
-       $(top_builddir)/libbase/libgnashbase.la
-
-
-bin_PROGRAMS = dump-gnash
-
-# TODO: stop using these  ?
-GUI_SRCS = ../gnash.cpp \
-       ../gui.cpp ../gui.h \
-       ../Player.cpp ../Player.h \
-       ../NullGui.cpp ../NullGui.h \
-       ../ScreenShotter.cpp ../ScreenShotter.h \
-       $(NULL)
-
-dump_gnash_SOURCES = $(GUI_SRCS) gui_dump.cpp dump.cpp dump.h
-dump_gnash_CPPFLAGS = -DGUI_DUMP -DGUI_CONFIG=\"DUMP\" \
-       $(AM_CPPFLAGS)  \
-       $(AGG_CFLAGS)
-dump_gnash_LDADD = \
-       $(GNASH_LIBS) \
-       $(AGG_LIBS) 
-
-endif                          # BUILD_FB_GUI
diff --git a/gui/dump/dump.am b/gui/dump/dump.am
new file mode 100644
index 0000000..13c16af
--- /dev/null
+++ b/gui/dump/dump.am
@@ -0,0 +1,34 @@
+## Process this file with automake to generate Makefile.in
+# 
+#   Copyright (C) 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc.
+# 
+# This program is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 3 of the License, or
+# (at your option) any later version.
+# 
+# This program is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+# You should have received a copy of the GNU General Public License
+# along with this program; if not, write to the Free Software
+# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
+# 
+
+#
+# Build the DUMP gui
+#
+
+bin_PROGRAMS += dump-gnash
+
+dump_gnash_SOURCES = $(GUI_SRCS) \
+       dump/gui_dump.cpp \
+       dump/dump.cpp \
+       dump/dump.h
+dump_gnash_CPPFLAGS = -DGUI_DUMP -DGUI_CONFIG=\"DUMP\" \
+       $(AM_CPPFLAGS)  \
+       $(AGG_CFLAGS)
+dump_gnash_LDADD = \
+       $(GNASH_LIBS) \
+       $(AGG_LIBS) 

http://git.savannah.gnu.org/cgit//commit/?id=978b967200c5e99a7966e12f9831c7b27222664c


commit 978b967200c5e99a7966e12f9831c7b27222664c
Author: Rob Savoye <address@hidden>
Date:   Mon Apr 4 09:45:07 2011 -0600

    add utilities back into DIST_SUBDIRS

diff --git a/Makefile.am b/Makefile.am
index 624055c..38ebdc4 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -67,7 +67,7 @@ STD_DIRS = \
        $(NULL)
 
 SUBDIRS = $(STD_DIRS)
-DIST_SUBDIRS = $(STD_DIRS) cygnal extensions testsuite
+DIST_SUBDIRS = $(STD_DIRS) cygnal utilities extensions testsuite
 
 if TESTSUITE
 SUBDIRS += testsuite

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

Summary of changes:
 Makefile.am                                        |    2 +-
 configure.ac                                       |    1 -
 gui/Makefile.am                                    |    4 +
 gui/dump/Makefile.am                               |  103 --------------------
 .../external/external.am => gui/dump/dump.am       |   26 +++--
 5 files changed, 21 insertions(+), 115 deletions(-)
 delete mode 100644 gui/dump/Makefile.am
 copy testsuite/misc-haxe.all/classes.all/external/external.am => 
gui/dump/dump.am (67%)


hooks/post-receive
-- 
Gnash