[Gnash-commit] /srv/bzr/gnash/trunk r9730: testsuite/misc-haxe.all/Makefile.am: improvements for distcheckpackaging/xpi.am: really ought to include the version.

[Russell Nelson]

------------------------------------------------------------
revno: 9730
committer: Russell Nelson <address@hidden>
branch nick: trunk
timestamp: Fri 2008-09-12 15:47:19 -0400
message:
  testsuite/misc-haxe.all/Makefile.am: improvements for 
distcheckpackaging/xpi.am: really ought to include the version.
modified:
  packaging/xpi.am
  testsuite/misc-haxe.all/Makefile.am

=== modified file 'packaging/xpi.am'
--- a/packaging/xpi.am  2008-09-06 18:59:09 +0000
+++ b/packaging/xpi.am  2008-09-12 19:47:19 +0000
@@ -75,8 +75,7 @@
        cp -fr $(XPI_TMP)/tmp/plugin/libgnashplugin.so $(XPI_BUNDLE)/
        cp -fr $(XPI_TMP)/tmp/plugin/extensions/*.xpt $(XPI_BUNDLE)/
        cp -fr $(XPI_TMP)/tmp/plugin/extensions/*.so $(XPI_BUNDLE)/
-       (cd $(XPI_BUNDLE) ; $(ZIP) -r /tmp/gnash.xpi *)
-       echo "The bundle is /tmp/gnash.xpi"
+       (cd $(XPI_BUNDLE) ; $(ZIP) -r /tmp/gnash-$(VERSION).xpi *)
 
 xpi-clean:
        rm -fr xpi-* $(XPI_BUILD) $(XPI_TMP) gnash-$(VERSION)*.xpi

=== modified file 'testsuite/misc-haxe.all/Makefile.am'
--- a/testsuite/misc-haxe.all/Makefile.am       2008-08-04 13:27:32 +0000
+++ b/testsuite/misc-haxe.all/Makefile.am       2008-09-12 19:47:19 +0000
@@ -31,10 +31,10 @@
 
 # These will get compiled to SWFs just as above, but will not be executed as a 
test
 # They are for secondary movies to be loaded by the above tests.
-AUXMOVIES = \
-           $(NULL)
+AUXMOVIES = Dejagnu.hx  \
+       $(NULL)
 
-EXTRA_DIST = $(ASTESTS) $(AUXMOVIES) 
+EXTRA_DIST = $(ASTESTS) $(AUXMOVIES) check.as
 
 HAXE_FLAGS = -swf-version 9 -cp $(HAXE_CLASSPATH) -cp $(srcdir) 
 # hopefully preprocessor is builtin in this case
@@ -65,7 +65,7 @@
 
 .hx.swf: 
        $(HAXE_CPP) $< > $(@:%.swf=PP_%.hx) 
-       $(HAXE) $(HAXE_FLAGS) -swf $@ -main $(@:%.swf=PP_%.hx)
+       $(HAXE) $(HAXE_FLAGS) -swf $@ $(@:%.swf=PP_%.hx)
 
 CLEANFILES =  \
        gnash-dbg.log \