? compile
? gnash-cvs-20061123.tar.gz
? patch-notes.txt
? gui/gnash
? libamf/.libs
? libamf/amf.lo
? libamf/libgnashamf.la
? libamf/rtmp.lo
? 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/libbase/NoSeekFileTest
? testsuite/libbase/RcTest
? testsuite/libbase/gnash-dbg.log
? testsuite/libbase/site.exp
? testsuite/misc-ming.all/Dejagnu
? testsuite/samples/clip_as_button2-TestRunner
? testsuite/samples/gnash-dbg.log
? testsuite/samples/site.exp
? testsuite/server/GetterSetterTest
? testsuite/server/MatrixTest
? testsuite/server/PropertyListTest
? testsuite/server/gnash-dbg.log
? testsuite/server/site.exp
? utilities/dumpshm
Index: Makefile.am
===================================================================
RCS file: /sources/gnash/gnash/Makefile.am,v
retrieving revision 1.51
diff -u -3 -p -r1.51 Makefile.am
--- Makefile.am	24 Nov 2006 04:45:05 -0000	1.51
+++ Makefile.am	24 Nov 2006 12:25:34 -0000
@@ -44,13 +44,7 @@ if DOCBOOK
 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
diff -u -3 -p -r1.47 Makefile.am
--- backend/Makefile.am	17 Nov 2006 19:24:57 -0000	1.47
+++ backend/Makefile.am	24 Nov 2006 12:25:34 -0000
@@ -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 @@ AM_LDFLAGS =  \
 	$(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_HEADERS = \
 #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
diff -u -3 -p -r1.47 Makefile.am
--- gui/Makefile.am	24 Nov 2006 11:52:18 -0000	1.47
+++ gui/Makefile.am	24 Nov 2006 12:25:34 -0000
@@ -21,7 +21,7 @@
 
 AUTOMAKE_OPTIONS = 
 
-INCLUDES = -I.. \
+AM_CPPFLAGS = -I.. \
         -I$(top_srcdir) \
         -I$(top_srcdir)/server \
         -I$(top_srcdir)/server/parser \
@@ -49,16 +49,15 @@ AM_LDFLAGS =  \
 	$(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 @@ else
 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 @@ if USE_GUI_GTK
   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 @@ endif
 
 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 @@ endif
 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 @@ GNASH_LIBS = \
 	$(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_SOURCES = gnash.cpp 
 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_LDFLAGS = -export-dynamic
 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
diff -u -3 -p -r1.18 Makefile.am
--- libamf/Makefile.am	10 Nov 2006 23:07:47 -0000	1.18
+++ libamf/Makefile.am	24 Nov 2006 12:25:34 -0000
@@ -19,8 +19,8 @@
 
 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_SOURCES = amf.cpp rtmp.cp
 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
diff -u -3 -p -r1.49 Makefile.am
--- libbase/Makefile.am	24 Nov 2006 04:45:05 -0000	1.49
+++ libbase/Makefile.am	24 Nov 2006 12:25:34 -0000
@@ -21,7 +21,10 @@ EXTRA_DIST = 
 # 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 @@ INCLUDES = -I.. -I$(srcdir) \
 	$(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 @@ if DMALLOC
 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 @@ libgnashbase_la_SOURCES = \
 	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
diff -u -3 -p -r1.21 Makefile.am
--- libgeometry/Makefile.am	10 Nov 2006 23:07:47 -0000	1.21
+++ libgeometry/Makefile.am	24 Nov 2006 12:25:34 -0000
@@ -22,8 +22,8 @@
 
 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 @@ lib_LTLIBRARIES = libgnashgeo.la
 # 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
diff -u -3 -p -r1.11 gnash.spec
--- packaging/redhat/gnash.spec	18 Oct 2006 20:52:42 -0000	1.11
+++ packaging/redhat/gnash.spec	24 Nov 2006 12:25:34 -0000
@@ -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:  boost-devel curl-devel 
 #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 @@ The gnash flash movie player plugin for 
 %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 @@ make %{?_smp_mflags}
 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 @@ scrollkeeper-update -q || :
 %{_bindir}/gnash
 %{_bindir}/gparser
 %{_bindir}/gprocessor
-%{_libdir}/libgnash*.so.*
+%{_libdir}/libgnash*-*.so
 %{_mandir}/man1/gnash*
 %{_infodir}/gnash*
 %{_datadir}/gnash/
@@ -119,6 +122,9 @@ scrollkeeper-update -q || :
 %{_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
diff -u -3 -p -r1.53 Makefile.am
--- plugin/Makefile.am	6 Nov 2006 19:35:05 -0000	1.53
+++ plugin/Makefile.am	24 Nov 2006 12:25:34 -0000
@@ -31,7 +31,11 @@ SUBDIRS = $(KLASH) # test mozilla-sdk
 
 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 @@ INCLUDES = -I.. \
 	$(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
diff -u -3 -p -r1.19 Makefile.am
--- plugin/klash/Makefile.am	6 Nov 2006 19:35:06 -0000	1.19
+++ plugin/klash/Makefile.am	24 Nov 2006 12:25:34 -0000
@@ -58,22 +58,6 @@ confdir = $(kde_confdir)
 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 @@ bin_PROGRAMS = klash
 
 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_LDADD =  $(AM_LDFLAGS) \
 
 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
diff -u -3 -p -r1.13 Makefile.am
--- plugin/mozilla-sdk/Makefile.am	29 Oct 2006 18:34:17 -0000	1.13
+++ plugin/mozilla-sdk/Makefile.am	24 Nov 2006 12:25:34 -0000
@@ -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.90
diff -u -3 -p -r1.90 Makefile.am
--- server/Makefile.am	24 Nov 2006 09:19:50 -0000	1.90
+++ server/Makefile.am	24 Nov 2006 12:25:34 -0000
@@ -22,8 +22,6 @@
 
 AUTOMAKE_OPTIONS = 
 
-AM_CPPFLAGS = 
-
 SUBDIRS = asobj parser vm
 
 # noinst_LTLIBRARIES = libserver.la 
@@ -31,7 +29,7 @@ lib_LTLIBRARIES = libgnashserver.la
 # 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.20
diff -u -3 -p -r1.20 Makefile.am
--- server/asobj/Makefile.am	24 Nov 2006 09:19:50 -0000	1.20
+++ server/asobj/Makefile.am	24 Nov 2006 12:25:34 -0000
@@ -22,11 +22,9 @@
 
 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
diff -u -3 -p -r1.16 Makefile.am
--- server/parser/Makefile.am	24 Nov 2006 09:04:24 -0000	1.16
+++ server/parser/Makefile.am	24 Nov 2006 12:25:34 -0000
@@ -22,8 +22,6 @@
 
 AUTOMAKE_OPTIONS = 
 
-AM_CPPFLAGS = 
-
 noinst_LTLIBRARIES = libgnashparser.la 
 
 # Only enable if we're configured with --enable-mp3
@@ -31,7 +29,7 @@ noinst_LTLIBRARIES = libgnashparser.la 
 # 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 @@ noinst_HEADERS = \
 	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
diff -u -3 -p -r1.2 Makefile.am
--- server/vm/Makefile.am	24 Nov 2006 11:49:18 -0000	1.2
+++ server/vm/Makefile.am	24 Nov 2006 12:25:34 -0000
@@ -22,11 +22,9 @@
 
 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
diff -u -3 -p -r1.53 Makefile.am
--- testsuite/actionscript.all/Makefile.am	22 Nov 2006 18:09:30 -0000	1.53
+++ testsuite/actionscript.all/Makefile.am	24 Nov 2006 12:25:34 -0000
@@ -35,7 +35,7 @@ TEST_CASES = \
 
 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
diff -u -3 -p -r1.23 Makefile.am
--- testsuite/libbase/Makefile.am	11 Nov 2006 22:44:54 -0000	1.23
+++ testsuite/libbase/Makefile.am	24 Nov 2006 12:25:34 -0000
@@ -25,6 +25,8 @@ AM_LDFLAGS =  \
 	$(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
diff -u -3 -p -r1.34 Makefile.am
--- testsuite/misc-ming.all/Makefile.am	16 Nov 2006 10:53:20 -0000	1.34
+++ testsuite/misc-ming.all/Makefile.am	24 Nov 2006 12:25:34 -0000
@@ -30,7 +30,7 @@ CLEANFILES =  \
       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
diff -u -3 -p -r1.2 Makefile.am
--- testsuite/movies.all/Makefile.am	2 Nov 2006 14:35:35 -0000	1.2
+++ testsuite/movies.all/Makefile.am	24 Nov 2006 12:25:34 -0000
@@ -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 @@ CLEANFILES =  \
       testrun.log
 
 
-INCLUDES = -I.. \
+AM_CPPFLAGS = -I.. \
         -I$(top_srcdir)		\
         -I$(top_srcdir)/libbase \
         -I$(top_srcdir)/server  \
@@ -40,11 +48,6 @@ INCLUDES = -I.. \
         $(MING_CFLAGS) \
 	$(NULL)
 
-
-check_PROGRAMS = \
-	gravity_embedded-TestRunner \
-	$(NULL)
-
 gravity_embedded_TestRunner_SOURCES = \
 	gravity_embedded-TestRunner.cpp \
 	$(NULL)
@@ -61,11 +64,8 @@ gravity_embedded_TestRunner_DEPENDENCIES
 
 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 @@ site-update: site.exp
 	@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
diff -u -3 -p -r1.4 Makefile.am
--- testsuite/samples/Makefile.am	5 Nov 2006 00:45:27 -0000	1.4
+++ testsuite/samples/Makefile.am	24 Nov 2006 12:25:34 -0000
@@ -27,7 +27,7 @@ CLEANFILES =  \
       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
diff -u -3 -p -r1.14 Makefile.am
--- testsuite/server/Makefile.am	24 Nov 2006 09:04:25 -0000	1.14
+++ testsuite/server/Makefile.am	24 Nov 2006 12:25:34 -0000
@@ -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
diff -u -3 -p -r1.40 Makefile.am
--- utilities/Makefile.am	24 Nov 2006 11:52:18 -0000	1.40
+++ utilities/Makefile.am	24 Nov 2006 12:25:34 -0000
@@ -27,7 +27,7 @@ GNASH_LIBS = \
 	$(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 @@ AM_LDFLAGS = \
 #	$(GLIB_LIBS) \
 #	$(PTHREAD_LIBS)
 
-INCLUDES = -I.. \
+AM_CPPFLAGS = -I.. \
         -I$(top_srcdir)	\
         -I$(top_srcdir)/libbase \
         -I$(top_srcdir)/server \
@@ -50,13 +50,13 @@ INCLUDES = -I.. \
 	$(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