[Gnash-commit] gnash ChangeLog backend/Makefile.am plugin/Make...

[Sandro Santilli]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Sandro Santilli <strk>  06/07/29 23:12:53

Modified files:
        .              : ChangeLog 
        backend        : Makefile.am 
        plugin         : Makefile.am 
        testsuite/libbase: Makefile.am 

Log message:
                * testsuite/libbase/Makefile.am, plugin/Makefile.am,            
                  testsuite/libbase/Makefile.am:
                  commented out AM_LDFLAGS (rely on helper libs deps)
                * backend/Makefile.am: make sure GLIB_LIBS is listed
                  before other libraries

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.553&r2=1.554
http://cvs.savannah.gnu.org/viewcvs/gnash/backend/Makefile.am?cvsroot=gnash&r1=1.28&r2=1.29
http://cvs.savannah.gnu.org/viewcvs/gnash/plugin/Makefile.am?cvsroot=gnash&r1=1.28&r2=1.29
http://cvs.savannah.gnu.org/viewcvs/gnash/testsuite/libbase/Makefile.am?cvsroot=gnash&r1=1.4&r2=1.5

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.553
retrieving revision 1.554
diff -u -b -r1.553 -r1.554
--- ChangeLog   29 Jul 2006 23:01:14 -0000      1.553
+++ ChangeLog   29 Jul 2006 23:12:53 -0000      1.554
@@ -1,5 +1,10 @@
 2006-07-29 Sandro Santilli <address@hidden>
 
+       * testsuite/libbase/Makefile.am, plugin/Makefile.am,
+         testsuite/libbase/Makefile.am:
+         commented out AM_LDFLAGS (rely on helper libs deps)
+       * backend/Makefile.am: make sure GLIB_LIBS is listed
+         before other libraries
        * gui/Makefile.am, utilities/Makefile.am:
          add GLIB_LIBS to AM_LDFLAGS to make sure
          user-provided paths are used rather then the

Index: backend/Makefile.am
===================================================================
RCS file: /sources/gnash/gnash/backend/Makefile.am,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -b -r1.28 -r1.29
--- backend/Makefile.am 26 Jul 2006 00:21:40 -0000      1.28
+++ backend/Makefile.am 29 Jul 2006 23:12:53 -0000      1.29
@@ -27,7 +27,10 @@
 
 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 =  \
+       $(GLIB_LIBS)            \
        $(JPEG_LIBS)            \
        $(PNG_LIBS)             \
         $(OGG_LIBS)            \
@@ -42,7 +45,6 @@
        $(PANGO_LIBS)           \
        $(CAIRO_LIBS)           \
        $(ATK_LIBS)             \
-       $(GLIB_LIBS)            \
        $(X_LIBS)               \
        $(DMALLOC_LIBS)         \
        $(MP3_LIBS)             \

Index: plugin/Makefile.am
===================================================================
RCS file: /sources/gnash/gnash/plugin/Makefile.am,v
retrieving revision 1.28
retrieving revision 1.29
diff -u -b -r1.28 -r1.29
--- plugin/Makefile.am  24 Jul 2006 20:05:38 -0000      1.28
+++ plugin/Makefile.am  29 Jul 2006 23:12:53 -0000      1.29
@@ -117,6 +117,7 @@
         mozilla-sdk/np_entry.cpp
 
 libgnashplugin_la_LIBADD   = \
+       $(GLIB_LIBS) \
        $(X_LIBS) \
        $(SDL_LIBS) \
        $(SDL_MIXER_LIBS) \
@@ -126,7 +127,6 @@
        $(PANGO_LIBS) \
        $(CAIRO_LIBS) \
        $(ATK_LIBS) \
-       $(GLIB_LIBS) \
        $(LIBXML_LIBS) \
        $(JPEG_LIBS) \
        $(PNG_LIBS) \

Index: testsuite/libbase/Makefile.am
===================================================================
RCS file: /sources/gnash/gnash/testsuite/libbase/Makefile.am,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- testsuite/libbase/Makefile.am       7 Jun 2006 03:03:22 -0000       1.4
+++ testsuite/libbase/Makefile.am       29 Jul 2006 23:12:53 -0000      1.5
@@ -43,26 +43,26 @@
 RUNTESTDEFAULTFLAGS = --srcdir $$srcdir
 
 AM_LDFLAGS =  \
-       $(JPEG_LIBS)            \
-       $(PNG_LIBS)             \
-        $(OGG_LIBS)            \
-       $(ZLIB_LIBS)            \
-        $(LIBXML_LIBS)         \
-        $(SDL_LIBS)            \
-        $(SDL_MIXER_LIBS)      \
-        $(OPENGL_LIBS)         \
-       $(GLEXT_LIBS)           \
-       $(GTK2_LIBS)            \
-       $(PANGO_LIBS)           \
-       $(CAIRO_LIBS)           \
-       $(ATK_LIBS)             \
-       $(GLIB_LIBS)            \
-       $(X_LIBS)               \
-       $(DMALLOC_LIBS)         \
-       $(MP3_LIBS)             \
-       $(PTHREAD_LIBS)         \
-       $(CURL_LIBS)            \
         ../../libbase/libgnashbase.la 
+#      $(JPEG_LIBS)            \
+#      $(PNG_LIBS)             \
+#        $(OGG_LIBS)           \
+#      $(ZLIB_LIBS)            \
+#        $(LIBXML_LIBS)                \
+#        $(SDL_LIBS)           \
+#        $(SDL_MIXER_LIBS)     \
+#        $(OPENGL_LIBS)                \
+#      $(GLEXT_LIBS)           \
+#      $(GTK2_LIBS)            \
+#      $(PANGO_LIBS)           \
+#      $(CAIRO_LIBS)           \
+#      $(ATK_LIBS)             \
+#      $(GLIB_LIBS)            \
+#      $(X_LIBS)               \
+#      $(DMALLOC_LIBS)         \
+#      $(MP3_LIBS)             \
+#      $(PTHREAD_LIBS)         \
+#      $(CURL_LIBS)            
 
 INCLUDES = -I.. \
         -I$(top_srcdir)                \