[rhythmbox] rearrange things to link less badly (bug #437110)

From: Jonathan Matthew <jmatthew src gnome org>
To: svn-commits-list gnome org
Subject: [rhythmbox] rearrange things to link less badly (bug #437110)
Date: Sun, 26 Jul 2009 11:54:23 +0000 (UTC)
commit 0117c1593eed3f0b77edec6b5bbd7e686485064d
Author: Jonathan Matthew <jonathan d14n org>
Date:   Tue Jun 9 22:57:41 2009 +1000

    rearrange things to link less badly (bug #437110)
    
    Plugin management code moves to shell/, librhythmbox-core gets built in
    shell/ and contains everything except main.c.  No more missing symbols
    in any of the shared libraries.

 Makefile.am                               |    2 +-
 configure.ac                              |    1 -
 corelib/Makefile.am                       |   18 ---------
 doc/reference/Makefile.am                 |   11 +-----
 plugins/Makefile.am                       |   48 ------------------------
 plugins/audiocd/Makefile.am               |    2 +-
 plugins/audioscrobbler/Makefile.am        |    2 +-
 plugins/brasero-disc-recorder/Makefile.am |    2 +-
 plugins/cd-recorder/Makefile.am           |    2 +-
 plugins/daap/Makefile.am                  |    2 +-
 plugins/fmradio/Makefile.am               |    2 +-
 plugins/generic-player/Makefile.am        |    2 +-
 plugins/ipod/Makefile.am                  |    2 +-
 plugins/iradio/Makefile.am                |    2 +-
 plugins/lirc/Makefile.am                  |    2 +-
 plugins/mmkeys/Makefile.am                |    2 +-
 plugins/mtpdevice/Makefile.am             |    2 +-
 plugins/power-manager/Makefile.am         |    2 +-
 plugins/sample/Makefile.am                |    2 +-
 plugins/status-icon/Makefile.am           |    2 +-
 plugins/visualizer/Makefile.am            |    2 +-
 po/POTFILES.in                            |   12 +++---
 podcast/Makefile.am                       |    6 +---
 shell/Makefile.am                         |   57 +++++++++++++++++++++--------
 {plugins => shell}/rb-module.c            |    0
 {plugins => shell}/rb-module.h            |    0
 {plugins => shell}/rb-plugin-manager.c    |    4 +-
 {plugins => shell}/rb-plugin-manager.h    |    0
 {plugins => shell}/rb-plugin.c            |    0
 {plugins => shell}/rb-plugin.h            |    0
 {plugins => shell}/rb-plugins-engine.c    |   10 +++---
 {plugins => shell}/rb-plugins-engine.h    |    0
 {plugins => shell}/rb-python-module.c     |    6 +++-
 {plugins => shell}/rb-python-module.h     |    0
 {plugins => shell}/rb-python-plugin.c     |   14 +++++---
 {plugins => shell}/rb-python-plugin.h     |    0
 36 files changed, 87 insertions(+), 134 deletions(-)
---
diff --git a/Makefile.am b/Makefile.am
index 998a559..c8fea86 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -6,7 +6,7 @@ DISTCHECK_CONFIGURE_FLAGS = --disable-schemas-install --enable-gtk-doc --disable
 distuninstallcheck_listfiles = find . -type f -print | grep -v '^\./var/scrollkeeper'
 
 SUBDIRS = macros lib metadata rhythmdb widgets sources podcast \
-	backends corelib plugins bindings shell remote data po help tests doc
+	backends bindings shell plugins remote data po help tests doc
 
 EXTRA_DIST = 			\
 	autogen.sh		\
diff --git a/configure.ac b/configure.ac
index b03543a..e12970e 100644
--- a/configure.ac
+++ b/configure.ac
@@ -804,7 +804,6 @@ data/icons/hicolor/scalable/apps/Makefile
 data/icons/hicolor/scalable/places/Makefile
 data/icons/hicolor/scalable/status/Makefile
 sources/Makefile
-corelib/Makefile
 plugins/Makefile
 plugins/sample/Makefile
 plugins/audiocd/Makefile
diff --git a/doc/reference/Makefile.am b/doc/reference/Makefile.am
index d001eba..f3a8319 100644
--- a/doc/reference/Makefile.am
+++ b/doc/reference/Makefile.am
@@ -83,17 +83,8 @@ MORE_GTKDOC_LIBS = $(PYTHON_LIBS)
 endif
 
 GTKDOC_LIBS=\
-	$(top_builddir)/shell/librbshell.la	        \
-	$(top_builddir)/sources/libsources.la	        \
-	$(top_builddir)/sources/libsourcesimpl.la	\
-	$(top_builddir)/podcast/librbpodcast.la		\
-	$(top_builddir)/metadata/librbmetadata.la	\
-	$(top_builddir)/widgets/librbwidgets.la         \
-	$(top_builddir)/plugins/librbplugins.la		\
+	$(top_builddir)/shell/librhythmbox-core.la        \
 	$(BINDING_LIBS)					\
-	$(top_builddir)/rhythmdb/librhythmdb.la         \
-	$(top_builddir)/backends/librbbackends.la	\
-	$(top_builddir)/lib/librb.la	                \
 	$(TOTEM_PLPARSER_LIBS)				\
 	$(HAL_LIBS)					\
 	$(LIBNAUTILUS_BURN_LIBS)			\
diff --git a/plugins/Makefile.am b/plugins/Makefile.am
index 8d68e92..1f599f2 100644
--- a/plugins/Makefile.am
+++ b/plugins/Makefile.am
@@ -1,5 +1,3 @@
-## arch-tag: Automake rules for Rhythmbox's plugin system
-
 SUBDIRS = 						\
 	audiocd						\
 	audioscrobbler					\
@@ -57,49 +55,3 @@ if ENABLE_FM_RADIO
 SUBDIRS += fmradio
 endif
 
-noinst_LTLIBRARIES = librbplugins.la
-
-librbplugins_la_SOURCES =				\
-	rb-plugin.h					\
-	rb-plugin.c					\
-	rb-module.c					\
-	rb-module.h					\
-	rb-plugin-manager.h				\
-	rb-plugin-manager.c				\
-	rb-plugins-engine.h				\
-	rb-plugins-engine.c
-
-INCLUDES =						\
-	-DGNOMELOCALEDIR=\""$(datadir)/locale"\"        \
-	-DSHARE_DIR=\"$(pkgdatadir)\"			\
-	-DG_LOG_DOMAIN=\"Rhythmbox\"		 	\
-	-I$(top_srcdir) 				\
-	-I$(top_srcdir)/lib 				\
-	-I$(top_builddir)/lib 				\
-	-I$(top_srcdir)/player				\
-	-I$(top_srcdir)/metadata			\
-	-I$(top_srcdir)/rhythmdb			\
-	-I$(top_srcdir)/sources				\
-	-I$(top_srcdir)/library				\
-	-I$(top_srcdir)/iradio				\
-	-I$(top_srcdir)/shell				\
-	-I$(top_srcdir)/widgets                    	\
-	$(RHYTHMBOX_CFLAGS)				\
-	-DRB_PLUGIN_DIR=\"$(PLUGINDIR)\"
-
-if ENABLE_PYTHON
-librbplugins_la_SOURCES += \
-	rb-python-module.c		\
-	rb-python-module.h		\
-	rb-python-plugin.c		\
-	rb-python-plugin.h
-
-INCLUDES += \
-	$(NO_STRICT_ALIASING_CFLAGS)	\
-	$(PYGTK_CFLAGS)			\
-	$(PYTHON_CFLAGS)
-endif
-
-
-librbplugins_la_LDFLAGS = -export-dynamic
-
diff --git a/plugins/audiocd/Makefile.am b/plugins/audiocd/Makefile.am
index 04cf0dc..35c97e2 100644
--- a/plugins/audiocd/Makefile.am
+++ b/plugins/audiocd/Makefile.am
@@ -10,7 +10,7 @@ libaudiocd_la_LDFLAGS = $(PLUGIN_LIBTOOL_FLAGS)
 libaudiocd_la_LIBTOOLFLAGS = --tag=disable-static
 
 libaudiocd_la_LIBADD = \
-	$(top_builddir)/corelib/librhythmbox-core.la	\
+	$(top_builddir)/shell/librhythmbox-core.la	\
 	$(TOTEM_PLPARSER_LIBS)				\
 	$(GSTCDDA_LIBS)
 
diff --git a/plugins/audioscrobbler/Makefile.am b/plugins/audioscrobbler/Makefile.am
index ef063d9..d7ebc57 100644
--- a/plugins/audioscrobbler/Makefile.am
+++ b/plugins/audioscrobbler/Makefile.am
@@ -17,7 +17,7 @@ libaudioscrobbler_la_SOURCES = \
 libaudioscrobbler_la_LDFLAGS = $(PLUGIN_LIBTOOL_FLAGS)
 libaudioscrobbler_la_LIBTOOLFLAGS = --tag=disable-static
 libaudioscrobbler_la_LIBADD = 				\
-	$(top_builddir)/corelib/librhythmbox-core.la	\
+	$(top_builddir)/shell/librhythmbox-core.la	\
 	$(TOTEM_PLPARSER_LIBS)				\
 	$(RHYTHMBOX_LIBS)
 
diff --git a/plugins/brasero-disc-recorder/Makefile.am b/plugins/brasero-disc-recorder/Makefile.am
index 16e404f..06909f5 100644
--- a/plugins/brasero-disc-recorder/Makefile.am
+++ b/plugins/brasero-disc-recorder/Makefile.am
@@ -10,7 +10,7 @@ libcd_recorder_la_SOURCES =					\
 libcd_recorder_la_LDFLAGS = $(PLUGIN_LIBTOOL_FLAGS)
 libcd_recorder_la_LIBTOOLFLAGS = --tag=disable-static
 libcd_recorder_la_LIBADD = 				\
-	$(top_builddir)/corelib/librhythmbox-core.la	\
+	$(top_builddir)/shell/librhythmbox-core.la	\
 	$(LIBBRASERO_MEDIA_LIBS)			\
 	$(NULL)
 
diff --git a/plugins/cd-recorder/Makefile.am b/plugins/cd-recorder/Makefile.am
index 706b2ac..730b1d4 100644
--- a/plugins/cd-recorder/Makefile.am
+++ b/plugins/cd-recorder/Makefile.am
@@ -14,7 +14,7 @@ libcd_recorder_la_SOURCES =					\
 libcd_recorder_la_LDFLAGS = $(PLUGIN_LIBTOOL_FLAGS)
 libcd_recorder_la_LIBTOOLFLAGS = --tag=disable-static
 libcd_recorder_la_LIBADD = 				\
-	$(top_builddir)/corelib/librhythmbox-core.la	\
+	$(top_builddir)/shell/librhythmbox-core.la	\
 	$(HAL_LIBS)					\
 	$(LIBNAUTILUS_BURN_LIBS)			\
 	$(NULL)
diff --git a/plugins/daap/Makefile.am b/plugins/daap/Makefile.am
index 4c8fe7d..90935ee 100644
--- a/plugins/daap/Makefile.am
+++ b/plugins/daap/Makefile.am
@@ -33,7 +33,7 @@ libdaap_la_SOURCES = \
 libdaap_la_LDFLAGS = $(PLUGIN_LIBTOOL_FLAGS)
 libdaap_la_LIBTOOLFLAGS = --tag=disable-static
 libdaap_la_LIBADD = 					\
-	$(top_builddir)/corelib/librhythmbox-core.la	\
+	$(top_builddir)/shell/librhythmbox-core.la	\
 	$(DBUS_LIBS)					\
 	$(MDNS_LIBS)
 
diff --git a/plugins/fmradio/Makefile.am b/plugins/fmradio/Makefile.am
index 8ec8a12..7db5832 100644
--- a/plugins/fmradio/Makefile.am
+++ b/plugins/fmradio/Makefile.am
@@ -12,7 +12,7 @@ libfmradio_la_SOURCES = \
 
 libfmradio_la_LDFLAGS = $(PLUGIN_LIBTOOL_FLAGS)
 libfmradio_la_LIBTOOLFLAGS = --tag=disable-static
-libfmradio_la_LIBADD = $(top_builddir)/corelib/librhythmbox-core.la
+libfmradio_la_LIBADD = $(top_builddir)/shell/librhythmbox-core.la
 
 INCLUDES = \
   -DGNOMELOCALEDIR=\""$(datadir)/locale"\" \
diff --git a/plugins/generic-player/Makefile.am b/plugins/generic-player/Makefile.am
index f7e7f45..574bb8f 100644
--- a/plugins/generic-player/Makefile.am
+++ b/plugins/generic-player/Makefile.am
@@ -18,7 +18,7 @@ endif
 
 libgeneric_player_la_LIBTOOLFLAGS = --tag=disable-static
 libgeneric_player_la_LDFLAGS = 				\
-	$(top_builddir)/corelib/librhythmbox-core.la	\
+	$(top_builddir)/shell/librhythmbox-core.la	\
 	$(TOTEM_PLPARSER_LIBS)				\
 	$(HAL_LIBS)				        \
 	$(PLUGIN_LIBTOOL_FLAGS)
diff --git a/plugins/ipod/Makefile.am b/plugins/ipod/Makefile.am
index 77707c4..daa7997 100644
--- a/plugins/ipod/Makefile.am
+++ b/plugins/ipod/Makefile.am
@@ -15,7 +15,7 @@ libipod_la_SOURCES = \
 libipod_la_LDFLAGS = $(PLUGIN_LIBTOOL_FLAGS)
 libipod_la_LIBTOOLFLAGS = --tag=disable-static
 libipod_la_LIBADD = 					\
-	$(top_builddir)/corelib/librhythmbox-core.la	\
+	$(top_builddir)/shell/librhythmbox-core.la	\
 	$(HAL_LIBS)					\
 	$(IPOD_LIBS)
 
diff --git a/plugins/iradio/Makefile.am b/plugins/iradio/Makefile.am
index 3cce0a1..37c8d54 100644
--- a/plugins/iradio/Makefile.am
+++ b/plugins/iradio/Makefile.am
@@ -15,7 +15,7 @@ libiradio_la_SOURCES = 					\
 libiradio_la_LDFLAGS = $(PLUGIN_LIBTOOL_FLAGS)
 libiradio_la_LIBTOOLFLAGS = --tag=disable-static
 libiradio_la_LIBADD = 					\
-	$(top_builddir)/corelib/librhythmbox-core.la	\
+	$(top_builddir)/shell/librhythmbox-core.la	\
 	$(TOTEM_PLPARSER_LIBS)				\
 	$(NULL)
 
diff --git a/plugins/lirc/Makefile.am b/plugins/lirc/Makefile.am
index daea54a..1906e09 100644
--- a/plugins/lirc/Makefile.am
+++ b/plugins/lirc/Makefile.am
@@ -7,7 +7,7 @@ librblirc_la_SOURCES = \
 librblirc_la_LDFLAGS = $(PLUGIN_LIBTOOL_FLAGS) -llirc_client
 librblirc_la_LIBTOOLFLAGS = --tag=disable-static
 
-librblirc_la_LIBADD = $(top_builddir)/corelib/librhythmbox-core.la
+librblirc_la_LIBADD = $(top_builddir)/shell/librhythmbox-core.la
 
 configdir = $(PLUGINDIR)/rblirc
 config_DATA = rhythmbox_lirc_default
diff --git a/plugins/mmkeys/Makefile.am b/plugins/mmkeys/Makefile.am
index 5c717e6..52403ca 100644
--- a/plugins/mmkeys/Makefile.am
+++ b/plugins/mmkeys/Makefile.am
@@ -11,7 +11,7 @@ libmmkeys_la_LDFLAGS = $(PLUGIN_LIBTOOL_FLAGS)
 libmmkeys_la_LIBTOOLFLAGS = --tag=disable-static
 
 libmmkeys_la_LIBADD =					\
-	$(top_builddir)/corelib/librhythmbox-core.la	\
+	$(top_builddir)/shell/librhythmbox-core.la	\
 	$(DBUS_LIBS)					\
 	$(NULL)
 
diff --git a/plugins/mtpdevice/Makefile.am b/plugins/mtpdevice/Makefile.am
index ebdd6d5..a294118 100644
--- a/plugins/mtpdevice/Makefile.am
+++ b/plugins/mtpdevice/Makefile.am
@@ -12,7 +12,7 @@ libmtpdevice_la_SOURCES = \
 libmtpdevice_la_LDFLAGS = $(PLUGIN_LIBTOOL_FLAGS)
 libmtpdevice_la_LIBTOOLFLAGS = --tag=disable-static
 libmtpdevice_la_LIBADD = 				\
-	$(top_builddir)/corelib/librhythmbox-core.la	\
+	$(top_builddir)/shell/librhythmbox-core.la	\
 	$(HAL_LIBS)					\
 	$(MTP_LIBS)
 
diff --git a/plugins/power-manager/Makefile.am b/plugins/power-manager/Makefile.am
index 11c090a..dd7c938 100644
--- a/plugins/power-manager/Makefile.am
+++ b/plugins/power-manager/Makefile.am
@@ -7,7 +7,7 @@ libpower_manager_la_SOURCES = \
 libpower_manager_la_LDFLAGS = $(PLUGIN_LIBTOOL_FLAGS)
 libpower_manager_la_LIBTOOLFLAGS = --tag=disable-static
 
-libpower_manager_la_LIBADD = $(top_builddir)/corelib/librhythmbox-core.la
+libpower_manager_la_LIBADD = $(top_builddir)/shell/librhythmbox-core.la
 
 INCLUDES = 						\
         -DGNOMELOCALEDIR=\""$(datadir)/locale"\"        \
diff --git a/plugins/sample/Makefile.am b/plugins/sample/Makefile.am
index 9ee5d58..21ff446 100644
--- a/plugins/sample/Makefile.am
+++ b/plugins/sample/Makefile.am
@@ -7,7 +7,7 @@ libsample_la_SOURCES = \
 	
 libsample_la_LDFLAGS = $(PLUGIN_LIBTOOL_FLAGS)
 
-libsample_la_LIBADD = $(top_builddir)/corelib/librhythmbox-core.la
+libsample_la_LIBADD = $(top_builddir)/shell/librhythmbox-core.la
 
 INCLUDES = 						\
         -DGNOMELOCALEDIR=\""$(datadir)/locale"\"        \
diff --git a/plugins/status-icon/Makefile.am b/plugins/status-icon/Makefile.am
index d52dffd..3bc0d6e 100644
--- a/plugins/status-icon/Makefile.am
+++ b/plugins/status-icon/Makefile.am
@@ -26,7 +26,7 @@ libstatus_icon_la_LDFLAGS = $(PLUGIN_LIBTOOL_FLAGS)
 libstatus_icon_la_LIBTOOLFLAGS = --tag=disable-static
 
 libstatus_icon_la_LIBADD = 				\
-	$(top_builddir)/corelib/librhythmbox-core.la	\
+	$(top_builddir)/shell/librhythmbox-core.la	\
 	$(NOTIFY_LIBS)					\
 	$(NULL)
 
diff --git a/plugins/visualizer/Makefile.am b/plugins/visualizer/Makefile.am
index 979ac0c..8376e73 100644
--- a/plugins/visualizer/Makefile.am
+++ b/plugins/visualizer/Makefile.am
@@ -12,7 +12,7 @@ libvisualizer_la_LDFLAGS = $(PLUGIN_LIBTOOL_FLAGS)
 libvisualizer_la_LIBTOOLFLAGS = --tag=disable-static
 
 libvisualizer_la_LIBADD = 				\
-	$(top_builddir)/corelib/librhythmbox-core.la	\
+	$(top_builddir)/shell/librhythmbox-core.la	\
 	-lgstinterfaces-0.10				\
 	$(DBUS_LIBS)					\
 	$(RHYTHMBOX_LIBS)
diff --git a/po/POTFILES.in b/po/POTFILES.in
index 61bcf3f..c91f7e9 100644
--- a/po/POTFILES.in
+++ b/po/POTFILES.in
@@ -115,12 +115,6 @@ plugins/mtpdevice/rb-mtp-source.c
 plugins/power-manager/rb-power-manager-plugin.c
 plugins/pythonconsole/pythonconsole.py
 [type: gettext/ini]plugins/pythonconsole/pythonconsole.rb-plugin.in
-plugins/rb-module.c
-plugins/rb-plugin-manager.c
-plugins/rb-plugin.c
-plugins/rb-plugins-engine.c
-plugins/rb-python-module.c
-plugins/rb-python-plugin.c
 plugins/rb/__init__.py
 plugins/sample-python/sample-python.py
 [type: gettext/ini]plugins/sample-python/sample-python.rb-plugin.in
@@ -145,8 +139,14 @@ rhythmdb/rhythmdb-property-model.c
 rhythmdb/rhythmdb-tree.c
 rhythmdb/rhythmdb.c
 shell/main.c
+shell/rb-module.c
 shell/rb-play-order.c
 shell/rb-playlist-manager.c
+shell/rb-plugin-manager.c
+shell/rb-plugin.c
+shell/rb-plugins-engine.c
+shell/rb-python-module.c
+shell/rb-python-plugin.c
 shell/rb-removable-media-manager.c
 shell/rb-shell-clipboard.c
 shell/rb-shell-player.c
diff --git a/podcast/Makefile.am b/podcast/Makefile.am
index 2e15edd..f944c58 100644
--- a/podcast/Makefile.am
+++ b/podcast/Makefile.am
@@ -6,9 +6,6 @@ librbpodcast_parse_la_SOURCES = 			\
 	rb-podcast-parse.c				\
 	rb-podcast-parse.h
 
-librbpodcast_parse_la_LIBADD =				\
-	$(top_builddir)/lib/librb.la
-
 librbpodcast_la_SOURCES =				\
 	rb-feed-podcast-properties-dialog.c		\
 	rb-feed-podcast-properties-dialog.h		\
@@ -18,14 +15,13 @@ librbpodcast_la_SOURCES =				\
 	rb-podcast-parse.h				\
 	rb-podcast-manager.c				\
 	rb-podcast-manager.h
-librbpodcast_la_LIBADD =				\
-	librbpodcast_parse.la
 
 noinst_PROGRAMS = test-podcast-parse
 test_podcast_parse_SOURCES =				\
 	test-podcast-parse.c
 test_podcast_parse_LDADD =				\
 	librbpodcast_parse.la				\
+	$(top_builddir)/lib/librb.la			\
 	$(RHYTHMBOX_LIBS)				\
 	$(TOTEM_PLPARSER_LIBS)
 
diff --git a/shell/Makefile.am b/shell/Makefile.am
index f42c85b..432267b 100644
--- a/shell/Makefile.am
+++ b/shell/Makefile.am
@@ -24,7 +24,7 @@ tab_files = AUTHORS.tab MAINTAINERS.tab MAINTAINERS.old.tab DOCUMENTERS.tab
 
 bin_PROGRAMS = rhythmbox
 rhythmbox_SOURCES = main.c
-noinst_LTLIBRARIES = librbshell.la
+lib_LTLIBRARIES = librhythmbox-core.la
 
 INCLUDES = 						\
         -DGNOMELOCALEDIR=\""$(datadir)/locale"\"        \
@@ -42,12 +42,13 @@ INCLUDES = 						\
 	-DPIXMAP_DIR=\""$(datadir)/pixmaps"\"		\
 	-DSHARE_DIR=\"$(pkgdatadir)\"                   \
 	-DDATADIR=\""$(datadir)"\"			\
+	-DRB_PLUGIN_DIR=\"$(PLUGINDIR)\"		\
 	$(RHYTHMBOX_CFLAGS)				\
 	$(TOTEM_PLPARSER_CFLAGS)			\
 	$(DBUS_CFLAGS)					\
 	-D_XOPEN_SOURCE -D__EXTENSIONS__ -D_BSD_SOURCE
 
-librbshell_la_SOURCES =              			\
+librhythmbox_core_la_SOURCES =				\
 	rb-shell.c					\
 	rb-shell.h					\
 	rb-shell-player.c				\
@@ -87,19 +88,46 @@ librbshell_la_SOURCES =              			\
 	rb-play-order-random-by-rating.c		\
 	rb-play-order-random-by-rating.h		\
 	rb-missing-plugins.c				\
-	rb-missing-plugins.h
-
-rhythmbox_LDADD =					\
-	librbshell.la					\
-	$(top_builddir)/corelib/librhythmbox-core.la	\
+	rb-missing-plugins.h				\
+	\
+	rb-plugin.h					\
+	rb-plugin.c					\
+	rb-module.h					\
+	rb-module.c					\
+	rb-plugin-manager.h				\
+	rb-plugin-manager.c				\
+	rb-plugins-engine.h				\
+	rb-plugins-engine.c
+
+librhythmbox_core_la_LIBADD =				\
 	$(top_builddir)/sources/libsourcesimpl.la	\
 	$(top_builddir)/podcast/librbpodcast.la	        \
-	$(top_builddir)/plugins/librbplugins.la		\
-	-lgstpbutils-0.10
+	$(top_builddir)/sources/libsources.la	        \
+	$(top_builddir)/metadata/librbmetadata.la	\
+	$(top_builddir)/widgets/librbwidgets.la         \
+	$(top_builddir)/rhythmdb/librhythmdb.la		\
+	$(top_builddir)/backends/librbbackends.la	\
+	$(top_builddir)/lib/librb.la			\
+	$(DBUS_LIBS)					\
+	$(TOTEM_PLPARSER_LIBS)				\
+	$(RHYTHMBOX_LIBS)				\
+	-lgstpbutils-0.10				\
+	-lgstcontroller-0.10
+
+librhythmbox_core_la_LDFLAGS = -export-dynamic -no-undefined
+librhythmbox_core_la_LIBTOOLFLAGS = --tag=disable-static
 
 if ENABLE_PYTHON
+
+librhythmbox_core_la_SOURCES +=				\
+	rb-python-module.h				\
+	rb-python-module.c				\
+	rb-python-plugin.h				\
+	rb-python-plugin.c
+
 INCLUDES += $(PYGTK_CFLAGS)  $(PYTHON_CFLAGS)
-rhythmbox_LDADD += $(PYTHON_LIBS) $(top_builddir)/bindings/python/rb.la
+
+librhythmbox_core_la_LIBADD += $(PYTHON_LIBS) $(top_builddir)/bindings/python/rb.la
 endif
 
 rb-shell-glue.h: rb-shell.xml Makefile
@@ -115,14 +143,11 @@ rb-shell-player-binding.h: rb-shell-player.xml Makefile
 
 BUILT_SOURCES += rb-shell-glue.h rb-shell-binding.h rb-shell-player-glue.h rb-shell-player-binding.h rb-playlist-manager-glue.h
 EXTRA_DIST += rb-shell.xml rb-shell-player.xml rb-playlist-manager.xml
-rhythmbox_LDADD += $(DBUS_LIBS)
 
-rhythmbox_LDADD += \
-	$(top_builddir)/backends/librbbackends.la	\
-	$(TOTEM_PLPARSER_LIBS)				\
-	$(HAL_LIBS)					\
+rhythmbox_LDADD = 					\
+	librhythmbox-core.la				\
 	$(RHYTHMBOX_LIBS)				\
-	-lgstcontroller-0.10
+	$(DBUS_LIBS)
 
 rhythmbox_LDFLAGS = -export-dynamic -no-undefined
 
diff --git a/plugins/rb-module.c b/shell/rb-module.c
similarity index 100%
rename from plugins/rb-module.c
rename to shell/rb-module.c
diff --git a/plugins/rb-module.h b/shell/rb-module.h
similarity index 100%
rename from plugins/rb-module.h
rename to shell/rb-module.h
diff --git a/plugins/rb-plugin-manager.c b/shell/rb-plugin-manager.c
similarity index 99%
rename from plugins/rb-plugin-manager.c
rename to shell/rb-plugin-manager.c
index 676f37b..1b1a6c5 100644
--- a/plugins/rb-plugin-manager.c
+++ b/shell/rb-plugin-manager.c
@@ -206,7 +206,7 @@ cursor_changed_cb (GtkTreeSelection *selection,
 		height = gdk_pixbuf_get_height (icon);
 		header_height = pm->priv->header_hbox->allocation.height;
 		if (height > header_height) {
-			icon_scaled = gdk_pixbuf_scale_simple (icon, 
+			icon_scaled = gdk_pixbuf_scale_simple (icon,
 							       (gfloat)width/height*header_height, header_height,
 							       GDK_INTERP_BILINEAR);
 			gtk_image_set_from_pixbuf (GTK_IMAGE (pm->priv->plugin_icon), icon_scaled);
@@ -515,7 +515,7 @@ rb_plugin_manager_init (RBPluginManager *pm)
 			  "clicked",
 			  G_CALLBACK (configure_button_cb),
 			  pm);
-	
+
         pm->priv->header_hbox = GTK_WIDGET (gtk_builder_get_object (builder, "header_hbox"));
 
 	pm->priv->plugin_title = GTK_WIDGET (gtk_builder_get_object (builder, "plugin_title"));
diff --git a/plugins/rb-plugin-manager.h b/shell/rb-plugin-manager.h
similarity index 100%
rename from plugins/rb-plugin-manager.h
rename to shell/rb-plugin-manager.h
diff --git a/plugins/rb-plugin.c b/shell/rb-plugin.c
similarity index 100%
rename from plugins/rb-plugin.c
rename to shell/rb-plugin.c
diff --git a/plugins/rb-plugin.h b/shell/rb-plugin.h
similarity index 100%
rename from plugins/rb-plugin.h
rename to shell/rb-plugin.h
diff --git a/plugins/rb-plugins-engine.c b/shell/rb-plugins-engine.c
similarity index 99%
rename from plugins/rb-plugins-engine.c
rename to shell/rb-plugins-engine.c
index 6a2aa44..94eea31 100644
--- a/plugins/rb-plugins-engine.c
+++ b/shell/rb-plugins-engine.c
@@ -125,7 +125,7 @@ rb_plugins_engine_load (const gchar *file)
 	}
 
 	if (!g_key_file_has_key (plugin_file,
-			   	 "RB Plugin",
+				 "RB Plugin",
 				 "IAge",
 				 NULL))	{
 		rb_debug ("IAge key does not exist in file: %s", file);
@@ -269,7 +269,7 @@ rb_plugins_engine_load_cb (GFile *file, gboolean dir, gpointer userdata)
 		sep = plugin_path;
 	else
 		sep += 1;
-	
+
 	/* don't look inside version control system directories.
 	 * most are already covered by excluding hidden files/directories.
 	 */
@@ -314,7 +314,7 @@ rb_plugins_engine_load_cb (GFile *file, gboolean dir, gpointer userdata)
 
 	if (activate)
 		rb_plugins_engine_activate_plugin (info);
-	return TRUE;	
+	return TRUE;
 }
 
 static void
@@ -396,7 +396,7 @@ rb_plugin_info_free (RBPluginInfo *info)
 		rb_plugins_engine_deactivate_plugin_real (info, rb_plugins_shell);
 
 	if (info->plugin != NULL) {
-	       	rb_debug ("Unref plugin %s", info->name);
+		rb_debug ("Unref plugin %s", info->name);
 
 		g_object_unref (info->plugin);
 
@@ -548,7 +548,7 @@ rb_plugins_engine_activate_plugin (RBPluginInfo *info)
 		g_free (key_name);
 	}
         info->active = ret;
- 
+
         if (ret != FALSE)
                 return TRUE;
 
diff --git a/plugins/rb-plugins-engine.h b/shell/rb-plugins-engine.h
similarity index 100%
rename from plugins/rb-plugins-engine.h
rename to shell/rb-plugins-engine.h
diff --git a/plugins/rb-python-module.c b/shell/rb-python-module.c
similarity index 99%
rename from plugins/rb-python-module.c
rename to shell/rb-python-module.c
index 3fd0e9d..5aa2fd7 100644
--- a/plugins/rb-python-module.c
+++ b/shell/rb-python-module.c
@@ -30,6 +30,10 @@
 #include <config.h>
 #endif
 
+#ifdef _XOPEN_SOURCE
+#undef _XOPEN_SOURCE
+#endif
+
 #include <pygobject.h>
 #include <pygtk/pygtk.h>
 
@@ -79,7 +83,7 @@ pyg_value_g_value_from_pyobject (GValue *value, PyObject *obj)
 {
 	GType type;
 	GValue obj_value = { 0, };
-	
+
 	type = pyg_type_from_object((PyObject *) obj->ob_type);
 	if (! type) {
 		PyErr_Clear();
diff --git a/plugins/rb-python-module.h b/shell/rb-python-module.h
similarity index 100%
rename from plugins/rb-python-module.h
rename to shell/rb-python-module.h
diff --git a/plugins/rb-python-plugin.c b/shell/rb-python-plugin.c
similarity index 98%
rename from plugins/rb-python-plugin.c
rename to shell/rb-python-plugin.c
index b832445..e3e1d5a 100644
--- a/plugins/rb-python-plugin.c
+++ b/shell/rb-python-plugin.c
@@ -27,6 +27,10 @@
 
 #include <config.h>
 
+#ifdef _XOPEN_SOURCE
+#undef _XOPEN_SOURCE
+#endif
+
 #include "rb-python-plugin.h"
 #include "rb-plugin.h"
 #include "rb-debug.h"
@@ -74,11 +78,11 @@ check_py_object_is_gtk_widget (PyObject *py_obj)
 	{
 		PyObject *module;
 
-	    	if ((module = PyImport_ImportModule ("gtk")))
-	    	{
+		if ((module = PyImport_ImportModule ("gtk")))
+		{
 			PyObject *moddict = PyModule_GetDict (module);
 			_PyGtkWidget_Type = (PyTypeObject *) PyDict_GetItemString (moddict, "Widget");
-	    	}
+		}
 
 		if (_PyGtkWidget_Type == NULL)
 		{
@@ -203,7 +207,7 @@ rb_python_object_init (RBPythonObject *object)
 	object->instance = PyObject_CallObject (class->type, NULL);
 	if (object->instance == NULL)
 		PyErr_Print();
-	
+
 	pyg_gil_state_release (state);
 }
 
@@ -217,7 +221,7 @@ rb_python_object_finalize (GObject *object)
 	if (((RBPythonObject *) object)->instance) {
 		Py_DECREF (((RBPythonObject *) object)->instance);
 	}
-	
+
 	pyg_gil_state_release (state);
 
 	G_OBJECT_CLASS (parent_class)->finalize (object);
diff --git a/plugins/rb-python-plugin.h b/shell/rb-python-plugin.h
similarity index 100%
rename from plugins/rb-python-plugin.h
rename to shell/rb-python-plugin.h
[Date Prev][Date Next] [Thread Prev][Thread Next] [Thread Index] [Date Index] [Author Index]