GNOME.org
 

[PATCH] windows: Fix DLL generation and build

From: Damien Lespiau <damien lespiau intel com>

As with the main grilo, libtool needs -no-undefined to generate DLLs on
windows. As it does not hurt to have it all the time, let's just add it to the
LDFLAGS.

A spurious -ldl -lpthread were left in the test Makefile as well, remove them.
---
 src/media/apple-trailers/Makefile.am     |    1 +
 src/media/bliptv/Makefile.am             |    3 ++-
 src/media/bookmarks/Makefile.am          |    1 +
 src/media/filesystem/Makefile.am         |    1 +
 src/media/flickr/Makefile.am             |    1 +
 src/media/jamendo/Makefile.am            |    1 +
 src/media/podcasts/Makefile.am           |    1 +
 src/media/shoutcast/Makefile.am          |    1 +
 src/media/tracker/Makefile.am            |    1 +
 src/media/upnp/Makefile.am               |    1 +
 src/media/vimeo/Makefile.am              |    1 +
 src/media/youtube/Makefile.am            |    1 +
 src/metadata/fake-metadata/Makefile.am   |    1 +
 src/metadata/gravatar/Makefile.am        |    1 +
 src/metadata/lastfm-albumart/Makefile.am |    1 +
 src/metadata/local-metadata/Makefile.am  |    3 ++-
 src/metadata/metadata-store/Makefile.am  |    1 +
 test/Makefile.am                         |    2 --
 18 files changed, 19 insertions(+), 4 deletions(-)

diff --git a/src/media/apple-trailers/Makefile.am b/src/media/apple-trailers/Makefile.am
index 90cc3d9..e5e1e6b 100644
--- a/src/media/apple-trailers/Makefile.am
+++ b/src/media/apple-trailers/Makefile.am
@@ -18,6 +18,7 @@ libgrlappletrailers_la_LIBADD =	\
 	$(XML_LIBS)
 
 libgrlappletrailers_la_LDFLAGS = \
+	-no-undefined		 \
 	-module			 \
 	-avoid-version
 
diff --git a/src/media/bliptv/Makefile.am b/src/media/bliptv/Makefile.am
index 4fbf8d4..076489e 100644
--- a/src/media/bliptv/Makefile.am
+++ b/src/media/bliptv/Makefile.am
@@ -18,7 +18,8 @@ libgrlbliptv_la_LIBADD =	\
 	$(LIBREST_LIBS)
 
 libgrlbliptv_la_LDFLAGS = \
-	-module		   \
+	-no-undefined	  \
+	-module		  \
 	-avoid-version
 
 libgrlbliptv_la_SOURCES = 		\
diff --git a/src/media/bookmarks/Makefile.am b/src/media/bookmarks/Makefile.am
index ce76650..a0a725a 100644
--- a/src/media/bookmarks/Makefile.am
+++ b/src/media/bookmarks/Makefile.am
@@ -16,6 +16,7 @@ libgrlbookmarks_la_LIBADD =	\
 	$(SQLITE_LIBS)
 
 libgrlbookmarks_la_LDFLAGS = \
+	-no-undefined	     \
 	-module		     \
 	-avoid-version
 
diff --git a/src/media/filesystem/Makefile.am b/src/media/filesystem/Makefile.am
index 8408251..5ffd069 100644
--- a/src/media/filesystem/Makefile.am
+++ b/src/media/filesystem/Makefile.am
@@ -16,6 +16,7 @@ libgrlfilesystem_la_LIBADD =	\
 	$(GIO_LIBS)
 
 libgrlfilesystem_la_LDFLAGS = \
+	-no-undefined	      \
 	-module		      \
 	-avoid-version
 
diff --git a/src/media/flickr/Makefile.am b/src/media/flickr/Makefile.am
index 1307763..bef05e2 100644
--- a/src/media/flickr/Makefile.am
+++ b/src/media/flickr/Makefile.am
@@ -18,6 +18,7 @@ libgrlflickr_la_LIBADD =	\
 	$(GRLNET_LIBS)
 
 libgrlflickr_la_LDFLAGS = \
+	-no-undefined	  \
 	-module		  \
 	-avoid-version
 
diff --git a/src/media/jamendo/Makefile.am b/src/media/jamendo/Makefile.am
index 15ad7ce..48a7d09 100644
--- a/src/media/jamendo/Makefile.am
+++ b/src/media/jamendo/Makefile.am
@@ -18,6 +18,7 @@ libgrljamendo_la_LIBADD =	\
 	$(XML_LIBS)
 
 libgrljamendo_la_LDFLAGS = \
+	-no-undefined	   \
 	-module		   \
 	-avoid-version
 
diff --git a/src/media/podcasts/Makefile.am b/src/media/podcasts/Makefile.am
index 0c70bc2..826ccc1 100644
--- a/src/media/podcasts/Makefile.am
+++ b/src/media/podcasts/Makefile.am
@@ -22,6 +22,7 @@ libgrlpodcasts_la_LIBADD =	\
 	$(GMIME_LIBS)
 
 libgrlpodcasts_la_LDFLAGS = \
+	-no-undefined	    \
 	-module		    \
 	-avoid-version
 
diff --git a/src/media/shoutcast/Makefile.am b/src/media/shoutcast/Makefile.am
index 088fdd3..b81ecde 100644
--- a/src/media/shoutcast/Makefile.am
+++ b/src/media/shoutcast/Makefile.am
@@ -18,6 +18,7 @@ libgrlshoutcast_la_LIBADD =	\
 	$(XML_LIBS)
 
 libgrlshoutcast_la_LDFLAGS = \
+	-no-undefined	     \
 	-module		     \
 	-avoid-version
 
diff --git a/src/media/tracker/Makefile.am b/src/media/tracker/Makefile.am
index dff699a..d44865d 100644
--- a/src/media/tracker/Makefile.am
+++ b/src/media/tracker/Makefile.am
@@ -16,6 +16,7 @@ libgrltracker_la_LIBADD =	\
 	$(TRACKER_SPARQL_LIBS)
 
 libgrltracker_la_LDFLAGS = \
+	-no-undefined	   \
 	-module		   \
 	-avoid-version
 
diff --git a/src/media/upnp/Makefile.am b/src/media/upnp/Makefile.am
index 529af34..7d6c8e8 100644
--- a/src/media/upnp/Makefile.am
+++ b/src/media/upnp/Makefile.am
@@ -22,6 +22,7 @@ libgrlupnp_la_LIBADD =	\
 	$(XML_LIBS)
 
 libgrlupnp_la_LDFLAGS = \
+	-no-undefined   \
 	-module		\
 	-avoid-version
 
diff --git a/src/media/vimeo/Makefile.am b/src/media/vimeo/Makefile.am
index c7a110a..777f00f 100644
--- a/src/media/vimeo/Makefile.am
+++ b/src/media/vimeo/Makefile.am
@@ -22,6 +22,7 @@ libgrlvimeo_la_LIBADD =	\
 	$(LIBGCRYPT_LIBS)
 
 libgrlvimeo_la_LDFLAGS = \
+	-no-undefined    \
 	-module		 \
 	-avoid-version
 
diff --git a/src/media/youtube/Makefile.am b/src/media/youtube/Makefile.am
index 5449f3b..be67ba2 100644
--- a/src/media/youtube/Makefile.am
+++ b/src/media/youtube/Makefile.am
@@ -24,6 +24,7 @@ libgrlyoutube_la_LIBADD =	\
 	$(QUVI_LIBS)
 
 libgrlyoutube_la_LDFLAGS = \
+	-no-undefined      \
 	-module		   \
 	-avoid-version
 
diff --git a/src/metadata/fake-metadata/Makefile.am b/src/metadata/fake-metadata/Makefile.am
index d5bdb0f..52eedd3 100644
--- a/src/metadata/fake-metadata/Makefile.am
+++ b/src/metadata/fake-metadata/Makefile.am
@@ -14,6 +14,7 @@ libgrlfakemetadata_la_LIBADD =	\
 	$(DEPS_LIBS)
 
 libgrlfakemetadata_la_LDFLAGS = \
+	-no-undefined		\
 	-module			\
 	-avoid-version
 
diff --git a/src/metadata/gravatar/Makefile.am b/src/metadata/gravatar/Makefile.am
index e9556b9..c17b811 100644
--- a/src/metadata/gravatar/Makefile.am
+++ b/src/metadata/gravatar/Makefile.am
@@ -14,6 +14,7 @@ libgrlgravatar_la_LIBADD =	\
 	$(DEPS_LIBS)
 
 libgrlgravatar_la_LDFLAGS = \
+	-no-undefined       \
 	-module		    \
 	-avoid-version
 
diff --git a/src/metadata/lastfm-albumart/Makefile.am b/src/metadata/lastfm-albumart/Makefile.am
index a902e1e..2fca1e7 100644
--- a/src/metadata/lastfm-albumart/Makefile.am
+++ b/src/metadata/lastfm-albumart/Makefile.am
@@ -18,6 +18,7 @@ libgrllastfm_albumart_la_LIBADD =	\
 	$(XML_LIBS)
 
 libgrllastfm_albumart_la_LDFLAGS = \
+	-no-undefined		   \
 	-module			   \
 	-avoid-version
 
diff --git a/src/metadata/local-metadata/Makefile.am b/src/metadata/local-metadata/Makefile.am
index f07b66f..e8ec945 100644
--- a/src/metadata/local-metadata/Makefile.am
+++ b/src/metadata/local-metadata/Makefile.am
@@ -16,7 +16,8 @@ libgrllocalmetadata_la_LIBADD =	\
 	$(GIO_LIBS)
 
 libgrllocalmetadata_la_LDFLAGS = \
-	-module			\
+	-no-undefined		 \
+	-module			 \
 	-avoid-version
 
 libgrllocalmetadata_la_SOURCES = grl-local-metadata.c grl-local-metadata.h
diff --git a/src/metadata/metadata-store/Makefile.am b/src/metadata/metadata-store/Makefile.am
index ba31e65..621935f 100644
--- a/src/metadata/metadata-store/Makefile.am
+++ b/src/metadata/metadata-store/Makefile.am
@@ -16,6 +16,7 @@ libgrlmetadatastore_la_LIBADD =	\
 	$(SQLITE_LIBS)
 
 libgrlmetadatastore_la_LDFLAGS = \
+	-no-undefined		 \
 	-module			 \
 	-avoid-version
 
diff --git a/test/Makefile.am b/test/Makefile.am
index a37fccd..63b2832 100644
--- a/test/Makefile.am
+++ b/test/Makefile.am
@@ -16,14 +16,12 @@ test_CFLAGS =	\
 	-DPREFIX=$(prefix)
 
 test_LDADD =		\
-	-ldl -lpthread	\
 	@DEPS_LIBS@
 
 test_local_metadata_SOURCES =  \
 	test_local_metadata.c
 
 test_local_metadata_LDADD = \
-	-ldl -lpthread	\
 	@DEPS_LIBS@ \
 	@GTHREAD_LIBS@ \
 	@GIO_LIBS@
-- 
1.7.6
[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]