GNOME.org
 

[grilo-plugins] Revert "build: Use variables for CFLAGS and LIBS."

commit 62e7c95f04eb3f624b69912bad17ef34a468e171
Author: Murray Cumming <murrayc murrayc com>
Date:   Fri Nov 9 11:01:16 2012 +0100

    Revert "build: Use variables for CFLAGS and LIBS."
    
    This reverts commit f78d298bf1975fcaa21c4fb48d2852c0b31bdbdf.

 configure.ac                    |  100 ---------------------------------------
 src/apple-trailers/Makefile.am  |    8 ++-
 src/bliptv/Makefile.am          |    8 ++-
 src/bookmarks/Makefile.am       |    6 ++-
 src/dmap/Makefile.am            |    8 ++-
 src/fake-metadata/Makefile.am   |    4 +-
 src/filesystem/Makefile.am      |    6 ++-
 src/flickr/Makefile.am          |    8 ++-
 src/gravatar/Makefile.am        |    4 +-
 src/jamendo/Makefile.am         |    8 ++-
 src/lastfm-albumart/Makefile.am |    8 ++-
 src/local-metadata/Makefile.am  |    6 ++-
 src/metadata-store/Makefile.am  |    6 ++-
 src/optical-media/Makefile.am   |   10 +++-
 src/podcasts/Makefile.am        |   12 ++++-
 src/shoutcast/Makefile.am       |    8 ++-
 src/tmdb/Makefile.am            |   14 ++++-
 src/tracker/Makefile.am         |    6 ++-
 src/upnp/Makefile.am            |   14 +++++-
 src/vimeo/Makefile.am           |   12 ++++-
 src/youtube/Makefile.am         |   14 +++++-
 21 files changed, 129 insertions(+), 141 deletions(-)
---
diff --git a/configure.ac b/configure.ac
index 9d67399..521723f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -184,11 +184,6 @@ FAKEMETADATA_PLUGIN_ID="grl-fake-metadata"
 AC_SUBST(FAKEMETADATA_PLUGIN_ID)
 AC_DEFINE_UNQUOTED([FAKEMETADATA_PLUGIN_ID], ["$FAKEMETADATA_PLUGIN_ID"], [Fake metadata plugin ID])
 
-DEPS_FAKEMETADATA_CFLAGS="$DEPS_CFLAGS"
-AC_SUBST(DEPS_FAKEMETADATA_CFLAGS)
-DEPS_FAKEMETADATA_LIBS="$DEPS_LIBS"
-AC_SUBST(DEPS_FAKEMETADATA_LIBS)
-
 # ----------------------------------------------------------
 # BUILD FILE SYSTEM PLUGIN
 # ----------------------------------------------------------
@@ -209,11 +204,6 @@ FILESYSTEM_PLUGIN_ID="grl-filesystem"
 AC_SUBST(FILESYSTEM_PLUGIN_ID)
 AC_DEFINE_UNQUOTED([FILESYSTEM_PLUGIN_ID], ["$FILESYSTEM_PLUGIN_ID"], [Filesystem plugin ID])
 
-DEPS_FILESYSTEM_CFLAGS="$DEPS_CFLAGS $GIO_CFLAGS"
-AC_SUBST(DEPS_FILESYSTEM_CFLAGS)
-DEPS_FILESYSTEM_LIBS="$DEPS_LIBS $GIO_LIBS"
-AC_SUBST(DEPS_FILESYSTEM_LIBS)
-
 # ----------------------------------------------------------
 # BUILD OPTICAL MEDIA PLUGIN
 # ----------------------------------------------------------
@@ -249,11 +239,6 @@ OPTICAL_MEDIA_PLUGIN_ID="grl-optical-media"
 AC_SUBST(OPTICAL_MEDIA_PLUGIN_ID)
 AC_DEFINE_UNQUOTED([OPTICAL_MEDIA_PLUGIN_ID], ["$OPTICAL_MEDIA_PLUGIN_ID"], [Optical Media plugin ID])
 
-DEPS_OPTICAL_MEDIA_STORE_CFLAGS="$DEPS_CFLAGS $GIO_CFLAGS $GTK_CFLAGS $TOTEM_PL_PARSER_CFLAGS"
-AC_SUBST(DEPS_OPTICAL_MEDIA_STORE_CFLAGS)
-DEPS_OPTICAL_MEDIA_STORE_LIBS="$DEPS_LIBS $GIO_LIBS $GTK_LIBS $TOTEM_PL_PARSER_LIBS"
-AC_SUBST(DEPS_OPTICAL_MEDIA_STORE_LIBS)
-
 # ----------------------------------------------------------
 # BUILD JAMENDO PLUGIN
 # ----------------------------------------------------------
@@ -292,11 +277,6 @@ JAMENDO_PLUGIN_ID="grl-jamendo"
 AC_SUBST(JAMENDO_PLUGIN_ID)
 AC_DEFINE_UNQUOTED([JAMENDO_PLUGIN_ID], ["$JAMENDO_PLUGIN_ID"], [Jamendo plugin ID])
 
-DEPS_JAMENDO_CFLAGS="$DEPS_CFLAGS $GRLNET_CFLAGS $XML_CFLAGS"
-AC_SUBST(DEPS_JAMENDO_CFLAGS)
-DEPS_JAMENDO_LIBS="$DEPS_LIBS $GRLNET_LIBS $XML_LIBS"
-AC_SUBST(DEPS_JAMENDO_LIBS)
-
 # ----------------------------------------------------------
 # BUILD LASTFM ALBUM ART PLUGIN
 # ----------------------------------------------------------
@@ -335,11 +315,6 @@ LASTFM_ALBUMART_PLUGIN_ID="grl-lastfm-albumart"
 AC_SUBST(LASTFM_ALBUMART_PLUGIN_ID)
 AC_DEFINE_UNQUOTED([LASTFM_ALBUMART_PLUGIN_ID], ["$LASTFM_ALBUMART_PLUGIN_ID"], [Last.fm album art plugin ID])
 
-DEPS_LASTFM_ALBUMART_CFLAGS="$DEPS_CFLAGS $GRLNET_CFLAGS $XML_CFLAGS"
-AC_SUBST(DEPS_LASTFM_ALBUMART_CFLAGS)
-DEPS_LASTFM_ALBUMART_LIBS="$DEPS_LIBS $GRLNET_LIBS $XML_LIBS"
-AC_SUBST(DEPS_LASTFM_ALBUMART_LIBS)
-
 # ----------------------------------------------------------
 # BUILD UPNP PLUGIN
 # ----------------------------------------------------------
@@ -383,11 +358,6 @@ UPNP_PLUGIN_ID="grl-upnp"
 AC_SUBST(UPNP_PLUGIN_ID)
 AC_DEFINE_UNQUOTED([UPNP_PLUGIN_ID], ["$UPNP_PLUGIN_ID"], [UPnP plugin ID])
 
-DEPS_UPNP_CFLAGS="$DEPS_CFLAGS $GSSDP_CFLAGS $GUPNP_CFLAGS $GUPNPAV_CFLAGS $GTHREAD_CFLAGS $XML_CFLAGS"
-AC_SUBST(DEPS_UPNP_CFLAGS)
-DEPS_UPNP_LIBS="$DEPS_LIBS $GSSDP_LIBS $GUPNP_LIBS $GUPNPAV_LIBS $GTHREAD_LIBS $XML_LIBS"
-AC_SUBST(DEPS_UPNP_LIBS)
-
 # ----------------------------------------------------------
 # BUILD YOUTUBE PLUGIN
 # ----------------------------------------------------------
@@ -432,11 +402,6 @@ YOUTUBE_PLUGIN_ID="grl-youtube"
 AC_SUBST(YOUTUBE_PLUGIN_ID)
 AC_DEFINE_UNQUOTED([YOUTUBE_PLUGIN_ID], ["$YOUTUBE_PLUGIN_ID"], [YouTube plugin ID])
 
-DEPS_YOUTUBE_CFLAGS="$DEPS_CFLAGS $GRLNET_CFLAGS $XML_CFLAGS $GTHREAD_CFLAGS $GDATA_CFLAGS $QUVI_CFLAGS"
-AC_SUBST(DEPS_YOUTUBE_CFLAGS)
-DEPS_YOUTUBE_LIBS="$DEPS_LIBS $GRLNET_LIBS $XML_LIBS $GTHREAD_LIBS $GDATA_LIBS $QUVI_LIBS"
-AC_SUBST(DEPS_YOUTUBE_LIBS)
-
 # ----------------------------------------------------------
 # BUILD FLICKR PLUGIN
 # ----------------------------------------------------------
@@ -475,11 +440,6 @@ FLICKR_PLUGIN_ID="grl-flickr"
 AC_SUBST(FLICKR_PLUGIN_ID)
 AC_DEFINE_UNQUOTED([FLICKR_PLUGIN_ID], ["$FLICKR_PLUGIN_ID"], [Flickr plugin ID])
 
-DEPS_FLICKR_CFLAGS="$DEPS_CFLAGS $XML_CFLAGS $GRLNET_CFLAGS"
-AC_SUBST(DEPS_FLICKR_CFLAGS)
-DEPS_FLICKR_LIBS="$DEPS_LIBS $XML_LIBS $GRLNET_LIBS"
-AC_SUBST(DEPS_FLICKR_LIBS)
-
 # ----------------------------------------------------------
 # BUILD PODCASTS PLUGIN
 # ----------------------------------------------------------
@@ -527,11 +487,6 @@ PODCASTS_PLUGIN_ID="grl-podcasts"
 AC_SUBST(PODCASTS_PLUGIN_ID)
 AC_DEFINE_UNQUOTED([PODCASTS_PLUGIN_ID], ["$PODCASTS_PLUGIN_ID"], [Podcasts plugin ID])
 
-DEPS_PODCASTS_CFLAGS="$DEPS_CFLAGS $GRLNET_CFLAGS $XML_CFLAGS $SQLITE_CFLAGS $GMIME_CFLAGS"
-AC_SUBST(DEPS_PODCASTS_CFLAGS)
-DEPS_PODCASTS_LIBS="$DEPS_LIBS $GRLNET_CFLAGS $XML_LIBS $SQLITE_LIBS $GMIME_LIBS"
-AC_SUBST(DEPS_PODCASTS_LIBS)
-
 # ----------------------------------------------------------
 # BUILD BOOKMARKS PLUGIN
 # ----------------------------------------------------------
@@ -573,11 +528,6 @@ BOOKMARKS_PLUGIN_ID="grl-bookmarks"
 AC_SUBST(BOOKMARKS_PLUGIN_ID)
 AC_DEFINE_UNQUOTED([BOOKMARKS_PLUGIN_ID], ["$BOOKMARKS_PLUGIN_ID"], [Bookmarks plugin ID])
 
-DEPS_BOOKMARKS_CFLAGS="$DEPS_CFLAGS $SQLITE_CFLAGS"
-AC_SUBST(DEPS_BOOKMARKS_CFLAGS)
-DEPS_BOOKMARKS_LIBS="$DEPS_LIBS $SQLITE_LIBS"
-AC_SUBST(DEPS_BOOKMARKS_LIBS)
-
 # ----------------------------------------------------------
 # BUILD SHOUTCAST PLUGIN
 # ----------------------------------------------------------
@@ -616,11 +566,6 @@ SHOUTCAST_PLUGIN_ID="grl-shoutcast"
 AC_SUBST(SHOUTCAST_PLUGIN_ID)
 AC_DEFINE_UNQUOTED([SHOUTCAST_PLUGIN_ID], ["$SHOUTCAST_PLUGIN_ID"], [Shoutcast plugin ID])
 
-DEPS_SHOUTCAST_CFLAGS="$DEPS_CFLAGS $GRLNET_CFLAGS $XML_CFLAGS"
-AC_SUBST(DEPS_SHOUTCAST_CFLAGS)
-DEPS_SHOUTCAST_LIBS="$DEPS_LIBS $GRLNET_CFLAGS $XML_LIBS"
-AC_SUBST(DEPS_SHOUTCAST_LIBS)
-
 # ----------------------------------------------------------
 # BUILD APPLE TRAILERS PLUGIN
 # ----------------------------------------------------------
@@ -659,11 +604,6 @@ APPLE_TRAILERS_PLUGIN_ID="grl-apple-trailers"
 AC_SUBST(APPLE_TRAILERS_PLUGIN_ID)
 AC_DEFINE_UNQUOTED([APPLE_TRAILERS_PLUGIN_ID], ["$APPLE_TRAILERS_PLUGIN_ID"], [Apple Trailers plugin ID])
 
-DEPS_APPLE_TRAILERS_CFLAGS="$DEPS_CFLAGS $GRLNET_CFLAGS $XML_CFLAGS"
-AC_SUBST(DEPS_APPLE_TRAILERS_CFLAGS)
-DEPS_APPLE_TRAILERS_LIBS="$DEPS_LIBS $GRLNET_LIBS $XML_LIBS"
-AC_SUBST(DEPS_APPLE_TRAILERS_LIBS)
-
 # ----------------------------------------------------------
 # BUILD METADATA-STORE PLUGIN
 # ----------------------------------------------------------
@@ -699,11 +639,6 @@ METADATA_STORE_PLUGIN_ID="grl-metadata-store"
 AC_SUBST(METADATA_STORE_PLUGIN_ID)
 AC_DEFINE_UNQUOTED([METADATA_STORE_PLUGIN_ID], ["$METADATA_STORE_PLUGIN_ID"], [Metadata Store plugin ID])
 
-DEPS_METADATA_STORE_CFLAGS="$DEPS_CFLAGS $SQLITE_CFLAGS"
-AC_SUBST(DEPS_METADATA_STORE_CFLAGS)
-DEPS_METADATA_STORE_LIBS="$DEPS_LIBS $SQLITE_LIBS"
-AC_SUBST(DEPS_METADATA_STORE_LIBS)
-
 # ----------------------------------------------------------
 # BUILD VIMEO PLUGIN
 # ----------------------------------------------------------
@@ -748,11 +683,6 @@ VIMEO_PLUGIN_ID="grl-vimeo"
 AC_SUBST(VIMEO_PLUGIN_ID)
 AC_DEFINE_UNQUOTED([VIMEO_PLUGIN_ID], ["$VIMEO_PLUGIN_ID"], [Vimeo plugin ID])
 
-DEPS_VIMEO_CFLAGS="$DEPS_CFLAGS $XML_CFLAGS $GTHREAD_CFLAGS $LIBSOUP_CFLAGS $LIBGCRYPT_CFLAGS"
-AC_SUBST(DEPS_VIMEO_CFLAGS)
-DEPS_VIMEO_LIBS="$DEPS_LIBS $XML_LIBS $GTHREAD_LIBS $LIBSOUP_LIBS $LIBGCRYPT_LIBS"
-AC_SUBST(DEPS_VIMEO_LIBS)
-
 # ----------------------------------------------------------
 # BUILD GRAVATAR PLUGIN
 # ----------------------------------------------------------
@@ -777,11 +707,6 @@ GRAVATAR_PLUGIN_ID="grl-gravatar"
 AC_SUBST(GRAVATAR_PLUGIN_ID)
 AC_DEFINE_UNQUOTED([GRAVATAR_PLUGIN_ID], ["$GRAVATAR_PLUGIN_ID"], [Gravatar plugin ID])
 
-DEPS_GRAVATAR_CFLAGS="$DEPS_CFLAGS"
-AC_SUBST(DEPS_GRAVATAR_CFLAGS)
-DEPS_GRAVATAR_LIBS="$DEPS_LIBS"
-AC_SUBST(DEPS_GRAVATAR_LIBS)
-
 # ----------------------------------------------------------
 # BUILD TRACKER PLUGIN
 # ----------------------------------------------------------
@@ -817,11 +742,6 @@ TRACKER_PLUGIN_ID="grl-tracker"
 AC_SUBST(TRACKER_PLUGIN_ID)
 AC_DEFINE_UNQUOTED([TRACKER_PLUGIN_ID], ["$TRACKER_PLUGIN_ID"], [Tracker plugin ID])
 
-DEPS_TRACKER_CFLAGS="$DEPS_CFLAGS $TRACKER_SPARQL_CFLAGS"
-AC_SUBST(DEPS_TRACKER_CFLAGS)
-DEPS_TRACKER_LIBS="$DEPS_LIBS $TRACKER_SPARQL_LIBS"
-AC_SUBST(DEPS_TRACKER_LIBS)
-
 # ----------------------------------------------------------
 # BUILD BLIP.TV PLUGIN
 # ----------------------------------------------------------
@@ -857,11 +777,6 @@ BLIPTV_PLUGIN_ID="grl-bliptv"
 AC_SUBST(BLIPTV_PLUGIN_ID)
 AC_DEFINE_UNQUOTED([BLIPTV_PLUGIN_ID], ["$BLIPTV_PLUGIN_ID"], [Blip.tv plugin ID])
 
-DEPS_BLIPTV_CFLAGS="$DEPS_CFLAGS $LIBXML_CFLAGS $LIBREST_CFLAGS"
-AC_SUBST(DEPS_BLIPTV_CFLAGS)
-DEPS_BLIPTV_LIBS="$DEPS_LIBS $LIBXML_LIBS $LIBREST_LIBS"
-AC_SUBST(DEPS_BLIPTV_LIBS)
-
 # ----------------------------------------------------------
 # BUILD LOCAL METADATA PLUGIN
 # ----------------------------------------------------------
@@ -897,11 +812,6 @@ LOCALMETADATA_PLUGIN_ID="grl-local-metadata"
 AC_SUBST(LOCALMETADATA_PLUGIN_ID)
 AC_DEFINE_UNQUOTED([LOCALMETADATA_PLUGIN_ID], ["$LOCALMETADATA_PLUGIN_ID"], [Local metadata plugin ID])
 
-DEPS_LOCALMETADATA_CFLAGS="$DEPS_CFLAGS $GIO_CFLAGS"
-AC_SUBST(DEPS_LOCALMETADATA_CFLAGS)
-DEPS_LOCALMETADATA_LIBS="$DEPS_LIBS $GIO_LIBS"
-AC_SUBST(DEPS_LOCALMETADATA_LIBS)
-
 # ----------------------------------------------------------
 # BUILD DMAP PLUGIN
 # ----------------------------------------------------------
@@ -939,11 +849,6 @@ DMAP_PLUGIN_ID="grl-dmap"
 AC_SUBST(DMAP_PLUGIN_ID)
 AC_DEFINE_UNQUOTED([DMAP_PLUGIN_ID], ["$DMAP_PLUGIN_ID"], [DMAP plugin ID])
 
-DEPS_DMAP_CFLAGS="$DEPS_CFLAGS $DMAP_CFLAGS $XML_CFLAGS"
-AC_SUBST(DEPS_DMAP_CFLAGS)
-DEPS_DMAP_LIBS="$DEPS_LIBS $DMAP_LIBS $XML_LIBS"
-AC_SUBST(DEPS_DMAP_LIBS)
-
 # ----------------------------------------------------------
 # BUILD TMDB PLUGIN
 # ----------------------------------------------------------
@@ -973,11 +878,6 @@ TMDB_PLUGIN_ID="grl-tmdb"
 AC_SUBST(TMDB_PLUGIN_ID)
 AC_DEFINE_UNQUOTED([TMDB_PLUGIN_ID], ["$TMDB_PLUGIN_ID"], [TMDb plugin ID])
 
-DEPS_TMDB_CFLAGS="$DEPS_CFLAGS $LIBSOUP_CFLAGS $GRLNET_CFLAGS $JSON_CFLAGS"
-AC_SUBST(DEPS_TMDB_CFLAGS)
-DEPS_TMDB_LIBS="$DEPS_LIBS $LIBSOUP_LIBS $GRLNET_LIBS $JSON_LIBS"
-AC_SUBST(DEPS_TMDB_LIBS)
-
 # ----------------------------------------------------------
 # GETTEXT
 # ----------------------------------------------------------
diff --git a/src/apple-trailers/Makefile.am b/src/apple-trailers/Makefile.am
index e55a0a2..6eba99e 100644
--- a/src/apple-trailers/Makefile.am
+++ b/src/apple-trailers/Makefile.am
@@ -8,10 +8,14 @@
 ext_LTLIBRARIES		 = libgrlappletrailers.la
 
 libgrlappletrailers_la_CFLAGS =	\
-	$(DEPS_APPLE_TRAILERS_CFLAGS)
+	$(DEPS_CFLAGS)		\
+	$(GRLNET_CFLAGS)	\
+	$(XML_CFLAGS)
 
 libgrlappletrailers_la_LIBADD =	\
-	$(DEPS_APPLE_TRAILERS_LIBS)
+	$(DEPS_LIBS)		\
+	$(GRLNET_LIBS)		\
+	$(XML_LIBS)
 
 libgrlappletrailers_la_LDFLAGS = \
 	-no-undefined		 \
diff --git a/src/bliptv/Makefile.am b/src/bliptv/Makefile.am
index 0654312..8d78113 100644
--- a/src/bliptv/Makefile.am
+++ b/src/bliptv/Makefile.am
@@ -9,10 +9,14 @@
 ext_LTLIBRARIES		 = libgrlbliptv.la
 
 libgrlbliptv_la_CFLAGS =	\
-	$(DEPS_BLIPTV_CFLAGS)
+	$(DEPS_CFLAGS)		\
+	$(LIBXML_CFLAGS)	\
+	$(LIBREST_CFLAGS)
 
 libgrlbliptv_la_LIBADD =	\
-	$(DEPS_BLIPTV_LIBS)
+	$(DEPS_LIBS)		\
+	$(LIBXML_LIBS)		\
+	$(LIBREST_LIBS)
 
 libgrlbliptv_la_LDFLAGS = \
 	-no-undefined	  \
diff --git a/src/bookmarks/Makefile.am b/src/bookmarks/Makefile.am
index 22aeec1..f63b1c7 100644
--- a/src/bookmarks/Makefile.am
+++ b/src/bookmarks/Makefile.am
@@ -8,10 +8,12 @@
 ext_LTLIBRARIES = libgrlbookmarks.la
 
 libgrlbookmarks_la_CFLAGS =	\
-	$(DEPS_BOOKMARKS_CFLAGS)
+	$(DEPS_CFLAGS)		\
+	$(SQLITE_CFLAGS)
 
 libgrlbookmarks_la_LIBADD =	\
-	$(DEPS_BOOKMARKS_LIBS)
+	$(DEPS_LIBS)		\
+	$(SQLITE_LIBS)
 
 libgrlbookmarks_la_LDFLAGS = \
 	-no-undefined	     \
diff --git a/src/dmap/Makefile.am b/src/dmap/Makefile.am
index 4d285ab..a5af68b 100644
--- a/src/dmap/Makefile.am
+++ b/src/dmap/Makefile.am
@@ -8,10 +8,14 @@
 ext_LTLIBRARIES	= libgrldmap.la
 
 libgrldmap_la_CFLAGS =	\
-	$(DEPS_DMAP_CFLAGS)
+	$(DEPS_CFLAGS)			\
+	$(DMAP_CFLAGS)			\
+	$(XML_CFLAGS)
 
 libgrldmap_la_LIBADD =	\
-	$(DEPS_DMAP_LIBS)
+	$(DEPS_LIBS)			\
+	$(DMAP_LIBS)			\
+	$(XML_LIBS)
 
 libgrldmap_la_LDFLAGS =	\
 	-no-undefined			\
diff --git a/src/fake-metadata/Makefile.am b/src/fake-metadata/Makefile.am
index 60ae3e3..e07ccc6 100644
--- a/src/fake-metadata/Makefile.am
+++ b/src/fake-metadata/Makefile.am
@@ -8,10 +8,10 @@
 ext_LTLIBRARIES		 = libgrlfakemetadata.la
 
 libgrlfakemetadata_la_CFLAGS =	\
-	$(DEPS_FAKEMETADATA_CFLAGS)
+	$(DEPS_CFLAGS)
 
 libgrlfakemetadata_la_LIBADD =	\
-	$(DEPS_FAKEMETADATA_LIBS)
+	$(DEPS_LIBS)
 
 libgrlfakemetadata_la_LDFLAGS = \
 	-no-undefined		\
diff --git a/src/filesystem/Makefile.am b/src/filesystem/Makefile.am
index e9b1441..7825aa7 100644
--- a/src/filesystem/Makefile.am
+++ b/src/filesystem/Makefile.am
@@ -8,10 +8,12 @@
 ext_LTLIBRARIES		 = libgrlfilesystem.la
 
 libgrlfilesystem_la_CFLAGS =	\
-	$(DEPS_FILESYSTEM_CFLAGS)
+	$(DEPS_CFLAGS)		\
+	$(GIO_CFLAGS)
 
 libgrlfilesystem_la_LIBADD =	\
-	$(DEPS_FILESYSTEM_LIBS)
+	$(DEPS_LIBS)		\
+	$(GIO_LIBS)
 
 libgrlfilesystem_la_LDFLAGS = \
 	-no-undefined	      \
diff --git a/src/flickr/Makefile.am b/src/flickr/Makefile.am
index 5bdc09f..bef05e2 100644
--- a/src/flickr/Makefile.am
+++ b/src/flickr/Makefile.am
@@ -8,10 +8,14 @@
 libplugin_LTLIBRARIES	= libgrlflickr.la
 
 libgrlflickr_la_CFLAGS =	\
-	$(DEPS_FLICKR_CFLAGS)
+	$(DEPS_CFLAGS)		\
+	$(XML_CFLAGS)		\
+	$(GRLNET_CFLAGS)
 
 libgrlflickr_la_LIBADD =	\
-	$(DEPS_FLICKR_LIBS)
+	$(DEPS_LIBS)		\
+	$(XML_LIBS)		\
+	$(GRLNET_LIBS)
 
 libgrlflickr_la_LDFLAGS = \
 	-no-undefined	  \
diff --git a/src/gravatar/Makefile.am b/src/gravatar/Makefile.am
index 8cbf4a2..c474be6 100644
--- a/src/gravatar/Makefile.am
+++ b/src/gravatar/Makefile.am
@@ -8,10 +8,10 @@
 ext_LTLIBRARIES = libgrlgravatar.la
 
 libgrlgravatar_la_CFLAGS =	\
-	$(DEPS_GRAVATAR_CFLAGS)
+	$(DEPS_CFLAGS)
 
 libgrlgravatar_la_LIBADD =	\
-	$(DEPS_GRAVATAR_LIBS)
+	$(DEPS_LIBS)
 
 libgrlgravatar_la_LDFLAGS = \
 	-no-undefined       \
diff --git a/src/jamendo/Makefile.am b/src/jamendo/Makefile.am
index 4e0acc3..fe1c7dd 100644
--- a/src/jamendo/Makefile.am
+++ b/src/jamendo/Makefile.am
@@ -8,10 +8,14 @@
 ext_LTLIBRARIES		 = libgrljamendo.la
 
 libgrljamendo_la_CFLAGS =	\
-	$(DEPS_JAMENDO_CFLAGS)
+	$(DEPS_CFLAGS)		\
+	$(GRLNET_CFLAGS)	\
+	$(XML_CFLAGS)
 
 libgrljamendo_la_LIBADD =	\
-	$(DEPS_JAMENDO_LIBS)
+	$(DEPS_LIBS)		\
+	$(GRLNET_LIBS)		\
+	$(XML_LIBS)
 
 libgrljamendo_la_LDFLAGS = \
 	-no-undefined	   \
diff --git a/src/lastfm-albumart/Makefile.am b/src/lastfm-albumart/Makefile.am
index 914df03..f90cbbb 100644
--- a/src/lastfm-albumart/Makefile.am
+++ b/src/lastfm-albumart/Makefile.am
@@ -8,10 +8,14 @@
 ext_LTLIBRARIES = libgrllastfm-albumart.la
 
 libgrllastfm_albumart_la_CFLAGS =	\
-	$(DEPS_LASTFM_ALBUMART_CFLAGS)
+	$(DEPS_CFLAGS) 			\
+	$(GRLNET_CFLAGS) 		\
+	$(XML_CFLAGS)
 
 libgrllastfm_albumart_la_LIBADD =	\
-	$(DEPS_LASTFM_ALBUMART_LIBS)
+	$(DEPS_LIBS)			\
+	$(GRLNET_LIBS)			\
+	$(XML_LIBS)
 
 libgrllastfm_albumart_la_LDFLAGS = \
 	-no-undefined		   \
diff --git a/src/local-metadata/Makefile.am b/src/local-metadata/Makefile.am
index 99c97fd..afc5312 100644
--- a/src/local-metadata/Makefile.am
+++ b/src/local-metadata/Makefile.am
@@ -8,10 +8,12 @@
 ext_LTLIBRARIES		 = libgrllocalmetadata.la
 
 libgrllocalmetadata_la_CFLAGS =	\
-	$(DEPS_LOCALMETADATA_CFLAGS)
+	$(DEPS_CFLAGS) \
+	$(GIO_CFLAGS)
 
 libgrllocalmetadata_la_LIBADD =	\
-	$(DEPS_LOCALMETADATA_LIBS)
+	$(DEPS_LIBS) \
+	$(GIO_LIBS)
 
 libgrllocalmetadata_la_LDFLAGS = \
 	-no-undefined		 \
diff --git a/src/metadata-store/Makefile.am b/src/metadata-store/Makefile.am
index d7128ce..1d4e1b5 100644
--- a/src/metadata-store/Makefile.am
+++ b/src/metadata-store/Makefile.am
@@ -8,10 +8,12 @@
 ext_LTLIBRARIES		 = libgrlmetadatastore.la
 
 libgrlmetadatastore_la_CFLAGS =	\
-	$(DEPS_METADATA_STORE_CFLAGS)
+	$(DEPS_CFLAGS) \
+	$(SQLITE_CFLAGS)
 
 libgrlmetadatastore_la_LIBADD =	\
-	$(DEPS_METADATA_STORE_LIBS)
+	$(DEPS_LIBS) \
+	$(SQLITE_LIBS)
 
 libgrlmetadatastore_la_LDFLAGS = \
 	-no-undefined		 \
diff --git a/src/optical-media/Makefile.am b/src/optical-media/Makefile.am
index 0877aa4..c8ee1f9 100644
--- a/src/optical-media/Makefile.am
+++ b/src/optical-media/Makefile.am
@@ -8,10 +8,16 @@
 ext_LTLIBRARIES		 = libgrloptical-media.la
 
 libgrloptical_media_la_CFLAGS =	\
-	$(DEPS_OPTICAL_MEDIA_STORE_CFLAGS)
+	$(DEPS_CFLAGS)		\
+	$(GIO_CFLAGS)		\
+	$(GTK_CFLAGS)		\
+	$(TOTEM_PL_PARSER_CFLAGS)
 
 libgrloptical_media_la_LIBADD =	\
-	$(DEPS_OPTICAL_MEDIA_STORE_LIBS)
+	$(DEPS_LIBS)	\
+	$(GIO_LIBS)		\
+	$(GTK_LIBS)		\
+	$(TOTEM_PL_PARSER_LIBS)
 
 libgrloptical_media_la_LDFLAGS = \
 	-no-undefined	      \
diff --git a/src/podcasts/Makefile.am b/src/podcasts/Makefile.am
index 4e5a357..fe3869f 100644
--- a/src/podcasts/Makefile.am
+++ b/src/podcasts/Makefile.am
@@ -8,10 +8,18 @@
 ext_LTLIBRARIES = libgrlpodcasts.la
 
 libgrlpodcasts_la_CFLAGS =	\
-	$(DEPS_PODCASTS_CFLAGS)
+	$(DEPS_CFLAGS)		\
+	$(GRLNET_CFLAGS)	\
+	$(XML_CFLAGS)		\
+	$(SQLITE_CFLAGS) 	\
+	$(GMIME_CFLAGS)
 
 libgrlpodcasts_la_LIBADD =	\
-	$(DEPS_PODCASTS_LIBS)
+	$(DEPS_LIBS)		\
+	$(GRLNET_LIBS)		\
+	$(XML_LIBS)		\
+	$(SQLITE_LIBS) 		\
+	$(GMIME_LIBS)
 
 libgrlpodcasts_la_LDFLAGS = \
 	-no-undefined	    \
diff --git a/src/shoutcast/Makefile.am b/src/shoutcast/Makefile.am
index 9bc2950..c05e0ea 100644
--- a/src/shoutcast/Makefile.am
+++ b/src/shoutcast/Makefile.am
@@ -8,10 +8,14 @@
 ext_LTLIBRARIES		 = libgrlshoutcast.la
 
 libgrlshoutcast_la_CFLAGS =	\
-	$(DEPS_SHOUTCAST_CFLAGS)
+	$(DEPS_CFLAGS)		\
+	$(GRLNET_CFLAGS)	\
+	$(XML_CFLAGS)
 
 libgrlshoutcast_la_LIBADD =	\
-	$(DEPS_SHOUTCAST_LIBS)
+	$(DEPS_LIBS)		\
+	$(GRLNET_LIBS)		\
+	$(XML_LIBS)
 
 libgrlshoutcast_la_LDFLAGS = \
 	-no-undefined	     \
diff --git a/src/tmdb/Makefile.am b/src/tmdb/Makefile.am
index 5119c0a..d40ad98 100644
--- a/src/tmdb/Makefile.am
+++ b/src/tmdb/Makefile.am
@@ -7,9 +7,17 @@
 
 ext_LTLIBRARIES		 = libgrltmdb.la
 
-libgrltmdb_la_CFLAGS = $(DEPS_TMDB_CFLAGS)
-
-libgrltmdb_la_LIBADD = $(DEPS_TMDB_LIBS)
+libgrltmdb_la_CFLAGS =	\
+	$(DEPS_CFLAGS) \
+	$(LIBSOUP_CFLAGS) \
+	$(GRLNET_CFLAGS) \
+	$(JSON_CFLAGS)
+
+libgrltmdb_la_LIBADD =	\
+	$(DEPS_LIBS) \
+	$(LIBSOUP_LIBS) \
+	$(GRLNET_LIBS) \
+	$(JSON_LIBS)
 
 libgrltmdb_la_LDFLAGS = \
 	-no-undefined		\
diff --git a/src/tracker/Makefile.am b/src/tracker/Makefile.am
index 6d863a2..1edee28 100644
--- a/src/tracker/Makefile.am
+++ b/src/tracker/Makefile.am
@@ -8,10 +8,12 @@
 ext_LTLIBRARIES		 = libgrltracker.la
 
 libgrltracker_la_CFLAGS =	\
-	$(DEPS_TRACKER_CFLAGS)
+	$(DEPS_CFLAGS)		\
+	$(TRACKER_SPARQL_CFLAGS)
 
 libgrltracker_la_LIBADD =	\
-	$(DEPS_TRACKER_LIBS)
+	$(DEPS_LIBS)		\
+	$(TRACKER_SPARQL_LIBS)
 
 libgrltracker_la_LDFLAGS = \
 	-no-undefined	   \
diff --git a/src/upnp/Makefile.am b/src/upnp/Makefile.am
index ac0d1b3..eec9a84 100644
--- a/src/upnp/Makefile.am
+++ b/src/upnp/Makefile.am
@@ -8,10 +8,20 @@
 ext_LTLIBRARIES	= libgrlupnp.la
 
 libgrlupnp_la_CFLAGS =		\
-	$(DEPS_UPNP_CFLAGS)
+	$(DEPS_CFLAGS)		\
+	$(GSSDP_CFLAGS)		\
+	$(GUPNP_CFLAGS)		\
+	$(GUPNPAV_CFLAGS)	\
+	$(GTHREAD_CFLAGS)	\
+	$(XML_CFLAGS)
 
 libgrlupnp_la_LIBADD =	\
-	$(DEPS_UPNP_LIBS)
+	$(DEPS_LIBS)	\
+	$(GSSDP_LIBS)	\
+	$(GUPNP_LIBS)	\
+	$(GUPNPAV_LIBS)	\
+	$(GTHREAD_LIBS)	\
+	$(XML_LIBS)
 
 libgrlupnp_la_LDFLAGS = \
 	-no-undefined   \
diff --git a/src/vimeo/Makefile.am b/src/vimeo/Makefile.am
index bf85da9..d0ba117 100644
--- a/src/vimeo/Makefile.am
+++ b/src/vimeo/Makefile.am
@@ -8,10 +8,18 @@
 ext_LTLIBRARIES		 = libgrlvimeo.la
 
 libgrlvimeo_la_CFLAGS =	\
-	$(DEPS_VIMEO_CFLAGS)
+	$(DEPS_CFLAGS)		\
+	$(XML_CFLAGS)		\
+	$(GTHREAD_CFLAGS)	\
+	$(LIBSOUP_CFLAGS)	\
+	$(LIBGCRYPT_CFLAGS)
 
 libgrlvimeo_la_LIBADD =	\
-	$(DEPS_VIMEO_LIBS)
+	$(DEPS_LIBS)		\
+	$(XML_LIBS)		\
+	$(GTHREAD_LIBS)		\
+	$(LIBSOUP_LIBS)		\
+	$(LIBGCRYPT_LIBS)
 
 libgrlvimeo_la_LDFLAGS = \
 	-no-undefined    \
diff --git a/src/youtube/Makefile.am b/src/youtube/Makefile.am
index 254a139..5f9ffd9 100644
--- a/src/youtube/Makefile.am
+++ b/src/youtube/Makefile.am
@@ -8,10 +8,20 @@
 ext_LTLIBRARIES = libgrlyoutube.la
 
 libgrlyoutube_la_CFLAGS =	\
-	$(DEPS_YOUTUBE_CFLAGS)
+	$(DEPS_CFLAGS)		\
+	$(GRLNET_CFLAGS)	\
+	$(XML_CFLAGS) 		\
+	$(GTHREAD_CFLAGS)	\
+	$(GDATA_CFLAGS)	\
+	$(QUVI_CFLAGS)
 
 libgrlyoutube_la_LIBADD =	\
-	$(DEPS_YOUTUBE_LIBS)
+	$(DEPS_LIBS)		\
+	$(GRLNET_LIBS)		\
+	$(XML_LIBS) 		\
+	$(GTHREAD_LIBS)	\
+	$(GDATA_LIBS)		\
+	$(QUVI_LIBS)
 
 libgrlyoutube_la_LDFLAGS = \
 	-no-undefined      \
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]