GNOME.org
 

[rhythmbox] install headers usable by C plugins

commit 6d6065dfb817e941fc8b76053621900630036630
Author: Jonathan Matthew <jonathan d14n org>
Date:   Sat Apr 17 22:44:11 2010 +1000

    install headers usable by C plugins

 backends/Makefile.am             |   16 +++++++++-----
 lib/Makefile.am                  |   18 ++++++++++------
 lib/libmediaplayerid/Makefile.am |    6 ++++-
 metadata/Makefile.am             |    5 ++++
 podcast/Makefile.am              |   11 +++++++--
 rhythmdb/Makefile.am             |   16 +++++++++-----
 shell/Makefile.am                |   23 ++++++++++++---------
 sources/Makefile.am              |   39 ++++++++++++++++++-------------------
 widgets/Makefile.am              |   26 ++++++++++++++----------
 9 files changed, 96 insertions(+), 64 deletions(-)
---
diff --git a/backends/Makefile.am b/backends/Makefile.am
index e7047e9..5de11c3 100644
--- a/backends/Makefile.am
+++ b/backends/Makefile.am
@@ -2,16 +2,21 @@ noinst_LTLIBRARIES = librbbackends.la
 
 SUBDIRS = gstreamer 
 
+backendincludedir = $(includedir)/rhythmbox/backends
+
+backendinclude_HEADERS =					\
+	rb-encoder.h					\
+	rb-player.h					\
+	rb-player-gst-filter.h				\
+	rb-player-gst-tee.h				\
+	rb-player-gst-data-tee.h
+
 librbbackends_la_SOURCES =				\
-	rb-encoder.h 					\
+	$(backend_HEADERS)				\
 	rb-encoder.c					\
-	rb-player.h					\
 	rb-player.c					\
-	rb-player-gst-filter.h				\
 	rb-player-gst-filter.c				\
-	rb-player-gst-tee.h				\
 	rb-player-gst-tee.c				\
-	rb-player-gst-data-tee.h			\
 	rb-player-gst-data-tee.c			\
 	$(NULL)
 
@@ -30,6 +35,5 @@ INCLUDES = 						\
 	-I$(top_srcdir)/rhythmdb			\
 	-I$(top_srcdir)/backends/gstreamer		\
 	-I$(top_builddir)/lib 				\
-	$(LIBNAUTILUS_BURN_CFLAGS)			\
 	$(RHYTHMBOX_CFLAGS)
 
diff --git a/lib/Makefile.am b/lib/Makefile.am
index 9d48295..0cd73da 100644
--- a/lib/Makefile.am
+++ b/lib/Makefile.am
@@ -9,10 +9,20 @@ else
 MKDTEMP_FILES =
 endif
 
+rbincludedir = $(includedir)/rhythmbox/lib
+rbinclude_HEADERS =					\
+	rb-builder-helpers.h				\
+	rb-debug.h					\
+	rb-file-helpers.h				\
+	rb-preferences.h				\
+	rb-stock-icons.h				\
+	rb-string-value-map.h				\
+	rb-util.h
+
 librb_la_SOURCES =					\
 	$(MKDTEMP_FILES)				\
+	$(rbinclude_HEADERS)				\
 	rb-debug.c					\
-	rb-debug.h					\
 	eel-gconf-extensions.c				\
 	eel-gconf-extensions.h				\
 	eggdesktopfile.c				\
@@ -23,20 +33,14 @@ librb_la_SOURCES =					\
 	eggsmclient-xsmp.c				\
 	gseal-gtk-compat.h				\
 	rb-file-helpers.c				\
-	rb-file-helpers.h				\
 	rb-builder-helpers.c				\
-	rb-builder-helpers.h				\
 	rb-stock-icons.c				\
-	rb-stock-icons.h				\
 	rb-cut-and-paste-code.c				\
 	rb-cut-and-paste-code.h				\
 	rb-util.c					\
-	rb-util.h					\
 	rb-tree-dnd.c					\
 	rb-tree-dnd.h					\
-	rb-preferences.h				\
 	rb-string-value-map.c				\
-	rb-string-value-map.h				\
 	rb-async-queue-watch.c				\
 	rb-async-queue-watch.h				\
 	rb-text-helpers.c				\
diff --git a/lib/libmediaplayerid/Makefile.am b/lib/libmediaplayerid/Makefile.am
index da06717..084aebc 100644
--- a/lib/libmediaplayerid/Makefile.am
+++ b/lib/libmediaplayerid/Makefile.am
@@ -1,8 +1,12 @@
 
 noinst_LTLIBRARIES = libmediaplayerid.la
 
+mpidincludedir = $(includedir)/rhythmbox/lib/libmediaplayerid
+mpidinclude_HEADERS = 			\
+	mediaplayerid.h
+
 libmediaplayerid_la_SOURCES =		\
-	mediaplayerid.h			\
+	$(mpidinclude_HEADERS)		\
 	mpid-private.h			\
 	mpid-device.c			\
 	mpid-files.c			\
diff --git a/metadata/Makefile.am b/metadata/Makefile.am
index 6202d1d..35895be 100644
--- a/metadata/Makefile.am
+++ b/metadata/Makefile.am
@@ -15,6 +15,11 @@ INCLUDES += $(DBUS_CFLAGS)				\
 	-DLIBEXEC_DIR=\"$(libexecdir)\"			\
 	-DINSTALLED_METADATA_HELPER=\"$(INSTALLED_METADATA_HELPER)\"
 
+# API
+
+metadataincludedir = $(includedir)/rhythmbox/metadata
+metadatainclude_HEADERS = rb-metadata.h
+
 # client library
 
 noinst_LTLIBRARIES = librbmetadata.la
diff --git a/podcast/Makefile.am b/podcast/Makefile.am
index 6a93149..cab390f 100644
--- a/podcast/Makefile.am
+++ b/podcast/Makefile.am
@@ -1,18 +1,23 @@
 noinst_LTLIBRARIES = librbpodcast.la librbpodcast_parse.la
 
+podcastincludedir = $(includedir)/rhythmbox/podcast
+podcastinclude_HEADERS =				\
+	rb-podcast-parse.h				\
+	rb-podcast-manager.h
+
+
 librbpodcast_parse_la_SOURCES = 			\
 	rb-podcast-parse.c				\
 	rb-podcast-parse.h
 
 librbpodcast_la_SOURCES =				\
+	$(podcastinclude_HEADERS)			\
 	rb-feed-podcast-properties-dialog.c		\
 	rb-feed-podcast-properties-dialog.h		\
 	rb-podcast-properties-dialog.c			\
 	rb-podcast-properties-dialog.h			\
 	rb-podcast-parse.c				\
-	rb-podcast-parse.h				\
-	rb-podcast-manager.c				\
-	rb-podcast-manager.h
+	rb-podcast-manager.c
 
 noinst_PROGRAMS = test-podcast-parse
 test_podcast_parse_SOURCES =				\
diff --git a/rhythmdb/Makefile.am b/rhythmdb/Makefile.am
index 021a7c8..18acbe2 100644
--- a/rhythmdb/Makefile.am
+++ b/rhythmdb/Makefile.am
@@ -14,21 +14,25 @@ INCLUDES = 						\
 	$(RHYTHMBOX_CFLAGS)				\
 	$(NO_STRICT_ALIASING_CFLAGS)
 
-librhythmdb_la_SOURCES =				\
-	rb-refstring.c					\
+rhythmdbincludedir = $(includedir)/rhythmbox/rhythmdb
+rhythmdbinclude_HEADERS =				\
 	rb-refstring.h					\
 	rhythmdb.h					\
+	rhythmdb-property-model.h			\
+	rhythmdb-query-model.h				\
+	rhythmdb-query-results.h			\
+	rhythmdb-import-job.h
+
+librhythmdb_la_SOURCES =				\
+	$(rhythmdbinclude_HEADERS)			\
+	rb-refstring.c					\
 	rhythmdb-private.h				\
 	rhythmdb.c					\
 	rhythmdb-monitor.c				\
 	rhythmdb-query.c				\
-	rhythmdb-property-model.h			\
 	rhythmdb-property-model.c			\
-	rhythmdb-query-model.h				\
 	rhythmdb-query-model.c				\
-	rhythmdb-query-results.h			\
 	rhythmdb-query-results.c			\
-	rhythmdb-import-job.h				\
 	rhythmdb-import-job.c
 
 
diff --git a/shell/Makefile.am b/shell/Makefile.am
index 86b501e..81a14b3 100644
--- a/shell/Makefile.am
+++ b/shell/Makefile.am
@@ -49,27 +49,32 @@ INCLUDES = 						\
 	$(WEBKIT_FLAGS)				\
 	-D_XOPEN_SOURCE -D__EXTENSIONS__ -D_BSD_SOURCE
 
+shellincludedir = $(includedir)/rhythmbox/shell
+shellinclude_HEADERS =					\
+	rb-shell.h					\
+	rb-shell-player.h				\
+	rb-shell-preferences.h				\
+	rb-playlist-manager.h				\
+	rb-removable-media-manager.h			\
+	rb-history.h					\
+	rb-play-order.h					\
+	rb-plugin.h
+
 librhythmbox_core_la_SOURCES =				\
+	$(shellinclude_HEADERS)				\
 	rb-shell.c					\
-	rb-shell.h					\
 	rb-shell-player.c				\
-	rb-shell-player.h				\
 	rb-source-header.c				\
 	rb-source-header.h				\
 	rb-statusbar.c					\
 	rb-statusbar.h					\
 	rb-shell-preferences.c				\
-	rb-shell-preferences.h				\
 	rb-shell-clipboard.c				\
 	rb-shell-clipboard.h				\
 	rb-playlist-manager.c				\
-	rb-playlist-manager.h				\
 	rb-removable-media-manager.c			\
-	rb-removable-media-manager.h			\
 	rb-history.c					\
-	rb-history.h					\
 	rb-play-order.c					\
-	rb-play-order.h					\
 	rb-play-order-linear.c				\
 	rb-play-order-linear.h				\
 	rb-play-order-linear-loop.c			\
@@ -91,7 +96,6 @@ librhythmbox_core_la_SOURCES =				\
 	rb-missing-plugins.c				\
 	rb-missing-plugins.h				\
 	\
-	rb-plugin.h					\
 	rb-plugin.c					\
 	rb-module.h					\
 	rb-module.c					\
@@ -101,9 +105,8 @@ librhythmbox_core_la_SOURCES =				\
 	rb-plugins-engine.c
 
 librhythmbox_core_la_LIBADD =				\
-	$(top_builddir)/sources/libsourcesimpl.la	\
-	$(top_builddir)/podcast/librbpodcast.la	        \
 	$(top_builddir)/sources/libsources.la	        \
+	$(top_builddir)/podcast/librbpodcast.la	        \
 	$(top_builddir)/metadata/librbmetadata.la	\
 	$(top_builddir)/widgets/librbwidgets.la         \
 	$(top_builddir)/rhythmdb/librhythmdb.la		\
diff --git a/sources/Makefile.am b/sources/Makefile.am
index 413ab76..a89540f 100644
--- a/sources/Makefile.am
+++ b/sources/Makefile.am
@@ -1,42 +1,44 @@
 NULL =
 
-noinst_LTLIBRARIES = libsources.la libsourcesimpl.la
+noinst_LTLIBRARIES = libsources.la
 
-libsources_la_SOURCES = 		\
-	rb-source.c 			\
+sourceincludedir = $(includedir)/rhythmbox/sources
+sourceinclude_HEADERS = 		\
 	rb-source.h			\
-	rb-streaming-source.c		\
 	rb-streaming-source.h		\
-	rb-source-group.c		\
 	rb-source-group.h		\
-	rb-source-search.c		\
 	rb-source-search.h		\
-	$(NULL)
+	rb-sourcelist.h			\
+	rb-sourcelist-model.h		\
+	rb-browser-source.h		\
+	rb-removable-media-source.h	\
+	rb-media-player-source.h	\
+	rb-playlist-source.h		\
+	rb-playlist-xml.h		\
+	rb-auto-playlist-source.h	\
+	rb-static-playlist-source.h	\
+	rb-source-search-basic.h
 
-libsourcesimpl_la_SOURCES =		\
+libsources_la_SOURCES = 		\
+	$(sourceinclude_HEADERS)	\
+	rb-source.c 			\
+	rb-streaming-source.c		\
+	rb-source-group.c		\
+	rb-source-search.c		\
 	rb-sourcelist.c			\
-	rb-sourcelist.h			\
 	rb-sourcelist-model.c		\
-	rb-sourcelist-model.h		\
 	rb-browser-source.c		\
-	rb-browser-source.h		\
 	rb-library-source.c		\
 	rb-library-source.h		\
 	rb-podcast-source.c		\
 	rb-podcast-source.h		\
 	rb-removable-media-source.c	\
-	rb-removable-media-source.h	\
 	rb-media-player-source.c	\
-	rb-media-player-source.h	\
 	rb-media-player-sync-settings.c	\
 	rb-media-player-sync-settings.h	\
 	rb-playlist-source.c            \
-	rb-playlist-source.h		\
-	rb-playlist-xml.h		\
 	rb-auto-playlist-source.c	\
-	rb-auto-playlist-source.h	\
 	rb-static-playlist-source.c	\
-	rb-static-playlist-source.h	\
 	rb-play-queue-source.c		\
 	rb-play-queue-source.h		\
 	rb-missing-files-source.c	\
@@ -44,7 +46,6 @@ libsourcesimpl_la_SOURCES =		\
 	rb-import-errors-source.c	\
 	rb-import-errors-source.h	\
 	rb-source-search-basic.c	\
-	rb-source-search-basic.h	\
 	$(NULL)
 
 INCLUDES =						\
@@ -72,5 +73,3 @@ INCLUDES =						\
 	$(NO_STRICT_ALIASING_CFLAGS)
 
 libsources_la_LDFLAGS = -export-dynamic
-libsourcesimpl_la_LDFLAGS = -export-dynamic
-
diff --git a/widgets/Makefile.am b/widgets/Makefile.am
index 0da1225..17128a5 100644
--- a/widgets/Makefile.am
+++ b/widgets/Makefile.am
@@ -1,40 +1,44 @@
 noinst_LTLIBRARIES = librbwidgets.la
 
+widgetincludedir = $(includedir)/rhythmbox/widgets
+widgetinclude_HEADERS =					\
+	rb-entry-view.h					\
+	rb-property-view.h				\
+	rb-dialog.h					\
+	rb-cell-renderer-pixbuf.h			\
+	rb-cell-renderer-rating.h			\
+	rb-rating.h					\
+	rb-library-browser.h				\
+	rb-segmented-bar.h				\
+	rb-song-info.h					\
+	rb-uri-dialog.h
+
 librbwidgets_la_SOURCES =				\
+	$(widgetinclude_HEADERS)			\
 	rb-entry-view.c					\
-	rb-entry-view.h					\
 	rb-property-view.c				\
-	rb-property-view.h				\
 	rb-search-entry.c				\
 	rb-search-entry.h				\
 	rb-header.c					\
 	rb-header.h					\
 	rb-dialog.c					\
-	rb-dialog.h					\
 	rb-cell-renderer-pixbuf.c			\
-	rb-cell-renderer-pixbuf.h			\
 	rb-cell-renderer-rating.c			\
-	rb-cell-renderer-rating.h			\
 	gossip-cell-renderer-expander.c			\
 	gossip-cell-renderer-expander.h			\
 	gedit-message-area.c				\
 	gedit-message-area.h				\
 	rb-song-info.c					\
-	rb-song-info.h					\
 	rb-rating.c					\
-	rb-rating.h					\
 	rb-rating-helper.c				\
 	rb-segmented-bar.c				\
-	rb-segmented-bar.h				\
-	rb-library-browser.h				\
 	rb-library-browser.c				\
 	rb-rating-helper.h				\
 	rb-query-creator.c				\
 	rb-query-creator.h				\
 	rb-query-creator-private.h			\
 	rb-query-creator-properties.c			\
-	rb-uri-dialog.c					\
-	rb-uri-dialog.h
+	rb-uri-dialog.c
 
 INCLUDES =						\
 	-DGNOMELOCALEDIR=\""$(datadir)/locale"\"        \
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]