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

[Sandro Santilli]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Sandro Santilli <strk>  08/03/12 09:51:59

Modified files:
        .              : ChangeLog 
        testsuite/samples: Makefile.am 

Log message:
        Don't add LDFLAGS (AGG_LIBS) to GNASH_LIBS, don't list GNASH_LIBS as
        dependency of test runners (should be imported by libgnashtestsuite.la).

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.5882&r2=1.5883
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/samples/Makefile.am?cvsroot=gnash&r1=1.25&r2=1.26

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.5882
retrieving revision 1.5883
diff -u -b -r1.5882 -r1.5883
--- ChangeLog   12 Mar 2008 07:41:48 -0000      1.5882
+++ ChangeLog   12 Mar 2008 09:51:58 -0000      1.5883
@@ -1,3 +1,9 @@
+2008-03-12 Sandro Santilli <address@hidden>
+
+       * testsuite/samples/Makefile.am: don't add LDFLAGS (AGG_LIBS)
+         to GNASH_LIBS, don't list GNASH_LIBS as dependency of test
+         runners (should be imported by libgnashtestsuite.la).
+
 2008-03-12 Benjamin Wolsey <address@hidden>
 
        * po/de.po: Updated translation by Alwin Meschede.

Index: testsuite/samples/Makefile.am
===================================================================
RCS file: /sources/gnash/gnash/testsuite/samples/Makefile.am,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -b -r1.25 -r1.26
--- testsuite/samples/Makefile.am       2 Mar 2008 23:39:23 -0000       1.25
+++ testsuite/samples/Makefile.am       12 Mar 2008 09:51:59 -0000      1.26
@@ -41,7 +41,6 @@
        $(top_builddir)/server/libgnashserver.la \
        $(top_builddir)/libbase/libgnashbase.la \
        $(top_builddir)/libamf/libgnashamf.la \
-       $(AGG_LIBS) \
        $(NULL)
 
 check_PROGRAMS = \
@@ -59,7 +58,6 @@
        $(NULL)
 clip_as_button2_TestRunner_LDADD = \
        $(top_builddir)/testsuite/libtestsuite.la \
-       $(GNASH_LIBS) \
        $(NULL)
 clip_as_button2_TestRunner_CXXFLAGS = \
        -DSRCDIR=\"$(srcdir)\" \
@@ -73,28 +71,25 @@
        $(NULL)
 subshapes_TestRunner_LDADD = \
        $(top_builddir)/testsuite/libtestsuite.la \
-       $(GNASH_LIBS) \
        $(NULL)
 subshapes_TestRunner_CXXFLAGS = \
        -DSRCDIR=\"$(srcdir)\" \
        $(NULL)
 subshapes_TestRunner_DEPENDENCIES = \
        subshapes.swf \
-       $(GNASH_LIBS) \
        $(NULL)
 
 gotoFrameOnKeyEvent_TestRunner_SOURCES = \
        gotoFrameOnKeyEvent-TestRunner.cpp \
        $(NULL)
 gotoFrameOnKeyEvent_TestRunner_LDADD = \
-       $(GNASH_LIBS) \
+       $(top_builddir)/testsuite/libtestsuite.la \
        $(NULL)
 gotoFrameOnKeyEvent_TestRunner_CXXFLAGS = \
        -DSRCDIR=\"$(srcdir)\" \
        $(NULL)
 gotoFrameOnKeyEvent_TestRunner_DEPENDENCIES = \
        gotoFrameOnKeyEvent.swf \
-       $(GNASH_LIBS) \
        $(NULL)
 
 GotoAndPlayTestRunner: $(srcdir)/../generic-testrunner.sh 
$(srcdir)/GotoAndPlayTest.swf