commit 83d8076747b44fd471649a3b7d9445c10b1be81b
Author: phantomjinx <[email protected]>
Date: Fri Apr 22 18:27:10 2011 +0100
Tidy up some autotools issues
* The library does not need to depend on all the optional libraries; only
the plugins need to do that.
* configure.ac
* Additional libraries should only be made available and not added to the
libraries list of dependencies
* cover_display
* Should depend on curl
* details_editor
* Should depend on curl
* filetype_flac
* Should depend on flac
* filetype_ogg
* Should depend on vorbisfile
* media_player
* Should depend on gstreamer
* plugins.mk
* Should append CFLAGS not LIBS
configure.ac | 27 ++++++++++++---------------
plugins/cover_display/Makefile.am | 5 +++--
plugins/details_editor/Makefile.am | 5 +++--
plugins/filetype_flac/Makefile.am | 5 +++--
plugins/filetype_ogg/Makefile.am | 5 +++--
plugins/media_player/Makefile.am | 4 ++--
plugins/plugins.mk | 2 +-
7 files changed, 27 insertions(+), 26 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 978b641..f611ea9 100644
--- a/configure.ac
+++ b/configure.ac
@@ -155,9 +155,8 @@ AM_CONDITIONAL(HAVE_CURL, test "x$have_curl" = "xyes")
if test "x$have_curl" = "xyes"; then
AC_DEFINE(HAVE_CURL, 1, [Define if you have curl support])
have_curl="yes -- will build with coverart download support"
- CPPFLAGS="$CPPFLAGS $CURL_CFLAGS"
- CFLAGS="$CFLAGS $CURL_CFLAGS"
- LIBS="$LIBS $CURL_LIBS"
+ AC_SUBST(CURL_CFLAGS)
+ AC_SUBST(CURL_LIBS)
else
have_curl="*no -- will build without coverart download support"
fi
@@ -186,9 +185,8 @@ fi
AM_CONDITIONAL(HAVE_PLUGIN_COVERWEB, [test "x$have_coverweb" = "xyes"])
if test "x$have_coverweb" = "xyes"; then
AC_DEFINE(HAVE_PLUGIN_COVERWEB, 1, [Define if you have coverweb support])
- CPPFLAGS="$CPPFLAGS $WEBKIT_CFLAGS"
- CFLAGS="$CFLAGS $WEBKIT_CFLAGS"
- LIBS="$LIBS $WEBKIT_LIBS"
+ AC_SUBST(WEBKIT_CFLAGS)
+ AC_SUBST(WEBKIT_LIBS)
fi
@@ -221,9 +219,10 @@ fi
AM_CONDITIONAL(HAVE_PLUGIN_MEDIA_PLAYER, [test "x$have_media_player" = "xyes"])
if test "x$have_media_player" = "xyes"; then
AC_DEFINE(HAVE_PLUGIN_MEDIA_PLAYER, 1, [Define if you have media player
support])
- CPPFLAGS="$CPPFLAGS $GSTREAMER_CFLAGS $GSTREAMER_INTERFACES_CFLAGS"
- CFLAGS="$CFLAGS $GSTREAMER_CFLAGS $GSTREAMER_INTERFACES_CFLAGS"
- LIBS="$LIBS $GSTREAMER_LIBS $GSTREAMER_INTERFACES_LIBS"
+ GSTREAMER_ALL_CFLAGS="$GSTREAMER_CFLAGS $GSTREAMER_INTERFACES_CFLAGS"
+ GSTREAMER_ALL_LIBS="$GSTREAMER_LIBS $GSTREAMER_INTERFACES_LIBS"
+ AC_SUBST(GSTREAMER_ALL_CFLAGS)
+ AC_SUBST(GSTREAMER_ALL_LIBS)
fi
dnl Check for libvorbisfile and libvorbis
@@ -238,9 +237,8 @@ fi
AM_CONDITIONAL(HAVE_LIBVORBISFILE, test "x$have_ogg" = "xyes")
if test "x$have_ogg" = "xyes"; then
AC_DEFINE(HAVE_LIBVORBISFILE, 1, [Define if you have the ogg/vorbis
library])
- CPPFLAGS="$CPPFLAGS $VORBISFILE_CFLAGS"
- CFLAGS="$CFLAGS $VORBISFILE_CFLAGS"
- LIBS="$LIBS $VORBISFILE_LIBS"
+ AC_SUBST(VORBISFILE_CFLAGS)
+ AC_SUBST(VORBISFILE_LIBS)
fi
dnl Check for FLAC
@@ -255,9 +253,8 @@ fi
AM_CONDITIONAL(HAVE_FLAC, test "x$have_flac" = "xyes")
if test "x$have_flac" = "xyes"; then
AC_DEFINE(HAVE_FLAC, 1, [Define if you have the flac library])
- CPPFLAGS="$CPPFLAGS $FLAC_CFLAGS"
- CFLAGS="$CFLAGS $FLAC_CFLAGS"
- LIBS="$LIBS $FLAC_LIBS"
+ AC_SUBST(FLAC_CFLAGS)
+ AC_SUBST(FLAC_LIBS)
fi
dnl Check for FAAD for use with m4a files
diff --git a/plugins/cover_display/Makefile.am
b/plugins/cover_display/Makefile.am
index fca010f..7ef4bc4 100644
--- a/plugins/cover_display/Makefile.am
+++ b/plugins/cover_display/Makefile.am
@@ -31,13 +31,14 @@ libcover_display_la_SOURCES = plugin.c plugin.h \
cover_display_context_menu.c cover_display_context_menu.h \
fetchcover.c
fetchcover.h \
cover_display_preferences.c cover_display_preferences.h
-
+libcover_display_la_CFLAGS = $(CURL_CFLAGS)
libcover_display_la_LDFLAGS = $(GTKPOD_PLUGIN_LDFLAGS)
# Plugin dependencies
libcover_display_la_LIBADD = \
$(GTKPOD_LIBS) \
- $(LIBANJUTA_LIBS)
+ $(LIBANJUTA_LIBS) \
+ $(CURL_LIBS)
EXTRA_DIST = \
$(plugin_file).in \
diff --git a/plugins/details_editor/Makefile.am
b/plugins/details_editor/Makefile.am
index 0f3c89d..46f9ec3 100644
--- a/plugins/details_editor/Makefile.am
+++ b/plugins/details_editor/Makefile.am
@@ -30,13 +30,14 @@ libdetails_editor_la_SOURCES = plugin.c plugin.h \
details.c
details.h \
details_editor_actions.c details_editor_actions.h \
fetchcover.c
fetchcover.h
-
+libdetails_editor_la_CFLAGS = $(CURL_CFLAGS)
libdetails_editor_la_LDFLAGS = $(GTKPOD_PLUGIN_LDFLAGS)
# Plugin dependencies
libdetails_editor_la_LIBADD = \
$(GTKPOD_LIBS) \
- $(LIBANJUTA_LIBS)
+ $(LIBANJUTA_LIBS) \
+ $(CURL_LIBS)
EXTRA_DIST = \
$(plugin_file).in \
diff --git a/plugins/filetype_flac/Makefile.am
b/plugins/filetype_flac/Makefile.am
index e0f09bc..6943528 100644
--- a/plugins/filetype_flac/Makefile.am
+++ b/plugins/filetype_flac/Makefile.am
@@ -31,13 +31,14 @@ plugin_LTLIBRARIES = libfiletype_flac.la
# Plugin sources
libfiletype_flac_la_SOURCES = plugin.c plugin.h \
flacfile.c flacfile.h
-
+libfiletype_flac_la_CFLAGS = $(FLAC_CFLAGS)
libfiletype_flac_la_LDFLAGS = $(GTKPOD_PLUGIN_LDFLAGS)
# Plugin dependencies
libfiletype_flac_la_LIBADD = \
$(GTKPOD_LIBS) \
- $(LIBANJUTA_LIBS)
+ $(LIBANJUTA_LIBS) \
+ $(FLAC_LIBS)
endif
diff --git a/plugins/filetype_ogg/Makefile.am b/plugins/filetype_ogg/Makefile.am
index ac5c185..e6801c2 100644
--- a/plugins/filetype_ogg/Makefile.am
+++ b/plugins/filetype_ogg/Makefile.am
@@ -31,13 +31,14 @@ plugin_LTLIBRARIES = libfiletype_ogg.la
# Plugin sources
libfiletype_ogg_la_SOURCES = plugin.c plugin.h \
oggfile.c oggfile.h
-
+libfiletype_ogg_la_CFLAGS = $(VORBISFILE_CFLAGS)
libfiletype_ogg_la_LDFLAGS = $(GTKPOD_PLUGIN_LDFLAGS)
# Plugin dependencies
libfiletype_ogg_la_LIBADD = \
$(GTKPOD_LIBS) \
- $(LIBANJUTA_LIBS)
+ $(LIBANJUTA_LIBS) \
+ $(VORBISFILE_LIBS)
endif
diff --git a/plugins/media_player/Makefile.am b/plugins/media_player/Makefile.am
index 972d51e..3662341 100644
--- a/plugins/media_player/Makefile.am
+++ b/plugins/media_player/Makefile.am
@@ -31,14 +31,14 @@ plugin_LTLIBRARIES = libmedia_player.la
# Plugin sources
libmedia_player_la_SOURCES = plugin.c plugin.h \
media_player.c
media_player.h
-libmedia_player_la_CFLAGS = $(GSTREAMER_CFLAGS)
+libmedia_player_la_CFLAGS = $(GSTREAMER_ALL_CFLAGS)
libmedia_player_la_LDFLAGS = $(GTKPOD_PLUGIN_LDFLAGS)
# Plugin dependencies
libmedia_player_la_LIBADD = \
$(GTKPOD_LIBS) \
$(LIBANJUTA_LIBS) \
- $(GSTREAMER_LIBS)
+ $(GSTREAMER_ALL_LIBS)
endif
EXTRA_DIST = \
diff --git a/plugins/plugins.mk b/plugins/plugins.mk
index 2e64171..b7e920a 100644
--- a/plugins/plugins.mk
+++ b/plugins/plugins.mk
@@ -11,7 +11,7 @@ AM_CPPFLAGS = \
-DPACKAGE_SRC_DIR=\"$(srcdir)\" \
-I$(top_srcdir) \
$(GTKPOD_CFLAGS) \
- $(LIBANJUTA_LIBS)
+ $(LIBANJUTA_CFLAGS)
# Where to install the plugin
plugindir = $(gtkpod_plugin_dir)
------------------------------------------------------------------------------
Fulfilling the Lean Software Promise
Lean software platforms are now widely adopted and the benefits have been
demonstrated beyond question. Learn why your peers are replacing JEE
containers with lightweight application servers - and what you can gain
from the move. http://p.sf.net/sfu/vmware-sfemails
_______________________________________________
gtkpod-cvs2 mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/gtkpod-cvs2
