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

[Sandro Santilli]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Sandro Santilli <strk>  06/08/01 23:12:49

Modified files:
        .              : ChangeLog 
        gui            : Makefile.am 

Log message:
                * gui/Makefile.am: use a GNASH_LIBS variable, to make future    
                  additions cleaner. Fixes missed link of libamf.la in 'gnash'  
                  executable,

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.571&r2=1.572
http://cvs.savannah.gnu.org/viewcvs/gnash/gui/Makefile.am?cvsroot=gnash&r1=1.11&r2=1.12

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.571
retrieving revision 1.572
diff -u -b -r1.571 -r1.572
--- ChangeLog   1 Aug 2006 16:57:35 -0000       1.571
+++ ChangeLog   1 Aug 2006 23:12:48 -0000       1.572
@@ -1,3 +1,9 @@
+2006-08-02 Sandro Santilli <address@hidden>
+
+       * gui/Makefile.am: use a GNASH_LIBS variable, to make future
+         additions cleaner. Fixes missed link of libamf.la in 'gnash'
+         executable,
+
 2006-08-01  Rob Savoye  <address@hidden>
 
        * configure.ac: Change testing to disabled by default.

Index: gui/Makefile.am
===================================================================
RCS file: /sources/gnash/gnash/gui/Makefile.am,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -b -r1.11 -r1.12
--- gui/Makefile.am     1 Aug 2006 16:57:35 -0000       1.11
+++ gui/Makefile.am     1 Aug 2006 23:12:48 -0000       1.12
@@ -160,29 +160,29 @@
 bin_PROGRAMS = gnash
 endif
 
-gnash_SOURCES = gnash.cpp # $(libgnashgui_la_SOURCES)
-gnash_CPPFLAGS = -DUSE_GTK
-gnash_LDFLAGS = -module -avoid-version -no-undefined
-gnash_LDADD = \
+GNASH_LIBS = \
         libgnashgui.la \
+       ../libamf/libgnashamf.la \
        ../backend/libgnashbackend.la \
        ../server/libgnashserver.la \
        ../server/asobj/libgnashasobjs.la \
        ../libgeometry/libgnashgeo.la \
        ../libbase/libgnashbase.la
 
+gnash_SOURCES = gnash.cpp # $(libgnashgui_la_SOURCES)
+gnash_CPPFLAGS = -DUSE_GTK
+gnash_LDFLAGS = -module -avoid-version -no-undefined
+gnash_LDADD = \
+       $(GNASH_LIBS)
+
 klash_SOURCES = gnash.cpp
 klash_CPPFLAGS = -DUSE_KDE
 klash_LDFLAGS = -module -avoid-version -no-undefined
 klash_LDADD = \
-       libgnashgui.la \
        $(LIB_KDECORE) \
        $(LIB_KDEUI) \
-       ../backend/libgnashbackend.la \
-       ../server/libgnashserver.la \
-       ../server/asobj/libgnashasobjs.la \
-       ../libgeometry/libgnashgeo.la \
-       ../libbase/libgnashbase.la
+       $(GNASH_LIBS)
+
 klash_DEPENDANCIES = klash.moc libgnashgui.la
 
 CLEANFILES = klash.moc