commit f1144af5f952d5b530265587d7fdc208f4861dc3
Author: Daniele Forsi <dani...@forsi.it>
Date: Tue Jan 11 22:37:31 2011 +0100
Build fixes
* plugins/*/Makefile.am
* The *.plugin.in files need to be unconditionally added else
translations would break (because they are referenced in
POTFILES.in) if make distcheck is executed on a system lacking
some prerequisites or if --disable-plugin-* is used.
Change also the other makefiles for consistency.
plugins/core_preferences/Makefile.am | 4 ++--
plugins/cover_display/Makefile.am | 4 ++--
plugins/coverweb/Makefile.am | 8 ++++----
plugins/details_editor/Makefile.am | 4 ++--
plugins/exporter/Makefile.am | 4 ++--
plugins/filetype_flac/Makefile.am | 9 +++++----
plugins/filetype_m4a/Makefile.am | 11 ++++++-----
plugins/filetype_mp3/Makefile.am | 4 ++--
plugins/filetype_mp4/Makefile.am | 11 ++++++-----
plugins/filetype_ogg/Makefile.am | 11 ++++++-----
plugins/filetype_video/Makefile.am | 4 ++--
plugins/filetype_wav/Makefile.am | 4 ++--
plugins/info_display/Makefile.am | 4 ++--
plugins/media_player/Makefile.am | 8 ++++----
plugins/mserv/Makefile.am | 4 ++--
plugins/photo_editor/Makefile.am | 4 ++--
plugins/playlist_display/Makefile.am | 4 ++--
plugins/plugins.mk | 3 ---
plugins/repository_editor/Makefile.am | 4 ++--
plugins/sorttab_display/Makefile.am | 4 ++--
plugins/track_display/Makefile.am | 4 ++--
21 files changed, 59 insertions(+), 58 deletions(-)
---
diff --git a/plugins/core_preferences/Makefile.am
b/plugins/core_preferences/Makefile.am
index 74a15d8..91ac629 100644
--- a/plugins/core_preferences/Makefile.am
+++ b/plugins/core_preferences/Makefile.am
@@ -1,5 +1,4 @@
plugin_name = core_prefs
-plugin_lib = lib$(plugin_name).so
plugin_file = $(plugin_name).plugin
# Plugin UI file
@@ -22,6 +21,7 @@ SUBDIRS = icons
include ../plugins.mk
# The plugin
+plugin_lib = lib$(plugin_name).so
plugin_LTLIBRARIES = libcore_prefs.la
# Plugin sources
@@ -36,7 +36,7 @@ libcore_prefs_la_LIBADD = \
$(LIBANJUTA_LIBS)
EXTRA_DIST = \
- $(plugin_in_files) \
+ $(plugin_file).in \
$(core_prefs_plugin_DATA) \
$(core_core_prefs_DATA) \
$(core_prefs_glade_DATA) \
diff --git a/plugins/cover_display/Makefile.am
b/plugins/cover_display/Makefile.am
index 85c6029..da6fc7e 100644
--- a/plugins/cover_display/Makefile.am
+++ b/plugins/cover_display/Makefile.am
@@ -1,5 +1,4 @@
plugin_name = cover_display
-plugin_lib = lib$(plugin_name).so
plugin_file = $(plugin_name).plugin
# Plugin UI file
@@ -22,6 +21,7 @@ SUBDIRS = icons
include ../plugins.mk
# The plugin
+plugin_lib = lib$(plugin_name).so
plugin_LTLIBRARIES = libcover_display.la
# Plugin sources
@@ -39,7 +39,7 @@ libcover_display_la_LIBADD = \
$(LIBANJUTA_LIBS)
EXTRA_DIST = \
- $(plugin_in_files) \
+ $(plugin_file).in \
$(cover_display_plugin_DATA) \
$(cover_display_ui_DATA) \
$(cover_display_glade_DATA) \
diff --git a/plugins/coverweb/Makefile.am b/plugins/coverweb/Makefile.am
index 288bc30..decbbf8 100644
--- a/plugins/coverweb/Makefile.am
+++ b/plugins/coverweb/Makefile.am
@@ -1,7 +1,4 @@
-if HAVE_PLUGIN_COVERWEB
-
plugin_name = coverweb
-plugin_lib = lib$(plugin_name).so
plugin_file = $(plugin_name).plugin
# Plugin UI file
@@ -22,9 +19,12 @@ coverweb_plugin_DATA =
SUBDIRS = icons
+if HAVE_PLUGIN_COVERWEB
+
include ../plugins.mk
# The plugin
+plugin_lib = lib$(plugin_name).so
plugin_LTLIBRARIES = libcoverweb.la
# Plugin sources
@@ -42,7 +42,7 @@ libcoverweb_la_LIBADD = \
endif
EXTRA_DIST = \
- $(plugin_in_files) \
+ $(plugin_file).in \
$(coverweb_plugin_DATA) \
$(coverweb_ui_DATA) \
$(coverweb_glade_DATA) \
diff --git a/plugins/details_editor/Makefile.am
b/plugins/details_editor/Makefile.am
index 5e3507a..2bfb064 100644
--- a/plugins/details_editor/Makefile.am
+++ b/plugins/details_editor/Makefile.am
@@ -1,5 +1,4 @@
plugin_name = details_editor
-plugin_lib = lib$(plugin_name).so
plugin_file = $(plugin_name).plugin
# Plugin UI file
@@ -22,6 +21,7 @@ SUBDIRS =
include ../plugins.mk
# The plugin
+plugin_lib = lib$(plugin_name).so
plugin_LTLIBRARIES = libdetails_editor.la
# Plugin sources
@@ -38,7 +38,7 @@ libdetails_editor_la_LIBADD = \
$(LIBANJUTA_LIBS)
EXTRA_DIST = \
- $(plugin_in_files) \
+ $(plugin_file).in \
$(details_editor_plugin_DATA) \
$(details_editor_ui_DATA) \
$(details_editor_glade_DATA) \
diff --git a/plugins/exporter/Makefile.am b/plugins/exporter/Makefile.am
index 7854f4b..c3dac8a 100644
--- a/plugins/exporter/Makefile.am
+++ b/plugins/exporter/Makefile.am
@@ -1,5 +1,4 @@
plugin_name = exporter
-plugin_lib = lib$(plugin_name).so
plugin_file = $(plugin_name).plugin
# Plugin UI file
@@ -22,6 +21,7 @@ SUBDIRS =
include ../plugins.mk
# The plugin
+plugin_lib = lib$(plugin_name).so
plugin_LTLIBRARIES = libexporter.la
# Plugin sources
@@ -37,7 +37,7 @@ libexporter_la_LIBADD = \
$(LIBANJUTA_LIBS)
EXTRA_DIST = \
- $(plugin_in_files) \
+ $(plugin_file).in \
$(exporter_plugin_DATA) \
$(exporter_ui_DATA) \
$(exporter_glade_DATA) \
diff --git a/plugins/filetype_flac/Makefile.am
b/plugins/filetype_flac/Makefile.am
index 4bd6aa8..a963a85 100644
--- a/plugins/filetype_flac/Makefile.am
+++ b/plugins/filetype_flac/Makefile.am
@@ -1,7 +1,4 @@
-if HAVE_FLAC
-
plugin_name = filetype_flac
-plugin_lib = lib$(plugin_name).so
plugin_file = $(plugin_name).plugin
# Plugin UI file
@@ -16,14 +13,18 @@ filetype_flac_glade_DATA =
filetype_flac_pixmapsdir = $(gtkpod_image_dir)
filetype_flac_pixmaps_DATA =
+# Where to install the plugin
filetype_flac_plugindir = $(gtkpod_plugin_dir)
filetype_flac_plugin_DATA =
SUBDIRS =
+if HAVE_FLAC
+
include ../plugins.mk
# The plugin
+plugin_lib = lib$(plugin_name).so
plugin_LTLIBRARIES = libfiletype_flac.la
# Plugin sources
@@ -40,7 +41,7 @@ libfiletype_flac_la_LIBADD = \
endif
EXTRA_DIST = \
- $(plugin_in_files) \
+ $(plugin_file).in \
$(filetype_flac_plugin_DATA) \
$(filetype_flac_ui_DATA) \
$(filetype_flac_glade_DATA) \
diff --git a/plugins/filetype_m4a/Makefile.am b/plugins/filetype_m4a/Makefile.am
index e5af081..329a460 100644
--- a/plugins/filetype_m4a/Makefile.am
+++ b/plugins/filetype_m4a/Makefile.am
@@ -1,7 +1,4 @@
-if HAVE_MP4
-
plugin_name = filetype_m4a
-plugin_lib = lib$(plugin_name).so
plugin_file = $(plugin_name).plugin
# Plugin UI file
@@ -16,14 +13,18 @@ filetype_m4a_glade_DATA =
filetype_m4a_pixmapsdir = $(gtkpod_image_dir)
filetype_m4a_pixmaps_DATA =
+# Where to install the plugin
filetype_m4a_plugindir = $(gtkpod_plugin_dir)
filetype_m4a_plugin_DATA =
SUBDIRS =
+if HAVE_MP4
+
include ../plugins.mk
# The plugin
+plugin_lib = lib$(plugin_name).so
plugin_LTLIBRARIES = libfiletype_m4a.la
# Plugin sources
@@ -41,8 +42,8 @@ libfiletype_m4a_la_LIBADD = \
endif
EXTRA_DIST = \
- $(plugin_in_files) \
+ $(plugin_file).in \
$(filetype_m4a_plugin_DATA) \
$(filetype_m4a_ui_DATA) \
$(filetype_m4a_glade_DATA) \
- $(filetype_m4a_pixmaps_DATA)
\ No newline at end of file
+ $(filetype_m4a_pixmaps_DATA)
diff --git a/plugins/filetype_mp3/Makefile.am b/plugins/filetype_mp3/Makefile.am
index 7ace0e2..981ff6b 100644
--- a/plugins/filetype_mp3/Makefile.am
+++ b/plugins/filetype_mp3/Makefile.am
@@ -1,5 +1,4 @@
plugin_name = filetype_mp3
-plugin_lib = lib$(plugin_name).so
plugin_file = $(plugin_name).plugin
# Plugin UI file
@@ -22,6 +21,7 @@ SUBDIRS =
include ../plugins.mk
# The plugin
+plugin_lib = lib$(plugin_name).so
plugin_LTLIBRARIES = libfiletype_mp3.la
# Plugin sources
@@ -36,7 +36,7 @@ libfiletype_mp3_la_LIBADD = \
$(LIBANJUTA_LIBS)
EXTRA_DIST = \
- $(plugin_in_files) \
+ $(plugin_file).in \
$(filetype_mp3_plugin_DATA) \
$(filetype_mp3_ui_DATA) \
$(filetype_mp3_glade_DATA) \
diff --git a/plugins/filetype_mp4/Makefile.am b/plugins/filetype_mp4/Makefile.am
index 74324d5..d6a7b4a 100644
--- a/plugins/filetype_mp4/Makefile.am
+++ b/plugins/filetype_mp4/Makefile.am
@@ -1,7 +1,4 @@
-if HAVE_MP4
-
plugin_name = filetype_mp4
-plugin_lib = lib$(plugin_name).so
plugin_file = $(plugin_name).plugin
# Plugin UI file
@@ -16,14 +13,18 @@ filetype_mp4_glade_DATA =
filetype_mp4_pixmapsdir = $(gtkpod_image_dir)
filetype_mp4_pixmaps_DATA =
+# Where to install the plugin
filetype_mp4_plugindir = $(gtkpod_plugin_dir)
filetype_mp4_plugin_DATA =
SUBDIRS =
+if HAVE_MP4
+
include ../plugins.mk
# The plugin
+plugin_lib = lib$(plugin_name).so
plugin_LTLIBRARIES = libfiletype_mp4.la
# Plugin sources
@@ -40,8 +41,8 @@ libfiletype_mp4_la_LIBADD = \
endif
EXTRA_DIST = \
- $(plugin_in_files) \
+ $(plugin_file).in \
$(filetype_mp4_plugin_DATA) \
$(filetype_mp4_ui_DATA) \
$(filetype_mp4_glade_DATA) \
- $(filetype_mp4_pixmaps_DATA)
\ No newline at end of file
+ $(filetype_mp4_pixmaps_DATA)
diff --git a/plugins/filetype_ogg/Makefile.am b/plugins/filetype_ogg/Makefile.am
index ebdd9e3..533f2b1 100644
--- a/plugins/filetype_ogg/Makefile.am
+++ b/plugins/filetype_ogg/Makefile.am
@@ -1,7 +1,4 @@
-if HAVE_LIBVORBISFILE
-
plugin_name = filetype_ogg
-plugin_lib = lib$(plugin_name).so
plugin_file = $(plugin_name).plugin
# Plugin UI file
@@ -16,14 +13,18 @@ filetype_ogg_glade_DATA =
filetype_ogg_pixmapsdir = $(gtkpod_image_dir)
filetype_ogg_pixmaps_DATA =
+# Where to install the plugin
filetype_ogg_plugindir = $(gtkpod_plugin_dir)
filetype_ogg_plugin_DATA =
SUBDIRS =
+if HAVE_LIBVORBISFILE
+
include ../plugins.mk
# The plugin
+plugin_lib = lib$(plugin_name).so
plugin_LTLIBRARIES = libfiletype_ogg.la
# Plugin sources
@@ -40,8 +41,8 @@ libfiletype_ogg_la_LIBADD = \
endif
EXTRA_DIST = \
- $(plugin_in_files) \
+ $(plugin_file).in \
$(filetype_ogg_plugin_DATA) \
$(filetype_ogg_ui_DATA) \
$(filetype_ogg_glade_DATA) \
- $(filetype_ogg_pixmaps_DATA)
\ No newline at end of file
+ $(filetype_ogg_pixmaps_DATA)
diff --git a/plugins/filetype_video/Makefile.am
b/plugins/filetype_video/Makefile.am
index b61afe3..3235b06 100644
--- a/plugins/filetype_video/Makefile.am
+++ b/plugins/filetype_video/Makefile.am
@@ -1,5 +1,4 @@
plugin_name = filetype_video
-plugin_lib = lib$(plugin_name).so
plugin_file = $(plugin_name).plugin
# Plugin UI file
@@ -22,6 +21,7 @@ SUBDIRS =
include ../plugins.mk
# The plugin
+plugin_lib = lib$(plugin_name).so
plugin_LTLIBRARIES = libfiletype_video.la
# Plugin sources
@@ -36,7 +36,7 @@ libfiletype_video_la_LIBADD = \
$(LIBANJUTA_LIBS)
EXTRA_DIST = \
- $(plugin_in_files) \
+ $(plugin_file).in \
$(filetype_video_plugin_DATA) \
$(filetype_video_ui_DATA) \
$(filetype_video_glade_DATA) \
diff --git a/plugins/filetype_wav/Makefile.am b/plugins/filetype_wav/Makefile.am
index 7b829a7..c5fa5f3 100644
--- a/plugins/filetype_wav/Makefile.am
+++ b/plugins/filetype_wav/Makefile.am
@@ -1,5 +1,4 @@
plugin_name = filetype_wav
-plugin_lib = lib$(plugin_name).so
plugin_file = $(plugin_name).plugin
# Plugin UI file
@@ -22,6 +21,7 @@ SUBDIRS =
include ../plugins.mk
# The plugin
+plugin_lib = lib$(plugin_name).so
plugin_LTLIBRARIES = libfiletype_wav.la
# Plugin sources
@@ -36,7 +36,7 @@ libfiletype_wav_la_LIBADD = \
$(LIBANJUTA_LIBS)
EXTRA_DIST = \
- $(plugin_in_files) \
+ $(plugin_file).in \
$(filetype_wav_plugin_DATA) \
$(filetype_wav_ui_DATA) \
$(filetype_wav_glade_DATA) \
diff --git a/plugins/info_display/Makefile.am b/plugins/info_display/Makefile.am
index 7effd75..29e31a6 100644
--- a/plugins/info_display/Makefile.am
+++ b/plugins/info_display/Makefile.am
@@ -1,5 +1,4 @@
plugin_name = info_display
-plugin_lib = lib$(plugin_name).so
plugin_file = $(plugin_name).plugin
# Plugin UI file
@@ -22,6 +21,7 @@ SUBDIRS =
include ../plugins.mk
# The plugin
+plugin_lib = lib$(plugin_name).so
plugin_LTLIBRARIES = libinfo_display.la
# Plugin sources
@@ -38,7 +38,7 @@ libinfo_display_la_LIBADD = \
$(LIBANJUTA_LIBS)
EXTRA_DIST = \
- $(plugin_in_files) \
+ $(plugin_file).in \
$(info_display_plugin_DATA) \
$(info_display_ui_DATA) \
$(info_display_glade_DATA) \
diff --git a/plugins/media_player/Makefile.am b/plugins/media_player/Makefile.am
index a94d4ef..7c17f30 100644
--- a/plugins/media_player/Makefile.am
+++ b/plugins/media_player/Makefile.am
@@ -1,7 +1,4 @@
-if HAVE_PLUGIN_MEDIA_PLAYER
-
plugin_name = media_player
-plugin_lib = lib$(plugin_name).so
plugin_file = $(plugin_name).plugin
# Plugin UI file
@@ -22,9 +19,12 @@ media_player_plugin_DATA =
SUBDIRS = icons
+if HAVE_PLUGIN_MEDIA_PLAYER
+
include ../plugins.mk
# The plugin
+plugin_lib = lib$(plugin_name).so
plugin_LTLIBRARIES = libmedia_player.la
# Plugin sources
@@ -41,7 +41,7 @@ libmedia_player_la_LIBADD = \
endif
EXTRA_DIST = \
- $(plugin_in_files) \
+ $(plugin_file).in \
$(media_player_plugin_DATA) \
$(media_player_ui_DATA) \
$(media_player_glade_DATA) \
diff --git a/plugins/mserv/Makefile.am b/plugins/mserv/Makefile.am
index 822799e..0b5d6ed 100644
--- a/plugins/mserv/Makefile.am
+++ b/plugins/mserv/Makefile.am
@@ -1,5 +1,4 @@
plugin_name = mserv
-plugin_lib = lib$(plugin_name).so
plugin_file = $(plugin_name).plugin
# Plugin UI file
@@ -23,6 +22,7 @@ SUBDIRS = icons
include ../plugins.mk
# The plugin
+plugin_lib = lib$(plugin_name).so
plugin_LTLIBRARIES = libmserv.la
# Plugin sources
@@ -39,7 +39,7 @@ libmserv_la_LIBADD = \
$(LIBANJUTA_LIBS)
EXTRA_DIST = \
- $(plugin_in_files) \
+ $(plugin_file).in \
$(mserv_plugin_DATA) \
$(mserv_ui_DATA) \
$(mserv_glade_DATA) \
diff --git a/plugins/photo_editor/Makefile.am b/plugins/photo_editor/Makefile.am
index 622aeae..94189bd 100644
--- a/plugins/photo_editor/Makefile.am
+++ b/plugins/photo_editor/Makefile.am
@@ -1,5 +1,4 @@
plugin_name = photo_editor
-plugin_lib = lib$(plugin_name).so
plugin_file = $(plugin_name).plugin
# Plugin UI file
@@ -22,6 +21,7 @@ SUBDIRS = icons
include ../plugins.mk
# The plugin
+plugin_lib = lib$(plugin_name).so
plugin_LTLIBRARIES = libphoto_editor.la
# Plugin sources
@@ -38,7 +38,7 @@ libphoto_editor_la_LIBADD = \
$(LIBANJUTA_LIBS)
EXTRA_DIST = \
- $(plugin_in_files) \
+ $(plugin_file).in \
$(photo_editor_plugin_DATA) \
$(photo_editor_ui_DATA) \
$(photo_editor_glade_DATA) \
diff --git a/plugins/playlist_display/Makefile.am
b/plugins/playlist_display/Makefile.am
index 5fdd455..a838782 100644
--- a/plugins/playlist_display/Makefile.am
+++ b/plugins/playlist_display/Makefile.am
@@ -1,5 +1,4 @@
plugin_name = playlist_display
-plugin_lib = lib$(plugin_name).so
plugin_file = $(plugin_name).plugin
# Plugin UI file
@@ -26,6 +25,7 @@ SUBDIRS = icons
include ../plugins.mk
# The plugin
+plugin_lib = lib$(plugin_name).so
plugin_LTLIBRARIES = libplaylist_display.la
# Plugin sources
@@ -43,7 +43,7 @@ libplaylist_display_la_LIBADD = \
$(LIBANJUTA_LIBS)
EXTRA_DIST = \
- $(plugin_in_files) \
+ $(plugin_file).in \
$(playlist_display_plugin_DATA) \
$(playlist_display_ui_DATA) \
$(playlist_display_glade_DATA) \
diff --git a/plugins/plugins.mk b/plugins/plugins.mk
index 313d489..74f8893 100644
--- a/plugins/plugins.mk
+++ b/plugins/plugins.mk
@@ -1,6 +1,3 @@
-# Plugin description file
-plugin_in_files = $(plugin_file).in
-
# Include paths
AM_CPPFLAGS = \
-DPACKAGE_LOCALE_DIR=\""$(prefix)/$(DATADIRNAME)/locale"\" \
diff --git a/plugins/repository_editor/Makefile.am
b/plugins/repository_editor/Makefile.am
index dbec7a1..fb93bb2 100644
--- a/plugins/repository_editor/Makefile.am
+++ b/plugins/repository_editor/Makefile.am
@@ -1,5 +1,4 @@
plugin_name = repository_editor
-plugin_lib = lib$(plugin_name).so
plugin_file = $(plugin_name).plugin
# Plugin UI file
@@ -22,6 +21,7 @@ SUBDIRS =
include ../plugins.mk
# The plugin
+plugin_lib = lib$(plugin_name).so
plugin_LTLIBRARIES = librepository_editor.la
# Plugin sources
@@ -40,7 +40,7 @@ librepository_editor_la_LIBADD = \
$(LIBANJUTA_LIBS)
EXTRA_DIST = \
- $(plugin_in_files) \
+ $(plugin_file).in \
$(repository_editor_plugin_DATA) \
$(repository_editor_ui_DATA) \
$(repository_editor_glade_DATA) \
diff --git a/plugins/sorttab_display/Makefile.am
b/plugins/sorttab_display/Makefile.am
index 1355878..60424b6 100644
--- a/plugins/sorttab_display/Makefile.am
+++ b/plugins/sorttab_display/Makefile.am
@@ -1,5 +1,4 @@
plugin_name = sorttab_display
-plugin_lib = lib$(plugin_name).so
plugin_file = $(plugin_name).plugin
# Plugin UI file
@@ -26,6 +25,7 @@ SUBDIRS = icons
include ../plugins.mk
# The plugin
+plugin_lib = lib$(plugin_name).so
plugin_LTLIBRARIES = libsorttab_display.la
# Plugin sources
@@ -45,7 +45,7 @@ libsorttab_display_la_LIBADD = \
$(LIBANJUTA_LIBS)
EXTRA_DIST = \
- $(plugin_in_files) \
+ $(plugin_file).in \
$(sorttab_display_plugin_DATA) \
$(sorttab_display_ui_DATA) \
$(sorttab_display_glade_DATA) \
diff --git a/plugins/track_display/Makefile.am
b/plugins/track_display/Makefile.am
index 9f3b1bc..27a6209 100644
--- a/plugins/track_display/Makefile.am
+++ b/plugins/track_display/Makefile.am
@@ -1,5 +1,4 @@
plugin_name = track_display
-plugin_lib = lib$(plugin_name).so
plugin_file = $(plugin_name).plugin
# Plugin UI file
@@ -22,6 +21,7 @@ SUBDIRS = icons
include ../plugins.mk
# The plugin
+plugin_lib = lib$(plugin_name).so
plugin_LTLIBRARIES = libtrack_display.la
# Plugin sources
@@ -41,7 +41,7 @@ libtrack_display_la_LIBADD = \
$(LIBANJUTA_LIBS)
EXTRA_DIST = \
- $(plugin_in_files) \
+ $(plugin_file).in \
$(track_display_plugin_DATA) \
$(track_display_ui_DATA) \
$(track_display_glade_DATA) \
------------------------------------------------------------------------------
Protect Your Site and Customers from Malware Attacks
Learn about various malware tactics and how to avoid them. Understand
malware threats, the impact they can have on your business, and how you
can protect your company and customers by using code signing.
http://p.sf.net/sfu/oracle-sfdevnl
_______________________________________________
gtkpod-cvs2 mailing list
gtkpod-cvs2@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/gtkpod-cvs2
