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

[Rob Savoye]

CVSROOT:        /sources/gnash
Module name:    gnash
Branch:         
Changes by:     Rob Savoye <address@hidden>     06/02/02 17:24:43

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

Log message:
        * testsuite/actionscript.all/Makefile.am: Use the standard
        automake way to build the test cases.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/ChangeLog.diff?tr1=1.63&tr2=1.64&r1=text&r2=text
http://cvs.savannah.gnu.org/viewcvs/gnash/gnash/testsuite/actionscript.all/Makefile.am.diff?tr1=1.4&tr2=1.5&r1=text&r2=text

Patches:
Index: gnash/ChangeLog
diff -u gnash/ChangeLog:1.63 gnash/ChangeLog:1.64
--- gnash/ChangeLog:1.63        Thu Feb  2 16:39:05 2006
+++ gnash/ChangeLog     Thu Feb  2 17:24:43 2006
@@ -1,5 +1,8 @@
 2006-02-02  Rob Savoye  <address@hidden>
 
+       * testsuite/actionscript.all/Makefile.am: Use the standard
+       automake way to build the test cases.
+
        * Makefile.am (STD_DIRS): Remove testsuite. Nothing actually needs
        to be done at "make all" time anyway. So now the testuites can
        only be run from the testsuite subdirctory.
Index: gnash/testsuite/actionscript.all/Makefile.am
diff -u gnash/testsuite/actionscript.all/Makefile.am:1.4 
gnash/testsuite/actionscript.all/Makefile.am:1.5
--- gnash/testsuite/actionscript.all/Makefile.am:1.4    Thu Feb  2 00:03:02 2006
+++ gnash/testsuite/actionscript.all/Makefile.am        Thu Feb  2 17:24:43 2006
@@ -21,11 +21,27 @@
 # We don't need  --tool anymore
 RUNTESTDEFAULTFLAGS = --srcdir $$srcdir
 
-LDFLAGS += $(MING_LDFLAGS)
+INCLUDES = -I.. \
+        -I$(top_srcdir)                \
+        -I$(top_srcdir)/libbase \
+        -I$(top_srcdir)/server  \
+        -I$(top_srcdir)/libgeometry \
+       $(LIBXML_CFLAGS)        \
+       $(OPENGL_CFLAGS)        \
+       $(DMALLOC_CFLAGS)       \
+       $(MP3_CFLAGS)           \
+       $(OGG_CFLAGS)           \
+        $(MING_CFLAGS)         \
+        $(SDL_CFLAGS)          \
+        $(SDL_MIXER_CFLAGS)
 
-if ENABLE_MING
+noinst_PROGRAMS = moviecliploader_test definebitsjpeg2 
 
-LDFLAGS += $(MING_LIBS)
+definebitsjpeg2_SOURCES = moviecliploader_test.c
+definebitsjpeg2_LDADD = $(MING_LIBS)
+
+moviecliploader_test_SOURCES = definebitsjpeg2.c
+moviecliploader_test_LDADD = $(MING_LIBS)
 
 # moviecliploader_test_ming.swf definebitsjpeg2.swf 
 GENERATED = xtrace.swf movieclip.swf array.swf
@@ -38,17 +54,15 @@
        gprocessor -v $(GENERATED)
 
 .as.swf: 
-       $(MAKESWF) -o $@ $<
-
-moviecliploader_test: moviecliploader_test.c
-       $(CC) $(LDFLAGS) $(CFLAGS) -o $@ $<
+       @if test x"$(MAKESWF)" != x; then \
+         $(MAKESWF) -o $@ $< ; \
+       else \
+         echo "You need to install Ming to compile"; \
+       fi
 
 moviecliploader_test_ming.swf: moviecliploader_test
        ./moviecliploader_test
 
-definebitsjpeg2: definebitsjpeg2.c
-       $(CC) $(LDFLAGS) $(CFLAGS) -o $@ $<
-
 definebitsjpeg2.swf: definebitsjpeg2
        ./definebitsjpeg2
 
@@ -56,4 +70,4 @@
        rm -f $(GENERATED)
        rm -f $(GENERATED) *.as.pp
 
-endif # ENABLE_MING
+