[Gnash-commit] [SCM] Gnash branch, master, updated. release_0_8_9_start-327-g16c7b18

[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  16c7b1809affcfe849de4d5b8695f4962fcf11b8 (commit)
       via  ea386e814e5849d00949b723278e3983f0937fc5 (commit)
      from  a8d3d671380ce3a91d9cfe1c4bc753272bff3492 (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=16c7b1809affcfe849de4d5b8695f4962fcf11b8


commit 16c7b1809affcfe849de4d5b8695f4962fcf11b8
Author: Benjamin Wolsey <address@hidden>
Date:   Wed Mar 23 13:40:55 2011 +0100

    Fix qtopia3 Makefile.

diff --git a/gui/qt/qtopia3.am b/gui/qt/qtopia3.am
index 9e0c4a6..72daaad 100644
--- a/gui/qt/qtopia3.am
+++ b/gui/qt/qtopia3.am
@@ -23,7 +23,7 @@ bin_PROGRAMS += qtopia-gnash
 
 qtopia_gnash_CPPFLAGS = -DGUI_QTOPIA -DGUI_CONFIG=\"QTOPIA\" \
         $(AM_CPPFLAGS) $(KDE_CFLAGS) $(QT_CFLAGS)
-qtopia_gnash_SOURCES = $(GUI_SRCS) kde/gui_kde.cpp
+qtopia_gnash_SOURCES = $(GUI_SRCS) qt/gui_kde.cpp
 qtopia_gnash_LDFLAGS = $(LIBLTDL) -export-dynamic 
 #qtopia_gnash_DEPENDENCIES = .configline
 qtopia_gnash_LDADD = \
@@ -34,15 +34,15 @@ if BUILD_OGL_RENDERER
 qtopia_gnash_CPPFLAGS += $(OPENGL_CFLAGS)
 qtopia_gnash_LDADD += $(top_builddir)/librender/libgnashogl.la \
        $(KDE_LIBS) $(QTOPIA_LIBS) $(QT_LIBS) $(OPENGL_LIBS)
-qtopia_gnash_SOURCES += kde/kde_glue_opengl.cpp kde/kde_glue_opengl.h 
kde/kde_glue.h \
-               kde/kde.cpp kde/kdesup.h kde/kde_glue.h
+qtopia_gnash_SOURCES += qt/kde_glue_opengl.cpp qt/kde_glue_opengl.h 
qt/kde_glue.h \
+               qt/kde.cpp qt/kdesup.h qt/kde_glue.h
 endif
 if BUILD_AGG_RENDERER
 qtopia_gnash_CPPFLAGS += $(AGG_CFLAGS)
 qtopia_gnash_LDADD += $(top_builddir)/librender/libgnashagg.la \
        $(KDE_LIBS) $(QTOPIA_LIBS) $(QT_LIBS) $(AGG_LIBS)
-qtopia_gnash_SOURCES += kde/kde_glue_agg.cpp kde/kde_glue_agg.h \
-               kde/kde.cpp kde/kdesup.h kde/kde_glue.h
+qtopia_gnash_SOURCES += qt/kde_glue_agg.cpp qt/kde_glue_agg.h \
+               qt/kde.cpp qt/kdesup.h qt/kde_glue.h
 endif
 endif
 

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


commit ea386e814e5849d00949b723278e3983f0937fc5
Author: Benjamin Wolsey <address@hidden>
Date:   Wed Mar 23 13:33:06 2011 +0100

    Fix kde3 build.

diff --git a/gui/Makefile.am b/gui/Makefile.am
index 1a51072..b5b4f90 100644
--- a/gui/Makefile.am
+++ b/gui/Makefile.am
@@ -166,7 +166,6 @@ AM_CPPFLAGS += -DCONFIG_CONFIG="\"$(shell cat 
../.configline)\""
 AM_CPPFLAGS += -DCXXFLAGS="\"$(CXXFLAGS)\"" 
 
 dist_images_DATA = images/gnash_128_96.ico images/GnashG.png
-#dist_images_DATA = images/gnash_G_v3.ico
 imagesdir = $(pkgdatadir)
 
 bin_SCRIPTS = gnash
diff --git a/gui/qt/kde3.am b/gui/qt/kde3.am
index 79e70bc..ae0345e 100644
--- a/gui/qt/kde3.am
+++ b/gui/qt/kde3.am
@@ -20,20 +20,20 @@
 # 
 if BUILD_KDE3_GUI
 
-klash3.moc: $(srcdir)/kde/kdesup.h
+klash3.moc: $(srcdir)/qt/kdesup.h
        @if test x"$(MOC3)" != x; then \
          echo "Generating MOC 3 file..."; \
-         $(MOC3) $(srcdir)/kde/kdesup.h -o klash3.moc; \
+         $(MOC3) $(srcdir)/qt/kdesup.h -o klash3.moc; \
        else  \
          echo "WARNING: Install QT 3.x moc tool! Linking to default MOC file"; 
\
-         ln -sf $(srcdir)/kde/klash3.moc.in klash3.moc; \
+         ln -sf $(srcdir)/qt/klash3.moc.in klash3.moc; \
        fi
 
 bin_PROGRAMS += kde3-gnash
 
 kde3_gnash_CPPFLAGS = -DGUI_KDE3 -DGUI_CONFIG=\"KDE3\" \
         $(AM_CPPFLAGS) $(KDE3_CFLAGS) $(QT3_CFLAGS)
-kde3_gnash_SOURCES = $(GUI_SRCS) kde/gui_kde.cpp
+kde3_gnash_SOURCES = $(GUI_SRCS) qt/gui_kde.cpp
 kde3_gnash_LDFLAGS = -export-dynamic 
 #kde_gnash_DEPENDENCIES = .configline
 kde3_gnash_LDADD = \
@@ -44,21 +44,21 @@ if BUILD_OGL_RENDERER
 kde3_gnash_CPPFLAGS += $(OPENGL_CFLAGS)
 kde3_gnash_LDADD += $(top_builddir)/librender/libgnashrender.la \
        $(KDE3_LIBS) $(QT3_LIBS) $(OPENGL_LIBS)
-kde3_gnash_SOURCES += kde/kde_glue_opengl.cpp \
-       kde/kde_glue_opengl.h \
-       kde/kde_glue.h \
-       kde/kde.cpp \
-       kde/kdesup.h \
-       kde/kde_glue.h
+kde3_gnash_SOURCES += qt/kde_glue_opengl.cpp \
+       qt/kde_glue_opengl.h \
+       qt/kde_glue.h \
+       qt/kde.cpp \
+       qt/kdesup.h \
+       qt/kde_glue.h
 endif
 if BUILD_AGG_RENDERER
 kde3_gnash_CPPFLAGS += $(AGG_CFLAGS) $(QT3_CFLAGS)
 kde3_gnash_LDADD += $(top_builddir)/librender/libgnashrender.la \
        $(KDE3_LIBS) $(QT3_LIBS) $(AGG_LIBS)
-kde3_gnash_SOURCES += kde/kde_glue_agg.cpp \
-       kde/kde_glue_agg.h \
-       kde/kde.cpp \
-       kde/kdesup.h \
-       kde/kde_glue.h
+kde3_gnash_SOURCES += qt/kde_glue_agg.cpp \
+       qt/kde_glue_agg.h \
+       qt/kde.cpp \
+       qt/kdesup.h \
+       qt/kde_glue.h
 endif
 endif

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

Summary of changes:
 gui/Makefile.am   |    1 -
 gui/qt/kde3.am    |   30 +++++++++++++++---------------
 gui/qt/qtopia3.am |   10 +++++-----
 3 files changed, 20 insertions(+), 21 deletions(-)


hooks/post-receive
-- 
Gnash