[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Gnash-commit] gnash ChangeLog Makefile.am backend/Makefile.am...
|
From: |
Sandro Santilli |
|
Subject: |
[Gnash-commit] gnash ChangeLog Makefile.am backend/Makefile.am... |
|
Date: |
Fri, 24 Nov 2006 22:33:01 +0000 |
CVSROOT: /sources/gnash
Module name: gnash
Changes by: Sandro Santilli <strk> 06/11/24 22:33:01
Modified files:
. : ChangeLog Makefile.am
backend : Makefile.am
gui : Makefile.am
libamf : Makefile.am
libbase : Makefile.am
libgeometry : Makefile.am
packaging/redhat: gnash.spec
plugin : Makefile.am
plugin/klash : Makefile.am
plugin/mozilla-sdk: Makefile.am
server : Makefile.am
server/asobj : Makefile.am
server/parser : Makefile.am
server/vm : Makefile.am
testsuite/actionscript.all: Makefile.am
testsuite/libbase: Makefile.am
testsuite/misc-ming.all: Makefile.am
testsuite/movies.all: Makefile.am
testsuite/samples: Makefile.am
testsuite/server: Makefile.am
utilities : Makefile.am
Log message:
Patch by Patrice Dumas <address@hidden>:
* Makefile.am, backend/Makefile.am, gui/Makefile.am,
libamf/Makefile.am, libbase/Makefile.am,
libgeometry/Makefile.am,
packaging/redhat/gnash.spec,
plugin/Makefile.am,
plugin/klash/Makefile.am,
plugin/mozilla-sdk/Makefile.am,
server/Makefile.am, server/asobj/Makefile.am,
server/parser/Makefile.am, server/vm/Makefile.am,
testsuite/actionscript.all/Makefile.am,
testsuite/libbase/Makefile.am,
testsuite/misc-ming.all/Makefile.am,
testsuite/movies.all/Makefile.am,
testsuite/samples/Makefile.am,
testsuite/server/Makefile.am, utilities/Makefile.am:
Use AM_CPPFLAGS instead of INCLUDES at most as possible,
try to be more selective in linking,
remove unused KLASH_DIRS in top-level Makefile.am,
remove one $(LIBADD_DL) since this variable is not set,
remove some redundancy, bring the spec file in sync with 0.7.2
branch,
avoid protecting everything in testsuite/movies.all/Makefile.am,
only what is dependent on ming.
CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.1749&r2=1.1750
http://cvs.savannah.gnu.org/viewcvs/gnash/Makefile.am?cvsroot=gnash&r1=1.51&r2=1.52
http://cvs.savannah.gnu.org/viewcvs/gnash/backend/Makefile.am?cvsroot=gnash&r1=1.47&r2=1.48
http://cvs.savannah.gnu.org/viewcvs/gnash/gui/Makefile.am?cvsroot=gnash&r1=1.47&r2=1.48
http://cvs.savannah.gnu.org/viewcvs/gnash/libamf/Makefile.am?cvsroot=gnash&r1=1.18&r2=1.19
http://cvs.savannah.gnu.org/viewcvs/gnash/libbase/Makefile.am?cvsroot=gnash&r1=1.49&r2=1.50
http://cvs.savannah.gnu.org/viewcvs/gnash/libgeometry/Makefile.am?cvsroot=gnash&r1=1.21&r2=1.22
http://cvs.savannah.gnu.org/viewcvs/gnash/packaging/redhat/gnash.spec?cvsroot=gnash&r1=1.11&r2=1.12
http://cvs.savannah.gnu.org/viewcvs/gnash/plugin/Makefile.am?cvsroot=gnash&r1=1.53&r2=1.54
http://cvs.savannah.gnu.org/viewcvs/gnash/plugin/klash/Makefile.am?cvsroot=gnash&r1=1.19&r2=1.20
http://cvs.savannah.gnu.org/viewcvs/gnash/plugin/mozilla-sdk/Makefile.am?cvsroot=gnash&r1=1.13&r2=1.14
http://cvs.savannah.gnu.org/viewcvs/gnash/server/Makefile.am?cvsroot=gnash&r1=1.91&r2=1.92
http://cvs.savannah.gnu.org/viewcvs/gnash/server/asobj/Makefile.am?cvsroot=gnash&r1=1.22&r2=1.23
http://cvs.savannah.gnu.org/viewcvs/gnash/server/parser/Makefile.am?cvsroot=gnash&r1=1.16&r2=1.17
http://cvs.savannah.gnu.org/viewcvs/gnash/server/vm/Makefile.am?cvsroot=gnash&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/actionscript.all/Makefile.am?cvsroot=gnash&r1=1.53&r2=1.54
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/libbase/Makefile.am?cvsroot=gnash&r1=1.23&r2=1.24
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/misc-ming.all/Makefile.am?cvsroot=gnash&r1=1.34&r2=1.35
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/movies.all/Makefile.am?cvsroot=gnash&r1=1.2&r2=1.3
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/samples/Makefile.am?cvsroot=gnash&r1=1.4&r2=1.5
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/server/Makefile.am?cvsroot=gnash&r1=1.14&r2=1.15
http://cvs.savannah.gnu.org/viewcvs/gnash/utilities/Makefile.am?cvsroot=gnash&r1=1.40&r2=1.41
Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.1749
retrieving revision 1.1750
diff -u -b -r1.1749 -r1.1750
--- ChangeLog 24 Nov 2006 22:09:02 -0000 1.1749
+++ ChangeLog 24 Nov 2006 22:33:00 -0000 1.1750
@@ -1,3 +1,24 @@
+2006-11-24 Patrice Dumas <address@hidden>
+
+ * Makefile.am, backend/Makefile.am, gui/Makefile.am,
+ libamf/Makefile.am, libbase/Makefile.am, libgeometry/Makefile.am,
+ packaging/redhat/gnash.spec, plugin/Makefile.am,
+ plugin/klash/Makefile.am, plugin/mozilla-sdk/Makefile.am,
+ server/Makefile.am, server/asobj/Makefile.am,
+ server/parser/Makefile.am, server/vm/Makefile.am,
+ testsuite/actionscript.all/Makefile.am,
+ testsuite/libbase/Makefile.am,
+ testsuite/misc-ming.all/Makefile.am,
+ testsuite/movies.all/Makefile.am, testsuite/samples/Makefile.am,
+ testsuite/server/Makefile.am, utilities/Makefile.am:
+ Use AM_CPPFLAGS instead of INCLUDES at most as possible,
+ try to be more selective in linking,
+ remove unused KLASH_DIRS in top-level Makefile.am,
+ remove one $(LIBADD_DL) since this variable is not set,
+ remove some redundancy, bring the spec file in sync with 0.7.2 branch,
+ avoid protecting everything in testsuite/movies.all/Makefile.am,
+ only what is dependent on ming.
+
2006-11-24 Sandro Santilli <address@hidden>
* server/vm/ASHandlers.cpp (ActionDelete):
Index: Makefile.am
===================================================================
RCS file: /sources/gnash/gnash/Makefile.am,v
retrieving revision 1.51
retrieving revision 1.52
diff -u -b -r1.51 -r1.52
--- Makefile.am 24 Nov 2006 04:45:05 -0000 1.51
+++ Makefile.am 24 Nov 2006 22:33:00 -0000 1.52
@@ -15,7 +15,7 @@
# Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
#
-# $Id: Makefile.am,v 1.51 2006/11/24 04:45:05 rsavoye Exp $
+# $Id: Makefile.am,v 1.52 2006/11/24 22:33:00 strk Exp $
## Process this file with automake to produce Makefile.in
AUTOMAKE_OPTIONS = 1.6.0
@@ -44,13 +44,7 @@
DOC_DIRS = doc
endif
-if PLUGIN
-if KLASH
-KLASH_DIRS = plugin/klash
-endif
-endif
-
-SUBDIRS = $(STD_DIRS) $(DOC_DIRS) $(PLUGIN_DIRS) $(KLASH_DIRS)
+SUBDIRS = $(STD_DIRS) $(DOC_DIRS) $(PLUGIN_DIRS)
man_MANS = doc/gnash.1
Index: backend/Makefile.am
===================================================================
RCS file: /sources/gnash/gnash/backend/Makefile.am,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -b -r1.47 -r1.48
--- backend/Makefile.am 17 Nov 2006 19:24:57 -0000 1.47
+++ backend/Makefile.am 24 Nov 2006 22:33:00 -0000 1.48
@@ -20,11 +20,11 @@
AUTOMAKE_OPTIONS =
-AM_CPPFLAGS = # -Wall
+#AM_CPPFLAGS = # -Wall
## WARNING: make sure GLIB_LIBS appears first
## See: http://lists.gnu.org/archive/html/gnash-dev/2006-07/msg00076.html
-AM_LDFLAGS = \
+libgnashbackend_LIBS = \
$(GLIB_LIBS) \
$(JPEG_LIBS) \
$(PNG_LIBS) \
@@ -38,7 +38,7 @@
$(PTHREAD_LIBS) \
$(NULL)
-INCLUDES = -I.. \
+AM_CPPFLAGS = -I.. \
-I$(top_srcdir) \
-I$(top_srcdir)/server \
-I$(top_srcdir)/server/parser \
@@ -65,48 +65,50 @@
#noinst_LTLIBRARIES = libgbackend.la
lib_LTLIBRARIES = libgnashbackend.la
+RENDER_SOURCES = render_handler_tri.cpp
+
if USE_RENDERER_CAIRO
-RENDER_SOURCES = render_handler_cairo.cpp render_handler_tri.cpp
-AM_LDFLAGS += $(CAIRO_LIBS)
-INCLUDES += $(CAIRO_CFLAGS)
+RENDER_SOURCES += render_handler_cairo.cpp
+libgnashbackend_LIBS += $(CAIRO_LIBS)
+AM_CPPFLAGS += $(CAIRO_CFLAGS)
endif
if USE_RENDERER_OPENGL
-RENDER_SOURCES = render_handler_ogl.cpp render_handler_tri.cpp
-AM_LDFLAGS += $(OPENGL_LIBS) # $(GLEXT_LIBS)
-INCLUDES += $(OPENGL_CFLAGS) # $(GLEXT_CFLAGS)
+RENDER_SOURCES += render_handler_ogl.cpp
+libgnashbackend_LIBS += $(OPENGL_LIBS) # $(GLEXT_LIBS)
+AM_CPPFLAGS += $(OPENGL_CFLAGS) # $(GLEXT_CFLAGS)
endif
if USE_SOUND_GST
SOUND_SOURCES = sound_handler_gst.cpp sound_handler_gst.h
-AM_LDFLAGS += $(GSTREAMER_LIBS)
-AM_LDFLAGS += $(LIBXML_LIBS)
-INCLUDES += $(GSTREAMER_CFLAGS)
-INCLUDES += $(LIBXML_CFLAGS)
+libgnashbackend_LIBS += $(GSTREAMER_LIBS)
+libgnashbackend_LIBS += $(LIBXML_LIBS)
+AM_CPPFLAGS += $(GSTREAMER_CFLAGS)
+AM_CPPFLAGS += $(LIBXML_CFLAGS)
endif
if USE_SOUND_SDL
SOUND_SOURCES = sound_handler_sdl.cpp sound_handler_sdl.h
if USE_FFMPEG_ENGINE
-AM_LDFLAGS += $(FFMPEG_LIBS)
-INCLUDES += $(FFMPEG_CFLAGS)
+libgnashbackend_LIBS += $(FFMPEG_LIBS)
+AM_CPPFLAGS += $(FFMPEG_CFLAGS)
endif
if USE_MAD_ENGINE
-AM_LDFLAGS += $(MAD_LIBS)
-INCLUDES += $(MAD_CFLAGS)
+libgnashbackend_LIBS += $(MAD_LIBS)
+AM_CPPFLAGS += $(MAD_CFLAGS)
endif
endif
if USE_RENDERER_AGG
-RENDER_SOURCES = render_handler_tri.cpp render_handler_agg.cpp
-AM_LDFLAGS += $(AGG_LIBS)
-INCLUDES += $(AGG_CFLAGS)
+RENDER_SOURCES += render_handler_agg.cpp
+libgnashbackend_LIBS += $(AGG_LIBS)
+AM_CPPFLAGS += $(AGG_CFLAGS)
endif
libgnashbackend_la_LIBADD = \
$(top_builddir)/libbase/libgnashbase.la \
$(top_builddir)/server/libgnashserver.la \
- $(AM_LDFLAGS)
+ $(libgnashbackend_LIBS)
libgnashbackend_la_SOURCES = \
$(RENDER_SOURCES) \
Index: gui/Makefile.am
===================================================================
RCS file: /sources/gnash/gnash/gui/Makefile.am,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -b -r1.47 -r1.48
--- gui/Makefile.am 24 Nov 2006 11:52:18 -0000 1.47
+++ gui/Makefile.am 24 Nov 2006 22:33:00 -0000 1.48
@@ -17,11 +17,11 @@
#
-# $Id: Makefile.am,v 1.47 2006/11/24 11:52:18 strk Exp $
+# $Id: Makefile.am,v 1.48 2006/11/24 22:33:00 strk Exp $
AUTOMAKE_OPTIONS =
-INCLUDES = -I.. \
+AM_CPPFLAGS = -I.. \
-I$(top_srcdir) \
-I$(top_srcdir)/server \
-I$(top_srcdir)/server/parser \
@@ -49,16 +49,15 @@
$(CURL_LIBS) \
$(PANGO_LIBS) \
$(PTHREAD_LIBS) \
- $(LIBADD_DL) \
$(LIBLTDL) \
$(NULL)
if USE_RENDERER_OPENGL
- INCLUDES += $(OPENGL_CFLAGS)
+ AM_CPPFLAGS += $(OPENGL_CFLAGS)
if USE_GUI_GTK
- AM_LDFLAGS += $(GLEXT_LIBS)
- INCLUDES += $(GLEXT_CFLAGS)
+ AM_LDFLAGS += $(GLEXT_LIBS) $(OPENGL_LIBS)
+ AM_CPPFLAGS += $(GLEXT_CFLAGS)
GTK_OPENGL_SRCS = gtk_glue_gtkglext.cpp gtk_glue_gtkglext.h
endif # USE_GUI_GTK
if USE_GUI_SDL
@@ -90,7 +89,7 @@
endif
if USE_RENDERER_AGG
- INCLUDES += $(AGG_CFLAGS)
+ AM_CPPFLAGS += $(AGG_CFLAGS)
AM_LDFLAGS += $(AGG_LIBS)
GTK_AGG_SRCS = gtk_glue_agg.cpp gtk_glue_agg.h
RO_AGG_SRCS = ro_glue_agg.cpp ro_glue_agg.h
@@ -105,7 +104,7 @@
AM_LDFLAGS += $(CAIRO_LIBS)
GTK_SRCS = gtk.cpp gtksup.h gtk_glue.h $(GTK_CAIRO_SRCS) $(GTK_OPENGL_SRCS)
$(GTK_AGG_SRCS)
AM_LDFLAGS += $(GTK2_LIBS)
- INCLUDES += $(GTK2_CFLAGS)
+ AM_CPPFLAGS += $(GTK2_CFLAGS)
else
GTK_SRCS =
endif
@@ -125,14 +124,14 @@
if USE_GUI_KDE
KDE_SRCS = kde.cpp kdesup.h $(KDE_CAIRO_SRCS) $(KDE_OPENGL_SRCS)
- INCLUDES += -I$(kde_includes)/kio $(all_includes)
+ AM_CPPFLAGS += -I$(kde_includes)/kio $(all_includes)
else
KDE_SRCS =
endif
if USE_GUI_FB
FB_SRCS = fb.cpp fbsup.h
- INCLUDES += $(AGG_CFLAGS)
+ AM_CPPFLAGS += $(AGG_CFLAGS)
else
FB_SRCS =
endif
@@ -140,24 +139,24 @@
if USE_SOUND_SDL
if USE_FFMPEG_ENGINE
AM_LDFLAGS += $(FFMPEG_LIBS)
-INCLUDES += $(FFMPEG_CFLAGS)
+AM_CPPFLAGS += $(FFMPEG_CFLAGS)
endif
if USE_MAD_ENGINE
AM_LDFLAGS += $(MAD_LIBS)
-INCLUDES += $(MAD_CFLAGS)
+AM_CPPFLAGS += $(MAD_CFLAGS)
endif
endif
#if USE_GUI_FLTK
# FLTK_SRCS = fltk.cpp fltksup.h
-# INCLUDES += $(FLTK_INCLS)
+# AM_CPPFLAGS += $(FLTK_INCLS)
#else
# FLTK_SRCS =
#endif
-AM_CPPFLAGS = $(INCLUDES) -DPKGDATADIR=\"$(pkgdatadir)\"
+AM_CPPFLAGS += -DPKGDATADIR=\"$(pkgdatadir)\"
AM_CPPFLAGS += -DRENDERER_CONFIG=\"$(RENDERER_CONFIG)\"
AM_CPPFLAGS += -DGUI_CONFIG=\"$(GUI_CONFIG)\"
AM_CPPFLAGS += -DSOUND_CONFIG=\"$(SOUND_CONFIG)\"
@@ -198,7 +197,8 @@
$(top_builddir)/backend/libgnashbackend.la \
$(top_builddir)/server/libgnashserver.la \
$(top_builddir)/libgeometry/libgnashgeo.la \
- $(top_builddir)/libbase/libgnashbase.la
+ $(top_builddir)/libbase/libgnashbase.la \
+ libgnashplayer.la
libgnashplayer_la_SOURCES = \
Player.cpp Player.h
@@ -214,8 +214,7 @@
gnash_LDFLAGS = -export-dynamic
gnash_DEPENDENCIES =
gnash_LDADD = \
- $(GNASH_LIBS) \
- libgnashplayer.la
+ $(GNASH_LIBS)
# $(LIBLTDL) "-dlopen" self "-dlopen"
klash_SOURCES = gnash.cpp
@@ -227,12 +226,10 @@
klash_LDADD = \
$(LIB_KDECORE) \
$(LIB_KDEUI) \
- $(GNASH_LIBS) \
- libgnashplayer.la
+ $(GNASH_LIBS)
-klash_DEPENDENCIES = libgnashgui.la \
- $(GNASH_LIBS) \
- libgnashplayer.la
+klash_DEPENDENCIES = \
+ $(GNASH_LIBS)
# $(LIBLTDL) "-dlopen" self "-dlopen"
CLEANFILES = klash.moc
Index: libamf/Makefile.am
===================================================================
RCS file: /sources/gnash/gnash/libamf/Makefile.am,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -b -r1.18 -r1.19
--- libamf/Makefile.am 10 Nov 2006 23:07:47 -0000 1.18
+++ libamf/Makefile.am 24 Nov 2006 22:33:00 -0000 1.19
@@ -15,12 +15,12 @@
# 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.18 2006/11/10 23:07:47 nihilus Exp $
+# $Id: Makefile.am,v 1.19 2006/11/24 22:33:00 strk Exp $
AUTOMAKE_OPTIONS =
-AM_CXXFLAGS = $(CXXFLAGS) $(SDL_CFLAGS) $(INCLUDES)
-AM_CPPFLAGS =
+#AM_CXXFLAGS = $(CXXFLAGS) $(SDL_CFLAGS) $(AM_CPPFLAGS)
+#AM_CPPFLAGS =
AM_LDFLAGS = \
$(top_builddir)/libbase/libgnashbase.la \
$(OPENGL_LIBS) \
@@ -41,7 +41,7 @@
libgnashamf_la_LDFLAGS = -avoid-version
# noinst_HEADERS = amf.h amfutf8.h
-INCLUDES = -I.. -I$(srcdir) \
+AM_CPPFLAGS = -I.. -I$(srcdir) \
-I$(top_srcdir)/server \
-I$(top_srcdir)/libbase \
$(LIBXML_CFLAGS)
Index: libbase/Makefile.am
===================================================================
RCS file: /sources/gnash/gnash/libbase/Makefile.am,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -b -r1.49 -r1.50
--- libbase/Makefile.am 24 Nov 2006 04:45:05 -0000 1.49
+++ libbase/Makefile.am 24 Nov 2006 22:33:00 -0000 1.50
@@ -21,7 +21,10 @@
# this is where Gnash plugins get installed
pluginsdir = $(prefix)/lib/gnash/plugins
-INCLUDES = -I.. -I$(srcdir) \
+lib_LTLIBRARIES = libgnashbase.la
+
+libgnashbase_la_CPPFLAGS = -DPLUGINSDIR=\"$(pluginsdir)\" \
+ -I.. -I$(srcdir) \
-I$(top_srcdir) \
-I$(top_srcdir)/server \
$(PTHREAD_CFLAGS) \
@@ -35,11 +38,6 @@
$(BOOST_CFLAGS) \
$(INCLTDL)
-AM_CXXFLAGS = $(INCLUDES)
-AM_CPPFLAGS = #-Wall
-
-lib_LTLIBRARIES = libgnashbase.la
-
# These headers get installed
# include_HEADERS = log.h err.h proc.h serial.h xantrex.h outback.h
@@ -48,13 +46,23 @@
DMALLOC_FILE = dlmalloc.c
endif
+libgnashbase_la_LIBADD = \
+ $(JPEG_LIBS) \
+ $(ZLIB_LIBS) \
+ $(CURL_LIBS) \
+ $(OPENGL_LIBS) \
+ $(PTHREAD_LIBS) \
+ $(LIBLTDL) \
+ $(NULL)
+
if HAS_SDL
SDL_FILE = tu_file_SDL.cpp
+libgnashbase_la_LIBADD += $(SDL_LIBS)
else
EXTRA_DIST += tu_file_SDL.cpp
endif
-libgnashbase_la_CPPFLAGS = -DPLUGINSDIR=\"$(pluginsdir)\"
+
libgnashbase_la_SOURCES = \
config.cpp \
container.cpp \
@@ -84,16 +92,6 @@
Thread.cpp \
URL.cpp
-libgnashbase_la_LIBADD = \
- $(JPEG_LIBS) \
- $(ZLIB_LIBS) \
- $(CURL_LIBS) \
- $(SDL_LIBS) \
- $(OPENGL_LIBS) \
- $(PTHREAD_LIBS) \
- $(LIBADD_DL) \
- $(LIBLTDL) \
- $(NULL)
noinst_HEADERS = \
container.h \
Index: libgeometry/Makefile.am
===================================================================
RCS file: /sources/gnash/gnash/libgeometry/Makefile.am,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -b -r1.21 -r1.22
--- libgeometry/Makefile.am 10 Nov 2006 23:07:47 -0000 1.21
+++ libgeometry/Makefile.am 24 Nov 2006 22:33:00 -0000 1.22
@@ -18,12 +18,12 @@
#
#
-# $Id: Makefile.am,v 1.21 2006/11/10 23:07:47 nihilus Exp $
+# $Id: Makefile.am,v 1.22 2006/11/24 22:33:00 strk Exp $
AUTOMAKE_OPTIONS =
-AM_CXXFLAGS = $(CXXFLAGS) $(SDL_CFLAGS) $(INCLUDES)
-AM_CPPFLAGS = #-Wall
+# AM_CXXFLAGS = $(CXXFLAGS) $(SDL_CFLAGS) $(AM_CPPFLAGS)
+# AM_CPPFLAGS = #-Wall
# AM_LDFLAGS = $(OPENGL_LIBNS) $(SDL_LIBS)
# noinst_LTLIBRARIES = libgeometry.la
@@ -33,7 +33,7 @@
# These headers get installed
# include_HEADERS = log.h err.h proc.h serial.h xantrex.h outback.h
-INCLUDES = -I.. -I$(srcdir) \
+AM_CPPFLAGS = -I.. -I$(srcdir) \
-I$(top_srcdir) \
-I$(top_srcdir)/libbase \
$(PTHREAD_CFLAGS) \
Index: packaging/redhat/gnash.spec
===================================================================
RCS file: /sources/gnash/gnash/packaging/redhat/gnash.spec,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -b -r1.11 -r1.12
--- packaging/redhat/gnash.spec 18 Oct 2006 20:52:42 -0000 1.11
+++ packaging/redhat/gnash.spec 24 Nov 2006 22:33:00 -0000 1.12
@@ -1,5 +1,5 @@
Name: gnash
-Version: 0.7.1
+Version: 0.7.2
Release: 1%{?dist}
Summary: GNU flash movie player
@@ -16,13 +16,10 @@
#BuildRequires: xorg-x11-devel
# modular Xorg
#BuildRequires: libGLU-devel libGL-devel
-# SDL-devel is required by SDL_mixer-devel
BuildRequires: SDL-devel
BuildRequires: kdelibs-devel
BuildRequires: gtkglext-devel
BuildRequires: docbook2X
-# GStreamer isn't used yet, but will be in the near future.
-#BuildRequires: gstreamer-devel
BuildRequires: gstreamer-devel >= 0.10
BuildRequires: scrollkeeper
@@ -60,8 +57,8 @@
%build
[ -n "$QTDIR" ] || . %{_sysconfdir}/profile.d/qt.sh
%configure --disable-static --with-plugindir=%{_libdir}/mozilla/plugins \
- --enable-ghelp --enable-docbook --enable-klash --enable-plugin \
- --disable-dependency-tracking --disable-rpath --enable-sound=gst \
+ --enable-ghelp --enable-docbook --enable-sound=GST \
+ --disable-dependency-tracking --disable-rpath \
--with-qtdir=$QTDIR
make %{?_smp_mflags}
@@ -70,7 +67,13 @@
rm -rf $RPM_BUILD_ROOT
make install DESTDIR=$RPM_BUILD_ROOT
rm $RPM_BUILD_ROOT/%{_libdir}/*.la
-rm $RPM_BUILD_ROOT/%{_libdir}/*.so
+rm \
+ $RPM_BUILD_ROOT/%{_libdir}/libgnashamf.so \
+ $RPM_BUILD_ROOT/%{_libdir}/libgnashbackend.so \
+ $RPM_BUILD_ROOT/%{_libdir}/libgnashbase.so \
+ $RPM_BUILD_ROOT/%{_libdir}/libgnashgeo.so \
+ $RPM_BUILD_ROOT/%{_libdir}/libgnashgui.so \
+ $RPM_BUILD_ROOT/%{_libdir}/libgnashserver.so
rm -rf $RPM_BUILD_ROOT/%{_localstatedir}/scrollkeeper
rm -f $RPM_BUILD_ROOT%{_infodir}/dir
@@ -100,7 +103,7 @@
%{_bindir}/gnash
%{_bindir}/gparser
%{_bindir}/gprocessor
-%{_libdir}/libgnash*.so.*
+%{_libdir}/libgnash*-*.so
%{_mandir}/man1/gnash*
%{_infodir}/gnash*
%{_datadir}/gnash/
@@ -119,6 +122,9 @@
%{_datadir}/services/klash_part.desktop
%changelog
+* Sat Nov 6 2006 Rob Savoye <address@hidden> - 0.7.2-1
+- update for 0.7.2 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: plugin/Makefile.am
===================================================================
RCS file: /sources/gnash/gnash/plugin/Makefile.am,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -b -r1.53 -r1.54
--- plugin/Makefile.am 6 Nov 2006 19:35:05 -0000 1.53
+++ plugin/Makefile.am 24 Nov 2006 22:33:00 -0000 1.54
@@ -15,7 +15,7 @@
# 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.53 2006/11/06 19:35:05 rsavoye Exp $
+# $Id: Makefile.am,v 1.54 2006/11/24 22:33:00 strk Exp $
AUTOMAKE_OPTIONS =
@@ -31,7 +31,11 @@
plugindir = $(FIREFOX_PLUGINS)
-INCLUDES = -I.. \
+# XP_UNIX This needs to get defined for npapi.h on unix platforms.
+# PLUGIN_TRACE Enable this define to get debug prints whenever the plugin
+# api gets control.
+AM_CPPFLAGS = -DPLUGIN_TRACE -DXP_UNIX -DMOZ_X11 -DPREFIX=\""${prefix}"\" \
+ -I.. \
-I$(srcdir) \
-I$(top_srcdir)/server \
-I$(top_srcdir)/server/parser \
@@ -47,11 +51,7 @@
$(NULL)
-AM_CXXFLAGS = $(INCLUDES)
-# XP_UNIX This needs to get defined for npapi.h on unix platforms.
-# PLUGIN_TRACE Enable this define to get debug prints whenever the plugin
-# api gets control.
-AM_CPPFLAGS = -DPLUGIN_TRACE -DXP_UNIX -DMOZ_X11 -DPREFIX=\""${prefix}"\"
+# AM_CXXFLAGS = $(AM_CPPFLAGS)
plugin_LTLIBRARIES = libgnashplugin.la
Index: plugin/klash/Makefile.am
===================================================================
RCS file: /sources/gnash/gnash/plugin/klash/Makefile.am,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -b -r1.19 -r1.20
--- plugin/klash/Makefile.am 6 Nov 2006 19:35:06 -0000 1.19
+++ plugin/klash/Makefile.am 24 Nov 2006 22:33:00 -0000 1.20
@@ -17,7 +17,7 @@
#
-# $Id: Makefile.am,v 1.19 2006/11/06 19:35:06 rsavoye Exp $
+# $Id: Makefile.am,v 1.20 2006/11/24 22:33:00 strk Exp $
AUTOMAKE_OPTIONS =
@@ -58,22 +58,6 @@
appsdatadir=$(kde_datadir)/klash
dist_appsdata_DATA= pluginsinfo
-AM_LDFLAGS = \
- $(KDE_LIBS) \
- $(LIBXML_LIBS) \
- $(PTHREAD_LIBS)
-
-AM_INCLUDES = -I.. \
- -I$(top_srcdir) \
- -I$(top_srcdir)/server \
- -I$(top_srcdir)/server/parser \
- -I$(top_srcdir)/libbase \
- -I$(top_srcdir)/backend \
- $(OPENGL_CFLAGS) \
- $(LIBXML_CFLAGS) \
- $(KDE_CFLAGS)
-
-CLEANFILES = klash_part.moc klash.moc
dummy.cpp:
echo > dummy.cpp
@@ -85,10 +69,24 @@
klash_SOURCES = klash.cpp
klash_CPPFLAGS = \
- $(AM_INCLUDES) \
+ -I.. \
+ -I$(top_srcdir) \
+ -I$(top_srcdir)/server \
+ -I$(top_srcdir)/server/parser \
+ -I$(top_srcdir)/server/asobj \
+ -I$(top_srcdir)/server/vm \
+ -I$(top_srcdir)/libbase \
+ -I$(top_srcdir)/backend \
+ $(LIBXML_CFLAGS) \
+ $(OPENGL_CFLAGS) \
+ $(KDE_CFLAGS) \
-DUSE_KDE
-klash_LDFLAGS =
-klash_LDADD = $(AM_LDFLAGS) \
+
+klash_LDADD = \
+ $(KDE_LIBS) \
+ $(OPENGL_LIBS) \
+ $(LIBXML_LIBS) \
+ $(PTHREAD_LIBS) \
../../backend/libgnashbackend.la \
../../server/libgnashserver.la \
../../server/asobj/libgnashasobjs.la \
@@ -97,6 +95,8 @@
klash_DEPENDENCIES = klash.moc
BUILT_SOURCES = klash_part.moc klash.moc
+
+CLEANFILES = klash_part.moc klash.moc
endif
klash_part.moc: $(srcdir)/klash_part.h
Index: plugin/mozilla-sdk/Makefile.am
===================================================================
RCS file: /sources/gnash/gnash/plugin/mozilla-sdk/Makefile.am,v
retrieving revision 1.13
retrieving revision 1.14
diff -u -b -r1.13 -r1.14
--- plugin/mozilla-sdk/Makefile.am 29 Oct 2006 18:34:17 -0000 1.13
+++ plugin/mozilla-sdk/Makefile.am 24 Nov 2006 22:33:00 -0000 1.14
@@ -18,12 +18,13 @@
AUTOMAKE_OPTIONS = dejagnu
-INCLUDES = -I.. \
+AM_CPPFLAGS = -DPLUGIN_TRACE -DXP_UNIX \
+ -I.. \
-I$(srcdir) \
-I$(srcdir)/include
-AM_CXXFLAGS = $(CXXFLAGS) $(INCLUDES)
-AM_CPPFLAGS = -DPLUGIN_TRACE -DXP_UNIX # $(FIREFOX_DEFS)
+# AM_CXXFLAGS = $(CXXFLAGS) $(AM_CPPFLAGS)
+# AM_CPPFLAGS = -DPLUGIN_TRACE -DXP_UNIX # $(FIREFOX_DEFS)
# AM_LDFLAGS = $(FIREFOX_LIBS)
# noinst_LTLIBRARIES = libmozsdk.la
Index: server/Makefile.am
===================================================================
RCS file: /sources/gnash/gnash/server/Makefile.am,v
retrieving revision 1.91
retrieving revision 1.92
diff -u -b -r1.91 -r1.92
--- server/Makefile.am 24 Nov 2006 13:37:22 -0000 1.91
+++ server/Makefile.am 24 Nov 2006 22:33:01 -0000 1.92
@@ -18,12 +18,10 @@
#
#
-# $Id: Makefile.am,v 1.91 2006/11/24 13:37:22 strk Exp $
+# $Id: Makefile.am,v 1.92 2006/11/24 22:33:01 strk Exp $
AUTOMAKE_OPTIONS =
-AM_CPPFLAGS =
-
SUBDIRS = asobj parser vm
# noinst_LTLIBRARIES = libserver.la
@@ -31,7 +29,7 @@
# noinst_SCRIPTS = gen-files.sh
# Only enable if we're configured with --enable-mp3
-INCLUDES = \
+AM_CPPFLAGS = \
-I$(top_srcdir)/backend \
-I$(top_srcdir)/server/swf \
-I$(top_srcdir)/server/asobj \
Index: server/asobj/Makefile.am
===================================================================
RCS file: /sources/gnash/gnash/server/asobj/Makefile.am,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -b -r1.22 -r1.23
--- server/asobj/Makefile.am 24 Nov 2006 14:50:30 -0000 1.22
+++ server/asobj/Makefile.am 24 Nov 2006 22:33:01 -0000 1.23
@@ -18,15 +18,13 @@
#
#
-# $Id: Makefile.am,v 1.22 2006/11/24 14:50:30 strk Exp $
+# $Id: Makefile.am,v 1.23 2006/11/24 22:33:01 strk Exp $
AUTOMAKE_OPTIONS =
-AM_CPPFLAGS =
-
noinst_LTLIBRARIES = libgnashasobjs.la
-INCLUDES = \
+AM_CPPFLAGS = \
-I$(top_srcdir)/backend \
-I$(top_srcdir)/server \
-I$(top_srcdir)/server/swf \
Index: server/parser/Makefile.am
===================================================================
RCS file: /sources/gnash/gnash/server/parser/Makefile.am,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -b -r1.16 -r1.17
--- server/parser/Makefile.am 24 Nov 2006 09:04:24 -0000 1.16
+++ server/parser/Makefile.am 24 Nov 2006 22:33:01 -0000 1.17
@@ -18,12 +18,10 @@
#
#
-# $Id: Makefile.am,v 1.16 2006/11/24 09:04:24 strk Exp $
+# $Id: Makefile.am,v 1.17 2006/11/24 22:33:01 strk Exp $
AUTOMAKE_OPTIONS =
-AM_CPPFLAGS =
-
noinst_LTLIBRARIES = libgnashparser.la
# Only enable if we're configured with --enable-mp3
@@ -31,7 +29,7 @@
# The 'backend' dir should not be required if we finally drop
# rendering calls from the parser (see https://savannah.gnu.org/task/?5837)
#
-INCLUDES = \
+AM_CPPFLAGS = \
-I$(top_srcdir)/backend \
-I$(top_srcdir)/server \
-I$(top_srcdir)/server/swf \
@@ -81,7 +79,8 @@
movie_definition.h \
movie_def_impl.h \
shape_character_def.h \
- sprite_definition.h
+ sprite_definition.h \
+ video_stream_def.h
libgnashparser_la_LIBADD = \
$(top_builddir)/libbase/libgnashbase.la
Index: server/vm/Makefile.am
===================================================================
RCS file: /sources/gnash/gnash/server/vm/Makefile.am,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- server/vm/Makefile.am 24 Nov 2006 11:49:18 -0000 1.2
+++ server/vm/Makefile.am 24 Nov 2006 22:33:01 -0000 1.3
@@ -18,15 +18,13 @@
#
#
-# $Id: Makefile.am,v 1.2 2006/11/24 11:49:18 strk Exp $
+# $Id: Makefile.am,v 1.3 2006/11/24 22:33:01 strk Exp $
AUTOMAKE_OPTIONS =
-AM_CPPFLAGS =
-
noinst_LTLIBRARIES = libgnashvm.la
-INCLUDES = \
+AM_CPPFLAGS = \
-I$(top_srcdir)/backend \
-I$(top_srcdir)/server \
-I$(top_srcdir)/server/asobj \
Index: testsuite/actionscript.all/Makefile.am
===================================================================
RCS file: /sources/gnash/gnash/testsuite/actionscript.all/Makefile.am,v
retrieving revision 1.53
retrieving revision 1.54
diff -u -b -r1.53 -r1.54
--- testsuite/actionscript.all/Makefile.am 22 Nov 2006 18:09:30 -0000
1.53
+++ testsuite/actionscript.all/Makefile.am 24 Nov 2006 22:33:01 -0000
1.54
@@ -16,7 +16,7 @@
# 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.53 2006/11/22 18:09:30 strk Exp $
+# $Id: Makefile.am,v 1.54 2006/11/24 22:33:01 strk Exp $
AUTOMAKE_OPTIONS = dejagnu
@@ -35,7 +35,7 @@
dist_noinst_SCRIPTS = gen-test.sh gen-index.sh
-INCLUDES = -I.. \
+AM_CPPFLAGS = -I.. \
-I$(top_srcdir) \
-I$(top_srcdir)/libbase \
-I$(top_srcdir)/server \
Index: testsuite/libbase/Makefile.am
===================================================================
RCS file: /sources/gnash/gnash/testsuite/libbase/Makefile.am,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -b -r1.23 -r1.24
--- testsuite/libbase/Makefile.am 11 Nov 2006 22:44:54 -0000 1.23
+++ testsuite/libbase/Makefile.am 24 Nov 2006 22:33:01 -0000 1.24
@@ -25,6 +25,8 @@
$(top_builddir)/libbase/libgnashbase.la \
$(NULL)
+# AM_CPPFLAGS isn't right here since per-program *_CPPFLAGS override global
+# AM_CPPFLAGS
INCLUDES = -I.. \
-I$(top_srcdir) \
-I$(top_srcdir)/libbase \
Index: testsuite/misc-ming.all/Makefile.am
===================================================================
RCS file: /sources/gnash/gnash/testsuite/misc-ming.all/Makefile.am,v
retrieving revision 1.34
retrieving revision 1.35
diff -u -b -r1.34 -r1.35
--- testsuite/misc-ming.all/Makefile.am 16 Nov 2006 10:53:20 -0000 1.34
+++ testsuite/misc-ming.all/Makefile.am 24 Nov 2006 22:33:01 -0000 1.35
@@ -30,7 +30,7 @@
testrun.log
-INCLUDES = -I.. \
+AM_CPPFLAGS = -I.. \
-I$(top_srcdir) \
-I$(top_srcdir)/libbase \
-I$(top_srcdir)/server \
Index: testsuite/movies.all/Makefile.am
===================================================================
RCS file: /sources/gnash/gnash/testsuite/movies.all/Makefile.am,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- testsuite/movies.all/Makefile.am 2 Nov 2006 14:35:35 -0000 1.2
+++ testsuite/movies.all/Makefile.am 24 Nov 2006 22:33:01 -0000 1.3
@@ -22,6 +22,14 @@
AUTOMAKE_OPTIONS = dejagnu
if ENABLE_MING
+check_PROGRAMS = \
+ gravity_embedded-TestRunner \
+ $(NULL)
+
+TEST_DRIVERS = ../simple.exp
+TEST_CASES = \
+ gravity_embedded-TestRunner
+endif
CLEANFILES = \
gnash-dbg.log \
@@ -30,7 +38,7 @@
testrun.log
-INCLUDES = -I.. \
+AM_CPPFLAGS = -I.. \
-I$(top_srcdir) \
-I$(top_srcdir)/libbase \
-I$(top_srcdir)/server \
@@ -40,11 +48,6 @@
$(MING_CFLAGS) \
$(NULL)
-
-check_PROGRAMS = \
- gravity_embedded-TestRunner \
- $(NULL)
-
gravity_embedded_TestRunner_SOURCES = \
gravity_embedded-TestRunner.cpp \
$(NULL)
@@ -61,11 +64,8 @@
clean-local:
-EXTRA_DIST = gravity_embedded.swf gravity.swf
+EXTRA_DIST = gravity-embedded.swf gravity.swf
-TEST_DRIVERS = ../simple.exp
-TEST_CASES = \
- gravity_embedded-TestRunner
check-DEJAGNU: site-update $(check_PROGRAMS)
@runtest=$(RUNTEST); \
@@ -84,5 +84,4 @@
@sed -e '/testcases/d' site.exp.bak > site.exp
@echo "# This is a list of the pre-compiled testcases" >> site.exp
@echo "set testcases \"$(TEST_CASES)\"" >> site.exp
-endif
Index: testsuite/samples/Makefile.am
===================================================================
RCS file: /sources/gnash/gnash/testsuite/samples/Makefile.am,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- testsuite/samples/Makefile.am 5 Nov 2006 00:45:27 -0000 1.4
+++ testsuite/samples/Makefile.am 24 Nov 2006 22:33:01 -0000 1.5
@@ -27,7 +27,7 @@
testrun.log
-INCLUDES = -I.. \
+AM_CPPFLAGS = -I.. \
-I$(top_srcdir) \
-I$(top_srcdir)/libbase \
-I$(top_srcdir)/server \
Index: testsuite/server/Makefile.am
===================================================================
RCS file: /sources/gnash/gnash/testsuite/server/Makefile.am,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -b -r1.14 -r1.15
--- testsuite/server/Makefile.am 24 Nov 2006 09:04:25 -0000 1.14
+++ testsuite/server/Makefile.am 24 Nov 2006 22:33:01 -0000 1.15
@@ -21,7 +21,7 @@
AUTOMAKE_OPTIONS = dejagnu
-INCLUDES = -I.. \
+AM_CPPFLAGS = -I.. \
-I$(srcdir) \
-I$(top_srcdir)/testsuite \
-I$(top_srcdir)/libbase \
Index: utilities/Makefile.am
===================================================================
RCS file: /sources/gnash/gnash/utilities/Makefile.am,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -b -r1.40 -r1.41
--- utilities/Makefile.am 24 Nov 2006 11:52:18 -0000 1.40
+++ utilities/Makefile.am 24 Nov 2006 22:33:01 -0000 1.41
@@ -27,7 +27,7 @@
$(top_builddir)/server/libgnashserver.la \
$(top_builddir)/libbase/libgnashbase.la
-AM_CPPFLAGS = # -Wall
+#AM_CPPFLAGS = # -Wall
## WARNING: make sure GLIB_LIBS appears first
## See: http://lists.gnu.org/archive/html/gnash-dev/2006-07/msg00076.html
@@ -39,7 +39,7 @@
# $(GLIB_LIBS) \
# $(PTHREAD_LIBS)
-INCLUDES = -I.. \
+AM_CPPFLAGS = -I.. \
-I$(top_srcdir) \
-I$(top_srcdir)/libbase \
-I$(top_srcdir)/server \
@@ -50,13 +50,13 @@
$(NULL)
if USE_FFMPEG_ENGINE
- INCLUDES += $(FFMPEG_INCLS)
- AM_LDFLAGS += $(FFMPEG_LIBS)
+ AM_CPPFLAGS += $(FFMPEG_INCLS)
+ GNASH_LIBS += $(FFMPEG_LIBS)
endif
if USE_MAD_ENGINE
- INCLUDES += $(MAD_INCLS)
- AM_LDFLAGS += $(MAD_LIBS)
+ AM_CPPFLAGS += $(MAD_INCLS)
+ GNASH_LIBS += $(MAD_LIBS)
endif
bin_PROGRAMS = gparser gprocessor
| [Prev in Thread] |
Current Thread |
[Next in Thread] |
- [Gnash-commit] gnash ChangeLog Makefile.am backend/Makefile.am...,
Sandro Santilli <=