Sophie: gnash-0.8.7-5mdv2010.1 src

gnash-0.8.7-5mdv2010.1.src.rpm

--- backend/Makefile.am.link	2010-02-11 00:20:18.000000000 +0100
+++ backend/Makefile.am	2010-02-15 16:07:49.000000000 +0100
@@ -85,7 +85,7 @@
 pkglib_LTLIBRARIES += libgnashagg.la
 libgnashagg_la_SOURCES = Renderer_agg.cpp 
 #libgnashagg_la_LDFLAGS = -module -avoid-version -no-undefined
-libgnashagg_la_LIBADD = $(AGG_LIBS)
+libgnashagg_la_LIBADD = $(AGG_LIBS) $(top_builddir)/libcore/libgnashcore.la
 endif
 endif
 
--- gui/Makefile.am.link	2010-02-11 00:20:22.000000000 +0100
+++ gui/Makefile.am	2010-02-15 16:07:49.000000000 +0100
@@ -95,7 +95,7 @@
 
 ## WARNING: make sure GLIB_LIBS appears first
 ## See: http://lists.gnu.org/archive/html/gnash-dev/2006-07/msg00076.html
-AM_LDFLAGS =  \
+AM_LIBS =  \
 	$(GLIB_LIBS) \
 	$(CURL_LIBS) \
 	$(JPEG_LIBS) \
@@ -157,14 +157,14 @@
 endif # BUILD_AQUA_GUI
 
 if USE_FFMPEG_ENGINE
-AM_LDFLAGS += $(FFMPEG_LIBS)
+AM_LIBS += $(FFMPEG_LIBS)
 AM_CPPFLAGS += $(FFMPEG_CFLAGS) 
 endif
 
 if USE_GST_ENGINE
 GST_STUFF = $(GSTPBUTILS_LIBS) $(GSTREAMER_PLUGINS_BASE_LIBS) $(GSTREAMER_LIBS)
 AM_CPPFLAGS += $(GSTREAMER_CFLAGS)
-AM_LDFLAGS += $(GST_STUFF)
+AM_LIBS += $(GST_STUFF)
 endif
 
 # if USE_GUI_FLTK
--- gui/am-frag/fb.am.link	2010-02-15 16:28:37.000000000 +0100
+++ gui/am-frag/fb.am	2010-02-15 16:28:53.000000000 +0100
@@ -23,7 +23,7 @@
 fb_gnash_SOURCES = $(GUI_SRCS) gui_fb.cpp fb.cpp fbsup.h
 fb_gnash_CPPFLAGS = -DGUI_FB -DGUI_CONFIG=\"FB\" \
 	$(AM_CPPFLAGS) 
-fb_gnash_LDFLAGS = $(LIBLTDL) -export-dynamic $(AM_LDFLAGS)
+fb_gnash_LDFLAGS = -export-dynamic $(AM_LDFLAGS)
 #fb_gnash_DEPENDENCIES = .configline
 
 if BUILD_AGG_RENDERER
--- gui/am-frag/gtk.am.link	2010-02-15 16:27:49.000000000 +0100
+++ gui/am-frag/gtk.am	2010-02-15 16:28:27.000000000 +0100
@@ -29,7 +29,7 @@
 gtk_gnash_SOURCES = $(GUI_SRCS) gui_gtk.cpp
 gtk_gnash_CPPFLAGS = -DGUI_GTK -DGUI_CONFIG=\"GTK\" \
 	$(AM_CPPFLAGS) $(GTK_CFLAGS) $(X11_CFLAGS)
-gtk_gnash_LDFLAGS = $(LIBLTDL) -export-dynamic $(AM_LDFLAGS)
+gtk_gnash_LDFLAGS = -export-dynamic $(AM_LDFLAGS)
 #gtk_gnash_DEPENDENCIES = .configline
 
 if BUILD_OGL_RENDERER
--- gui/am-frag/kde4.am.link	2010-02-15 16:25:22.000000000 +0100
+++ gui/am-frag/kde4.am	2010-02-15 16:26:01.000000000 +0100
@@ -35,8 +35,8 @@
 
 kde4_gnash_CPPFLAGS = -DGUI_KDE4 -DGUI_CONFIG=\"KDE4\" $(AM_CPPFLAGS) $(KDE4_CFLAGS) $(QT4_CFLAGS)
 kde4_gnash_SOURCES = $(GUI_SRCS) GuiKde4.cpp
-kde4_gnash_LDFLAGS = $(LIBLTDL) -export-dynamic 
-kde4_gnash_LDADD = $(MYSQL_LIBS) $(GNASH_LIBS) $(AM_LDFLAGS) $(KDE4_LIBS)
+kde4_gnash_LDFLAGS = -export-dynamic 
+kde4_gnash_LDADD = $(MYSQL_LIBS) $(GNASH_LIBS) $(AM_LDFLAGS) $(KDE4_LIBS) $(LIBLTDL)
 
 if BUILD_OGL_RENDERER
 kde4_gnash_CPPFLAGS += $(OPENGL_CFLAGS)
--- gui/am-frag/sdl.am.link	2010-02-15 16:26:58.000000000 +0100
+++ gui/am-frag/sdl.am	2010-02-15 16:27:42.000000000 +0100
@@ -23,9 +23,10 @@
 sdl_gnash_CPPFLAGS = -DGUI_SDL -DGUI_CONFIG=\"SDL\" \
 	 $(AM_CPPFLAGS) $(SDL_CFLAGS) 
 sdl_gnash_SOURCES = $(GUI_SRCS) gui_sdl.cpp sdl.cpp sdlsup.h sdl_glue.h
-sdl_gnash_LDFLAGS = $(LIBLTDL) -export-dynamic 
+sdl_gnash_LDFLAGS = -export-dynamic 
 #sdl_gnash_DEPENDENCIES = .configline
 sdl_gnash_LDADD = \
+	$(LIBLTDL) \
 	$(MYSQL_LIBS) \
 	$(GNASH_LIBS) \
 	$(AM_LDFLAGS) \
--- libmedia/Makefile.am.link	2010-02-14 01:56:00.000000000 +0100
+++ libmedia/Makefile.am	2010-02-15 16:07:49.000000000 +0100
@@ -47,6 +47,7 @@
 # include_HEADERS = log.h err.h proc.h serial.h xantrex.h outback.h
 
 libgnashmedia_la_LIBADD = \
+	$(top_builddir)/libbase/libgnashbase.la \
 	$(PNG_LIBS) \
 	$(JPEG_LIBS) \
 	$(GIF_LIBS) \
--- libsound/Makefile.am.link	2010-02-11 00:20:17.000000000 +0100
+++ libsound/Makefile.am	2010-02-15 16:07:49.000000000 +0100
@@ -30,6 +30,7 @@
 	$(NULL)
 
 libgnashsound_la_LIBADD = \
+	$(top_builddir)/libmedia/libgnashmedia.la \
 	$(BOOST_LIBS) \
 	$(PTHREAD_LIBS) \
 	$(SDL_LIBS) \
--- macros/kde4.m4.link	2010-02-15 16:32:07.000000000 +0100
+++ macros/kde4.m4	2010-02-15 16:33:45.000000000 +0100
@@ -228,7 +228,7 @@
   fi
 
   if test x"${ac_cv_path_kde4_lib}" != x; then
-    KDE4_LIBS="${ac_cv_path_kde4_lib}"
+    KDE4_LIBS="${ac_cv_path_kde4_lib} -lkparts"
     AC_DEFINE(HAVE_KDE4, 1,[Have KDE 4.x installed])
     has_kde4=yes
   else
--- plugin/klash4/Makefile.am.link	2010-02-15 16:29:54.000000000 +0100
+++ plugin/klash4/Makefile.am	2010-02-15 16:30:58.000000000 +0100
@@ -38,10 +38,11 @@
 libklashpart_la_SOURCES = klash_part.cpp klash_part.h
 libklashpart_la_DEPENDENCIES = klash_part.moc
 if PLUGIN_LINK_UNDEFINED
-libklashpart_la_LDFLAGS = -avoid-version -L$(plugindir) $(KDE4_LIBS) $(QT4_LIBS)
+libklashpart_la_LDFLAGS = -avoid-version -L$(plugindir)
 else
-libklashpart_la_LDFLAGS = -module -avoid-version -L$(plugindir) $(KDE4_LIBS) $(QT4_LIBS)
+libklashpart_la_LDFLAGS = -module -avoid-version -L$(plugindir)
 endif
+libklashpart_la_LIBADD = $(KDE4_LIBS) $(QT4_LIBS)
 
 dist_kde_services_DATA = klash_part.desktop
 dist_kde_rc_DATA = klashpartui.rc
--- utilities/Makefile.am.link	2010-02-11 00:20:17.000000000 +0100
+++ utilities/Makefile.am	2010-02-15 16:07:49.000000000 +0100
@@ -41,7 +41,7 @@
 
 ## WARNING: make sure GLIB_LIBS appears first
 ## See: http://lists.gnu.org/archive/html/gnash-dev/2006-07/msg00076.html
-AM_LDFLAGS = \
+AM_LIBS = \
 	$(LIBINTL) \
 	$(LIBADD_DL) \
 	$(MYSQL_LIBS) \
@@ -55,7 +55,7 @@
 
 # bzip2 is a dependency of some libraries with mingw32
 if WIN32
-AM_LDFLAGS += $(BZ2_LIBS)
+AM_LIBS += $(BZ2_LIBS)
 endif
 
 localedir = $(datadir)/locale
@@ -115,30 +115,30 @@
 gprocessor_SOURCES = processor.cpp
 # export our symbols so they can be used by Gnash plugins
 gprocessor_LDFLAGS = -export-dynamic
-gprocessor_LDADD = $(GNASH_LIBS) $(AM_LDFLAGS)
+gprocessor_LDADD = $(GNASH_LIBS) $(AM_LIBS)
 
 dumpshm_SOURCES = dumpshm.cpp
-dumpshm_LDADD = $(GNASH_LIBS) $(AM_LDFLAGS)
+dumpshm_LDADD = $(GNASH_LIBS) $(AM_LIBS)
 
 soldumper_SOURCES = soldumper.cpp
-soldumper_LDADD = $(GNASH_LIBS) $(AM_LDFLAGS)
+soldumper_LDADD = $(GNASH_LIBS) $(AM_LIBS)
 
 flvdumper_SOURCES = flvdumper.cpp
-flvdumper_LDADD = $(GNASH_LIBS) $(AM_LDFLAGS)
+flvdumper_LDADD = $(GNASH_LIBS) $(AM_LIBS)
 
 if USE_GST_ENGINE
  GST_STUFF = $(GSTPBUTILS_LIBS) $(GSTREAMER_PLUGINS_BASE_LIBS) $(GSTREAMER_LIBS) 
  findwebcams_SOURCES = findwebcams.cpp
- findwebcams_LDADD = $(GST_STUFF) $(GNASH_LIBS) $(AM_LDFLAGS)
+ findwebcams_LDADD = $(GST_STUFF) $(GNASH_LIBS) $(AM_LIBS)
 
  findmicrophones_SOURCES = findmicrophones.cpp
- findmicrophones_LDADD = $(GST_STUFF) $(GNASH_LIBS) $(AM_LDFLAGS)
+ findmicrophones_LDADD = $(GST_STUFF) $(GNASH_LIBS) $(AM_LIBS)
 endif
 
 # Rebuild with GCC 4.x Mudflap support
 mudflap:
 	@echo "Rebuilding with GCC Mudflap support"
-	$(MAKE) CXXFLAGS="$(CXXFLAGS) -fmudflap" LDFLAGS="$(LDFLAGS) -lmudflap"
+	$(MAKE) CXXFLAGS="$(CXXFLAGS) -fmudflap" LIBS="$(LIBS) -lmudflap"
 
 clean-hook:
 	-rm -f core.*