[Gnash-commit] /srv/bzr/gnash/trunk r12062: Fix build of dump and fb guis

[Sandro Santilli]

------------------------------------------------------------
revno: 12062
committer: Sandro Santilli <address@hidden>
branch nick: trunk
timestamp: Mon 2010-03-15 22:42:16 +0100
message:
  Fix build of dump and fb guis
modified:
  gui/am-frag/dump.am
  gui/am-frag/fb.am

=== modified file 'gui/am-frag/dump.am'
--- a/gui/am-frag/dump.am       2010-03-11 03:27:57 +0000
+++ b/gui/am-frag/dump.am       2010-03-15 21:42:16 +0000
@@ -25,7 +25,7 @@
 dump_gnash_CPPFLAGS = -DGUI_DUMP -DGUI_CONFIG=\"DUMP\" \
        $(AM_CPPFLAGS) $(DUMP_CFLAGS) $(AGG_CFLAGS)
 dump_gnash_LDFLAGS = $(LIBLTDL) -export-dynamic $(AM_LDFLAGS) \
-       $(top_builddir)/librender/libgnashagg.la \
+       $(top_builddir)/librender/libgnashrender.la \
        $(GNASH_LIBS) $(DUMP_LIBS) $(AGG_LIBS) $(CAIRO_LIBS)
 endif                          # BUILD_AGG_RENDERER
 endif                          # BUILD_DUMP_GUI

=== modified file 'gui/am-frag/fb.am'
--- a/gui/am-frag/fb.am 2010-03-11 03:27:57 +0000
+++ b/gui/am-frag/fb.am 2010-03-15 21:42:16 +0000
@@ -25,12 +25,13 @@
        $(AM_CPPFLAGS) 
 fb_gnash_LDFLAGS = $(LIBLTDL) -export-dynamic $(AM_LDFLAGS)
 #fb_gnash_DEPENDENCIES = .configline
+fb_gnash_LDADD = \
+       $(top_builddir)/librender/libgnashrender.la \
+       $(GNASH_LIBS) 
 
 if BUILD_AGG_RENDERER
 fb_gnash_CPPFLAGS += $(AGG_CFLAGS)
-fb_gnash_SOURCES += 
-fb_gnash_LDADD = $(top_builddir)/librender/libgnashagg.la \
-               $(GNASH_LIBS) $(AGG_LIBS)
+fb_gnash_LDADD += $(AGG_LIBS)
 endif                          # BUILD_AGG_RENDERER
 endif                          # BUILD_FB_GUI