[Gnash-commit] gnash ChangeLog gui/Makefile.am testsuite/misc-...

[Sandro Santilli]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Sandro Santilli <strk>  07/07/23 13:49:43

Modified files:
        .              : ChangeLog 
        gui            : Makefile.am 
        testsuite/misc-mtasc.all: Makefile.am 

Log message:
                * gui/Makefile.am, testsuite/misc-mtasc.all/Makefile.am:
                  Fix 'dist' rule.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.3789&r2=1.3790
http://cvs.savannah.gnu.org/viewcvs/gnash/gui/Makefile.am?cvsroot=gnash&r1=1.85&r2=1.86
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/misc-mtasc.all/Makefile.am?cvsroot=gnash&r1=1.11&r2=1.12

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.3789
retrieving revision 1.3790
diff -u -b -r1.3789 -r1.3790
--- ChangeLog   23 Jul 2007 04:48:49 -0000      1.3789
+++ ChangeLog   23 Jul 2007 13:49:43 -0000      1.3790
@@ -1,5 +1,7 @@
 2007-07-23 Sandro Santilli <address@hidden>
 
+       * gui/Makefile.am, testsuite/misc-mtasc.all/Makefile.am:
+         Fix 'dist' rule.
        * testsuite/misc-ming.all/: DefineEditTextTest-Runner.cpp,
          Makefile.am: skeleton for a MovieTester based runner.
        * testsuite/misc-ming.all/DefineEditTextTest.c: fixed expected

Index: gui/Makefile.am
===================================================================
RCS file: /sources/gnash/gnash/gui/Makefile.am,v
retrieving revision 1.85
retrieving revision 1.86
diff -u -b -r1.85 -r1.86
--- gui/Makefile.am     21 Jul 2007 01:08:38 -0000      1.85
+++ gui/Makefile.am     23 Jul 2007 13:49:43 -0000      1.86
@@ -15,7 +15,7 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
-# $Id: Makefile.am,v 1.85 2007/07/21 01:08:38 nihilus Exp $
+# $Id: Makefile.am,v 1.86 2007/07/23 13:49:43 strk Exp $
 
 AUTOMAKE_OPTIONS = -Wno-portability
 
@@ -166,7 +166,7 @@
      libgnashkde_gl_la_CPPFLAGS = -DGUI_KDE $(AM_CPPFLAGS) \
        $(OPENGL_FLAGS) $(KDE_CFLAGS) $(QT_CFLAGS)
      libgnashkde_gl_la_SOURCES = $(PLAYER_SRCS) \
-       kde_glue_opengl.cpp kde_glue_.h \
+       kde_glue_opengl.cpp kde_glue.h \
        kde.cpp kdesup.h kde_glue.h
      libgnashkde_gl_la_LDFLAGS = $(LIB_FLAGS)
      libgnashkde_gl_la_LIBADD = libgnashgui.la \
@@ -206,7 +206,7 @@
      libgnashsdl_agg_la_CPPFLAGS = -DGUI_SDL $(AM_CPPFLAGS) \
        $(SDL_CFLAGS) $(AGG_CFLAGS)
      libgnashsdl_agg_la_SOURCES = $(PLAYER_SRCS) \
-       sdl_glue_agg.cpp sdl_glue_agg.h \
+       sdl_agg_glue.cpp sdl_agg_glue.h \
        sdl.cpp sdlsup.h sdl_glue.h
      libgnashsdl_agg_la_LDFLAGS = $(LIB_FLAGS)
      libgnashsdl_agg_la_LIBADD = \
@@ -235,7 +235,7 @@
        $(FLTK2_CFLAGS) $(AGG_CFLAGS)
      libgnashfltk_agg_la_SOURCES = $(PLAYER_SRCS) \
        fltk_glue_agg.cpp fltk_glue_agg.h \
-       fltk.cpp fltksup.h fltk_glue.h
+       fltk.cpp fltksup.h 
      libgnashfltk_agg_la_LDFLAGS = $(LIB_FLAGS)
      libgnashfltk_agg_la_LIBADD = \
        $(top_builddir)/backend/libgnashagg.la libgnashgui.la \
@@ -247,7 +247,7 @@
        $(FLTK2_CFLAGS) $(CAIRO_CFLAGS)
      libgnashfltk_cairo_la_SOURCES = $(PLAYER_SRCS) \
        fltk_glue_cairo.cpp fltk_glue_cairo.h \
-       fltk.cpp fltksup.h fltk_glue.h
+       fltk.cpp fltksup.h 
      libgnashfltk_cairo_la_LDFLAGS = $(LIB_FLAGS)
      libgnashfltk_cairo_la_LIBADD = \
        $(top_builddir)/backend/libgnashcairo.la libgnashgui.la \
@@ -260,10 +260,10 @@
 if  HAVE_AGG
      libgnashsdl_agg_la_CPPFLAGS = -DGUI_FB $(AM_CPPFLAGS) $(SDL_CFLAGS)
      plugins_LTLIBRARIES += libgnashfb_agg.la
-     libgnashsdl_agg_la_SOURCES = $(PLAYER_SRCS) \
+     libgnashfb_agg_la_SOURCES = $(PLAYER_SRCS) \
        fb.cpp fbsup.h
-     libgnashsdl_agg_la_LDFLAGS = $(LIB_FLAGS)
-     libgnashsdl_agg_la_LIBADD = \
+     libgnashfb_agg_la_LDFLAGS = $(LIB_FLAGS)
+     libgnashfb_agg_la_LIBADD = \
        $(top_builddir)/backend/libgnashagg.la libgnashgui.la \
        $(SDL_LIBS) $(AGG_LIBS)
 endif # HAVE_AGG

Index: testsuite/misc-mtasc.all/Makefile.am
===================================================================
RCS file: /sources/gnash/gnash/testsuite/misc-mtasc.all/Makefile.am,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -b -r1.11 -r1.12
--- testsuite/misc-mtasc.all/Makefile.am        12 Jul 2007 22:03:37 -0000      
1.11
+++ testsuite/misc-mtasc.all/Makefile.am        23 Jul 2007 13:49:43 -0000      
1.12
@@ -39,7 +39,7 @@
            level99.as \
            $(NULL)
 
-EXTRA_DIST = $(ASTESTS) $(AUXMOVIES) TestClass.as check.h Dejagnu.as
+EXTRA_DIST = $(ASTESTS) $(AUXMOVIES) TestClass.as check.as Dejagnu.as
 
 ASTESTS_OUT = $(ASTESTS:.as=.swf)