[ekiga] Fix build with -Wl,-z,defs of xcap plugin



commit e7ad8353dab33d211f527d71441f3e12d5d0238b
Author: Eugen Dedu <Eugen Dedu pu-pm univ-fcomte fr>
Date:   Tue Aug 2 19:25:45 2011 +0200

    Fix build with -Wl,-z,defs of xcap plugin

 plugins/resource-list/Makefile.am |    1 +
 plugins/xcap/Makefile.am          |    6 ++++--
 2 files changed, 5 insertions(+), 2 deletions(-)
---
diff --git a/plugins/resource-list/Makefile.am b/plugins/resource-list/Makefile.am
index c1ab5a3..263c761 100644
--- a/plugins/resource-list/Makefile.am
+++ b/plugins/resource-list/Makefile.am
@@ -31,5 +31,6 @@ libgmresource_list_la_LDFLAGS = \
 	-L$(top_builddir)/plugins/xcap \
 	$(PLUGINS_LIBTOOL_FLAGS)
 libgmresource_list_la_LIBADD = \
+	$(top_builddir)/lib/libekiga.la \
 	$(top_builddir)/plugins/xcap/libgmxcap.la \
 	$(BOOST_LDFLAGS) $(BOOST_LIBS) $(GLIB_LIBS) $(XML_LIBS)
diff --git a/plugins/xcap/Makefile.am b/plugins/xcap/Makefile.am
index 1290769..612c69e 100644
--- a/plugins/xcap/Makefile.am
+++ b/plugins/xcap/Makefile.am
@@ -1,6 +1,6 @@
 plugin_LTLIBRARIES = libgmxcap.la
 
-xcap_dir = $(top_srcdir)/plugins/xcap/
+xcap_dir = $(top_srcdir)/plugins/xcap
 
 AM_CXXFLAGS = $(BOOST_CPPFLAGS) $(SOUP_CFLAGS)
 
@@ -16,4 +16,6 @@ libgmxcap_la_SOURCES = \
 	$(xcap_dir)/xcap-main.cpp
 
 libgmxcap_la_LDFLAGS = $(PLUGINS_LIBTOOL_FLAGS)
-libgmxcap_la_LIBADD = $(BOOST_LDFLAGS) $(BOOST_LIBS) $(SOUP_LIBS)
\ No newline at end of file
+libgmxcap_la_LIBADD = \
+	$(top_builddir)/lib/libekiga.la \
+	$(BOOST_LDFLAGS) $(BOOST_LIBS) $(SOUP_LIBS)



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]