commit 5dae4283bd42612e611281eecdf705b1f0aab3d8
Author: phantomjinx <p.g.richard...@phantomjinx.co.uk>
Date: Wed Jan 26 23:55:55 2011 +0000
Fix some configure warnings and missing files
* configure.ac
* Seems that config.h.in no longer gets recreated. Rejigged some of the
configure macros and now all files should be properly created from
scratch
* plugins.mk
* Modify the %.plugin operation to remove GNU specific syntax so stopping
annoying warnings when running configure
* build-plugin-file takes care of generating the .plugin files
* */Makefile.am
* Each plugin calls build-plugin-file to generate the .plugin file
configure.ac | 16 +++++++++++-----
plugins/core_preferences/Makefile.am | 1 +
plugins/cover_display/Makefile.am | 1 +
plugins/coverweb/Makefile.am | 1 +
plugins/details_editor/Makefile.am | 1 +
plugins/exporter/Makefile.am | 1 +
plugins/filetype_flac/Makefile.am | 1 +
plugins/filetype_m4a/Makefile.am | 1 +
plugins/filetype_mp3/Makefile.am | 1 +
plugins/filetype_mp4/Makefile.am | 1 +
plugins/filetype_ogg/Makefile.am | 1 +
plugins/filetype_video/Makefile.am | 1 +
plugins/filetype_wav/Makefile.am | 1 +
plugins/info_display/Makefile.am | 1 +
plugins/media_player/Makefile.am | 1 +
plugins/mserv/Makefile.am | 1 +
plugins/photo_editor/Makefile.am | 1 +
plugins/playlist_display/Makefile.am | 1 +
plugins/plugins.mk | 18 +++++++++++++++++-
plugins/repository_editor/Makefile.am | 1 +
plugins/sorttab_display/Makefile.am | 1 +
plugins/track_display/Makefile.am | 1 +
22 files changed, 48 insertions(+), 6 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 05a26b2..c9233a1 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3,11 +3,11 @@ m4_include([./version.m4])
# Require autoconf 2.55 or higher
AC_PREREQ(2.65)
-
AC_INIT([gtkpod], VERSION_NUMBER)
-AC_CONFIG_HEADERS([config.h])
AC_CONFIG_SRCDIR(src/main.c)
+AM_CONFIG_HEADER([config.h])
+
dnl libtool versioning
# +1 : 0 : +1 == adds new functions to the interface
# +1 : 0 : 0 == changes or removes functions (changes include both
@@ -22,12 +22,18 @@ AC_SUBST(LIBGTKPOD_SO_VERSION)
AC_SUBST(LIBGTKPOD_VERSION)
AM_INIT_AUTOMAKE([1.9 tar-ustar])
+
AM_MAINTAINER_MODE
+
+AC_PROG_CC
+
+LT_PATH_LD
+AC_HEADER_STDC
+AC_PROG_INSTALL
+LT_INIT
AC_CANONICAL_HOST
AC_SEARCH_LIBS([strerror],[cposix])
-LT_INIT
-AC_PROG_CC
-AC_PROG_CC
+
AC_DIAGNOSE([obsolete],[AM_PROG_CC_STDC:
your code should no longer depend upon `am_cv_prog_cc_stdc', but upon
`ac_cv_prog_cc_stdc'. Remove this warning and the assignment when
diff --git a/plugins/core_preferences/Makefile.am
b/plugins/core_preferences/Makefile.am
index 91ac629..3da1547 100644
--- a/plugins/core_preferences/Makefile.am
+++ b/plugins/core_preferences/Makefile.am
@@ -19,6 +19,7 @@ core_prefs_plugin_DATA =
SUBDIRS = icons
include ../plugins.mk
+core_prefs.plugin: build-plugin-file
# The plugin
plugin_lib = lib$(plugin_name).so
diff --git a/plugins/cover_display/Makefile.am
b/plugins/cover_display/Makefile.am
index da6fc7e..c025444 100644
--- a/plugins/cover_display/Makefile.am
+++ b/plugins/cover_display/Makefile.am
@@ -19,6 +19,7 @@ cover_display_plugin_DATA =
SUBDIRS = icons
include ../plugins.mk
+cover_display.plugin: build-plugin-file
# The plugin
plugin_lib = lib$(plugin_name).so
diff --git a/plugins/coverweb/Makefile.am b/plugins/coverweb/Makefile.am
index decbbf8..3fd36ac 100644
--- a/plugins/coverweb/Makefile.am
+++ b/plugins/coverweb/Makefile.am
@@ -22,6 +22,7 @@ SUBDIRS = icons
if HAVE_PLUGIN_COVERWEB
include ../plugins.mk
+coverweb.plugin: build-plugin-file
# The plugin
plugin_lib = lib$(plugin_name).so
diff --git a/plugins/details_editor/Makefile.am
b/plugins/details_editor/Makefile.am
index 2bfb064..6d3139c 100644
--- a/plugins/details_editor/Makefile.am
+++ b/plugins/details_editor/Makefile.am
@@ -19,6 +19,7 @@ details_editor_plugin_DATA =
SUBDIRS =
include ../plugins.mk
+details_editor.plugin: build-plugin-file
# The plugin
plugin_lib = lib$(plugin_name).so
diff --git a/plugins/exporter/Makefile.am b/plugins/exporter/Makefile.am
index c3dac8a..7c96da0 100644
--- a/plugins/exporter/Makefile.am
+++ b/plugins/exporter/Makefile.am
@@ -19,6 +19,7 @@ exporter_plugin_DATA =
SUBDIRS =
include ../plugins.mk
+exporter.plugin: build-plugin-file
# The plugin
plugin_lib = lib$(plugin_name).so
diff --git a/plugins/filetype_flac/Makefile.am
b/plugins/filetype_flac/Makefile.am
index a963a85..9abad48 100644
--- a/plugins/filetype_flac/Makefile.am
+++ b/plugins/filetype_flac/Makefile.am
@@ -22,6 +22,7 @@ SUBDIRS =
if HAVE_FLAC
include ../plugins.mk
+filetype_flac.plugin: build-plugin-file
# The plugin
plugin_lib = lib$(plugin_name).so
diff --git a/plugins/filetype_m4a/Makefile.am b/plugins/filetype_m4a/Makefile.am
index 329a460..86fe828 100644
--- a/plugins/filetype_m4a/Makefile.am
+++ b/plugins/filetype_m4a/Makefile.am
@@ -22,6 +22,7 @@ SUBDIRS =
if HAVE_MP4
include ../plugins.mk
+filetype_m4a.plugin: build-plugin-file
# The plugin
plugin_lib = lib$(plugin_name).so
diff --git a/plugins/filetype_mp3/Makefile.am b/plugins/filetype_mp3/Makefile.am
index 981ff6b..555cc42 100644
--- a/plugins/filetype_mp3/Makefile.am
+++ b/plugins/filetype_mp3/Makefile.am
@@ -19,6 +19,7 @@ filetype_mp3_plugin_DATA =
SUBDIRS =
include ../plugins.mk
+filetype_mp3.plugin: build-plugin-file
# The plugin
plugin_lib = lib$(plugin_name).so
diff --git a/plugins/filetype_mp4/Makefile.am b/plugins/filetype_mp4/Makefile.am
index d6a7b4a..7a72a9d 100644
--- a/plugins/filetype_mp4/Makefile.am
+++ b/plugins/filetype_mp4/Makefile.am
@@ -22,6 +22,7 @@ SUBDIRS =
if HAVE_MP4
include ../plugins.mk
+filetype_mp4.plugin: build-plugin-file
# The plugin
plugin_lib = lib$(plugin_name).so
diff --git a/plugins/filetype_ogg/Makefile.am b/plugins/filetype_ogg/Makefile.am
index 533f2b1..c9d6b36 100644
--- a/plugins/filetype_ogg/Makefile.am
+++ b/plugins/filetype_ogg/Makefile.am
@@ -22,6 +22,7 @@ SUBDIRS =
if HAVE_LIBVORBISFILE
include ../plugins.mk
+filetype_ogg.plugin: build-plugin-file
# The plugin
plugin_lib = lib$(plugin_name).so
diff --git a/plugins/filetype_video/Makefile.am
b/plugins/filetype_video/Makefile.am
index 3235b06..d6a7541 100644
--- a/plugins/filetype_video/Makefile.am
+++ b/plugins/filetype_video/Makefile.am
@@ -19,6 +19,7 @@ filetype_video_plugin_DATA =
SUBDIRS =
include ../plugins.mk
+filetype_video.plugin: build-plugin-file
# The plugin
plugin_lib = lib$(plugin_name).so
diff --git a/plugins/filetype_wav/Makefile.am b/plugins/filetype_wav/Makefile.am
index c5fa5f3..5d801fe 100644
--- a/plugins/filetype_wav/Makefile.am
+++ b/plugins/filetype_wav/Makefile.am
@@ -19,6 +19,7 @@ filetype_wav_plugin_DATA =
SUBDIRS =
include ../plugins.mk
+filetype_wav.plugin: build-plugin-file
# The plugin
plugin_lib = lib$(plugin_name).so
diff --git a/plugins/info_display/Makefile.am b/plugins/info_display/Makefile.am
index 29e31a6..764a7e7 100644
--- a/plugins/info_display/Makefile.am
+++ b/plugins/info_display/Makefile.am
@@ -19,6 +19,7 @@ info_display_plugin_DATA =
SUBDIRS =
include ../plugins.mk
+info_display.plugin: build-plugin-file
# The plugin
plugin_lib = lib$(plugin_name).so
diff --git a/plugins/media_player/Makefile.am b/plugins/media_player/Makefile.am
index 7c17f30..92a54c8 100644
--- a/plugins/media_player/Makefile.am
+++ b/plugins/media_player/Makefile.am
@@ -22,6 +22,7 @@ SUBDIRS = icons
if HAVE_PLUGIN_MEDIA_PLAYER
include ../plugins.mk
+media_player.plugin: build-plugin-file
# The plugin
plugin_lib = lib$(plugin_name).so
diff --git a/plugins/mserv/Makefile.am b/plugins/mserv/Makefile.am
index 0b5d6ed..b3e400d 100644
--- a/plugins/mserv/Makefile.am
+++ b/plugins/mserv/Makefile.am
@@ -20,6 +20,7 @@ mserv_plugin_DATA =
SUBDIRS = icons
include ../plugins.mk
+mserv.plugin: build-plugin-file
# The plugin
plugin_lib = lib$(plugin_name).so
diff --git a/plugins/photo_editor/Makefile.am b/plugins/photo_editor/Makefile.am
index 94189bd..e5f7839 100644
--- a/plugins/photo_editor/Makefile.am
+++ b/plugins/photo_editor/Makefile.am
@@ -19,6 +19,7 @@ photo_editor_plugin_DATA =
SUBDIRS = icons
include ../plugins.mk
+photo_editor.plugin: build-plugin-file
# The plugin
plugin_lib = lib$(plugin_name).so
diff --git a/plugins/playlist_display/Makefile.am
b/plugins/playlist_display/Makefile.am
index a838782..bf9a47a 100644
--- a/plugins/playlist_display/Makefile.am
+++ b/plugins/playlist_display/Makefile.am
@@ -23,6 +23,7 @@ playlist_display_plugin_DATA =
SUBDIRS = icons
include ../plugins.mk
+playlist_display.plugin: build-plugin-file
# The plugin
plugin_lib = lib$(plugin_name).so
diff --git a/plugins/plugins.mk b/plugins/plugins.mk
index 695c49e..01f2bf4 100644
--- a/plugins/plugins.mk
+++ b/plugins/plugins.mk
@@ -70,5 +70,21 @@ clean-glade-dir:
rm -f ../../data/glade/$(plugin_name).xml; \
fi;
+# List out the current language po files
+PO_FILES=\
+ $(top_srcdir)/po/ca.po \
+ $(top_srcdir)/po/es.po \
+ $(top_srcdir)/po/he.po \
+ $(top_srcdir)/po/ja.po \
+ $(top_srcdir)/po/ru.po \
+ $(top_srcdir)/po/zh_CN.po \
+ $(top_srcdir)/po/de.po \
+ $(top_srcdir)/po/fr.po \
+ $(top_srcdir)/po/it.po \
+ $(top_srcdir)/po/ro.po \
+ $(top_srcdir)/po/sv.po
+
# Create plugin description file with translations
-%.plugin: %.plugin.in $(INTLTOOL_MERGE) $(wildcard $(top_srcdir)/po/*po) ;
$(INTLTOOL_MERGE) $(top_srcdir)/po $< $@ -d -u -c
$(top_builddir)/po/.intltool-merge-cache
+build-plugin-file: $(INTLTOOL_MERGE) $(PO_FILES)
+ $(INTLTOOL_MERGE) $(top_srcdir)/po $(plugin_name).plugin.in
$(plugin_name).plugin -d -u -c $(top_builddir)/po/.intltool-merge-cache
+
diff --git a/plugins/repository_editor/Makefile.am
b/plugins/repository_editor/Makefile.am
index fb93bb2..4288288 100644
--- a/plugins/repository_editor/Makefile.am
+++ b/plugins/repository_editor/Makefile.am
@@ -19,6 +19,7 @@ repository_editor_plugin_DATA =
SUBDIRS =
include ../plugins.mk
+repository_editor.plugin: build-plugin-file
# The plugin
plugin_lib = lib$(plugin_name).so
diff --git a/plugins/sorttab_display/Makefile.am
b/plugins/sorttab_display/Makefile.am
index 60424b6..1aa11a7 100644
--- a/plugins/sorttab_display/Makefile.am
+++ b/plugins/sorttab_display/Makefile.am
@@ -23,6 +23,7 @@ sorttab_display_plugin_DATA =
SUBDIRS = icons
include ../plugins.mk
+sorttab_display.plugin: build-plugin-file
# The plugin
plugin_lib = lib$(plugin_name).so
diff --git a/plugins/track_display/Makefile.am
b/plugins/track_display/Makefile.am
index 27a6209..63673e3 100644
--- a/plugins/track_display/Makefile.am
+++ b/plugins/track_display/Makefile.am
@@ -19,6 +19,7 @@ track_display_plugin_DATA =
SUBDIRS = icons
include ../plugins.mk
+track_display.plugin: build-plugin-file
# The plugin
plugin_lib = lib$(plugin_name).so
------------------------------------------------------------------------------
Special Offer-- Download ArcSight Logger for FREE (a $49 USD value)!
Finally, a world-class log management solution at an even better price-free!
Download using promo code Free_Logger_4_Dev2Dev. Offer expires
February 28th, so secure your free ArcSight Logger TODAY!
http://p.sf.net/sfu/arcsight-sfd2d
_______________________________________________
gtkpod-cvs2 mailing list
gtkpod-cvs2@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/gtkpod-cvs2
