diff options
author | Yaakov Selkowitz <yselkowitz@users.sourceforge.net> | 2011-12-02 11:28:26 +0000 |
---|---|---|
committer | Philip Withnall <philip@tecnocode.co.uk> | 2011-12-02 11:28:26 +0000 |
commit | 485f7897b69c9b1180da338c9cecaf9efb9c7d63 (patch) | |
tree | fc23ad95350e1a179679379a1e54eb4d31198911 /src | |
parent | 5c905cc61d04ffe40bb92330e66aea4257dd0269 (diff) | |
download | totem-485f7897b69c9b1180da338c9cecaf9efb9c7d63.tar.gz |
Fix build on Cygwin
Ensure libraries are built with -no-undefined and fix dynamically loading
dbus-glib in the browser plugin on Cygwin.
Helps: bgo#572713
Diffstat (limited to 'src')
-rw-r--r-- | src/Makefile.am | 3 | ||||
-rw-r--r-- | src/plugins/Makefile.plugins | 3 | ||||
-rw-r--r-- | src/plugins/zeitgeist-dp/Makefile.am | 5 |
3 files changed, 8 insertions, 3 deletions
diff --git a/src/Makefile.am b/src/Makefile.am index e4edd6e15..210b921b9 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -104,7 +104,8 @@ libtotem_la_CFLAGS = \ $(AM_CFLAGS) libtotem_la_LDFLAGS = \ - -export_dynamic \ + -export-dynamic \ + -no-undefined \ $(AM_LDFLAGS) libtotem_la_LIBADD = \ diff --git a/src/plugins/Makefile.plugins b/src/plugins/Makefile.plugins index c670c65f6..ae0357cb6 100644 --- a/src/plugins/Makefile.plugins +++ b/src/plugins/Makefile.plugins @@ -20,7 +20,8 @@ plugin_cflags = \ $(WARN_CFLAGS) plugin_ldflags = \ - -export_dynamic \ + -export-dynamic \ + -no-undefined \ -avoid-version \ -module diff --git a/src/plugins/zeitgeist-dp/Makefile.am b/src/plugins/zeitgeist-dp/Makefile.am index 7472b1256..3f544f598 100644 --- a/src/plugins/zeitgeist-dp/Makefile.am +++ b/src/plugins/zeitgeist-dp/Makefile.am @@ -14,7 +14,10 @@ VALAFLAGS = \ bacon-video.vapi libtotem_zeitgeist_dp_plugin_la_SOURCES = totem-zeitgeist-dp-plugin.vala -libtotem_zeitgeist_dp_plugin_la_LDFLAGS = $(plugin_ldflags) $(LIBZEITGEIST_LIBS) +libtotem_zeitgeist_dp_plugin_la_LDFLAGS = $(plugin_ldflags) +libtotem_zeitgeist_dp_plugin_la_LIBADD = \ + $(plugin_libadd) \ + $(LIBZEITGEIST_LIBS) libtotem_zeitgeist_dp_plugin_la_CFLAGS = \ $(plugin_cflags) \ $(LIBZEITGEIST_CFLAGS) \ |