[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: [Gnash-dev] [patch] for build
|
From: |
strk |
|
Subject: |
Re: [Gnash-dev] [patch] for build |
|
Date: |
Tue, 28 Nov 2006 12:23:15 +0100 |
Thanks a lot, I'm about to commit this, but first wanted
to show you this:
*** [Gentoo] sanity check failed! ***
*** libtool.m4 and ltmain.sh have a version mismatch! ***
*** (libtool.m4 = 1.5.22, ltmain.sh = "1.5.22 Debian 1.5.22-2") ***
Please run:
libtoolize --copy --force
if appropriate, please contact the maintainer of this
package (or your distribution) for help.
I hope this is related with my werid install/build mismatch bug ( #18392)
So, is any action required on the repository side ?
--strk;
On Tue, Nov 28, 2006 at 12:04:57PM +0100, Patrice Dumas wrote:
> Hello,
>
> * remove or conditionalize CPPFLAGS and LIBS
> * add distributed files or dirs
> * use AC_PROG_LIBTOOL instead of AM_PROG_LIBTOOL in autogen.sh
> * add dependencies on libs for gnash, to avoid parallel make error
> * change <..> to ".." for includes from source
>
> --
> Pat
> ? compile
> ? gnash-cvs-20061123.tar.gz
> ? gnash-cvs-20061124.tar.gz
> ? gnash-cvs-20061125
> ? gnash-cvs-20061125.tar.gz
> ? gnash-cvs-20061127
> ? gnash-cvs-20061127.tar.gz
> ? gnash-cvs-20061128.tar.gz
> ? patch-notes.txt
> ? doc/C/gnash.texi
> ? extensions/Makefile
> ? extensions/Makefile.in
> ? extensions/dejagnu/.deps
> ? extensions/dejagnu/.libs
> ? extensions/dejagnu/Makefile
> ? extensions/dejagnu/Makefile.in
> ? extensions/dejagnu/dejagnu.la
> ? extensions/dejagnu/dejagnu.lo
> ? gui/gnash
> ? libamf/.libs
> ? libamf/amf.lo
> ? libamf/libgnashamf.la
> ? libamf/rtmp.lo
> ? libbase/.Makefile.am.swp
> ? libltdl/.libs
> ? libltdl/Makefile
> ? libltdl/Makefile.in
> ? libltdl/aclocal.m4
> ? libltdl/autom4te.cache
> ? libltdl/config.h
> ? libltdl/config.log
> ? libltdl/config.status
> ? libltdl/configure
> ? libltdl/libltdl.la
> ? libltdl/libtool
> ? libltdl/ltdl.lo
> ? libltdl/stamp-h1
> ? plugin/np_entry.lo
> ? plugin/npn_gate.lo
> ? plugin/npp_gate.lo
> ? plugin/klash/.libs
> ? plugin/klash/klash
> ? plugin/klash/klash.moc
> ? plugin/klash/klash_part.lo
> ? plugin/klash/klash_part.moc
> ? plugin/klash/libklashpart.la
> ? testsuite/.deps
> ? testsuite/.libs
> ? testsuite/Dejagnu.swf
> ? testsuite/libtestsuite.la
> ? testsuite/libtestsuite_la-MovieTester.lo
> ? testsuite/actionscript.all/Boolean-v5.swf
> ? testsuite/actionscript.all/Boolean-v6.swf
> ? testsuite/actionscript.all/Boolean-v7.swf
> ? testsuite/actionscript.all/Boolean-v8.swf
> ? testsuite/actionscript.all/Boolean.swf.frame1.pp
> ? testsuite/actionscript.all/Boolean.swf.frame2.pp
> ? testsuite/actionscript.all/Camera-v5.swf
> ? testsuite/actionscript.all/Camera-v6.swf
> ? testsuite/actionscript.all/Camera-v7.swf
> ? testsuite/actionscript.all/Camera-v8.swf
> ? testsuite/actionscript.all/Camera.swf.frame1.pp
> ? testsuite/actionscript.all/Camera.swf.frame2.pp
> ? testsuite/actionscript.all/Color-v5.swf
> ? testsuite/actionscript.all/Color-v6.swf
> ? testsuite/actionscript.all/Color-v7.swf
> ? testsuite/actionscript.all/Color-v8.swf
> ? testsuite/actionscript.all/Color.swf.frame1.pp
> ? testsuite/actionscript.all/Color.swf.frame2.pp
> ? testsuite/actionscript.all/ContextMenu-v5.swf
> ? testsuite/actionscript.all/ContextMenu-v6.swf
> ? testsuite/actionscript.all/ContextMenu-v7.swf
> ? testsuite/actionscript.all/ContextMenu-v8.swf
> ? testsuite/actionscript.all/ContextMenu.swf.frame1.pp
> ? testsuite/actionscript.all/ContextMenu.swf.frame2.pp
> ? testsuite/actionscript.all/CustomActions-v5.swf
> ? testsuite/actionscript.all/CustomActions-v6.swf
> ? testsuite/actionscript.all/CustomActions-v7.swf
> ? testsuite/actionscript.all/CustomActions-v8.swf
> ? testsuite/actionscript.all/CustomActions.swf.frame1.pp
> ? testsuite/actionscript.all/CustomActions.swf.frame2.pp
> ? testsuite/actionscript.all/Date-v5.swf
> ? testsuite/actionscript.all/Date-v6.swf
> ? testsuite/actionscript.all/Date-v7.swf
> ? testsuite/actionscript.all/Date-v8.swf
> ? testsuite/actionscript.all/Date.swf.frame1.pp
> ? testsuite/actionscript.all/Date.swf.frame2.pp
> ? testsuite/actionscript.all/Error-v5.swf
> ? testsuite/actionscript.all/Error-v6.swf
> ? testsuite/actionscript.all/Error-v7.swf
> ? testsuite/actionscript.all/Error-v8.swf
> ? testsuite/actionscript.all/Error.swf.frame1.pp
> ? testsuite/actionscript.all/Error.swf.frame2.pp
> ? testsuite/actionscript.all/Function-v5.swf
> ? testsuite/actionscript.all/Function-v6.swf
> ? testsuite/actionscript.all/Function-v7.swf
> ? testsuite/actionscript.all/Function-v8.swf
> ? testsuite/actionscript.all/Function.swf.frame1.pp
> ? testsuite/actionscript.all/Function.swf.frame2.pp
> ? testsuite/actionscript.all/Global-v5.swf
> ? testsuite/actionscript.all/Global-v6.swf
> ? testsuite/actionscript.all/Global-v7.swf
> ? testsuite/actionscript.all/Global-v8.swf
> ? testsuite/actionscript.all/Global.swf.frame1.pp
> ? testsuite/actionscript.all/Global.swf.frame2.pp
> ? testsuite/actionscript.all/Inheritance-v5.swf
> ? testsuite/actionscript.all/Inheritance-v6.swf
> ? testsuite/actionscript.all/Inheritance-v7.swf
> ? testsuite/actionscript.all/Inheritance-v8.swf
> ? testsuite/actionscript.all/Inheritance.swf.frame1.pp
> ? testsuite/actionscript.all/Inheritance.swf.frame2.pp
> ? testsuite/actionscript.all/LoadVars-v5.swf
> ? testsuite/actionscript.all/LoadVars-v6.swf
> ? testsuite/actionscript.all/LoadVars-v7.swf
> ? testsuite/actionscript.all/LoadVars-v8.swf
> ? testsuite/actionscript.all/LoadVars.swf.frame1.pp
> ? testsuite/actionscript.all/LoadVars.swf.frame2.pp
> ? testsuite/actionscript.all/LocalConnection-v5.swf
> ? testsuite/actionscript.all/LocalConnection-v6.swf
> ? testsuite/actionscript.all/LocalConnection-v7.swf
> ? testsuite/actionscript.all/LocalConnection-v8.swf
> ? testsuite/actionscript.all/LocalConnection.swf.frame1.pp
> ? testsuite/actionscript.all/LocalConnection.swf.frame2.pp
> ? testsuite/actionscript.all/Microphone-v5.swf
> ? testsuite/actionscript.all/Microphone-v6.swf
> ? testsuite/actionscript.all/Microphone-v7.swf
> ? testsuite/actionscript.all/Microphone-v8.swf
> ? testsuite/actionscript.all/Microphone.swf.frame1.pp
> ? testsuite/actionscript.all/Microphone.swf.frame2.pp
> ? testsuite/actionscript.all/Mouse-v5.swf
> ? testsuite/actionscript.all/Mouse-v6.swf
> ? testsuite/actionscript.all/Mouse-v7.swf
> ? testsuite/actionscript.all/Mouse-v8.swf
> ? testsuite/actionscript.all/Mouse.swf.frame1.pp
> ? testsuite/actionscript.all/Mouse.swf.frame2.pp
> ? testsuite/actionscript.all/MovieClip-v5.swf
> ? testsuite/actionscript.all/MovieClip-v6.swf
> ? testsuite/actionscript.all/MovieClip-v7.swf
> ? testsuite/actionscript.all/MovieClip-v8.swf
> ? testsuite/actionscript.all/MovieClip.swf.frame1.pp
> ? testsuite/actionscript.all/MovieClip.swf.frame2.pp
> ? testsuite/actionscript.all/NetConnection-v5.swf
> ? testsuite/actionscript.all/NetConnection-v6.swf
> ? testsuite/actionscript.all/NetConnection-v7.swf
> ? testsuite/actionscript.all/NetConnection-v8.swf
> ? testsuite/actionscript.all/NetConnection.swf.frame1.pp
> ? testsuite/actionscript.all/NetConnection.swf.frame2.pp
> ? testsuite/actionscript.all/NetStream-v5.swf
> ? testsuite/actionscript.all/NetStream-v6.swf
> ? testsuite/actionscript.all/NetStream-v7.swf
> ? testsuite/actionscript.all/NetStream-v8.swf
> ? testsuite/actionscript.all/NetStream.swf.frame1.pp
> ? testsuite/actionscript.all/NetStream.swf.frame2.pp
> ? testsuite/actionscript.all/Number-v5.swf
> ? testsuite/actionscript.all/Number-v6.swf
> ? testsuite/actionscript.all/Number-v7.swf
> ? testsuite/actionscript.all/Number-v8.swf
> ? testsuite/actionscript.all/Number.swf.frame1.pp
> ? testsuite/actionscript.all/Number.swf.frame2.pp
> ? testsuite/actionscript.all/Object-v5.swf
> ? testsuite/actionscript.all/Object-v6.swf
> ? testsuite/actionscript.all/Object-v7.swf
> ? testsuite/actionscript.all/Object-v8.swf
> ? testsuite/actionscript.all/Object.swf.frame1.pp
> ? testsuite/actionscript.all/Object.swf.frame2.pp
> ? testsuite/actionscript.all/Selection-v5.swf
> ? testsuite/actionscript.all/Selection-v6.swf
> ? testsuite/actionscript.all/Selection-v7.swf
> ? testsuite/actionscript.all/Selection-v8.swf
> ? testsuite/actionscript.all/Selection.swf.frame1.pp
> ? testsuite/actionscript.all/Selection.swf.frame2.pp
> ? testsuite/actionscript.all/SharedObject-v5.swf
> ? testsuite/actionscript.all/SharedObject-v6.swf
> ? testsuite/actionscript.all/SharedObject-v7.swf
> ? testsuite/actionscript.all/SharedObject-v8.swf
> ? testsuite/actionscript.all/SharedObject.swf.frame1.pp
> ? testsuite/actionscript.all/SharedObject.swf.frame2.pp
> ? testsuite/actionscript.all/Stage-v5.swf
> ? testsuite/actionscript.all/Stage-v6.swf
> ? testsuite/actionscript.all/Stage-v7.swf
> ? testsuite/actionscript.all/Stage-v8.swf
> ? testsuite/actionscript.all/Stage.swf.frame1.pp
> ? testsuite/actionscript.all/Stage.swf.frame2.pp
> ? testsuite/actionscript.all/String-v5.swf
> ? testsuite/actionscript.all/String-v6.swf
> ? testsuite/actionscript.all/String-v7.swf
> ? testsuite/actionscript.all/String-v8.swf
> ? testsuite/actionscript.all/String.swf.frame1.pp
> ? testsuite/actionscript.all/String.swf.frame2.pp
> ? testsuite/actionscript.all/System-v5.swf
> ? testsuite/actionscript.all/System-v6.swf
> ? testsuite/actionscript.all/System-v7.swf
> ? testsuite/actionscript.all/System-v8.swf
> ? testsuite/actionscript.all/System.swf.frame1.pp
> ? testsuite/actionscript.all/System.swf.frame2.pp
> ? testsuite/actionscript.all/TextSnapshot-v5.swf
> ? testsuite/actionscript.all/TextSnapshot-v6.swf
> ? testsuite/actionscript.all/TextSnapshot-v7.swf
> ? testsuite/actionscript.all/TextSnapshot-v8.swf
> ? testsuite/actionscript.all/TextSnapshot.swf.frame1.pp
> ? testsuite/actionscript.all/TextSnapshot.swf.frame2.pp
> ? testsuite/actionscript.all/Video-v5.swf
> ? testsuite/actionscript.all/Video-v6.swf
> ? testsuite/actionscript.all/Video-v7.swf
> ? testsuite/actionscript.all/Video-v8.swf
> ? testsuite/actionscript.all/Video.swf.frame1.pp
> ? testsuite/actionscript.all/Video.swf.frame2.pp
> ? testsuite/actionscript.all/XML-v5.swf
> ? testsuite/actionscript.all/XML-v6.swf
> ? testsuite/actionscript.all/XML-v7.swf
> ? testsuite/actionscript.all/XML-v8.swf
> ? testsuite/actionscript.all/XML.swf.frame1.pp
> ? testsuite/actionscript.all/XML.swf.frame2.pp
> ? testsuite/actionscript.all/XMLNode-v5.swf
> ? testsuite/actionscript.all/XMLNode-v6.swf
> ? testsuite/actionscript.all/XMLNode-v7.swf
> ? testsuite/actionscript.all/XMLNode-v8.swf
> ? testsuite/actionscript.all/XMLNode.swf.frame1.pp
> ? testsuite/actionscript.all/XMLNode.swf.frame2.pp
> ? testsuite/actionscript.all/array-v5.swf
> ? testsuite/actionscript.all/array-v6.swf
> ? testsuite/actionscript.all/array-v7.swf
> ? testsuite/actionscript.all/array-v8.swf
> ? testsuite/actionscript.all/array.swf.frame1.pp
> ? testsuite/actionscript.all/array.swf.frame2.pp
> ? testsuite/actionscript.all/astests-v5-Runner
> ? testsuite/actionscript.all/astests-v6-Runner
> ? testsuite/actionscript.all/astests-v7-Runner
> ? testsuite/actionscript.all/astests-v8-Runner
> ? testsuite/actionscript.all/delete-v5.swf
> ? testsuite/actionscript.all/delete-v6.swf
> ? testsuite/actionscript.all/delete-v7.swf
> ? testsuite/actionscript.all/delete-v8.swf
> ? testsuite/actionscript.all/delete.swf.frame1.pp
> ? testsuite/actionscript.all/delete.swf.frame2.pp
> ? testsuite/actionscript.all/gnash-dbg.log
> ? testsuite/actionscript.all/require-ming
> ? testsuite/actionscript.all/rtmp-v5.swf
> ? testsuite/actionscript.all/rtmp-v6.swf
> ? testsuite/actionscript.all/rtmp-v7.swf
> ? testsuite/actionscript.all/rtmp-v8.swf
> ? testsuite/actionscript.all/rtmp.swf.frame1.pp
> ? testsuite/actionscript.all/rtmp.swf.frame2.pp
> ? testsuite/actionscript.all/site.exp
> ? testsuite/actionscript.all/testrun.log
> ? testsuite/actionscript.all/testrun.sum
> ? testsuite/actionscript.all/with-v5.swf
> ? testsuite/actionscript.all/with-v6.swf
> ? testsuite/actionscript.all/with-v7.swf
> ? testsuite/actionscript.all/with-v8.swf
> ? testsuite/actionscript.all/with.swf.frame1.pp
> ? testsuite/actionscript.all/with.swf.frame2.pp
> ? testsuite/libbase/NoSeekFileTest
> ? testsuite/libbase/NoSeekFileTestCache
> ? testsuite/libbase/RcTest
> ? testsuite/libbase/gnash-dbg.log
> ? testsuite/libbase/site.exp
> ? testsuite/libbase/testrun.log
> ? testsuite/libbase/testrun.sum
> ? testsuite/misc-ming.all/ButtonEventsTest
> ? testsuite/misc-ming.all/ButtonEventsTest-Runner
> ? testsuite/misc-ming.all/DefineEditTextTest
> ? testsuite/misc-ming.all/DefineEditTextVariableNameTest
> ? testsuite/misc-ming.all/DefineEditTextVariableNameTest-Runner
> ? testsuite/misc-ming.all/Dejagnu
> ? testsuite/misc-ming.all/PlaceObject2Test
> ? testsuite/misc-ming.all/RemoveObject2Test
> ? testsuite/misc-ming.all/RollOverOutTest
> ? testsuite/misc-ming.all/RollOverOutTest-Runner
> ? testsuite/misc-ming.all/gnash-dbg.log
> ? testsuite/misc-ming.all/site.exp
> ? testsuite/misc-ming.all/testrun.log
> ? testsuite/misc-ming.all/testrun.sum
> ? testsuite/movies.all/gnash-dbg.log
> ? testsuite/movies.all/gravity_embedded-TestRunner
> ? testsuite/movies.all/site.exp
> ? testsuite/movies.all/testrun.log
> ? testsuite/movies.all/testrun.sum
> ? testsuite/samples/clip_as_button2-TestRunner
> ? testsuite/samples/gnash-dbg.log
> ? testsuite/samples/site.exp
> ? testsuite/samples/testrun.log
> ? testsuite/samples/testrun.sum
> ? testsuite/server/GetterSetterTest
> ? testsuite/server/MatrixTest
> ? testsuite/server/PropertyListTest
> ? testsuite/server/gnash-dbg.log
> ? testsuite/server/site.exp
> ? testsuite/server/testrun.log
> ? testsuite/server/testrun.sum
> ? utilities/dumpshm
> Index: Makefile.am
> ===================================================================
> RCS file: /sources/gnash/gnash/Makefile.am,v
> retrieving revision 1.52
> diff -u -3 -p -r1.52 Makefile.am
> --- Makefile.am 24 Nov 2006 22:33:00 -0000 1.52
> +++ Makefile.am 28 Nov 2006 10:57:54 -0000
> @@ -31,8 +31,8 @@ STD_DIRS = \
> backend \
> utilities \
> gui \
> - testsuite
> -# extensions
> + testsuite \
> + extensions
>
> if PLUGIN
> if HAVE_GTK2
> @@ -48,7 +48,6 @@ SUBDIRS = $(STD_DIRS) $(DOC_DIRS) $
>
> man_MANS = doc/gnash.1
>
> -# libamf isn't used yet, but we still want it in the distribution
> DIST_SUBDIRS = $(STD_DIRS) doc plugin
>
> EXTRA_DIST= $(man_MANS)
> Index: autogen.sh
> ===================================================================
> RCS file: /sources/gnash/gnash/autogen.sh,v
> retrieving revision 1.16
> diff -u -3 -p -r1.16 autogen.sh
> --- autogen.sh 4 Nov 2006 00:00:30 -0000 1.16
> +++ autogen.sh 28 Nov 2006 10:57:54 -0000
> @@ -135,7 +135,7 @@ do
> echo "Running xml-i18n-toolize..."
> xml-i18n-toolize --copy --force --automake
> fi
> - if grep "^AM_PROG_LIBTOOL" configure.ac >/dev/null; then
> + if grep "^AC_PROG_LIBTOOL" configure.ac >/dev/null; then
> if test -z "$NO_LIBTOOLIZE" ; then
> echo "Running libtoolize..."
> ${LIBTOOLIZE:-libtoolize} --force --copy
> Index: gui/Makefile.am
> ===================================================================
> RCS file: /sources/gnash/gnash/gui/Makefile.am,v
> retrieving revision 1.48
> diff -u -3 -p -r1.48 Makefile.am
> --- gui/Makefile.am 24 Nov 2006 22:33:00 -0000 1.48
> +++ gui/Makefile.am 28 Nov 2006 10:57:54 -0000
> @@ -31,17 +31,18 @@ AM_CPPFLAGS = -I.. \
> -I$(top_srcdir)/libgeometry \
> $(PTHREAD_CFLAGS) \
> $(SDL_CFLAGS) \
> - $(PANGO_CFLAGS) \
> - $(GLIB_CFLAGS) \
> - $(CAIRO_CFLAGS) \
> - $(ATK_CFLAGS) \
> $(DMALLOC_CFLAGS) \
> - $(PNG_CFLAGS) \
> - $(JPEG_CFLAGS) \
> - $(MP3_CFLAGS) \
> - $(OGG_CFLAGS) \
> $(BOOST_CFLAGS)
>
> +# $(GLIB_CFLAGS) \
> +# $(PANGO_CFLAGS) \
> +# $(ATK_CFLAGS) \
> +# $(PNG_CFLAGS) \
> +# $(JPEG_CFLAGS) \
> +# $(MP3_CFLAGS) \
> +# $(OGG_CFLAGS) \
> +#
> +
> ## WARNING: make sure GLIB_LIBS appears first
> ## See: http://lists.gnu.org/archive/html/gnash-dev/2006-07/msg00076.html
> AM_LDFLAGS = \
> @@ -82,6 +83,7 @@ if USE_RENDERER_CAIRO
> GTK_CAIRO_SRCS = gtk_glue_cairo.cpp gtk_glue_cairo.h
> KDE_CAIRO_SRCS = #kde_glue_cairo.cpp kde_glue_cairo.h
> SDL_CAIRO_SRCS = sdl_cairo_glue.cpp sdl_cairo_glue.h
> + AM_CPPFLAGS += $(CAIRO_CFLAGS)
> else
> GTK_CAIRO_SRCS =
> KDE_CAIRO_SRCS =
> @@ -212,7 +214,7 @@ libgnashplayer_la_LIBADD = \
> gnash_SOURCES = gnash.cpp
> # export our symbols so they can be used by Gnash plugins
> gnash_LDFLAGS = -export-dynamic
> -gnash_DEPENDENCIES =
> +gnash_DEPENDENCIES = $(GNASH_LIBS)
> gnash_LDADD = \
> $(GNASH_LIBS)
> # $(LIBLTDL) "-dlopen" self "-dlopen"
> Index: libbase/Makefile.am
> ===================================================================
> RCS file: /sources/gnash/gnash/libbase/Makefile.am,v
> retrieving revision 1.51
> diff -u -3 -p -r1.51 Makefile.am
> --- libbase/Makefile.am 25 Nov 2006 18:42:55 -0000 1.51
> +++ libbase/Makefile.am 28 Nov 2006 10:57:54 -0000
> @@ -104,6 +104,7 @@ noinst_HEADERS = \
> jpeg.h \
> membuf.h \
> network.h \
> + hash_wrapper.h \
> log.h \
> ogl.h \
> postscript.h \
> Index: libgeometry/Makefile.am
> ===================================================================
> RCS file: /sources/gnash/gnash/libgeometry/Makefile.am,v
> retrieving revision 1.22
> diff -u -3 -p -r1.22 Makefile.am
> --- libgeometry/Makefile.am 24 Nov 2006 22:33:00 -0000 1.22
> +++ libgeometry/Makefile.am 28 Nov 2006 10:57:54 -0000
> @@ -34,13 +34,15 @@ lib_LTLIBRARIES = libgnashgeo.la
> # include_HEADERS = log.h err.h proc.h serial.h xantrex.h outback.h
>
> AM_CPPFLAGS = -I.. -I$(srcdir) \
> - -I$(top_srcdir) \
> -I$(top_srcdir)/libbase \
> - $(PTHREAD_CFLAGS) \
> - $(SDL_CFLAGS) \
> - $(OPENGL_CFLAGS) \
> $(NULL)
>
> +# -I$(top_srcdir) \
> +# $(PTHREAD_CFLAGS) \
> +# $(SDL_CFLAGS) \
> +# $(OPENGL_CFLAGS) \
> +#
> +
> libgnashgeo_la_SOURCES = \
> axial_box.cpp \
> bsp.cpp \
> Index: plugin/Makefile.am
> ===================================================================
> RCS file: /sources/gnash/gnash/plugin/Makefile.am,v
> retrieving revision 1.54
> diff -u -3 -p -r1.54 Makefile.am
> --- plugin/Makefile.am 24 Nov 2006 22:33:00 -0000 1.54
> +++ plugin/Makefile.am 28 Nov 2006 10:57:54 -0000
> @@ -44,13 +44,15 @@ AM_CPPFLAGS = -DPLUGIN_TRACE -DXP_UNIX -
> -I$(srcdir)/mozilla-sdk \
> -I$(srcdir)/mozilla-sdk/include \
> $(GTK2_CFLAGS) \
> - $(GLIB_CFLAGS) \
> - $(CAIRO_CFLAGS) \
> - $(ATK_CFLAGS) \
> - $(PANGO_CFLAGS) \
> $(NULL)
>
>
> +# $(GLIB_CFLAGS) \
> +# $(CAIRO_CFLAGS) \
> +# $(ATK_CFLAGS) \
> +# $(PANGO_CFLAGS) \
> +#
> +
> # AM_CXXFLAGS = $(AM_CPPFLAGS)
>
> plugin_LTLIBRARIES = libgnashplugin.la
> Index: server/Makefile.am
> ===================================================================
> RCS file: /sources/gnash/gnash/server/Makefile.am,v
> retrieving revision 1.92
> diff -u -3 -p -r1.92 Makefile.am
> --- server/Makefile.am 24 Nov 2006 22:33:01 -0000 1.92
> +++ server/Makefile.am 28 Nov 2006 10:57:54 -0000
> @@ -133,6 +133,7 @@ noinst_HEADERS = \
> textformat.h \
> timers.h \
> types.h \
> + video_stream_instance.h \
> $(NULL)
>
> libgnashserver_la_LIBADD = \
> @@ -143,9 +144,6 @@ libgnashserver_la_LIBADD = \
> $(LIBXML_LIBS) \
> $(NULL)
>
> -# $(ZLIB_LIBS) \
> -# $(OPENGL_LIBS)
> -
> #libserver_la_LDFLAGS = -module -avoid-version -no-undefined
> #libserver_la_LIBDADD = address@hidden@ # $(LIBLTDL)
> libgnashserver_la_LDFLAGS = -avoid-version
> Index: server/as_function.cpp
> ===================================================================
> RCS file: /sources/gnash/gnash/server/as_function.cpp,v
> retrieving revision 1.11
> diff -u -3 -p -r1.11 as_function.cpp
> --- server/as_function.cpp 24 Nov 2006 14:50:30 -0000 1.11
> +++ server/as_function.cpp 28 Nov 2006 10:57:54 -0000
> @@ -22,14 +22,14 @@
> #include "config.h"
> #endif
>
> -#include <log.h>
> -#include <as_function.h>
> -#include <builtin_function.h> // for _global.Function
> +#include "log.h"
> +#include "as_function.h"
> +#include "builtin_function.h" // for _global.Function
> #include "as_value.h"
> -#include <array.h>
> -#include <gnash.h>
> -#include <fn_call.h>
> -#include <sprite_instance.h>
> +#include "array.h"
> +#include "gnash.h"
> +#include "fn_call.h"
> +#include "sprite_instance.h"
>
> #include <typeinfo>
> #include <iostream>
> Index: server/swf_function.cpp
> ===================================================================
> RCS file: /sources/gnash/gnash/server/swf_function.cpp,v
> retrieving revision 1.9
> diff -u -3 -p -r1.9 swf_function.cpp
> --- server/swf_function.cpp 24 Nov 2006 14:50:30 -0000 1.9
> +++ server/swf_function.cpp 28 Nov 2006 10:57:54 -0000
> @@ -22,15 +22,15 @@
> #include "config.h"
> #endif
>
> -#include <log.h>
> -#include <swf_function.h>
> -#include <array.h>
> -#include <gnash.h>
> -#include <fn_call.h>
> -#include <sprite_instance.h>
> -#include <action_buffer.h>
> -#include <ActionExec.h> // for operator()
> -#include <VM.h> // for storing _global in a local register
> +#include "log.h"
> +#include "swf_function.h"
> +#include "array.h"
> +#include "gnash.h"
> +#include "fn_call.h"
> +#include "sprite_instance.h"
> +#include "action_buffer.h"
> +#include "ActionExec.h" // for operator()
> +#include "VM.h" // for storing _global in a local register
>
> #include <typeinfo>
> #include <iostream>
> Index: server/asobj/Makefile.am
> ===================================================================
> RCS file: /sources/gnash/gnash/server/asobj/Makefile.am,v
> retrieving revision 1.23
> diff -u -3 -p -r1.23 Makefile.am
> --- server/asobj/Makefile.am 24 Nov 2006 22:33:01 -0000 1.23
> +++ server/asobj/Makefile.am 28 Nov 2006 10:57:54 -0000
> @@ -37,9 +37,9 @@ AM_CPPFLAGS = \
> $(DMALLOC_CFLAGS) \
> $(BOOST_CFLAGS) \
> $(LIBXML_CFLAGS) \
> - $(FFMPEG_CFLAGS) \
> $(NULL)
>
> +
> libgnashasobjs_la_SOURCES = \
> ASSound.cpp \
> Boolean.cpp \
> @@ -110,8 +110,12 @@ noinst_HEADERS = \
>
> libgnashasobjs_la_LIBADD = \
> $(top_builddir)/libamf/libgnashamf.la \
> - $(top_builddir)/libbase/libgnashbase.la \
> - $(FFMPEG_LIBS)
> + $(top_builddir)/libbase/libgnashbase.la
> +
> +if USE_FFMPEG_ENGINE
> +AM_CPPFLAGS += $(FFMPEG_CFLAGS)
> +libgnashasobjs_la_LIBADD += $(FFMPEG_LIBS)
> +endif
>
> libgnashasobjs_la_LDFLAGS = -avoid-version
>
> Index: server/parser/Makefile.am
> ===================================================================
> RCS file: /sources/gnash/gnash/server/parser/Makefile.am,v
> retrieving revision 1.17
> diff -u -3 -p -r1.17 Makefile.am
> --- server/parser/Makefile.am 24 Nov 2006 22:33:01 -0000 1.17
> +++ server/parser/Makefile.am 28 Nov 2006 10:57:54 -0000
> @@ -42,19 +42,6 @@ AM_CPPFLAGS = \
> $(DMALLOC_CFLAGS) \
> $(BOOST_CFLAGS)
>
> -# $(LIBXML_CFLAGS)
> -# $(ZLIB_CFLAGS) \
> -# $(OGG_CFLAGS) \
> -# $(JPEG_CFLAGS) \
> -# $(SDL_CFLAGS) \
> -# $(OPENGL_CFLAGS) \
> -# $(GTK2_CFLAGS) \
> -# $(PANGO_CFLAGS) \
> -# $(GLIB_CFLAGS) \
> -# $(CAIRO_CFLAGS) \
> -# $(ATK_CFLAGS) \
> -#
> -
> libgnashparser_la_SOURCES = \
> action_buffer.cpp \
> bitmap_character_def.cpp \
> Index: server/vm/Makefile.am
> ===================================================================
> RCS file: /sources/gnash/gnash/server/vm/Makefile.am,v
> retrieving revision 1.3
> diff -u -3 -p -r1.3 Makefile.am
> --- server/vm/Makefile.am 24 Nov 2006 22:33:01 -0000 1.3
> +++ server/vm/Makefile.am 28 Nov 2006 10:57:54 -0000
> @@ -37,7 +37,6 @@ AM_CPPFLAGS = \
> $(DMALLOC_CFLAGS) \
> $(BOOST_CFLAGS) \
> $(LIBXML_CFLAGS) \
> - $(FFMPEG_CFLAGS) \
> $(NULL)
>
> libgnashvm_la_SOURCES = \
> @@ -58,8 +57,7 @@ noinst_HEADERS = \
>
> libgnashvm_la_LIBADD = \
> $(top_builddir)/libamf/libgnashamf.la \
> - $(top_builddir)/libbase/libgnashbase.la \
> - $(FFMPEG_LIBS)
> + $(top_builddir)/libbase/libgnashbase.la
>
> libgnashvm_la_LDFLAGS = -avoid-version
>
> _______________________________________________
> Gnash-dev mailing list
> address@hidden
> http://lists.gnu.org/mailman/listinfo/gnash-dev
--
/"\ ASCII Ribbon Campaign
\ / Respect for low technology.
X Keep e-mail messages readable by any computer system.
/ \ Keep it ASCII.
- [Gnash-dev] [patch] for build, Patrice Dumas, 2006/11/28
- Re: [Gnash-dev] [patch] for build,
strk <=
- Re: [Gnash-dev] [patch] for build, Patrice Dumas, 2006/11/28
- Re: [Gnash-dev] [patch] for build, strk, 2006/11/28
- Re: [Gnash-dev] [patch] for build, Rob Savoye, 2006/11/28
- Re: [Gnash-dev] [patch] for build, strk, 2006/11/29
- Re: [Gnash-dev] [patch] for build, Rob Savoye, 2006/11/29