[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Gnash-commit] /srv/bzr/gnash/avm2 r9745: link in libgnashas3.la when ne
From: |
rob |
Subject: |
[Gnash-commit] /srv/bzr/gnash/avm2 r9745: link in libgnashas3.la when needed. |
Date: |
Mon, 18 May 2009 11:12:45 -0600 |
User-agent: |
Bazaar (1.13.1) |
------------------------------------------------------------
revno: 9745
committer: address@hidden
branch nick: avm2
timestamp: Mon 2009-05-18 11:12:45 -0600
message:
link in libgnashas3.la when needed.
modified:
testsuite/Makefile.am
testsuite/libcore.all/Makefile.am
testsuite/misc-ming.all/Makefile.am
testsuite/samples/Makefile.am
=== modified file 'testsuite/Makefile.am'
--- a/testsuite/Makefile.am 2009-04-30 16:01:16 +0000
+++ b/testsuite/Makefile.am 2009-05-18 17:12:45 +0000
@@ -102,6 +102,7 @@
$(RENDERER_LIBS) \
$(top_builddir)/libmedia/libgnashmedia.la \
$(top_builddir)/libsound/libgnashsound.la \
+ $(top_builddir)/libcore/asobj3/libgnashas3.la \
$(top_builddir)/libcore/libgnashcore.la \
$(top_builddir)/libbase/libgnashbase.la \
$(NULL)
=== modified file 'testsuite/libcore.all/Makefile.am'
--- a/testsuite/libcore.all/Makefile.am 2009-05-17 16:15:25 +0000
+++ b/testsuite/libcore.all/Makefile.am 2009-05-18 17:12:45 +0000
@@ -64,6 +64,7 @@
$(top_builddir)/libbase/libgnashbase.la \
$(top_builddir)/libamf/libgnashamf.la \
$(top_builddir)/libcore/libgnashcore.la \
+ $(top_builddir)/libcore/asobj3/libgnashas3.la \
$(NULL)
if USE_FFMPEG_ENGINE
=== modified file 'testsuite/misc-ming.all/Makefile.am'
--- a/testsuite/misc-ming.all/Makefile.am 2009-04-07 09:19:54 +0000
+++ b/testsuite/misc-ming.all/Makefile.am 2009-05-18 17:12:45 +0000
@@ -362,7 +362,7 @@
./definebitsjpeg2 $(srcdir)/../media/lynch.jpg
moviecliploader_test_SOURCES = moviecliploader_test.c
-moviecliploader_test_LDADD = $(MING_LIBS)
+moviecliploader_test_LDADD = $(MING_LIBS)
#FIXME: make this rule consistent with the others
#and write a test runner for the absolute *and* relative
@@ -389,8 +389,10 @@
$(NULL)
DefineTextTest_Runner_LDADD = \
$(top_builddir)/testsuite/libtestsuite.la \
+ $(top_builddir)/libcore/asobj3/libgnashas3.la \
$(NULL)
DefineTextTest_Runner_DEPENDENCIES = \
+ $(top_builddir)/libcore/asobj3/libgnashas3.la \
$(top_builddir)/testsuite/libtestsuite.la \
DefineTextTest.swf \
$(NULL)
@@ -419,9 +421,11 @@
$(NULL)
DefineEditTextTest_Runner_LDADD = \
$(top_builddir)/testsuite/libtestsuite.la \
+ $(top_builddir)/libcore/asobj3/libgnashas3.la \
$(NULL)
DefineEditTextTest_Runner_DEPENDENCIES = \
$(top_builddir)/testsuite/libtestsuite.la \
+ $(top_builddir)/libcore/asobj3/libgnashas3.la \
DefineEditTextTest.swf \
$(NULL)
@@ -463,7 +467,7 @@
new_child_in_unload_testrunner: $(srcdir)/../generic-testrunner.sh
new_child_in_unload_test.swf
sh $< $(top_builddir) new_child_in_unload_test.swf > $@
chmod 755 $@
-
+
PlaceObject2Test_SOURCES = \
PlaceObject2Test.c \
$(NULL)
@@ -494,9 +498,11 @@
$(NULL)
eventSoundTest1_Runner_LDADD = \
$(top_builddir)/testsuite/libtestsuite.la \
+ $(top_builddir)/libcore/asobj3/libgnashas3.la \
$(NULL)
eventSoundTest1_Runner_DEPENDENCIES = \
$(top_builddir)/testsuite/libtestsuite.la \
+ $(top_builddir)/libcore/asobj3/libgnashas3.la \
eventSoundTest1.swf \
$(NULL)
@@ -514,9 +520,11 @@
$(NULL)
streamingSoundTest1_Runner_LDADD = \
$(top_builddir)/testsuite/libtestsuite.la \
+ $(top_builddir)/libcore/asobj3/libgnashas3.la \
$(NULL)
streamingSoundTest1_Runner_DEPENDENCIES = \
$(top_builddir)/testsuite/libtestsuite.la \
+ $(top_builddir)/libcore/asobj3/libgnashas3.la \
streamingSoundTest1.swf \
$(NULL)
@@ -534,9 +542,11 @@
$(NULL)
DefineEditTextVariableNameTest_Runner_LDADD = \
$(top_builddir)/testsuite/libtestsuite.la \
+ $(top_builddir)/libcore/asobj3/libgnashas3.la \
$(NULL)
DefineEditTextVariableNameTest_Runner_DEPENDENCIES = \
$(top_builddir)/testsuite/libtestsuite.la \
+ $(top_builddir)/libcore/asobj3/libgnashas3.la \
DefineEditTextVariableNameTest.swf \
$(NULL)
@@ -576,12 +586,14 @@
$(NULL)
root_stop_testrunner_LDADD = \
$(top_builddir)/testsuite/libtestsuite.la \
+ $(top_builddir)/libcore/asobj3/libgnashas3.la \
$(NULL)
root_stop_testrunner_CXXFLAGS = \
-DSRCDIR='"$(srcdir)"' \
-DTGTDIR='"$(abs_builddir)"'
root_stop_testrunner_DEPENDENCIES = \
$(top_builddir)/testsuite/libtestsuite.la \
+ $(top_builddir)/libcore/asobj3/libgnashas3.la \
root_stop_test.swf \
$(NULL)
@@ -592,7 +604,10 @@
./loop_test $(top_srcdir)/testsuite/media
loop_test_Runner_SOURCES = loop_test-Runner.cpp
-loop_test_Runner_LDADD = $(top_builddir)/testsuite/libtestsuite.la
+loop_test_Runner_LDADD = \
+ $(top_builddir)/testsuite/libtestsuite.la \
+ $(top_builddir)/libcore/asobj3/libgnashas3.la \
+ $(NULL)
loop_test_Runner_CXXFLAGS = \
-DSRCDIR='"$(srcdir)"' \
@@ -602,6 +617,7 @@
loop_test_Runner_DEPENDENCIES = \
loop_test.swf \
$(top_builddir)/testsuite/libtestsuite.la \
+ $(top_builddir)/libcore/asobj3/libgnashas3.la \
$(NULL)
loop_test2_SOURCES = loop_test2.c
@@ -618,9 +634,11 @@
$(NULL)
loop_test2runner_LDADD = \
$(top_builddir)/testsuite/libtestsuite.la \
+ $(top_builddir)/libcore/asobj3/libgnashas3.la \
$(NULL)
loop_test2runner_DEPENDENCIES = \
$(top_builddir)/testsuite/libtestsuite.la \
+ $(top_builddir)/libcore/asobj3/libgnashas3.la \
loop_test2.swf \
$(NULL)
@@ -704,7 +722,7 @@
loop_test10runner: $(srcdir)/../generic-testrunner.sh loop_test10.swf Makefile
sh $< -f10 -c "#total tests" $(top_builddir) loop_test10.swf > $@
chmod 755 $@
-
+
shape_test_SOURCES = shape_test.c
shape_test_LDADD = libgnashmingutils.la
@@ -726,6 +744,7 @@
$(NULL)
morph_test1runner_LDADD = \
$(top_builddir)/testsuite/libtestsuite.la \
+ $(top_builddir)/libcore/asobj3/libgnashas3.la \
$(NULL)
morph_test1runner_CXXFLAGS = \
-DSRCDIR='"$(srcdir)"' \
@@ -734,8 +753,9 @@
morph_test1runner_DEPENDENCIES = \
morph_test1.swf \
$(top_builddir)/testsuite/libtestsuite.la \
+ $(top_builddir)/libcore/asobj3/libgnashas3.la \
$(NULL)
-
+
key_event_test_SOURCES = key_event_test.c
key_event_test_LDADD = libgnashmingutils.la
@@ -747,6 +767,7 @@
$(NULL)
key_event_testrunner_LDADD = \
$(top_builddir)/testsuite/libtestsuite.la \
+ $(top_builddir)/libcore/asobj3/libgnashas3.la \
$(NULL)
key_event_testrunner_CXXFLAGS = \
-DSRCDIR='"$(srcdir)"' \
@@ -755,8 +776,9 @@
key_event_testrunner_DEPENDENCIES = \
key_event_test.swf \
$(top_builddir)/testsuite/libtestsuite.la \
+ $(top_builddir)/libcore/asobj3/libgnashas3.la \
$(NULL)
-
+
place_object_test_SOURCES = place_object_test.c
place_object_test_LDADD = libgnashmingutils.la
@@ -767,7 +789,7 @@
sh $< -r5 $(top_builddir) place_object_test.swf > $@
chmod 755 $@
-
+
place_object_test2_SOURCES = place_object_test2.c
place_object_test2_LDADD = libgnashmingutils.la
@@ -968,7 +990,7 @@
sh $< -r5 $(top_builddir) DepthLimitsTest.swf > $@
chmod 755 $@
-
+
replace_shapes1test_SOURCES = replace_shapes1test.c
replace_shapes1test_LDADD = libgnashmingutils.la
@@ -983,9 +1005,11 @@
$(NULL)
replace_shapes1test_runner_LDADD = \
$(top_builddir)/testsuite/libtestsuite.la \
+ $(top_builddir)/libcore/asobj3/libgnashas3.la \
$(NULL)
replace_shapes1test_runner_DEPENDENCIES = \
$(top_builddir)/testsuite/libtestsuite.la \
+ $(top_builddir)/libcore/asobj3/libgnashas3.la \
replace_shapes1test.swf \
$(NULL)
@@ -1003,9 +1027,11 @@
$(NULL)
replace_sprites1test_runner_LDADD = \
$(top_builddir)/testsuite/libtestsuite.la \
+ $(top_builddir)/libcore/asobj3/libgnashas3.la \
$(NULL)
replace_sprites1test_runner_DEPENDENCIES = \
$(top_builddir)/testsuite/libtestsuite.la \
+ $(top_builddir)/libcore/asobj3/libgnashas3.la \
replace_sprites1test.swf \
$(NULL)
@@ -1023,9 +1049,11 @@
$(NULL)
replace_buttons1test_runner_LDADD = \
$(top_builddir)/testsuite/libtestsuite.la \
+ $(top_builddir)/libcore/asobj3/libgnashas3.la \
$(NULL)
replace_buttons1test_runner_DEPENDENCIES = \
$(top_builddir)/testsuite/libtestsuite.la \
+ $(top_builddir)/libcore/asobj3/libgnashas3.la \
replace_buttons1test.swf \
$(NULL)
@@ -1046,13 +1074,14 @@
$(NULL)
masks_testrunner_LDADD = \
$(top_builddir)/testsuite/libtestsuite.la \
+ $(top_builddir)/libcore/asobj3/libgnashas3.la \
$(NULL)
masks_testrunner_DEPENDENCIES = \
$(top_builddir)/testsuite/libtestsuite.la \
+ $(top_builddir)/libcore/asobj3/libgnashas3.la \
masks_test.swf \
$(NULL)
-
masks_test2_SOURCES = \
masks_test2.c \
$(NULL)
@@ -1069,9 +1098,11 @@
$(NULL)
masks_test2runner_LDADD = \
$(top_builddir)/testsuite/libtestsuite.la \
+ $(top_builddir)/libcore/asobj3/libgnashas3.la \
$(NULL)
masks_test2runner_DEPENDENCIES = \
$(top_builddir)/testsuite/libtestsuite.la \
+ $(top_builddir)/libcore/asobj3/libgnashas3.la \
masks_test2.swf \
$(NULL)
@@ -1172,7 +1203,7 @@
event_handler_scope_testrunner: $(srcdir)/../generic-testrunner.sh
event_handler_scope_test.swf
sh $< -r5 $(top_builddir) event_handler_scope_test.swf > $@
chmod 755 $@
-
+
attachMovieTest_SOURCES = \
attachMovieTest.c \
$(NULL)
@@ -1186,6 +1217,7 @@
$(NULL)
attachMovieTestRunner_LDADD = \
$(top_builddir)/testsuite/libtestsuite.la \
+ $(top_builddir)/libcore/asobj3/libgnashas3.la \
$(NULL)
attachMovieTestRunner_CXXFLAGS = \
-DSRCDIR='"$(srcdir)"' \
@@ -1194,6 +1226,7 @@
attachMovieTestRunner_DEPENDENCIES = \
attachMovieTest.swf \
$(top_builddir)/testsuite/libtestsuite.la \
+ $(top_builddir)/libcore/asobj3/libgnashas3.la \
$(NULL)
attachMovieLoopingTest_SOURCES = \
@@ -1209,6 +1242,7 @@
$(NULL)
attachMovieLoopingTestRunner_LDADD = \
$(top_builddir)/testsuite/libtestsuite.la \
+ $(top_builddir)/libcore/asobj3/libgnashas3.la \
$(NULL)
attachMovieLoopingTestRunner_CXXFLAGS = \
-DSRCDIR='"$(srcdir)"' \
@@ -1217,6 +1251,7 @@
attachMovieLoopingTestRunner_DEPENDENCIES = \
attachMovieLoopingTest.swf \
$(top_builddir)/testsuite/libtestsuite.la \
+ $(top_builddir)/libcore/asobj3/libgnashas3.la \
$(NULL)
simple_loop_test_SOURCES = \
@@ -1232,6 +1267,7 @@
$(NULL)
simple_loop_testrunner_LDADD = \
$(top_builddir)/testsuite/libtestsuite.la \
+ $(top_builddir)/libcore/asobj3/libgnashas3.la \
$(NULL)
simple_loop_testrunner_CXXFLAGS = \
-DSRCDIR='"$(srcdir)"' \
@@ -1240,6 +1276,7 @@
simple_loop_testrunner_DEPENDENCIES = \
simple_loop_test.swf \
$(top_builddir)/testsuite/libtestsuite.la \
+ $(top_builddir)/libcore/asobj3/libgnashas3.la \
$(NULL)
@@ -1531,6 +1568,7 @@
$(NULL)
registerClassTestRunner_LDADD = \
$(top_builddir)/testsuite/libtestsuite.la \
+ $(top_builddir)/libcore/asobj3/libgnashas3.la \
$(NULL)
registerClassTestRunner_CXXFLAGS = \
-DSRCDIR='"$(srcdir)"' \
@@ -1539,6 +1577,7 @@
registerClassTestRunner_DEPENDENCIES = \
registerClassTest.swf \
$(top_builddir)/testsuite/libtestsuite.la \
+ $(top_builddir)/libcore/asobj3/libgnashas3.la \
$(NULL)
registerClassTest2_SOURCES = \
@@ -1570,12 +1609,14 @@
$(NULL)
RollOverOutTest_Runner_LDADD = \
$(top_builddir)/testsuite/libtestsuite.la \
+ $(top_builddir)/libcore/asobj3/libgnashas3.la \
$(NULL)
RollOverOutTest_Runner_CXXFLAGS = \
-DSRCDIR='"$(srcdir)"' \
-DTGTDIR='"$(abs_builddir)"'
RollOverOutTest_Runner_DEPENDENCIES = \
$(top_builddir)/testsuite/libtestsuite.la \
+ $(top_builddir)/libcore/asobj3/libgnashas3.la \
RollOverOutTest.swf \
$(NULL)
@@ -1590,9 +1631,11 @@
$(NULL)
ButtonEventsTest_Runner_LDADD = \
$(top_builddir)/testsuite/libtestsuite.la \
+ $(top_builddir)/libcore/asobj3/libgnashas3.la \
$(NULL)
ButtonEventsTest_Runner_DEPENDENCIES = \
$(top_builddir)/testsuite/libtestsuite.la \
+ $(top_builddir)/libcore/asobj3/libgnashas3.la \
ButtonEventsTest.swf \
$(NULL)
ButtonEventsTest_Runner_CXXFLAGS = \
@@ -1610,9 +1653,11 @@
$(NULL)
SpriteButtonEventsTest_Runner_LDADD = \
$(top_builddir)/testsuite/libtestsuite.la \
+ $(top_builddir)/libcore/asobj3/libgnashas3.la \
$(NULL)
SpriteButtonEventsTest_Runner_DEPENDENCIES = \
$(top_builddir)/testsuite/libtestsuite.la \
+ $(top_builddir)/libcore/asobj3/libgnashas3.la \
SpriteButtonEventsTest.swf \
$(NULL)
SpriteButtonEventsTest_Runner_CXXFLAGS = \
@@ -1637,6 +1682,7 @@
$(NULL)
loadMovieTestRunner_LDADD = \
$(top_builddir)/testsuite/libtestsuite.la \
+ $(top_builddir)/libcore/asobj3/libgnashas3.la \
$(NULL)
loadMovieTestRunner_CXXFLAGS = \
-DSRCDIR='"$(srcdir)"' \
@@ -1646,6 +1692,7 @@
loadMovieTestRunner_DEPENDENCIES = \
loadMovieTest.swf \
$(top_builddir)/testsuite/libtestsuite.la \
+ $(top_builddir)/libcore/asobj3/libgnashas3.la \
$(NULL)
#loadMovieTest_Runner_SOURCES = \
@@ -1707,9 +1754,11 @@
$(NULL)
intervalTestRunner_LDADD = \
$(top_builddir)/testsuite/libtestsuite.la \
+ $(top_builddir)/libcore/asobj3/libgnashas3.la \
$(NULL)
intervalTestRunner_DEPENDENCIES = \
$(top_builddir)/testsuite/libtestsuite.la \
+ $(top_builddir)/libcore/asobj3/libgnashas3.la \
intervalTest.swf \
$(NULL)
@@ -1734,9 +1783,11 @@
$(NULL)
DrawingApiTestRunner_LDADD = \
$(top_builddir)/testsuite/libtestsuite.la \
+ $(top_builddir)/libcore/asobj3/libgnashas3.la \
$(NULL)
DrawingApiTestRunner_DEPENDENCIES = \
$(top_builddir)/testsuite/libtestsuite.la \
+ $(top_builddir)/libcore/asobj3/libgnashas3.la \
DrawingApiTest.swf \
$(NULL)
@@ -1753,9 +1804,11 @@
$(NULL)
PrototypeEventListenersTestRunner_LDADD = \
$(top_builddir)/testsuite/libtestsuite.la \
+ $(top_builddir)/libcore/asobj3/libgnashas3.la \
$(NULL)
PrototypeEventListenersTestRunner_DEPENDENCIES = \
$(top_builddir)/testsuite/libtestsuite.la \
+ $(top_builddir)/libcore/asobj3/libgnashas3.la \
PrototypeEventListeners.swf \
$(NULL)
@@ -1772,7 +1825,7 @@
red5testRunner: $(srcdir)/../generic-testrunner.sh red5test.swf
sh $< $(top_builddir) red5test.swf > $@
chmod 755 $@
-
+
DragDropTest.swf: $(srcdir)/DragDropTest.as Dejagnu.swf DragDropTestLoaded.swf
Makefile ../actionscript.all/check.as ../actionscript.all/utils.as
$(MAKESWF) -r12 -o $@ -v6 -DUSE_DEJAGNU_MODULE -DOUTPUT_VERSION=6
Dejagnu.swf $(srcdir)/DragDropTest.as
@@ -1789,9 +1842,11 @@
$(NULL)
DragDropTestRunner_LDADD = \
$(top_builddir)/testsuite/libtestsuite.la \
+ $(top_builddir)/libcore/asobj3/libgnashas3.la \
$(NULL)
DragDropTestRunner_DEPENDENCIES = \
$(top_builddir)/testsuite/libtestsuite.la \
+ $(top_builddir)/libcore/asobj3/libgnashas3.la \
DragDropTest.swf \
$(NULL)
@@ -1857,10 +1912,12 @@
NetStream_SquareTestRunner_LDADD = \
$(top_builddir)/testsuite/libtestsuite.la \
+ $(top_builddir)/libcore/asobj3/libgnashas3.la \
$(NULL)
NetStream_SquareTestRunner_DEPENDENCIES = \
$(top_builddir)/testsuite/libtestsuite.la \
+ $(top_builddir)/libcore/asobj3/libgnashas3.la \
NetStream-SquareTest.swf \
$(NULL)
@@ -1884,10 +1941,12 @@
Video_EmbedSquareTestRunner_LDADD = \
$(top_builddir)/testsuite/libtestsuite.la \
+ $(top_builddir)/libcore/asobj3/libgnashas3.la \
$(NULL)
Video_EmbedSquareTestRunner_DEPENDENCIES = \
$(top_builddir)/testsuite/libtestsuite.la \
+ $(top_builddir)/libcore/asobj3/libgnashas3.la \
Video-EmbedSquareTest.swf \
$(NULL)
=== modified file 'testsuite/samples/Makefile.am'
--- a/testsuite/samples/Makefile.am 2009-04-07 09:49:53 +0000
+++ b/testsuite/samples/Makefile.am 2009-05-18 17:12:45 +0000
@@ -48,6 +48,7 @@
GNASH_LIBS = \
$(top_builddir)/testsuite/libtestsuite.la \
$(top_builddir)/libcore/libgnashcore.la \
+ $(top_builddir)/libcore/asobj3/libgnashas3.la \
$(top_builddir)/libbase/libgnashbase.la \
$(top_builddir)/libamf/libgnashamf.la \
$(NULL)
@@ -67,6 +68,7 @@
$(NULL)
clip_as_button2_TestRunner_LDADD = \
$(top_builddir)/testsuite/libtestsuite.la \
+ $(top_builddir)/libcore/asobj3/libgnashas3.la \
$(NULL)
clip_as_button2_TestRunner_CXXFLAGS = \
-DSRCDIR=\"$(abs_srcdir)\" \
@@ -80,6 +82,7 @@
$(NULL)
subshapes_TestRunner_LDADD = \
$(top_builddir)/testsuite/libtestsuite.la \
+ $(top_builddir)/libcore/asobj3/libgnashas3.la \
$(NULL)
subshapes_TestRunner_CXXFLAGS = \
-DSRCDIR=\"$(abs_srcdir)\" \
@@ -93,6 +96,7 @@
$(NULL)
gotoFrameOnKeyEvent_TestRunner_LDADD = \
$(top_builddir)/testsuite/libtestsuite.la \
+ $(top_builddir)/libcore/asobj3/libgnashas3.la \
$(NULL)
gotoFrameOnKeyEvent_TestRunner_CXXFLAGS = \
-DSRCDIR=\"$(abs_srcdir)\" \
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Gnash-commit] /srv/bzr/gnash/avm2 r9745: link in libgnashas3.la when needed.,
rob <=