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

[Sandro Santilli]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Sandro Santilli <strk>  06/07/29 13:42:20

Modified files:
        .              : ChangeLog 
        gui            : Makefile.am 

Log message:
        * gui/Makefile.am: comment out AM_LDFLAGS (rely on dependencies 
extracted from .la files)

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.549&r2=1.550
http://cvs.savannah.gnu.org/viewcvs/gnash/gui/Makefile.am?cvsroot=gnash&r1=1.7&r2=1.8

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.549
retrieving revision 1.550
diff -u -b -r1.549 -r1.550
--- ChangeLog   29 Jul 2006 13:27:50 -0000      1.549
+++ ChangeLog   29 Jul 2006 13:42:19 -0000      1.550
@@ -1,5 +1,7 @@
 2006-07-29 Sandro Santilli <address@hidden>
 
+       * gui/Makefile.am: comment out AM_LDFLAGS (rely on dependencies
+         extracted from .la files)
        * Makefile.am: add KDE_INCLUDES and KDE_LDFLAGS to
          'dumpconfig' output.
 

Index: gui/Makefile.am
===================================================================
RCS file: /sources/gnash/gnash/gui/Makefile.am,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- gui/Makefile.am     22 Jul 2006 23:47:55 -0000      1.7
+++ gui/Makefile.am     29 Jul 2006 13:42:19 -0000      1.8
@@ -111,31 +111,31 @@
 
 AM_CPPFLAGS = $(INCLUDES)
 
-AM_LDFLAGS =  \
-        ../libbase/libgnashbase.la \
-       $(JPEG_LIBS) \
-       $(PNG_LIBS) \
-        $(OGG_LIBS) \
-       $(ZLIB_LIBS) \
-        $(LIBXML_LIBS) \
-        $(SDL_LIBS) \
-        $(SDL_MIXER_LIBS) \
-        $(OPENGL_LIBS) \
-       $(GLEXT_LIBS) \
-       $(GTK2_LIBS) \
-       $(FLTK_LIBS) \
-       $(XFT_LIBS) \
-       $(PANGO_LIBS) \
-       $(CAIRO_LIBS) \
-       $(ATK_LIBS) \
-       $(GLIB_LIBS) \
-       $(X_LIBS) \
-       $(DMALLOC_LIBS) \
-       $(MP3_LIBS) \
-       $(PTHREAD_LIBS) \
-       $(KDE_LDFLAGS) \
-       $(all_libraries) \
-       $(KDE_RPATH)
+#AM_LDFLAGS =  \
+#        ../libbase/libgnashbase.la \
+#      $(JPEG_LIBS) \
+#      $(PNG_LIBS) \
+#        $(OGG_LIBS) \
+#      $(ZLIB_LIBS) \
+#        $(LIBXML_LIBS) \
+#        $(SDL_LIBS) \
+#        $(SDL_MIXER_LIBS) \
+#        $(OPENGL_LIBS) \
+#      $(GLEXT_LIBS) \
+#      $(GTK2_LIBS) \
+#      $(FLTK_LIBS) \
+#      $(XFT_LIBS) \
+#      $(PANGO_LIBS) \
+#      $(CAIRO_LIBS) \
+#      $(ATK_LIBS) \
+#      $(GLIB_LIBS) \
+#      $(X_LIBS) \
+#      $(DMALLOC_LIBS) \
+#      $(MP3_LIBS) \
+#      $(PTHREAD_LIBS) \
+#      $(KDE_LDFLAGS) \
+#      $(all_libraries) \
+#      $(KDE_RPATH)
 
 lib_LTLIBRARIES = libgnashgui.la
 libgnashgui_la_SOURCES = \
@@ -156,7 +156,7 @@
 gnash_SOURCES = gnash.cpp # $(libgnashgui_la_SOURCES)
 gnash_CPPFLAGS = -DUSE_GTK
 gnash_LDFLAGS = -module -avoid-version -no-undefined
-gnash_LDADD = $(AM_LDFLAGS) \
+gnash_LDADD = \
         libgnashgui.la \
        ../backend/libgnashbackend.la \
        ../server/libgnashserver.la \
@@ -167,7 +167,7 @@
 klash_SOURCES = gnash.cpp
 klash_CPPFLAGS = -DUSE_KDE
 klash_LDFLAGS = -module -avoid-version -no-undefined
-klash_LDADD = $(AM_LDFLAGS) \
+klash_LDADD = \
        libgnashgui.la \
        $(LIB_KDECORE) \
        $(LIB_KDEUI) \