[Gnash-commit] gnash gui/Makefile.am plugin/Makefile.am backen...

[Rob Savoye]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Rob Savoye <rsavoye>    06/10/22 17:27:41

Modified files:
        gui            : Makefile.am 
        plugin         : Makefile.am 
        backend        : Makefile.am 
        libbase        : Makefile.am 
        server         : shm.cpp 
        macros         : agg.m4 libXML.m4 
        .              : ChangeLog 

Log message:
                * gui/Makefile.am: Don't link with -no-undefined to reduce
                dependancy problems.
                * plugin/Makefile.am, klash/Makefile.am: Don't link with
                -no-undefined to reduce dependancy problems.
                * backend/Makefile.am: List additional headers in
                noinst_HEADERS. 
                * libbase/Makefile.am: Add ref_counted.h.
                * macros/agg.m4: Look in $includedir instead of $prefix.
                * macros/libXML.m4: Use double quotes when setting 
LIBXML_CFLAGS.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/gui/Makefile.am?cvsroot=gnash&r1=1.38&r2=1.39
http://cvs.savannah.gnu.org/viewcvs/gnash/plugin/Makefile.am?cvsroot=gnash&r1=1.49&r2=1.50
http://cvs.savannah.gnu.org/viewcvs/gnash/backend/Makefile.am?cvsroot=gnash&r1=1.43&r2=1.44
http://cvs.savannah.gnu.org/viewcvs/gnash/libbase/Makefile.am?cvsroot=gnash&r1=1.44&r2=1.45
http://cvs.savannah.gnu.org/viewcvs/gnash/server/shm.cpp?cvsroot=gnash&r1=1.22&r2=1.23
http://cvs.savannah.gnu.org/viewcvs/gnash/macros/agg.m4?cvsroot=gnash&r1=1.15&r2=1.16
http://cvs.savannah.gnu.org/viewcvs/gnash/macros/libXML.m4?cvsroot=gnash&r1=1.21&r2=1.22
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.1344&r2=1.1345

Patches:
Index: gui/Makefile.am
===================================================================
RCS file: /sources/gnash/gnash/gui/Makefile.am,v
retrieving revision 1.38
retrieving revision 1.39
diff -u -b -r1.38 -r1.39
--- gui/Makefile.am     18 Oct 2006 17:29:57 -0000      1.38
+++ gui/Makefile.am     22 Oct 2006 17:27:40 -0000      1.39
@@ -35,7 +35,7 @@
 # forward this exception.
 # 
 
-# $Id: Makefile.am,v 1.38 2006/10/18 17:29:57 nihilus Exp $
+# $Id: Makefile.am,v 1.39 2006/10/22 17:27:40 rsavoye Exp $
 
 AUTOMAKE_OPTIONS = 
 
@@ -141,16 +141,18 @@
  FB_SRCS = 
 endif
 
+if USE_SOUND_SDL
 if USE_FFMPEG_ENGINE
- INCLUDES += $(FFMPEG_INCLS) 
- AM_LDFLAGS += $(FFMPEG_LIBS)
+AM_LDFLAGS += $(FFMPEG_LIBS)
+INCLUDES += $(FFMPEG_CFLAGS)
 endif
-
 if USE_MAD_ENGINE
- INCLUDES += $(MAD_INCLS) 
- AM_LDFLAGS += $(MAD_LIBS)
+AM_LDFLAGS += $(MAD_LIBS)
+INCLUDES += $(MAD_CFLAGS)
+endif
 endif
 
+
 #if USE_GUI_FLTK
 # FLTK_SRCS = fltk.cpp fltksup.h
 # INCLUDES += $(FLTK_INCLS) 
@@ -207,7 +209,7 @@
        $(AM_LDFLAGS) 
 
 gnash_SOURCES = gnash.cpp 
-gnash_LDFLAGS = -module -avoid-version -no-undefined
+gnash_LDFLAGS = -module -avoid-version
 gnash_LDADD = \
        $(GNASH_LIBS) \
        libgnashplayer.la
@@ -216,7 +218,7 @@
 klash_CPPFLAGS =       \
        $(KDE_INCLS)    \
        -DUSE_KDE
-klash_LDFLAGS = -module -avoid-version -no-undefined
+klash_LDFLAGS = -module -avoid-version
 klash_LDADD = \
        $(LIB_KDECORE) \
        $(LIB_KDEUI) \

Index: plugin/Makefile.am
===================================================================
RCS file: /sources/gnash/gnash/plugin/Makefile.am,v
retrieving revision 1.49
retrieving revision 1.50
diff -u -b -r1.49 -r1.50
--- plugin/Makefile.am  15 Oct 2006 09:11:20 -0000      1.49
+++ plugin/Makefile.am  22 Oct 2006 17:27:40 -0000      1.50
@@ -36,7 +36,7 @@
 # 
 #
 
-# $Id: Makefile.am,v 1.49 2006/10/15 09:11:20 nihilus Exp $
+# $Id: Makefile.am,v 1.50 2006/10/22 17:27:40 rsavoye Exp $
 
 AUTOMAKE_OPTIONS = 
 
@@ -143,7 +143,7 @@
 if PLUGIN_LINK_UNDEFINED
 libgnashplugin_la_LDFLAGS = -avoid-version -L$(plugindir)
 else
-libgnashplugin_la_LDFLAGS = -module -avoid-version -no-undefined -L$(plugindir)
+libgnashplugin_la_LDFLAGS = -module -avoid-version -L$(plugindir)
 endif
 
 # For now the plugin has to be installed in the root plugin

Index: backend/Makefile.am
===================================================================
RCS file: /sources/gnash/gnash/backend/Makefile.am,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -b -r1.43 -r1.44
--- backend/Makefile.am 11 Oct 2006 15:45:17 -0000      1.43
+++ backend/Makefile.am 22 Oct 2006 17:27:40 -0000      1.44
@@ -57,7 +57,8 @@
        $(NULL)
 
 noinst_HEADERS = \
-       render_handler.h
+       render_handler.h \
+       render_handler_tri.h
 
 # bin_PROGRAMS = gnash
 
@@ -85,7 +86,7 @@
 endif
 
 if USE_SOUND_SDL
-SOUND_SOURCES = sound_handler_sdl.cpp 
+SOUND_SOURCES = sound_handler_sdl.cpp sound_handler_sdl.h
 if USE_FFMPEG_ENGINE
 AM_LDFLAGS += $(FFMPEG_LIBS)
 INCLUDES += $(FFMPEG_CFLAGS)

Index: libbase/Makefile.am
===================================================================
RCS file: /sources/gnash/gnash/libbase/Makefile.am,v
retrieving revision 1.44
retrieving revision 1.45
diff -u -b -r1.44 -r1.45
--- libbase/Makefile.am 18 Oct 2006 00:29:07 -0000      1.44
+++ libbase/Makefile.am 22 Oct 2006 17:27:40 -0000      1.45
@@ -121,6 +121,7 @@
        ogl.h \
        postscript.h \
        rc.h \
+       ref_counted.h \
        smart_ptr.h \
        triangulate.h \
        triangulate_impl.h \

Index: server/shm.cpp
===================================================================
RCS file: /sources/gnash/gnash/server/shm.cpp,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -b -r1.22 -r1.23
--- server/shm.cpp      22 Oct 2006 01:00:54 -0000      1.22
+++ server/shm.cpp      22 Oct 2006 17:27:40 -0000      1.23
@@ -235,7 +235,7 @@
         if (exists && !nuke) {
            // If there is an existing memory segment that we don't
            // want to trash, we just want to attach to it. We know
-           // that a ShmControl data class has been instantiated in
+           // that a Shm data class has been instantiated in
            // the base of memory, and the first field is the address
            // used for the previous mmap(), so we grab that value,
            // unmap the old address, and map the original address
@@ -314,6 +314,8 @@
     return true; 
 }
 
+/// \brief Copy the current data for the shared memory segment to the
+/// head of the segment.
 Shm *
 Shm::cloneSelf(void)
 {

Index: macros/agg.m4
===================================================================
RCS file: /sources/gnash/gnash/macros/agg.m4,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -b -r1.15 -r1.16
--- macros/agg.m4       18 Oct 2006 17:35:33 -0000      1.15
+++ macros/agg.m4       22 Oct 2006 17:27:41 -0000      1.16
@@ -35,7 +35,7 @@
 dnl  
 dnl 
 
-dnl $Id: agg.m4,v 1.15 2006/10/18 17:35:33 strk Exp $
+dnl $Id: agg.m4,v 1.16 2006/10/22 17:27:41 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 
@@ -62,10 +62,10 @@
        dnl I think this setting of agg_include_dir is too error prone!
     $PKG_CONFIG --exists libagg && agg_include_dir=`$PKG_CONFIG 
--cflags-only-I libagg | cut -d " " -f 1 | sed -e 's/-I//g'`
   fi
+
   AC_MSG_CHECKING([for AGG headers])
   if test x"${ac_cv_path_agg_incl}" = x ; then
-    incllist="${prefix}/include /sw/include /usr/pkg/include 
/usr/local/include /home/latest/include /opt/include /opt/local/include 
/usr/include .. ../.."
-
+    incllist="${includedir} /sw/include /usr/pkg/include /usr/local/include 
/home/latest/include /opt/include /opt/local/include /usr/include .. ../.."
     for i in $incllist; do
       if test -f $i/agg2/agg_rasterizer_compound_aa.h; then
         ac_cv_path_agg_incl="-I$i/agg2"

Index: macros/libXML.m4
===================================================================
RCS file: /sources/gnash/gnash/macros/libXML.m4,v
retrieving revision 1.21
retrieving revision 1.22
diff -u -b -r1.21 -r1.22
--- macros/libXML.m4    15 Oct 2006 14:26:05 -0000      1.21
+++ macros/libXML.m4    22 Oct 2006 17:27:41 -0000      1.22
@@ -96,7 +96,7 @@
       if test "x$LIBXML_CFLAGS" = "x"; then
         for j in `ls -dr $i/include/libxml2* 2>/dev/null ` ; do
         if test -f $j/libxml/parser.h; then
-          LIBXML_CFLAGS=-I`(cd $j; pwd)`
+          LIBXML_CFLAGS="-I`(cd $j; pwd)`"
           break
         fi
         done

Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.1344
retrieving revision 1.1345
diff -u -b -r1.1344 -r1.1345
--- ChangeLog   22 Oct 2006 17:05:34 -0000      1.1344
+++ ChangeLog   22 Oct 2006 17:27:41 -0000      1.1345
@@ -1,3 +1,15 @@
+2006-10-22  Rob Savoye  <address@hidden>
+
+       * gui/Makefile.am: Don't link with -no-undefined to reduce
+       dependancy problems.
+       * plugin/Makefile.am, klash/Makefile.am: Don't link with
+       -no-undefined to reduce dependancy problems.
+       * backend/Makefile.am: List additional headers in
+       noinst_HEADERS. 
+       * libbase/Makefile.am: Add ref_counted.h.
+       * macros/agg.m4: Look in $includedir instead of $prefix.
+       * macros/libXML.m4: Use double quotes when setting LIBXML_CFLAGS.
+       
 2006-10-22 Markus Gothe <address@hidden>
 
        * configure.ac: Don't look for KDE if not --enable-plugin.