[Gnash-commit] gnash ChangeLog gui/Makefile.am utilities/Makef...

[Sandro Santilli]

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

Modified files:
        .              : ChangeLog 
        gui            : Makefile.am 
        utilities      : Makefile.am 

Log message:
                * gui/Makefile.am, utilities/Makefile.am:
                  add GLIB_LIBS to AM_LDFLAGS to make sure
                  user-provided paths are used rather then the
                  ones found by libtool in dependent packages
                  (seems not the cleanest solution, but it worked for me)

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.552&r2=1.553
http://cvs.savannah.gnu.org/viewcvs/gnash/gui/Makefile.am?cvsroot=gnash&r1=1.8&r2=1.9
http://cvs.savannah.gnu.org/viewcvs/gnash/utilities/Makefile.am?cvsroot=gnash&r1=1.22&r2=1.23

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.552
retrieving revision 1.553
diff -u -b -r1.552 -r1.553
--- ChangeLog   29 Jul 2006 17:17:38 -0000      1.552
+++ ChangeLog   29 Jul 2006 23:01:14 -0000      1.553
@@ -1,5 +1,13 @@
 2006-07-29 Sandro Santilli <address@hidden>
 
+       * gui/Makefile.am, utilities/Makefile.am:
+         add GLIB_LIBS to AM_LDFLAGS to make sure
+         user-provided paths are used rather then the
+         ones found by libtool in dependent packages
+         (seems not the cleanest solution, but it worked for me)
+
+2006-07-29 Sandro Santilli <address@hidden>
+
        * macros/pthreads.m4: don't add -I/usr/include
          (should already be in the default search path)
        * gui/gnash.cpp: fixed typo in -r help 

Index: gui/Makefile.am
===================================================================
RCS file: /sources/gnash/gnash/gui/Makefile.am,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- gui/Makefile.am     29 Jul 2006 13:42:19 -0000      1.8
+++ gui/Makefile.am     29 Jul 2006 23:01:14 -0000      1.9
@@ -111,7 +111,10 @@
 
 AM_CPPFLAGS = $(INCLUDES)
 
-#AM_LDFLAGS =  \
+## WARNING: make sure GLIB_LIBS appears first
+## See: http://lists.gnu.org/archive/html/gnash-dev/2006-07/msg00076.html
+AM_LDFLAGS =  \
+       $(GLIB_LIBS) 
 #        ../libbase/libgnashbase.la \
 #      $(JPEG_LIBS) \
 #      $(PNG_LIBS) \

Index: utilities/Makefile.am
===================================================================
RCS file: /sources/gnash/gnash/utilities/Makefile.am,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -b -r1.22 -r1.23
--- utilities/Makefile.am       28 Jul 2006 02:36:38 -0000      1.22
+++ utilities/Makefile.am       29 Jul 2006 23:01:14 -0000      1.23
@@ -37,8 +37,10 @@
 
 AM_CPPFLAGS = # -Wall
 
-# @@ dependencies are derived by GNASH_LIBS
-#AM_LDFLAGS = \
+## WARNING: make sure GLIB_LIBS appears first
+## See: http://lists.gnu.org/archive/html/gnash-dev/2006-07/msg00076.html
+AM_LDFLAGS = \
+       $(GLIB_LIBS)
 #      $(LIBXML_LIBS) \
 #      $(JPEG_LIBS) \
 #      $(PNG_LIBS) \