[Gnash-commit] gnash/gui Makefile.am am-frag/fltk.am

[Dossy Shiobara]

CVSROOT:        /sources/gnash
Module name:    gnash
Changes by:     Dossy Shiobara <dossy>  08/03/26 20:38:19

Modified files:
        gui            : Makefile.am 
        gui/am-frag    : fltk.am 

Log message:
        Add missing line-continuation backslash.  Move extra Win32 libs
        to am-frag/fltk.am from main Makefile.am.

CVSWeb URLs:
http://cvs.savannah.gnu.org/viewcvs/gnash/gui/Makefile.am?cvsroot=gnash&r1=1.121&r2=1.122
http://cvs.savannah.gnu.org/viewcvs/gnash/gui/am-frag/fltk.am?cvsroot=gnash&r1=1.3&r2=1.4

Patches:
Index: Makefile.am
===================================================================
RCS file: /sources/gnash/gnash/gui/Makefile.am,v
retrieving revision 1.121
retrieving revision 1.122
diff -u -b -r1.121 -r1.122
--- Makefile.am 22 Mar 2008 18:03:53 -0000      1.121
+++ Makefile.am 26 Mar 2008 20:38:19 -0000      1.122
@@ -82,15 +82,11 @@
        $(LIBXML_LIBS) \
        $(INCLTDL) \
        $(LIRC_LIBS) \
-       $(MYSQL_LIBS)
+       $(MYSQL_LIBS) \
        $(BOOST_LIBS) \
        $(PTHREAD_LIBS) \
        $(NULL)
 
-if WIN32
-       AM_LDFLAGS += -lgdi32 -lole32 -luuid -lws2_32 -lmsimg32
-endif
-
 GNASH_LIBS = \
        $(top_builddir)/libamf/libgnashamf.la \
        $(top_builddir)/libmedia/libgnashmedia.la \

Index: am-frag/fltk.am
===================================================================
RCS file: /sources/gnash/gnash/gui/am-frag/fltk.am,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- am-frag/fltk.am     21 Jan 2008 21:19:22 -0000      1.3
+++ am-frag/fltk.am     26 Mar 2008 20:38:19 -0000      1.4
@@ -43,4 +43,7 @@
 fltk_gnash_SOURCES += fltk_glue_agg.cpp fltk_glue_agg.h \
                fltk.cpp fltksup.h 
 endif
+if WIN32
+fltk_gnash_LDADD += -lgdi32 -lole32 -luuid -lws2_32 -lmsimg32
+endif
 endif