[rhythmbox] move sample plugins to a separate directory
- From: Jonathan Matthew <jmatthew src gnome org>
- To: commits-list gnome org
- Cc:
- Subject: [rhythmbox] move sample plugins to a separate directory
- Date: Mon, 3 Sep 2012 22:53:57 +0000 (UTC)
commit 523a0659264537c396eca6d7700e3c42d459c7fc
Author: Jonathan Matthew <jonathan d14n org>
Date: Tue Sep 4 08:12:22 2012 +1000
move sample plugins to a separate directory
This means we can build them properly without getting in the way
of uninstalled builds. Sample plugins are now also installed to a
directory parallel to the real plugins dir, but I don't expect
them to be packaged.
Makefile.am | 2 +-
configure.ac | 9 ++++++---
plugins/Makefile.am | 9 +--------
.../sample-python/Makefile.am | 6 +++---
.../sample-python/sample-python.plugin.in | 0
.../sample-python/sample-python.py | 0
.../sample-vala/Makefile.am | 7 ++-----
.../sample-vala/rb-sample-vala-plugin.vala | 0
.../sample-vala/sample-vala.plugin.in | 0
{plugins => sample-plugins}/sample/Makefile.am | 7 +++----
.../sample/rb-sample-plugin.c | 0
.../sample/sample.plugin.in | 0
12 files changed, 16 insertions(+), 24 deletions(-)
---
diff --git a/Makefile.am b/Makefile.am
index fb6eeac..f3e0e21 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -4,7 +4,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 shell bindings plugins remote data po help tests doc
+ backends shell bindings sample-plugins plugins remote data po help tests doc
INCLUDES = rhythmbox.h
diff --git a/configure.ac b/configure.ac
index b9ec80f..d50ec49 100644
--- a/configure.ac
+++ b/configure.ac
@@ -588,8 +588,10 @@ AC_SUBST(PLUGIN_LIBTOOL_FLAGS)
PLUGINDIR='${libdir}/rhythmbox/plugins'
PLUGINDATADIR='${datadir}/rhythmbox/plugins'
+SAMPLEPLUGINDIR='${libdir}/rhythmbox/sample-plugins'
AC_SUBST(PLUGINDIR)
AC_SUBST(PLUGINDATADIR)
+AC_SUBST(SAMPLEPLUGINDIR)
dnl ================================================================
dnl Python plugins
@@ -797,7 +799,6 @@ data/icons/src/Makefile
sources/Makefile
sources/sync/Makefile
plugins/Makefile
-plugins/sample/Makefile
plugins/audiocd/Makefile
plugins/audioscrobbler/Makefile
plugins/brasero-disc-recorder/Makefile
@@ -809,8 +810,6 @@ plugins/mtpdevice/Makefile
plugins/iradio/Makefile
plugins/lirc/Makefile
plugins/lyrics/Makefile
-plugins/sample-python/Makefile
-plugins/sample-vala/Makefile
plugins/pythonconsole/Makefile
plugins/artsearch/Makefile
plugins/magnatune/Makefile
@@ -827,6 +826,10 @@ plugins/rbzeitgeist/Makefile
plugins/notification/Makefile
plugins/visualizer/Makefile
plugins/grilo/Makefile
+sample-plugins/Makefile
+sample-plugins/sample/Makefile
+sample-plugins/sample-python/Makefile
+sample-plugins/sample-vala/Makefile
bindings/Makefile
bindings/vala/Makefile
bindings/gi/Makefile
diff --git a/plugins/Makefile.am b/plugins/Makefile.am
index bbea476..e4f6e69 100644
--- a/plugins/Makefile.am
+++ b/plugins/Makefile.am
@@ -9,8 +9,7 @@ SUBDIRS = \
iradio \
mmkeys \
mpris \
- power-manager \
- sample
+ power-manager
if ENABLE_PYTHON
SUBDIRS += \
@@ -22,17 +21,11 @@ SUBDIRS += \
pythonconsole \
rbzeitgeist \
replaygain \
- sample-python \
sendto \
rb
endif
-if ENABLE_VALA
-SUBDIRS += \
- sample-vala
-endif
-
if WITH_LIRC
SUBDIRS += lirc
endif
diff --git a/plugins/sample-python/Makefile.am b/sample-plugins/sample-python/Makefile.am
similarity index 72%
rename from plugins/sample-python/Makefile.am
rename to sample-plugins/sample-python/Makefile.am
index 118a426..abe0434 100644
--- a/plugins/sample-python/Makefile.am
+++ b/sample-plugins/sample-python/Makefile.am
@@ -1,11 +1,11 @@
# sample python plugin
-plugindir = $(PLUGINDIR)/sample-python
-#plugin_PYTHON = sample-python.py
+plugindir = $(SAMPLEPLUGINDIR)/sample-python
+plugin_PYTHON = sample-python.py
plugin_in_files = sample-python.plugin.in
%.plugin: %.plugin.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*po) ; $(INTLTOOL_MERGE) $(top_srcdir)/po $< $@ -d -u -c $(top_builddir)/po/.intltool-merge-cache
-#plugin_DATA = $(plugin_in_files:.plugin.in=.plugin)
+plugin_DATA = $(plugin_in_files:.plugin.in=.plugin)
EXTRA_DIST = $(plugin_in_files) sample-python.py
diff --git a/plugins/sample-python/sample-python.plugin.in b/sample-plugins/sample-python/sample-python.plugin.in
similarity index 100%
rename from plugins/sample-python/sample-python.plugin.in
rename to sample-plugins/sample-python/sample-python.plugin.in
diff --git a/plugins/sample-python/sample-python.py b/sample-plugins/sample-python/sample-python.py
similarity index 100%
rename from plugins/sample-python/sample-python.py
rename to sample-plugins/sample-python/sample-python.py
diff --git a/plugins/sample-vala/Makefile.am b/sample-plugins/sample-vala/Makefile.am
similarity index 86%
rename from plugins/sample-vala/Makefile.am
rename to sample-plugins/sample-vala/Makefile.am
index 4df57a3..9d3631e 100644
--- a/plugins/sample-vala/Makefile.am
+++ b/sample-plugins/sample-vala/Makefile.am
@@ -1,6 +1,5 @@
-plugindir = $(PLUGINDIR)/sample-vala
+plugindir = $(SAMPLEPLUGINDIR)/sample-vala
plugin_LTLIBRARIES = libsample-vala.la
-#noinst_LTLIBRARIES = libsample-vala.la
libsample_vala_la_SOURCES = \
rb-sample-vala-plugin.vala
@@ -18,11 +17,9 @@ INCLUDES = \
-I$(top_srcdir) \
-I$(top_srcdir)/lib \
-I$(top_srcdir)/metadata \
- -I$(top_srcdir)/player \
-I$(top_srcdir)/rhythmdb \
-I$(top_srcdir)/widgets \
-I$(top_srcdir)/sources \
- -I$(top_srcdir)/iradio \
-I$(top_srcdir)/podcast \
-I$(top_srcdir)/plugins \
-I$(top_srcdir)/shell \
@@ -42,7 +39,7 @@ VALAFLAGS = --vapidir=$(top_srcdir)/bindings/vala --pkg=rhythmdb --pkg=rb --pkg=
%.c %.h: %.vala
$(VALAC) -C $(VALAFLAGS) $^
-# plugin_DATA = $(plugin_in_files:.plugin.in=.plugin)
+plugin_DATA = $(plugin_in_files:.plugin.in=.plugin)
EXTRA_DIST = $(plugin_in_files)
diff --git a/plugins/sample-vala/rb-sample-vala-plugin.vala b/sample-plugins/sample-vala/rb-sample-vala-plugin.vala
similarity index 100%
rename from plugins/sample-vala/rb-sample-vala-plugin.vala
rename to sample-plugins/sample-vala/rb-sample-vala-plugin.vala
diff --git a/plugins/sample-vala/sample-vala.plugin.in b/sample-plugins/sample-vala/sample-vala.plugin.in
similarity index 100%
rename from plugins/sample-vala/sample-vala.plugin.in
rename to sample-plugins/sample-vala/sample-vala.plugin.in
diff --git a/plugins/sample/Makefile.am b/sample-plugins/sample/Makefile.am
similarity index 88%
rename from plugins/sample/Makefile.am
rename to sample-plugins/sample/Makefile.am
index 9181dab..dc55684 100644
--- a/plugins/sample/Makefile.am
+++ b/sample-plugins/sample/Makefile.am
@@ -1,6 +1,5 @@
-plugindir = $(PLUGINDIR)
-#plugin_LTLIBRARIES = libsample.la
-noinst_LTLIBRARIES = libsample.la
+plugindir = $(SAMPLEPLUGINDIR)/sample
+plugin_LTLIBRARIES = libsample.la
libsample_la_SOURCES = \
rb-sample-plugin.c
@@ -31,7 +30,7 @@ plugin_in_files = sample.plugin.in
%.plugin: %.plugin.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*po) ; $(INTLTOOL_MERGE) $(top_srcdir)/po $< $@ -d -u -c $(top_builddir)/po/.intltool-merge-cache
-#plugin_DATA = $(plugin_in_files:.plugin.in=.plugin)
+plugin_DATA = $(plugin_in_files:.plugin.in=.plugin)
EXTRA_DIST = $(plugin_in_files)
diff --git a/plugins/sample/rb-sample-plugin.c b/sample-plugins/sample/rb-sample-plugin.c
similarity index 100%
rename from plugins/sample/rb-sample-plugin.c
rename to sample-plugins/sample/rb-sample-plugin.c
diff --git a/plugins/sample/sample.plugin.in b/sample-plugins/sample/sample.plugin.in
similarity index 100%
rename from plugins/sample/sample.plugin.in
rename to sample-plugins/sample/sample.plugin.in
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]