[Gnash-commit] gnash ChangeLog testsuite/actionscript.all/Make...

[Sandro Santilli]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Sandro Santilli <strk>  06/06/20 22:50:54

Modified files:
        .              : ChangeLog 
        testsuite/actionscript.all: Makefile.am 

Log message:
        * testsuite/actionscript.all/Makefile.am: fixed duplicated defines when 
building online tests.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.418&r2=1.419
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/actionscript.all/Makefile.am?cvsroot=gnash&r1=1.25&r2=1.26

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.418
retrieving revision 1.419
diff -u -b -r1.418 -r1.419
--- ChangeLog   20 Jun 2006 20:45:26 -0000      1.418
+++ ChangeLog   20 Jun 2006 22:50:53 -0000      1.419
@@ -1,5 +1,7 @@
 2006-06-20 Sandro Santilli <address@hidden>
 
+       * testsuite/actionscript.all/Makefile.am: fixed duplicated
+       defines when building online tests.
        * testsuite/actionscript.all/: added rcsid variable
        to all testfiles, had check.as print testfile info at
        the beginning rather then at each check.

Index: testsuite/actionscript.all/Makefile.am
===================================================================
RCS file: /sources/gnash/gnash/testsuite/actionscript.all/Makefile.am,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -b -r1.25 -r1.26
--- testsuite/actionscript.all/Makefile.am      20 Jun 2006 19:50:41 -0000      
1.25
+++ testsuite/actionscript.all/Makefile.am      20 Jun 2006 22:50:54 -0000      
1.26
@@ -107,29 +107,25 @@
        sh $(srcdir)/gen-index.sh $(GENERATED)
 
 v8-online-tests: index-html
-       MAKESWF_FLAGS="-DONLINE -DOUTPUT_VERSION=8 -v8" \
-               make swf
+       MAKESWF_FLAGS="-DONLINE" SWFVERSION="8" make swf
        mkdir -p v8;
        mv $(GENERATED) v8;
        cp index.html v8
 
 v7-online-tests: index-html
-       MAKESWF_FLAGS="-DONLINE -DOUTPUT_VERSION=7 -v7" \
-               make swf
+       MAKESWF_FLAGS="-DONLINE" SWFVERSION="7" make swf
        mkdir -p v7;
        mv $(GENERATED) v7;
        cp index.html v7
 
 v6-online-tests: index-html
-       MAKESWF_FLAGS="-DONLINE -DOUTPUT_VERSION=6 -v6" \
-               make swf
+       MAKESWF_FLAGS="-DONLINE" SWFVERSION="6" make swf
        mkdir -p v6;
        mv $(GENERATED) v6;
        cp index.html v6
 
 v5-online-tests: index-html
-       MAKESWF_FLAGS="-DONLINE -DOUTPUT_VERSION=5 -v5" \
-               make swf
+       MAKESWF_FLAGS="-DONLINE" SWFVERSION="5" make swf
        mkdir -p v5;
        mv $(GENERATED) v5;
        cp index.html v5
@@ -141,16 +137,26 @@
 
 # To use XTRACE output:
 #  MAKESWF_FLAGS=-DUSE_XTRACE make Whatever.swf
+# or use the Whatever.vswf rule
 .as.swf: 
        @if test x"$(MAKESWF)" != x; then \
-         $(MAKESWF) -DOUTPUT_VERSION=6 -v6 $(MAKESWF_FLAGS) -o $@ $< ; \
+         if test x"$(SWFVERSION)" = x; then \
+          SWFVERSION="6" make $@; \
+         else \
+          $(MAKESWF) -DOUTPUT_VERSION=$(SWFVERSION) -v$(SWFVERSION) 
$(MAKESWF_FLAGS) -o $@ $< ; \
+         fi; \
        else \
          echo "You need to install Ming to compile"; \
        fi
 
+# Build with XTRACE output (visual swf)
 .as.vswf: 
        @if test x"$(MAKESWF)" != x; then \
-         $(MAKESWF) -DUSE_XTRACE -DOUTPUT_VERSION=6 -v6 $(MAKESWF_FLAGS) -o $@ 
$< ; \
+         if test x"$(SWFVERSION)" = x; then \
+          SWFVERSION="6" make $@; \
+         else \
+          $(MAKESWF) -DUSE_XTRACE -DOUTPUT_VERSION=$(SWFVERSION) 
-v$(SWFVERSION) $(MAKESWF_FLAGS) -o $@ $< ; \
+         fi; \
        else \
          echo "You need to install Ming to compile"; \
        fi