[Gnash-commit] [SCM] Gnash branch, master, updated. release_0_8_9_final-262-g66a4323

[Sandro Santilli]

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  66a4323197e75066d9d478b0ffb737a78fd6aa74 (commit)
      from  72743434f9a593c7c0295b4c52ed624db2a8052a (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=66a4323197e75066d9d478b0ffb737a78fd6aa74


commit 66a4323197e75066d9d478b0ffb737a78fd6aa74
Author: Sandro Santilli <address@hidden>
Date:   Thu Apr 14 21:23:18 2011 +0200

    Cleanup rules to build kde3-gnash. Fixes bug #31782

diff --git a/gui/qt/kde3.am b/gui/qt/kde3.am
index 060337f..45cc108 100644
--- a/gui/qt/kde3.am
+++ b/gui/qt/kde3.am
@@ -33,31 +33,29 @@ bin_PROGRAMS += kde3-gnash
 
 kde3_gnash_CPPFLAGS = -DGUI_KDE3 -DGUI_CONFIG=\"KDE3\" \
         $(AM_CPPFLAGS) $(KDE3_CFLAGS) $(QT3_CFLAGS)
-kde3_gnash_SOURCES = $(GUI_SRCS) qt/gui_kde.cpp
+kde3_gnash_SOURCES = $(GUI_SRCS) \
+    qt/gui_kde.cpp \
+       qt/kde.cpp \
+       qt/kdesup.h \
+       qt/kde_glue.h
+
 kde3_gnash_LDFLAGS = -export-dynamic 
 #kde_gnash_DEPENDENCIES = .configline
 kde3_gnash_LDADD = \
+       $(AM_LDFLAGS) \
        $(GNASH_LIBS) \
-       $(AM_LDFLAGS)
+    $(KDE3_LIBS) \
+    $(QT3_LIBS)
+
 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 += qt/kde_glue_opengl.cpp \
-       qt/kde_glue_opengl.h \
-       qt/kde_glue.h \
-       qt/kde.cpp \
-       qt/kdesup.h \
-       qt/kde_glue.h
+kde3_gnash_LDADD += $(OPENGL_LIBS)
+kde3_gnash_SOURCES += qt/kde_glue_opengl.cpp qt/kde_glue_opengl.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 += qt/kde_glue_agg.cpp \
-       qt/kde_glue_agg.h \
-       qt/kde.cpp \
-       qt/kdesup.h \
-       qt/kde_glue.h
+kde3_gnash_CPPFLAGS += $(AGG_CFLAGS)
+kde3_gnash_LDADD += $(AGG_LIBS)
+kde3_gnash_SOURCES += qt/kde_glue_agg.cpp qt/kde_glue_agg.h 
 endif
 endif

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

Summary of changes:
 gui/qt/kde3.am |   34 ++++++++++++++++------------------
 1 files changed, 16 insertions(+), 18 deletions(-)


hooks/post-receive
-- 
Gnash