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

[Sandro Santilli]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Sandro Santilli <strk>  07/07/25 13:38:29

Modified files:
        .              : ChangeLog 
        gui            : Makefile.am 

Log message:
                * gui/Makefile.am: build klash when conditinally enabled

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/ChangeLog?cvsroot=gnash&r1=1.3822&r2=1.3823
http://cvs.savannah.gnu.org/viewcvs/gnash/gui/Makefile.am?cvsroot=gnash&r1=1.86&r2=1.87

Patches:
Index: ChangeLog
===================================================================
RCS file: /sources/gnash/gnash/ChangeLog,v
retrieving revision 1.3822
retrieving revision 1.3823
diff -u -b -r1.3822 -r1.3823
--- ChangeLog   25 Jul 2007 12:38:28 -0000      1.3822
+++ ChangeLog   25 Jul 2007 13:38:28 -0000      1.3823
@@ -1,5 +1,6 @@
 2007-07-25 Sandro Santilli <address@hidden>
 
+       * gui/Makefile.am: build klash when conditinally enabled
        * gui/gnash.cpp: add missing newline after Gstreamer version
          (--version).
 

Index: gui/Makefile.am
===================================================================
RCS file: /sources/gnash/gnash/gui/Makefile.am,v
retrieving revision 1.86
retrieving revision 1.87
diff -u -b -r1.86 -r1.87
--- gui/Makefile.am     23 Jul 2007 13:49:43 -0000      1.86
+++ gui/Makefile.am     25 Jul 2007 13:38:29 -0000      1.87
@@ -15,7 +15,7 @@
 # along with this program; if not, write to the Free Software
 # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
 
-# $Id: Makefile.am,v 1.86 2007/07/23 13:49:43 strk Exp $
+# $Id: Makefile.am,v 1.87 2007/07/25 13:38:29 strk Exp $
 
 AUTOMAKE_OPTIONS = -Wno-portability
 
@@ -81,6 +81,13 @@
        $(top_builddir)/libgeometry/libgnashgeo.la \
        $(top_builddir)/libbase/libgnashbase.la
 
+KLASH_LIBS = \
+       $(top_builddir)/libamf/libgnashamf.la \
+       $(top_builddir)/backend/libgnashbackend.la \
+       $(top_builddir)/server/libgnashserver.la \
+       $(top_builddir)/libgeometry/libgnashgeo.la \
+       $(top_builddir)/libbase/libgnashbase.la
+
 # The player class has to be added to each GUI library because it
 # requires an ifdef to change between the various GUI toolkits.
 PLAYER_SRCS = Player.cpp Player.h
@@ -290,6 +297,7 @@
 endif # BUILD_SDL_GUI
 if BUILD_KDE_GUI
      GNASH_LIBS += libgnashkde_gl.la $(KDE_LIBS) $(QT_LIBS) $(OPENGL_LIBS)
+     KLASH_LIBS += libgnashkde_gl.la $(KDE_LIBS) $(QT_LIBS) $(OPENGL_LIBS)
 endif # BUILD_KDE_GUI
 endif # BUILD_OPENGL_RENDERER
 
@@ -326,6 +334,7 @@
 endif # BUILD_FLTK_GUI
 if  BUILD_KDE_GUI
      GNASH_LIBS += libgnashkde_agg.la $(KDE_LIBS) $(QT_LIBS) $(AGG_LIBS)
+     KLASH_LIBS += libgnashkde_agg.la $(KDE_LIBS) $(QT_LIBS) $(AGG_LIBS)
 endif # BUILD_KDE_GUI
 if  BUILD_RISCOS_GUI
      GNASH_LIBS += libgnashriscos_agg.la $(RISCOS_LIBS) $(AGG_LIBS)
@@ -386,6 +395,20 @@
 
 bin_PROGRAMS = gnash
 
+if KLASH
+ bin_PROGRAMS += klash
+
+ klash_SOURCES = gnash.cpp
+ # export our symbols so they can be used by Gnash plugins
+ klash_LDFLAGS = $(LIBLTDL) -export-dynamic 
+ klash_DEPENDENCIES = libgnashgui.la .configline
+ klash_LDADD = \
+       libgnashgui.la \
+       $(MYSQL_LIBS) \
+       $(KLASH_LIBS) \
+       $(AM_LDFLAGS)
+endif # KLASH
+
 gnash_SOURCES = gnash.cpp
 # export our symbols so they can be used by Gnash plugins
 gnash_LDFLAGS = $(LIBLTDL) -export-dynamic