[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Gnash-commit] gnash autogen.sh configure.ac ChangeLog backend...
From: |
Rob Savoye |
Subject: |
[Gnash-commit] gnash autogen.sh configure.ac ChangeLog backend... |
Date: |
Wed, 28 Mar 2007 23:42:20 +0000 |
CVSROOT: /sources/gnash
Module name: gnash
Changes by: Rob Savoye <rsavoye> 07/03/28 23:42:20
Modified files:
. : autogen.sh configure.ac ChangeLog
backend : Makefile.am
macros : agg.m4 pthreads.m4
packaging/redhat: gnash.spec
server : Makefile.am
server/parser : Makefile.am
server/asobj : Makefile.am
testsuite/misc-ming.all: Makefile.am
testsuite/misc-mtasc.all: Makefile.am
utilities : Makefile.am
Log message:
* autogen.sh: Make config-h.in atfer running libtoolize so
Darwin builds stop failing.
* configure.ac: Remove dash after cvs, it confuses rpmbuild.
* backend/Makefile.am: List AGG headers in noinst_HEADERS.
* macros/agg.m4: Set ac_cv_path_agg_incl based on
agg_include_dir
to save a few cycles.
* macros/pthreads.m4: Don't set any flags for pthreads on
Darwin. Test for the .dylib suffix too.
* packaging/redhat/gnash.spec: Merge in changes from Redhat.
* server/Makefile.am: Add BOOST and pthreads libs for cross
builds.
* server/asobj/Makefile.am: Make an installable library for
dynamically linking on Darwin.
* server/parser/Makefile.am: Make an installable library for
dynamically linking on Darwin.
* testsuite/misc-ming.all/Makefile.am: Add intervalTest.as to
EXTRA_DIST so distcheck passes.
* testsuite/misc-mtasc.all/Makefile.am: Add all .as files to
EXTRA_DIST so distcheck passes. Add to CLEANFILES so distcheck
passes.
* testsuite/samples/Makefile.am: Add to CLEANFILES so distcheck
passes.
* testsuite/libbase/Makefile.am: Link in libgnashvm too.
* utilities/Makefile.am: Add CURLS_LIBS. Add sufix rule for for
build swf from as files.
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/autogen.sh?cvsroot=gnash&r1=1.22&r2=1.23
http://cvs.savannah.gnu.org/viewcvs/gnash/configure.ac?cvsroot=gnash&r1=1.277&r2=1.278
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.2707&r2=1.2708
http://cvs.savannah.gnu.org/viewcvs/gnash/backend/Makefile.am?cvsroot=gnash&r1=1.51&r2=1.52
http://cvs.savannah.gnu.org/viewcvs/gnash/macros/agg.m4?cvsroot=gnash&r1=1.24&r2=1.25
http://cvs.savannah.gnu.org/viewcvs/gnash/macros/pthreads.m4?cvsroot=gnash&r1=1.26&r2=1.27
http://cvs.savannah.gnu.org/viewcvs/gnash/packaging/redhat/gnash.spec?cvsroot=gnash&r1=1.13&r2=1.14
http://cvs.savannah.gnu.org/viewcvs/gnash/server/Makefile.am?cvsroot=gnash&r1=1.107&r2=1.108
http://cvs.savannah.gnu.org/viewcvs/gnash/server/parser/Makefile.am?cvsroot=gnash&r1=1.25&r2=1.26
http://cvs.savannah.gnu.org/viewcvs/gnash/server/asobj/Makefile.am?cvsroot=gnash&r1=1.32&r2=1.33
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/misc-ming.all/Makefile.am?cvsroot=gnash&r1=1.83&r2=1.84
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/misc-mtasc.all/Makefile.am?cvsroot=gnash&r1=1.5&r2=1.6
http://cvs.savannah.gnu.org/viewcvs/gnash/utilities/Makefile.am?cvsroot=gnash&r1=1.47&r2=1.48
Patches:
Index: autogen.sh
===================================================================
RCS file: /sources/gnash/gnash/autogen.sh,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -b -r1.22 -r1.23
--- autogen.sh 29 Dec 2006 01:12:20 -0000 1.22
+++ autogen.sh 28 Mar 2007 23:42:19 -0000 1.23
@@ -110,7 +110,7 @@
if test -z "$NO_LIBTOOLIZE" ; then
echo "Running libtoolize --force --ltdl --copy ..."
if ${LIBTOOLIZE:-libtoolize} --force --ltdl --copy; then
- :
+ chmod a+w libltdl/config-h.in # Darwin needs this
else
echo
echo "**Error**: libtoolize failed, do you have libltdl dev
package installed?"
Index: configure.ac
===================================================================
RCS file: /sources/gnash/gnash/configure.ac,v
retrieving revision 1.277
retrieving revision 1.278
diff -u -b -r1.277 -r1.278
--- configure.ac 25 Mar 2007 12:57:20 -0000 1.277
+++ configure.ac 28 Mar 2007 23:42:19 -0000 1.278
@@ -15,7 +15,7 @@
dnl Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
dnl
-dnl $Id: configure.ac,v 1.277 2007/03/25 12:57:20 martinwguy Exp $
+dnl $Id: configure.ac,v 1.278 2007/03/28 23:42:19 rsavoye Exp $
AC_PREREQ(2.50)
AC_INIT(gnash, cvs)
@@ -48,7 +48,7 @@
BUILDDATE="`date +%Y%m%d`"
dnl These are required by automake
-AM_INIT_AUTOMAKE(gnash, "cvs-$BUILDDATE")
+AM_INIT_AUTOMAKE(gnash, "cvs$BUILDDATE")
AM_MAINTAINER_MODE
AC_PROG_MAKE_SET
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.2707
retrieving revision 1.2708
diff -u -b -r1.2707 -r1.2708
--- ChangeLog 28 Mar 2007 22:21:29 -0000 1.2707
+++ ChangeLog 28 Mar 2007 23:42:19 -0000 1.2708
@@ -1,3 +1,31 @@
+2007-03-28 Rob Savoye <address@hidden>
+
+ * autogen.sh: Make config-h.in atfer running libtoolize so
+ Darwin builds stop failing.
+ * configure.ac: Remove dash after cvs, it confuses rpmbuild.
+ * backend/Makefile.am: List AGG headers in noinst_HEADERS.
+ * macros/agg.m4: Set ac_cv_path_agg_incl based on agg_include_dir
+ to save a few cycles.
+ * macros/pthreads.m4: Don't set any flags for pthreads on
+ Darwin. Test for the .dylib suffix too.
+ * packaging/redhat/gnash.spec: Merge in changes from Redhat.
+ * server/Makefile.am: Add BOOST and pthreads libs for cross
+ builds.
+ * server/asobj/Makefile.am: Make an installable library for
+ dynamically linking on Darwin.
+ * server/parser/Makefile.am: Make an installable library for
+ dynamically linking on Darwin.
+ * testsuite/misc-ming.all/Makefile.am: Add intervalTest.as to
+ EXTRA_DIST so distcheck passes.
+ * testsuite/misc-mtasc.all/Makefile.am: Add all .as files to
+ EXTRA_DIST so distcheck passes. Add to CLEANFILES so distcheck
+ passes.
+ * testsuite/samples/Makefile.am: Add to CLEANFILES so distcheck
+ passes.
+ * testsuite/libbase/Makefile.am: Link in libgnashvm too.
+ * utilities/Makefile.am: Add CURLS_LIBS. Add sufix rule for for
+ build swf from as files.
+
2007-03-28 Tomas Groth Christensen <address@hidden>
* server/asobj/NetStreamGst.cpp: Make sure pipeline exists before
Index: backend/Makefile.am
===================================================================
RCS file: /sources/gnash/gnash/backend/Makefile.am,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -b -r1.51 -r1.52
--- backend/Makefile.am 27 Feb 2007 09:10:19 -0000 1.51
+++ backend/Makefile.am 28 Mar 2007 23:42:19 -0000 1.52
@@ -39,6 +39,7 @@
$(NULL)
AM_CPPFLAGS = -I.. \
+ -I$(srcdir) \
-I$(top_srcdir) \
-I$(top_srcdir)/server \
-I$(top_srcdir)/server/parser \
@@ -58,9 +59,16 @@
$(NULL)
noinst_HEADERS = \
- sound_handler.h \
render_handler.h \
- render_handler_tri.h
+ render_handler_agg.h \
+ render_handler_agg_bitmap.h \
+ render_handler_agg_compat.h \
+ render_handler_agg_style.h \
+ render_handler_cairo.h \
+ render_handler_tri.h \
+ sound_handler.h \
+ sound_handler_gst.h \
+ sound_handler_sdl.h
# bin_PROGRAMS = gnash
Index: macros/agg.m4
===================================================================
RCS file: /sources/gnash/gnash/macros/agg.m4,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -b -r1.24 -r1.25
--- macros/agg.m4 9 Jan 2007 18:19:15 -0000 1.24
+++ macros/agg.m4 28 Mar 2007 23:42:19 -0000 1.25
@@ -14,7 +14,7 @@
dnl along with this program; if not, write to the Free Software
dnl Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-dnl $Id: agg.m4,v 1.24 2007/01/09 18:19:15 bjacques Exp $
+dnl $Id: agg.m4,v 1.25 2007/03/28 23:42:19 rsavoye Exp $
dnl agg_rasterizer_compound_aa.h is a new file included in AGG 2.4,
dnl but not in AGG 2.3. As we need AGG 2.4, we use this as
@@ -25,8 +25,8 @@
AC_CACHE_VAL(ac_cv_path_agg_incl, [
if test x"${with_agg_incl}" != x ; then
if test -f ${with_agg_incl}/agg_rasterizer_compound_aa.h ; then
- ac_cv_path_agg_incl="-I`(cd ${with_agg_incl}; pwd)`"
agg_include_dir="`(cd ${with_agg_incl}; pwd)`"
+ ac_cv_path_agg_incl="-I${agg_include_dir}"
agg25=yes
else
AC_MSG_ERROR([${with_agg_incl} directory doesn't contain any headers])
Index: macros/pthreads.m4
===================================================================
RCS file: /sources/gnash/gnash/macros/pthreads.m4,v
retrieving revision 1.26
retrieving revision 1.27
diff -u -b -r1.26 -r1.27
--- macros/pthreads.m4 25 Mar 2007 15:52:15 -0000 1.26
+++ macros/pthreads.m4 28 Mar 2007 23:42:19 -0000 1.27
@@ -15,7 +15,7 @@
dnl Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
dnl Copyright (C) 2006 Steven G. Johnson <address@hidden>.
-dnl $Id: pthreads.m4,v 1.26 2007/03/25 15:52:15 martinwguy Exp $
+dnl $Id: pthreads.m4,v 1.27 2007/03/28 23:42:19 rsavoye Exp $
AC_DEFUN([GNASH_PATH_PTHREADS],
[
@@ -85,6 +85,9 @@
*linux*)
pthread_flags="-pthread"
;;
+ *darwin*)
+ pthread_flags="none"
+ ;;
*solaris*)
dnl On Solaris (at least, for some versions), libc contains stubbed
@@ -172,7 +175,7 @@
if test x"${PTHREAD_LIBS}" = "x"; then
AC_MSG_CHECKING([searching for pthread library])
for i in $libslist; do
- if test -f $i/libpthread.a -o -f $i/libpthread.so; then
+ if test -f $i/libpthread.a -o -f $i/libpthread.so -o -f
$i/libpthread.dylib; then
pthreads=yes
if test x"$i" != x"/usr/lib"; then
PTHREAD_LIBS="-L$i -lpthread"
Index: packaging/redhat/gnash.spec
===================================================================
RCS file: /sources/gnash/gnash/packaging/redhat/gnash.spec,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -b -r1.13 -r1.14
--- packaging/redhat/gnash.spec 6 Mar 2007 18:06:12 -0000 1.13
+++ packaging/redhat/gnash.spec 28 Mar 2007 23:42:19 -0000 1.14
@@ -1,6 +1,6 @@
-%define version 20070306
+%define version 20070328
Name: gnash
-Version: %{version}
+Version: cvs%{version}
Release: 1%{?dist}
Summary: GNU flash movie player
@@ -14,18 +14,18 @@
#AutoReqProv: no
-BuildRequires: libxml2 libpng libjpeg libogg
-BuildRequires: gtk2 libX11 agg
-# BuildRequires: boost curl
+BuildRequires: libxml2-devel libpng-devel libjpeg-devel libogg-devel
+BuildRequires: gtk2-devel libX11-devel agg-devel
+BuildRequires: boost-devel curl-devel libXt-devel
# the opengl devel packages are required by gtkglext-devel
# monolithic Xorg
#BuildRequires: xorg-x11-devel
# modular Xorg
#BuildRequires: libGLU-devel libGL-devel
#BuildRequires: gtkglext-devel
-BuildRequires: mysql mysqlclient14
-BuildRequires: SDL
-BuildRequires: kdelibs
+BuildRequires: mysql-devel mysqlclient14-devel
+BuildRequires: SDL-devel
+BuildRequires: kdelibs-devel
BuildRequires: docbook2X
BuildRequires: gstreamer >= 0.10
# BuildRequires: scrollkeeper
@@ -34,8 +34,8 @@
#Requires(postun): scrollkeeper
Requires(post): /sbin/ldconfig
Requires(postun): /sbin/ldconfig
-Requires(post): /sbin/install-info
-Requires(preun): /sbin/install-info
+#Requires(post): /sbin/install-info
+#Requires(preun): /sbin/install-info
%description
Gnash is a GNU Flash movie player that supports many SWF v7 features.
@@ -43,7 +43,7 @@
%package plugin
Summary: Web-client flash movie player plugin
Requires: %{name} = %{version}-%{release}
-Requires: webclient
+Requires: xulrunner
Group: Applications/Internet
%description plugin
@@ -85,6 +85,9 @@
%endif
%{?do_cross_compile:%define cross_compile 1}
+# FIXME: this ia a bad hack! Although all this does work correctly and
+# build an RPM, it's set for an geode-olpc, so the actual hardware
+# won't let us install it.
%define cross_compile 1
%define olpc 1
@@ -121,7 +124,8 @@
# build RPMs on, so we do it this way.
%if olpc
CROSS_OPTS="$CROSS_OPTS --disable-klash"
- SOUND="--enable-sound=gst" # could be sdl
+ SOUND="--enable-sound=sdl --with-mp3-decoder=mad --disable-static"
+ RENDERER="$RENDERER --with-pixelformat=RGB565"
%endif
%else
# Native RPM build
@@ -134,6 +138,16 @@
# cross configuring, so we force them to be what we know is correct.
# export CONFIG_SHELL="sh -x"
# sh -x ./configure \
+%if %{cross_compile}
+%configure --disable-static --with-plugindir=%{_libdir}/mozilla/plugins \
+ $CROSS_OPTS \
+ $SOUND \
+ $RENDERER \
+ --disable-dependency-tracking --disable-rpath \
+ --with-plugindir=%{_libdir}/mozilla/plugins
+
+make %{?_smp_mflags} CXXFLAGS="-g" dumpconfig all
+%else
./configure \
--with-qtdir=$QTDIR \
$CROSS_OPTS \
@@ -147,6 +161,7 @@
--with-plugindir=%{_libdir}/mozilla/plugins
make CXXFLAGS="-g" dumpconfig all
+%endif
%install
rm -rf $RPM_BUILD_ROOT
@@ -186,14 +201,13 @@
%{_bindir}/gparser
%{_bindir}/gprocessor
%{_libdir}/libgnash*.so
-%{_libdir}/gnash/plugins/*.so
-%{_libdir}/gnash/plugins/*.la
+%{_libdir}/mozilla/plugins/*.so
%{_libdir}/libltdl*
%{_prefix}/include/ltdl.h
%{_prefix}/share/gnash/GnashG.png
%{_prefix}/share/gnash/gnash_128_96.ico
-%{_prefix}/man/man1/gnash.1*
%if !%{cross_compile}
+%{_prefix}/man/man1/gnash.1*
%doc doc/C/gnash.html
%doc %{_prefix}/share/gnash/doc/gnash/C/images
%{_datadir}/omf/gnash/gnash-C.omf
@@ -219,12 +233,62 @@
%{_bindir}/cygnal
%changelog
-* Sat Mar 4 2007 Rob Savoye <address@hidden> - %{version}-%{release}
-- update for OLPC release.
+* Sat Mar 6 2007 Rob Savoye <address@hidden> - %{version}-%{release}
+- merge in patch from John @ Redhat.
-* Sat Nov 6 2006 Rob Savoye <address@hidden> - 0.7.2-1
+* Tue Mar 06 2007 John (J5) Palmieri <address@hidden> 0.7.2.cvs20070306-1
+- update to new snapshot
+
+* Thu Feb 28 2007 John (J5) Palmieri <address@hidden> 0.7.2.cvs20070226-3
+- require xulrunner instead of webclient
+
+* Wed Feb 28 2007 John (J5) Palmieri <address@hidden> 0.7.2.cvs20070226-2
+- don't delete requires .so files
+
+* Mon Feb 26 2007 John (J5) Palmieri <address@hidden> 0.7.2.cvs20070226-1
+- cvs snapshot built for olpc
+
+* Sat Nov 7 2006 Rob Savoye <address@hidden> - 0.7.2-2
- update for 0.7.2 release.
+* Sat Nov 6 2006 Patrice Dumas <address@hidden> 0.7.2-1
+- update for 0.7.2 release.
+
+* Thu Oct 05 2006 Christian Iseli <address@hidden> 0.7.1-9
+ - rebuilt for unwind info generation, broken in gcc-4.1.1-21
+
+* Sun Sep 24 2006 Patrice Dumas <address@hidden> 0.7.1-8
+- plugin requires %%{_libdir}/mozilla/plugins. Fix (incompletly and
+ temporarily, but there is no better solution yet) #207613
+
+* Sun Aug 27 2006 Patrice Dumas <address@hidden> - 0.7.1-7
+- add defattr for klash
+- add warnings in the description about stability
+
+* Mon Aug 21 2006 Patrice Dumas <address@hidden> - 0.7.1-6
+- remove superfluous buildrequires autoconf
+- rename last patch to gnash-plugin-tempfile-dir.patch
+- add README.fedora to plugin to explain tmpdirs
+
+* Wed Aug 16 2006 Jens Petersen <address@hidden> - 0.7.1-5
+- source qt.sh and configure --with-qtdir (Dominik Mierzejewski)
+- add plugin-tempfile-dir.patch for plugin to use a safe tempdir
+
+* Fri Jul 28 2006 Jens Petersen <address@hidden> - 0.7.1-4
+- buildrequire autotools (Michael Knox)
+
+* Fri Jun 2 2006 Patrice Dumas <address@hidden> - 0.7.1-3
+- add gnash-continue_on_info_install_error.patch to avoid
+- buildrequire libXmu-devel
+
+* Wed May 17 2006 Jens Petersen <address@hidden> - 0.7.1-2
+- configure with --disable-rpath
+- buildrequire docbook2X
+- remove devel files
+
+* Sun May 7 2006 Jens Petersen <address@hidden> - 0.7.1-1
+- update to 0.7.1 alpha release
+
* Sat Apr 22 2006 Rob Savoye <address@hidden> - 0.7-1
- install the info file. Various tweaks for my system based on
Patrice's latest patch,
Index: server/Makefile.am
===================================================================
RCS file: /sources/gnash/gnash/server/Makefile.am,v
retrieving revision 1.107
retrieving revision 1.108
diff -u -b -r1.107 -r1.108
--- server/Makefile.am 15 Mar 2007 22:39:53 -0000 1.107
+++ server/Makefile.am 28 Mar 2007 23:42:19 -0000 1.108
@@ -18,7 +18,7 @@
#
#
-# $Id: Makefile.am,v 1.107 2007/03/15 22:39:53 strk Exp $
+# $Id: Makefile.am,v 1.108 2007/03/28 23:42:19 rsavoye Exp $
AUTOMAKE_OPTIONS =
@@ -156,6 +156,8 @@
$(top_builddir)/server/parser/libgnashparser.la \
$(top_builddir)/server/vm/libgnashvm.la \
$(LIBXML_LIBS) \
+ $(BOOST_LIBS) \
+ $(PTHREAD_LIBS) \
$(NULL)
if USE_SOUND_GST
Index: server/parser/Makefile.am
===================================================================
RCS file: /sources/gnash/gnash/server/parser/Makefile.am,v
retrieving revision 1.25
retrieving revision 1.26
diff -u -b -r1.25 -r1.26
--- server/parser/Makefile.am 27 Feb 2007 09:10:20 -0000 1.25
+++ server/parser/Makefile.am 28 Mar 2007 23:42:20 -0000 1.26
@@ -15,11 +15,11 @@
# along with this program; if not, write to the Free Software
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-# $Id: Makefile.am,v 1.25 2007/02/27 09:10:20 strk Exp $
+# $Id: Makefile.am,v 1.26 2007/03/28 23:42:20 rsavoye Exp $
AUTOMAKE_OPTIONS =
-noinst_LTLIBRARIES = libgnashparser.la
+lib_LTLIBRARIES = libgnashparser.la
# Only enable if we're configured with --enable-mp3
#
Index: server/asobj/Makefile.am
===================================================================
RCS file: /sources/gnash/gnash/server/asobj/Makefile.am,v
retrieving revision 1.32
retrieving revision 1.33
diff -u -b -r1.32 -r1.33
--- server/asobj/Makefile.am 14 Feb 2007 20:41:48 -0000 1.32
+++ server/asobj/Makefile.am 28 Mar 2007 23:42:20 -0000 1.33
@@ -15,11 +15,11 @@
# along with this program; if not, write to the Free Software
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
-# $Id: Makefile.am,v 1.32 2007/02/14 20:41:48 tgc Exp $
+# $Id: Makefile.am,v 1.33 2007/03/28 23:42:20 rsavoye Exp $
AUTOMAKE_OPTIONS =
-noinst_LTLIBRARIES = libgnashasobjs.la
+lib_LTLIBRARIES = libgnashasobjs.la
AM_CPPFLAGS = \
-I$(top_srcdir)/backend \
Index: testsuite/misc-ming.all/Makefile.am
===================================================================
RCS file: /sources/gnash/gnash/testsuite/misc-ming.all/Makefile.am,v
retrieving revision 1.83
retrieving revision 1.84
diff -u -b -r1.83 -r1.84
--- testsuite/misc-ming.all/Makefile.am 28 Mar 2007 10:52:34 -0000 1.83
+++ testsuite/misc-ming.all/Makefile.am 28 Mar 2007 23:42:20 -0000 1.84
@@ -36,6 +36,7 @@
gotoFrame2Test.as \
DrawingApiTest.as \
FlashVarsTest.as \
+ intervalTest.as \
FlashVarsTest.html
Index: testsuite/misc-mtasc.all/Makefile.am
===================================================================
RCS file: /sources/gnash/gnash/testsuite/misc-mtasc.all/Makefile.am,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- testsuite/misc-mtasc.all/Makefile.am 6 Mar 2007 08:46:00 -0000
1.5
+++ testsuite/misc-mtasc.all/Makefile.am 28 Mar 2007 23:42:20 -0000
1.6
@@ -25,14 +25,14 @@
DEJAGNU_SO_FINI = $(srcdir)/../actionscript.all/dejagnu_so_fini.as
MTASC_FLAGS= -cp $(MTASC_CLASSPATH) -cp $(srcdir) -v -header 800:600:20
+EXTRA_DIST = hello.as inheritance.as TestClass.as function.as hello.as
+
ASTESTS = \
hello.as \
inheritance.as \
function.as \
$(NULL)
-EXTRA_DIST = TestClass.as
-
ASTESTS_OUT = $(ASTESTS:.as=.swf)
TEST_DRIVERS = ../simple.exp
@@ -47,7 +47,15 @@
$(MTASC) $(MTASC_FLAGS) -swf mtasc-$@ -main $<
$(MAKESWF) -o $@ $(DEJAGNU_SO_PATH) mtasc-$@ $(DEJAGNU_SO_FINI)
-CLEANFILES = *.swf
+CLEANFILES = \
+ gnash-dbg.log \
+ site.exp.bak \
+ alltests-runner \
+ testrun.* \
+ *.swf \
+ *.pp \
+ *_testrunner \
+ *_Runner
check-DEJAGNU: site-update $(TEST_CASES)
@runtest=$(RUNTEST); \
Index: utilities/Makefile.am
===================================================================
RCS file: /sources/gnash/gnash/utilities/Makefile.am,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -b -r1.47 -r1.48
--- utilities/Makefile.am 11 Feb 2007 06:21:29 -0000 1.47
+++ utilities/Makefile.am 28 Mar 2007 23:42:20 -0000 1.48
@@ -32,11 +32,11 @@
## WARNING: make sure GLIB_LIBS appears first
## See: http://lists.gnu.org/archive/html/gnash-dev/2006-07/msg00076.html
AM_LDFLAGS = \
- $(CURL_LIBS) \
$(LIBADD_DL) \
$(LIBLTDL) \
$(MYSQL_LIBS) \
$(LIBXML_LIBS) \
+ $(CURL_LIBS) \
$(BOOST_LIBS) \
$(PTHREAD_LIBS) \
$(NULL)
@@ -70,6 +70,7 @@
bin_PROGRAMS = gparser gprocessor
noinst_PROGRAMS = dumpshm
+#check_PROGRAMS = gdebug.swf
gparser_SOURCES = parser.cpp
gparser_LDADD = $(GNASH_LIBS) $(LIBLTDL) "-dlopen" self #"-dlopen"
@@ -94,3 +95,13 @@
clean-hook:
-rm -f core.*
+
+#gdebug.swf: gdebug.as gdebcmds.as
+
+# Wrap a single .as tests in dejagnu_so importer.
+# At play time, if the relative url '../ming-misc.all/Dejagnu.swf'
+# takes to the Dejagnu.swf shared library we'll get visual traces,
+# otherwise normal traces will be used.
+SUFFIXES = as swf
+.as.swf:
+ $(MAKESWF) $(DEF_MAKESWF_FLAGS) $(MAKESWF_FLAGS) -o $@ $<
[Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Gnash-commit] gnash autogen.sh configure.ac ChangeLog backend...,
Rob Savoye <=