[Gnash-commit] [SCM] Gnash branch, master, updated. 96987c1938aa8f319a94bf8c65f83e3ac3291efc

[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  96987c1938aa8f319a94bf8c65f83e3ac3291efc (commit)
      from  79dc4984cab2b8cfcf66ecb9022274e9b8c5591b (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=96987c1938aa8f319a94bf8c65f83e3ac3291efc


commit 96987c1938aa8f319a94bf8c65f83e3ac3291efc
Author: Benjamin Wolsey <address@hidden>
Date:   Wed Nov 10 10:15:14 2010 +0100

    Revert unintentional changes to Makefiles.

diff --git a/gui/Makefile.am b/gui/Makefile.am
index dd79c73..208cca0 100644
--- a/gui/Makefile.am
+++ b/gui/Makefile.am
@@ -22,8 +22,20 @@
 
 AUTOMAKE_OPTIONS = -Wno-portability
 
+DIST_SUBDIRS = pythonmod fb
+
 # Build the current directory first. It's hard to see, but there is a '.' dot 
here.
-SUBDIRS = .
+SUBDIRS = . fb
+
+if BUILD_FB_GUI
+SUBDIRS += fb
+endif
+
+# If python support is enabled, built that too
+if HAS_PYTHON
+SUBDIRS += pythonmod
+endif
+
 
 localedir = $(datadir)/locale
 
@@ -31,19 +43,12 @@ localedir = $(datadir)/locale
 pluginsdir = $(libdir)/gnash/plugins
 
 # noinst_LTLIBRARIES = libgnashgui.la
-BUILT_SOURCES = .configline
+BUILT_SOURCES =
 
 EXTRA_DIST = gnash.in \
        kde/klash3.moc.in \
        kde/Kde4Gui.moc.in \
-       kde/Kde4Glue.moc.in \
-       am-frag
-
-# If python support is enabled, built that too
-if HAS_PYTHON
-SUBDIRS += pythonmod
-endif
-DIST_SUBDIRS = pythonmod
+       kde/Kde4Glue.moc.in
 
 noinst_HEADERS =
 noinst_LTLIBRARIES = 
@@ -62,12 +67,12 @@ AM_CPPFLAGS = \
        -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 \
-       -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) \
@@ -148,24 +153,6 @@ endif
 
 # endif # DYNAMIC_GUI
 
-# AQUA Toolkit
-if BUILD_AQUA_GUI
-#OS X stuff goes here...
-GUI_CPPFLAGS += -DGUI_AQUA
-
-bundle_name = Gnash.app
-
-if  HAVE_OPENGL
-noinst_LTLIBRARIES += libgnashaqua_ogl.la
-libgnashaqua_ogl_la_CPPFLAGS = $(AM_CPPFLAGS) \
-       $(OPENGL_CFLAGS)
-libgnashaqua_ogl_la_SOURCES = \
-       aqua_ogl_glue.cpp aqua_ogl_glue.h \
-       aqua.cpp aquasup.h aqua_glue.h
-libgnashaqua_ogl_la_LDFLAGS = $(LIB_FLAGS)
-libgnashaqua_ogl_la_LIBADD = 
-endif # HAVE_OPENGL
-endif # BUILD_AQUA_GUI
 
 if USE_FFMPEG_ENGINE
 AM_LDFLAGS += $(FFMPEG_LIBS) $(LIBVA_LIBS) $(LIBVA_X11_LIBS) 
@@ -190,7 +177,7 @@ 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 += -DCONFIG_CONFIG="\"$(shell cat ../.configline)\""
 AM_CPPFLAGS += -DCXXFLAGS="\"$(CXXFLAGS)\"" 
 
 dist_images_DATA = images/gnash_128_96.ico images/GnashG.png
@@ -204,39 +191,17 @@ gnash: gnash.in
        cp $< $@
        chmod +x $@
 
-# These are used to handle input events from a keyboard, mouse, or
-# touchscreen. These are only used by the Framebuffer GUI, as without
-# X11, it has no event handling. We do it this way so the optionally
-# built source files still get included in the source tarball.
-DEVICES =
-if ENABLE_INPUT_DEVICES
-DEVICES += InputDevice.cpp InputDevice.h
-
-# Touchscreen
-if ENABLE_TSLIB
-DEVICES += TouchDevice.cpp
-endif
-# PS/2 Mouse
-if ENABLE_MOUSE
-DEVICES += MouseDevice.cpp
-endif
-# Linux input events
-if ENABLE_INPUT_EVENTS
-DEVICES += EventDevice.cpp
-endif
-endif
-
 # Always include the device files in the source tarball
 EXTRA_DIST += \
-       TouchDevice.cpp \
-       MouseDevice.cpp \
-       EventDevice.cpp
+       fb/TouchDevice.cpp \
+       fb/MouseDevice.cpp \
+       fb/EventDevice.cpp
 
 GUI_SRCS = gnash.cpp \
        gui.cpp gui.h \
        Player.cpp Player.h \
        NullGui.cpp NullGui.h \
-       $(DEVICES) \
+       ScreenShotter.cpp ScreenShotter.h \
        $(NULL)
 
 if BUILD_AQUA_GUI
@@ -284,7 +249,7 @@ endif
 
 # Build the AQUA gui
 if BUILD_AQUA_GUI
-include $(srcdir)/am-frag/aqua.am
+include $(srcdir)/aqua/aqua.am
 endif
 
 # Build the GTK gui
@@ -294,20 +259,15 @@ endif
 
 # Build the DUMP gui
 if BUILD_DUMP_GUI
-include $(srcdir)/am-frag/dump.am
-endif
-
-# Build the FB gui
-if BUILD_FB_GUI
-include $(srcdir)/fb/fb.am
+include $(srcdir)/dump/dump.am
 endif
 
 # Build the RISCOS gui
 if BUILD_RISCOS_GUI
-include $(srcdir)/am-frag/riscos.am
+include $(srcdir)/riscos/riscos.am
 endif
 
-CLEANFILES = klash3.moc Kde4Gui.moc Kde4Glue.moc .configline gnash
+CLEANFILES = klash3.moc Kde4Gui.moc Kde4Glue.moc gnash
 
 bundle: Info.plist aqua-gnash
        @echo " Building: $(bundle_name)" 
@@ -320,10 +280,6 @@ bundle: Info.plist aqua-gnash
        cp -f images/GnashG.icns $(bundle_name)/Contents/Resources/
 
 
-.configline: ../config.log
-       address@hidden -f .configline
-       @head ../config.log | grep " .*/configure " | sed -e 's:^  . 
.*configure ::' > .configline
-
 #noinst_PROGRAMS = guitest # klash flak
 #guitest_SOURCES = guitest.cpp #fltk.cpp #fltksup.h fltksupp.h gnash.cpp 
gtk.cpp 
 #      gtksup.h gui.cpp gui.h menu.cpp menu.h sdl.cpp sdlsup.h [21~sdlsupp.h
diff --git a/librender/Makefile.am b/librender/Makefile.am
index 40bba03..54a81b8 100644
--- a/librender/Makefile.am
+++ b/librender/Makefile.am
@@ -21,14 +21,11 @@
 
 AUTOMAKE_OPTIONS =
 
-#AM_CPPFLAGS = # -Wall
-
 # this is where Gnash plugins get installed
 pluginsdir = $(libdir)/gnash/plugins
 
 ## WARNING: make sure GLIB_LIBS appears first
 ## See: http://lists.gnu.org/archive/html/gnash-dev/2006-07/msg00076.html
-
 AM_CPPFLAGS = -I.. \
        -I$(srcdir) \
        -I$(top_srcdir) \
@@ -54,34 +51,43 @@ AM_CPPFLAGS = -I.. \
 
 GNASH_LIBS = \
        $(top_builddir)/libcore/libgnashcore.la \
-       $(top_builddir)/libbase/libgnashbase.la 
+       $(top_builddir)/libbase/libgnashbase.la \
+       $(NULL)
 
-noinst_HEADERS = \
+instdir = $(includedir)/gnash
+
+inst_HEADERS = \
        Renderer.h \
-       Renderer_agg.h \
-       Renderer_agg_bitmap.h \
-       Renderer_agg_style.h \
-       Renderer_cairo.h \
-       Renderer_ogl.h \
-        PathParser.h
+       $(NULL)
+
+noinst_HEADERS = \
+       agg/Renderer_agg.h \
+       agg/Renderer_agg_bitmap.h \
+       agg/Renderer_agg_style.h \
+       opengl/tu_opengl_includes.h \
+       opengl/Renderer_ogl.h \
+       cairo/Renderer_cairo.h \
+       cairo/PathParser.h
+       $(NULL)
 
 pkglib_LTLIBRARIES = libgnashrender.la
 libgnashrender_la_LIBADD = $(LIBVA_LIBS) $(LIBVA_X11_LIBS) $(LIBVA_GLX_LIBS)
-libgnashrender_la_SOURCES = PathParser.cpp
 libgnashrender_la_LDFLAGS =  -release $(VERSION) 
+libgnashrender_la_SOURCES =
 
 if BUILD_OGL_RENDERER
-libgnashrender_la_SOURCES += Renderer_ogl.cpp
+libgnashrender_la_SOURCES += opengl/Renderer_ogl.cpp
 libgnashrender_la_LIBADD += $(OPENGL_LIBS)
 endif
 
 if  BUILD_AGG_RENDERER
-libgnashrender_la_SOURCES += Renderer_agg.cpp 
+libgnashrender_la_SOURCES += agg/Renderer_agg.cpp 
 libgnashrender_la_LIBADD += $(AGG_LIBS) $(LIBVA)
 endif
 
 if  BUILD_CAIRO_RENDERER
-libgnashrender_la_SOURCES += Renderer_cairo.cpp
+libgnashrender_la_SOURCES += cairo/Renderer_cairo.cpp
+libgnashrender_la_SOURCES += cairo/PathParser.cpp
 libgnashrender_la_LIBADD += $(CAIRO_LIBS)
 endif
 

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

Summary of changes:
 gui/Makefile.am       |  100 ++++++++++++++-----------------------------------
 librender/Makefile.am |   36 ++++++++++-------
 2 files changed, 49 insertions(+), 87 deletions(-)


hooks/post-receive
-- 
Gnash