1 --- gnome-mplayer-0.9.6/src/libgmlib/Makefile.am~ 2009-05-18 15:04:21.000000000 +0200
2 +++ gnome-mplayer-0.9.6/src/libgmlib/Makefile.am 2009-06-20 21:38:16.233478837 +0200
7 +libgmlib_la_LIBADD = \
8 + $(GLIB_LIBS) $(GCONF_LIBS)
11 diff -ur gecko-mediaplayer-0.9.6.org/src/Makefile.am gecko-mediaplayer-0.9.6/src/Makefile.am
12 --- gecko-mediaplayer-0.9.6.org/src/Makefile.am 2009-03-23 17:41:15.000000000 +0100
13 +++ gecko-mediaplayer-0.9.6/src/Makefile.am 2009-06-23 13:47:34.000000000 +0200
17 install_libexecdir = $(libdir)/mozilla/plugins
18 -install_libexec_PROGRAMS = \
19 - gecko-mediaplayer.so \
20 - gecko-mediaplayer-qt.so \
21 - gecko-mediaplayer-wmp.so \
22 - gecko-mediaplayer-rm.so \
23 - gecko-mediaplayer-dvx.so
24 +install_libexec_LTLIBRARIES = \
25 + gecko-mediaplayer.la \
26 + gecko-mediaplayer-qt.la \
27 + gecko-mediaplayer-wmp.la \
28 + gecko-mediaplayer-rm.la \
29 + gecko-mediaplayer-dvx.la
31 -gecko_mediaplayer_so_SOURCES = \
32 +gecko_mediaplayer_la_SOURCES = \
33 plugin_types_std.cpp \
36 -gecko_mediaplayer_so_CFLAGS = -fPIC
37 -gecko_mediaplayer_so_LDFLAGS = -shared $(GLIB_LIBS) $(DBUS_LIBS) $(GCONF_LIBS) -fPIC
38 -gecko_mediaplayer_so_LDADD = libgmlib/libgmlib.la
39 +gecko_mediaplayer_la_CFLAGS = -fPIC
40 +gecko_mediaplayer_la_LDFLAGS = -module -avoid-version -fPIC
41 +gecko_mediaplayer_la_LIBADD = libgmlib/libgmlib.la $(GLIB_LIBS) $(DBUS_LIBS) $(GCONF_LIBS)
43 -gecko_mediaplayer_qt_so_SOURCES = \
44 +gecko_mediaplayer_qt_la_SOURCES = \
48 -gecko_mediaplayer_qt_so_CFLAGS = -fPIC
49 -gecko_mediaplayer_qt_so_LDFLAGS = -shared $(GLIB_LIBS) $(DBUS_LIBS) $(GCONF_LIBS) -fPIC
50 -gecko_mediaplayer_qt_so_LDADD = libgmlib/libgmlib.la
51 +gecko_mediaplayer_qt_la_CFLAGS = -fPIC
52 +gecko_mediaplayer_qt_la_LDFLAGS = -module -avoid-version -fPIC
53 +gecko_mediaplayer_qt_la_LIBADD = libgmlib/libgmlib.la $(GLIB_LIBS) $(DBUS_LIBS) $(GCONF_LIBS)
55 -gecko_mediaplayer_wmp_so_SOURCES = \
56 +gecko_mediaplayer_wmp_la_SOURCES = \
57 plugin_types_wmp.cpp \
60 -gecko_mediaplayer_wmp_so_CFLAGS = -fPIC
61 -gecko_mediaplayer_wmp_so_LDFLAGS = -shared $(GLIB_LIBS) $(DBUS_LIBS) $(GCONF_LIBS) -fPIC
62 -gecko_mediaplayer_wmp_so_LDADD = libgmlib/libgmlib.la
63 +gecko_mediaplayer_wmp_la_CFLAGS = -fPIC
64 +gecko_mediaplayer_wmp_la_LDFLAGS = -module -avoid-version -fPIC
65 +gecko_mediaplayer_wmp_la_LIBADD = libgmlib/libgmlib.la $(GLIB_LIBS) $(DBUS_LIBS) $(GCONF_LIBS)
67 -gecko_mediaplayer_dvx_so_SOURCES = \
68 +gecko_mediaplayer_dvx_la_SOURCES = \
69 plugin_types_dvx.cpp \
72 -gecko_mediaplayer_dvx_so_CFLAGS = -fPIC
73 -gecko_mediaplayer_dvx_so_LDFLAGS = -shared $(GLIB_LIBS) $(DBUS_LIBS) $(GCONF_LIBS) -fPIC
74 -gecko_mediaplayer_dvx_so_LDADD = libgmlib/libgmlib.la
75 +gecko_mediaplayer_dvx_la_CFLAGS = -fPIC
76 +gecko_mediaplayer_dvx_la_LDFLAGS = -module -avoid-version -fPIC
77 +gecko_mediaplayer_dvx_la_LIBADD = libgmlib/libgmlib.la $(GLIB_LIBS) $(DBUS_LIBS) $(GCONF_LIBS)
79 -gecko_mediaplayer_rm_so_SOURCES = \
80 +gecko_mediaplayer_rm_la_SOURCES = \
84 -gecko_mediaplayer_rm_so_CFLAGS = -fPIC
85 -gecko_mediaplayer_rm_so_LDFLAGS = -shared $(GLIB_LIBS) $(DBUS_LIBS) $(GCONF_LIBS) -fPIC
86 -gecko_mediaplayer_rm_so_LDADD = libgmlib/libgmlib.la
87 +gecko_mediaplayer_rm_la_CFLAGS = -fPIC
88 +gecko_mediaplayer_rm_la_LDFLAGS = -module -avoid-version -fPIC
89 +gecko_mediaplayer_rm_la_LIBADD = libgmlib/libgmlib.la $(GLIB_LIBS) $(DBUS_LIBS) $(GCONF_LIBS)
92 indent -kr -l100 -i4 -nut *.cpp